From 4704cd21f6ae261b0633185557fc58373d4311c4 Mon Sep 17 00:00:00 2001 From: Mansour B Date: Mon, 15 Apr 2024 13:02:20 +0200 Subject: [PATCH] fixed typo in module name and imports --- Makefile | 2 +- go.mod | 2 +- internal/config/config.go | 2 +- internal/files/config.go | 4 ++-- internal/log/debug.go | 2 +- internal/log/error.go | 2 +- internal/log/info.go | 2 +- internal/log/warning.go | 2 +- internal/provider/docker/client.go | 2 +- internal/provider/docker/engine.go | 6 +++--- internal/provider/docker/engine_test.go | 2 +- internal/provider/docker/feature.go | 6 +++--- internal/provider/docker/feature_test.go | 4 ++-- internal/provider/docker/labels.go | 2 +- internal/provider/docker/provider.go | 10 +++++----- internal/provider/docker/provider_test.go | 6 +++--- internal/provider/docker/types.go | 2 +- internal/provider/docker/types_test.go | 2 +- internal/provider/interface.go | 6 +++--- internal/service/application/server.go | 6 +++--- internal/service/grpc.go | 10 +++++----- internal/service/http.go | 10 +++++----- internal/state/diff/diff.go | 10 +++++----- internal/state/diff/diff_test.go | 6 +++--- internal/state/diff/provider_test.go | 6 +++--- internal/state/diff/reconciler.go | 6 +++--- internal/state/diff/reconciler_test.go | 6 +++--- internal/state/evaluation.go | 2 +- internal/state/evaluation_test.go | 4 ++-- internal/state/feature.go | 2 +- internal/state/persistence/local.go | 4 ++-- internal/state/persistence/local_test.go | 4 ++-- internal/state/persistence/reader.go | 4 ++-- internal/state/persistence/reader_test.go | 2 +- internal/state/persistence/types.go | 2 +- internal/state/persistence/watcher.go | 4 ++-- internal/state/persistence/watcher_test.go | 2 +- internal/state/persistence/writer.go | 4 ++-- internal/state/persistence/writer_test.go | 4 ++-- internal/state/spec.go | 4 ++-- internal/state/spec_test.go | 2 +- main.go | 12 ++++++------ pkg/control/loop.go | 8 ++++---- pkg/control/loop_test.go | 6 +++--- pkg/control/state.go | 10 +++++----- pkg/feature/fluent_bit.go | 4 ++-- pkg/resource/application.go | 4 ++-- pkg/resource/image.go | 2 +- pkg/resource/port.go | 2 +- proto/application/v1/resources.proto | 2 +- proto/application/v1/service.proto | 2 +- proto/buf.gen.yaml | 4 ++-- 52 files changed, 113 insertions(+), 113 deletions(-) diff --git a/Makefile b/Makefile index d10a438..0310c71 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ BINARY := out/agent -PACKAGE_NAME := github.com/mabaitar/gco/agent +PACKAGE_NAME := github.com/mbaitar/gco/agent VERSION := v0.1.0 BUILD := $(shell date +%Y%m%d) diff --git a/go.mod b/go.mod index 9d627e5..3179bc5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/mabaitar/gco/agent +module github.com/mbaitar/gco/agent go 1.19 diff --git a/internal/config/config.go b/internal/config/config.go index c002956..34f3f8e 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -1,7 +1,7 @@ package config import ( - "github.com/mabaitar/gco/agent/internal/flag" + "github.com/mbaitar/gco/agent/internal/flag" ) type Config struct { diff --git a/internal/files/config.go b/internal/files/config.go index 8dcf60b..5907ad9 100644 --- a/internal/files/config.go +++ b/internal/files/config.go @@ -5,8 +5,8 @@ import ( "os" "path" - "github.com/mabaitar/gco/agent/internal/hash" - "github.com/mabaitar/gco/agent/internal/log" + "github.com/mbaitar/gco/agent/internal/hash" + "github.com/mbaitar/gco/agent/internal/log" ) // directory specifies the directory to use when writing configuration files. diff --git a/internal/log/debug.go b/internal/log/debug.go index 361ceb6..7e77836 100644 --- a/internal/log/debug.go +++ b/internal/log/debug.go @@ -3,7 +3,7 @@ package log import ( "fmt" - "github.com/mabaitar/gco/agent/internal/flag" + "github.com/mbaitar/gco/agent/internal/flag" ) // Debug prints out a debug message to StdOut. diff --git a/internal/log/error.go b/internal/log/error.go index 54e8ee2..012b9a9 100644 --- a/internal/log/error.go +++ b/internal/log/error.go @@ -3,7 +3,7 @@ package log import ( "fmt" - "github.com/mabaitar/gco/agent/internal/flag" + "github.com/mbaitar/gco/agent/internal/flag" ) // Error prints out an error message to StdErr. diff --git a/internal/log/info.go b/internal/log/info.go index 2a62954..1c35130 100644 --- a/internal/log/info.go +++ b/internal/log/info.go @@ -3,7 +3,7 @@ package log import ( "fmt" - "github.com/mabaitar/gco/agent/internal/flag" + "github.com/mbaitar/gco/agent/internal/flag" ) // Info prints out an informative message to StdOut. diff --git a/internal/log/warning.go b/internal/log/warning.go index d63592f..baf68cc 100644 --- a/internal/log/warning.go +++ b/internal/log/warning.go @@ -3,7 +3,7 @@ package log import ( "fmt" - "github.com/mabaitar/gco/agent/internal/flag" + "github.com/mbaitar/gco/agent/internal/flag" ) // Warn prints out a warning message to StdOut. diff --git a/internal/provider/docker/client.go b/internal/provider/docker/client.go index 2c8f14f..ca17c8a 100644 --- a/internal/provider/docker/client.go +++ b/internal/provider/docker/client.go @@ -4,7 +4,7 @@ import ( "os" docker "github.com/docker/docker/client" - "github.com/mabaitar/gco/agent/internal/log" + "github.com/mbaitar/gco/agent/internal/log" ) func newDockerClient() docker.APIClient { diff --git a/internal/provider/docker/engine.go b/internal/provider/docker/engine.go index ffadffd..5226f69 100644 --- a/internal/provider/docker/engine.go +++ b/internal/provider/docker/engine.go @@ -6,9 +6,9 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - "github.com/mabaitar/gco/agent/internal/files" - "github.com/mabaitar/gco/agent/internal/log" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/internal/files" + "github.com/mbaitar/gco/agent/internal/log" + "github.com/mbaitar/gco/agent/pkg/resource" ) // startContainer allows the provider to start a container using their known container id. diff --git a/internal/provider/docker/engine_test.go b/internal/provider/docker/engine_test.go index 0b01e2b..d6a200b 100644 --- a/internal/provider/docker/engine_test.go +++ b/internal/provider/docker/engine_test.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/pkg/resource" "github.com/stretchr/testify/assert" ) diff --git a/internal/provider/docker/feature.go b/internal/provider/docker/feature.go index e0e31ee..685647b 100644 --- a/internal/provider/docker/feature.go +++ b/internal/provider/docker/feature.go @@ -3,9 +3,9 @@ package docker import ( "fmt" - "github.com/mabaitar/gco/agent/internal/files" - "github.com/mabaitar/gco/agent/pkg/feature" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/internal/files" + "github.com/mbaitar/gco/agent/pkg/feature" + "github.com/mbaitar/gco/agent/pkg/resource" ) // createFluentBitContainer creates an internal container definition based on the feature.FluentBit configuration. diff --git a/internal/provider/docker/feature_test.go b/internal/provider/docker/feature_test.go index 4cc393a..98f1f31 100644 --- a/internal/provider/docker/feature_test.go +++ b/internal/provider/docker/feature_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/mabaitar/gco/agent/pkg/feature" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/pkg/feature" + "github.com/mbaitar/gco/agent/pkg/resource" "github.com/stretchr/testify/assert" ) diff --git a/internal/provider/docker/labels.go b/internal/provider/docker/labels.go index cf6f18b..9698495 100644 --- a/internal/provider/docker/labels.go +++ b/internal/provider/docker/labels.go @@ -3,7 +3,7 @@ package docker import ( "fmt" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/pkg/resource" ) // labelPrefix is the prefix used for the labels associated with GCO diff --git a/internal/provider/docker/provider.go b/internal/provider/docker/provider.go index 823b36e..f38152d 100644 --- a/internal/provider/docker/provider.go +++ b/internal/provider/docker/provider.go @@ -2,11 +2,11 @@ package docker import ( docker "github.com/docker/docker/client" - "github.com/mabaitar/gco/agent/internal/config" - "github.com/mabaitar/gco/agent/internal/provider" - "github.com/mabaitar/gco/agent/internal/state" - "github.com/mabaitar/gco/agent/pkg/feature" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/internal/config" + "github.com/mbaitar/gco/agent/internal/provider" + "github.com/mbaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/pkg/feature" + "github.com/mbaitar/gco/agent/pkg/resource" ) // Provider defines a docker provider which can communicate with the local docker socket. diff --git a/internal/provider/docker/provider_test.go b/internal/provider/docker/provider_test.go index 08e5615..99fbb39 100644 --- a/internal/provider/docker/provider_test.go +++ b/internal/provider/docker/provider_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/docker/docker/api/types" - "github.com/mabaitar/gco/agent/internal/files" - "github.com/mabaitar/gco/agent/pkg/feature" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/internal/files" + "github.com/mbaitar/gco/agent/pkg/feature" + "github.com/mbaitar/gco/agent/pkg/resource" "github.com/stretchr/testify/assert" ) diff --git a/internal/provider/docker/types.go b/internal/provider/docker/types.go index 2eed0fa..68cf64b 100644 --- a/internal/provider/docker/types.go +++ b/internal/provider/docker/types.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/pkg/resource" ) // containerPort describes a port exposed by a container. diff --git a/internal/provider/docker/types_test.go b/internal/provider/docker/types_test.go index 916ed16..aa82b48 100644 --- a/internal/provider/docker/types_test.go +++ b/internal/provider/docker/types_test.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/pkg/resource" "github.com/stretchr/testify/assert" ) diff --git a/internal/provider/interface.go b/internal/provider/interface.go index 34d12c0..64cab31 100644 --- a/internal/provider/interface.go +++ b/internal/provider/interface.go @@ -1,9 +1,9 @@ package provider import ( - "github.com/mabaitar/gco/agent/internal/state" - "github.com/mabaitar/gco/agent/pkg/feature" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/pkg/feature" + "github.com/mbaitar/gco/agent/pkg/resource" ) // Provider defines the external container system which will be used diff --git a/internal/service/application/server.go b/internal/service/application/server.go index 77cc70d..498bdf1 100644 --- a/internal/service/application/server.go +++ b/internal/service/application/server.go @@ -3,9 +3,9 @@ package application import ( "context" - applicationv1 "github.com/mabaitar/gco/agent/gen/proto/application/v1" - "github.com/mabaitar/gco/agent/pkg/control" - "github.com/mabaitar/gco/agent/pkg/resource" + applicationv1 "github.com/mbaitar/gco/agent/gen/proto/application/v1" + "github.com/mbaitar/gco/agent/pkg/control" + "github.com/mbaitar/gco/agent/pkg/resource" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/service/grpc.go b/internal/service/grpc.go index d9eaa96..7b214ef 100644 --- a/internal/service/grpc.go +++ b/internal/service/grpc.go @@ -4,11 +4,11 @@ import ( "net" "os" - applicationv1 "github.com/mabaitar/gco/agent/gen/proto/application/v1" - "github.com/mabaitar/gco/agent/internal/config" - "github.com/mabaitar/gco/agent/internal/log" - "github.com/mabaitar/gco/agent/internal/service/application" - "github.com/mabaitar/gco/agent/pkg/control" + applicationv1 "github.com/mbaitar/gco/agent/gen/proto/application/v1" + "github.com/mbaitar/gco/agent/internal/config" + "github.com/mbaitar/gco/agent/internal/log" + "github.com/mbaitar/gco/agent/internal/service/application" + "github.com/mbaitar/gco/agent/pkg/control" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/service/http.go b/internal/service/http.go index 02f9ca2..4ea7f18 100644 --- a/internal/service/http.go +++ b/internal/service/http.go @@ -10,11 +10,11 @@ import ( "net/http" "os" - applicationv1 "github.com/mabaitar/gco/agent/gen/proto/application/v1" - "github.com/mabaitar/gco/agent/internal/config" - "github.com/mabaitar/gco/agent/internal/log" - "github.com/mabaitar/gco/agent/internal/service/application" - "github.com/mabaitar/gco/agent/pkg/control" + applicationv1 "github.com/mbaitar/gco/agent/gen/proto/application/v1" + "github.com/mbaitar/gco/agent/internal/config" + "github.com/mbaitar/gco/agent/internal/log" + "github.com/mbaitar/gco/agent/internal/service/application" + "github.com/mbaitar/gco/agent/pkg/control" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/state/diff/diff.go b/internal/state/diff/diff.go index cc17b86..8c7eb05 100644 --- a/internal/state/diff/diff.go +++ b/internal/state/diff/diff.go @@ -1,11 +1,11 @@ package diff import ( - "github.com/mabaitar/gco/agent/internal/flag" - "github.com/mabaitar/gco/agent/internal/log" - "github.com/mabaitar/gco/agent/internal/state" - "github.com/mabaitar/gco/agent/pkg/feature" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/internal/flag" + "github.com/mbaitar/gco/agent/internal/log" + "github.com/mbaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/pkg/feature" + "github.com/mbaitar/gco/agent/pkg/resource" ) // changes defines a structure which holds the comparison results of to states. diff --git a/internal/state/diff/diff_test.go b/internal/state/diff/diff_test.go index 45f4f1e..b632623 100644 --- a/internal/state/diff/diff_test.go +++ b/internal/state/diff/diff_test.go @@ -3,9 +3,9 @@ package diff import ( "testing" - "github.com/mabaitar/gco/agent/internal/state" - "github.com/mabaitar/gco/agent/pkg/feature" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/pkg/feature" + "github.com/mbaitar/gco/agent/pkg/resource" "github.com/stretchr/testify/assert" ) diff --git a/internal/state/diff/provider_test.go b/internal/state/diff/provider_test.go index 64c69d8..7b16f7e 100644 --- a/internal/state/diff/provider_test.go +++ b/internal/state/diff/provider_test.go @@ -1,9 +1,9 @@ package diff import ( - "github.com/mabaitar/gco/agent/internal/state" - "github.com/mabaitar/gco/agent/pkg/feature" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/pkg/feature" + "github.com/mbaitar/gco/agent/pkg/resource" ) type TestProvider struct { diff --git a/internal/state/diff/reconciler.go b/internal/state/diff/reconciler.go index 1553de1..c03c3fb 100644 --- a/internal/state/diff/reconciler.go +++ b/internal/state/diff/reconciler.go @@ -1,9 +1,9 @@ package diff import ( - "github.com/mabaitar/gco/agent/internal/log" - "github.com/mabaitar/gco/agent/internal/provider" - "github.com/mabaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/internal/log" + "github.com/mbaitar/gco/agent/internal/provider" + "github.com/mbaitar/gco/agent/internal/state" ) // Reconciler defines a structure that is responsible for the reconciliation process diff --git a/internal/state/diff/reconciler_test.go b/internal/state/diff/reconciler_test.go index 1facc39..bfed786 100644 --- a/internal/state/diff/reconciler_test.go +++ b/internal/state/diff/reconciler_test.go @@ -4,9 +4,9 @@ import ( "errors" "testing" - "github.com/mabaitar/gco/agent/internal/state" - "github.com/mabaitar/gco/agent/pkg/feature" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/pkg/feature" + "github.com/mbaitar/gco/agent/pkg/resource" "github.com/stretchr/testify/assert" ) diff --git a/internal/state/evaluation.go b/internal/state/evaluation.go index f5cd427..8151957 100644 --- a/internal/state/evaluation.go +++ b/internal/state/evaluation.go @@ -1,7 +1,7 @@ package state import ( - "github.com/mabaitar/gco/agent/pkg/feature" + "github.com/mbaitar/gco/agent/pkg/feature" ) // Evaluate updates the current application specifications based on the enabled features. diff --git a/internal/state/evaluation_test.go b/internal/state/evaluation_test.go index 876f7b8..c5f0515 100644 --- a/internal/state/evaluation_test.go +++ b/internal/state/evaluation_test.go @@ -3,8 +3,8 @@ package state import ( "testing" - "github.com/mabaitar/gco/agent/pkg/feature" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/pkg/feature" + "github.com/mbaitar/gco/agent/pkg/resource" "github.com/stretchr/testify/assert" ) diff --git a/internal/state/feature.go b/internal/state/feature.go index b17c0ac..1cc0bec 100644 --- a/internal/state/feature.go +++ b/internal/state/feature.go @@ -1,6 +1,6 @@ package state -import "github.com/mabaitar/gco/agent/pkg/feature" +import "github.com/mbaitar/gco/agent/pkg/feature" type Feature struct { // FluentBit specifies the fluent-bit feature configuration for the agent. diff --git a/internal/state/persistence/local.go b/internal/state/persistence/local.go index 9785875..57230e8 100644 --- a/internal/state/persistence/local.go +++ b/internal/state/persistence/local.go @@ -3,8 +3,8 @@ package persistence import ( "os" - "github.com/mabaitar/gco/agent/internal/log" - "github.com/mabaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/internal/log" + "github.com/mbaitar/gco/agent/internal/state" ) type LocalController struct { diff --git a/internal/state/persistence/local_test.go b/internal/state/persistence/local_test.go index 40b3e11..0cf59a3 100644 --- a/internal/state/persistence/local_test.go +++ b/internal/state/persistence/local_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/mabaitar/gco/agent/internal/state" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/pkg/resource" "github.com/stretchr/testify/assert" ) diff --git a/internal/state/persistence/reader.go b/internal/state/persistence/reader.go index ab84475..9171ba0 100644 --- a/internal/state/persistence/reader.go +++ b/internal/state/persistence/reader.go @@ -4,8 +4,8 @@ import ( "encoding/json" "io" - "github.com/mabaitar/gco/agent/internal/log" - "github.com/mabaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/internal/log" + "github.com/mbaitar/gco/agent/internal/state" ) // ReadJson reads the state from the io.ReadCloser. diff --git a/internal/state/persistence/reader_test.go b/internal/state/persistence/reader_test.go index a44f306..2743897 100644 --- a/internal/state/persistence/reader_test.go +++ b/internal/state/persistence/reader_test.go @@ -7,7 +7,7 @@ import ( "testing" "testing/iotest" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/pkg/resource" "github.com/stretchr/testify/assert" ) diff --git a/internal/state/persistence/types.go b/internal/state/persistence/types.go index ffe13dc..cfcd3f7 100644 --- a/internal/state/persistence/types.go +++ b/internal/state/persistence/types.go @@ -1,7 +1,7 @@ package persistence import ( - "github.com/mabaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/internal/state" ) // ChangeChannel defines a channel used for read only messages of a changed State. diff --git a/internal/state/persistence/watcher.go b/internal/state/persistence/watcher.go index d7bab7d..eb2c899 100644 --- a/internal/state/persistence/watcher.go +++ b/internal/state/persistence/watcher.go @@ -4,8 +4,8 @@ import ( "os" "github.com/fsnotify/fsnotify" - "github.com/mabaitar/gco/agent/internal/log" - "github.com/mabaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/internal/log" + "github.com/mbaitar/gco/agent/internal/state" ) type ChangeHandler func(s *state.Spec) diff --git a/internal/state/persistence/watcher_test.go b/internal/state/persistence/watcher_test.go index 37bb60d..01eb01c 100644 --- a/internal/state/persistence/watcher_test.go +++ b/internal/state/persistence/watcher_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/fsnotify/fsnotify" - "github.com/mabaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/internal/state" "github.com/stretchr/testify/assert" ) diff --git a/internal/state/persistence/writer.go b/internal/state/persistence/writer.go index 746bb03..78a1e73 100644 --- a/internal/state/persistence/writer.go +++ b/internal/state/persistence/writer.go @@ -6,8 +6,8 @@ import ( "errors" "io" - "github.com/mabaitar/gco/agent/internal/log" - "github.com/mabaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/internal/log" + "github.com/mbaitar/gco/agent/internal/state" ) // WriteJson writes the given state to the io.Writer. diff --git a/internal/state/persistence/writer_test.go b/internal/state/persistence/writer_test.go index 7e6e7af..4106376 100644 --- a/internal/state/persistence/writer_test.go +++ b/internal/state/persistence/writer_test.go @@ -6,8 +6,8 @@ import ( "regexp" "testing" - "github.com/mabaitar/gco/agent/internal/state" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/pkg/resource" "github.com/stretchr/testify/assert" ) diff --git a/internal/state/spec.go b/internal/state/spec.go index 310b7e0..60aea6d 100644 --- a/internal/state/spec.go +++ b/internal/state/spec.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/mabaitar/gco/agent/pkg/feature" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/pkg/feature" + "github.com/mbaitar/gco/agent/pkg/resource" ) // Spec describes the application specification in an 'as is' or 'should be' state. diff --git a/internal/state/spec_test.go b/internal/state/spec_test.go index 7675931..ed2e53b 100644 --- a/internal/state/spec_test.go +++ b/internal/state/spec_test.go @@ -3,7 +3,7 @@ package state import ( "testing" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/pkg/resource" "github.com/stretchr/testify/assert" ) diff --git a/main.go b/main.go index d6efb77..0b1cf28 100644 --- a/main.go +++ b/main.go @@ -3,12 +3,12 @@ package main import ( "os" - "github.com/mabaitar/gco/agent/internal/config" - "github.com/mabaitar/gco/agent/internal/log" - "github.com/mabaitar/gco/agent/internal/provider" - "github.com/mabaitar/gco/agent/internal/provider/docker" - "github.com/mabaitar/gco/agent/internal/service" - "github.com/mabaitar/gco/agent/pkg/control" + "github.com/mbaitar/gco/agent/internal/config" + "github.com/mbaitar/gco/agent/internal/log" + "github.com/mbaitar/gco/agent/internal/provider" + "github.com/mbaitar/gco/agent/internal/provider/docker" + "github.com/mbaitar/gco/agent/internal/service" + "github.com/mbaitar/gco/agent/pkg/control" ) func createProvider(conf *config.Config) provider.Provider { diff --git a/pkg/control/loop.go b/pkg/control/loop.go index fa7bc45..4396dda 100644 --- a/pkg/control/loop.go +++ b/pkg/control/loop.go @@ -5,10 +5,10 @@ import ( "os" "github.com/google/uuid" - "github.com/mabaitar/gco/agent/internal/log" - "github.com/mabaitar/gco/agent/internal/provider" - "github.com/mabaitar/gco/agent/internal/state" - "github.com/mabaitar/gco/agent/internal/state/diff" + "github.com/mbaitar/gco/agent/internal/log" + "github.com/mbaitar/gco/agent/internal/provider" + "github.com/mbaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/internal/state/diff" "golang.org/x/sync/semaphore" ) diff --git a/pkg/control/loop_test.go b/pkg/control/loop_test.go index fd6dd8a..3a0cc8c 100644 --- a/pkg/control/loop_test.go +++ b/pkg/control/loop_test.go @@ -5,9 +5,9 @@ import ( "sync" "testing" - "github.com/mabaitar/gco/agent/internal/state" - "github.com/mabaitar/gco/agent/pkg/feature" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/pkg/feature" + "github.com/mbaitar/gco/agent/pkg/resource" "github.com/stretchr/testify/assert" ) diff --git a/pkg/control/state.go b/pkg/control/state.go index b56c204..5356cf7 100644 --- a/pkg/control/state.go +++ b/pkg/control/state.go @@ -4,11 +4,11 @@ import ( "os" "path" - "github.com/mabaitar/gco/agent/internal/flag" - "github.com/mabaitar/gco/agent/internal/log" - "github.com/mabaitar/gco/agent/internal/state" - "github.com/mabaitar/gco/agent/internal/state/persistence" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/internal/flag" + "github.com/mbaitar/gco/agent/internal/log" + "github.com/mbaitar/gco/agent/internal/state" + "github.com/mbaitar/gco/agent/internal/state/persistence" + "github.com/mbaitar/gco/agent/pkg/resource" ) // StateController is a controller structure which manages the internal desired state of the application. diff --git a/pkg/feature/fluent_bit.go b/pkg/feature/fluent_bit.go index 0d5267e..109f2e3 100644 --- a/pkg/feature/fluent_bit.go +++ b/pkg/feature/fluent_bit.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "github.com/mabaitar/gco/agent/internal/hash" - "github.com/mabaitar/gco/agent/pkg/resource" + "github.com/mbaitar/gco/agent/internal/hash" + "github.com/mbaitar/gco/agent/pkg/resource" ) type FluentBit struct { diff --git a/pkg/resource/application.go b/pkg/resource/application.go index eed777c..ec56dfc 100644 --- a/pkg/resource/application.go +++ b/pkg/resource/application.go @@ -1,8 +1,8 @@ package resource import ( - applicationv1 "github.com/mabaitar/gco/agent/gen/proto/application/v1" - "github.com/mabaitar/gco/agent/internal/hash" + applicationv1 "github.com/mbaitar/gco/agent/gen/proto/application/v1" + "github.com/mbaitar/gco/agent/internal/hash" ) // Application defines a structure which describes everything the application needs diff --git a/pkg/resource/image.go b/pkg/resource/image.go index afbf553..ef6b5b1 100644 --- a/pkg/resource/image.go +++ b/pkg/resource/image.go @@ -1,6 +1,6 @@ package resource -import applicationv1 "github.com/mabaitar/gco/agent/gen/proto/application/v1" +import applicationv1 "github.com/mbaitar/gco/agent/gen/proto/application/v1" // Image defines a containerized image. type Image struct { diff --git a/pkg/resource/port.go b/pkg/resource/port.go index f55f10d..1b75b70 100644 --- a/pkg/resource/port.go +++ b/pkg/resource/port.go @@ -1,6 +1,6 @@ package resource -import applicationv1 "github.com/mabaitar/gco/agent/gen/proto/application/v1" +import applicationv1 "github.com/mbaitar/gco/agent/gen/proto/application/v1" type Protocol string diff --git a/proto/application/v1/resources.proto b/proto/application/v1/resources.proto index 32eec65..acafcd7 100644 --- a/proto/application/v1/resources.proto +++ b/proto/application/v1/resources.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package application.v1; -option go_package = "github.com/mabaitar/gco/agent/gen/proto/application/v1;applicationv1"; +option go_package = "github.com/mbaitar/gco/agent/gen/proto/application/v1;applicationv1"; message Image { string name = 1; diff --git a/proto/application/v1/service.proto b/proto/application/v1/service.proto index 71ff386..9f3c686 100644 --- a/proto/application/v1/service.proto +++ b/proto/application/v1/service.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package application.v1; -option go_package = "github.com/mabaitar/gco/agent/gen/proto/application/v1;applicationv1"; +option go_package = "github.com/mbaitar/gco/agent/gen/proto/application/v1;applicationv1"; import "application/v1/resources.proto"; diff --git a/proto/buf.gen.yaml b/proto/buf.gen.yaml index f3af0f7..595932b 100644 --- a/proto/buf.gen.yaml +++ b/proto/buf.gen.yaml @@ -3,8 +3,8 @@ plugins: - plugin: go out: ../ opt: - - module=github.com/mabaitar/gco/agent + - module=github.com/mbaitar/gco/agent - plugin: go-grpc out: ../ opt: - - module=github.com/mabaitar/gco/agent \ No newline at end of file + - module=github.com/mbaitar/gco/agent \ No newline at end of file