Skip to content

Commit

Permalink
Merge pull request #4 from mbaitar/3-fix-typo-in-modules
Browse files Browse the repository at this point in the history
fixed typo in module name and imports
  • Loading branch information
mbaitar authored Apr 15, 2024
2 parents cb6d3df + 4704cd2 commit bd680ee
Show file tree
Hide file tree
Showing 52 changed files with 113 additions and 113 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/mabaitar/gco/agent
module github.com/mbaitar/gco/agent

go 1.19

Expand Down
2 changes: 1 addition & 1 deletion internal/config/config.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package config

import (
"github.com/mabaitar/gco/agent/internal/flag"
"github.com/mbaitar/gco/agent/internal/flag"
)

type Config struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/files/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/log/debug.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/log/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/log/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/log/warning.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/docker/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions internal/provider/docker/engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/docker/engine_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/provider/docker/feature.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/docker/feature_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/provider/docker/labels.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions internal/provider/docker/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions internal/provider/docker/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/provider/docker/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/docker/types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/provider/interface.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions internal/service/application/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
10 changes: 5 additions & 5 deletions internal/service/grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
10 changes: 5 additions & 5 deletions internal/service/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
10 changes: 5 additions & 5 deletions internal/state/diff/diff.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 3 additions & 3 deletions internal/state/diff/diff_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/state/diff/provider_test.go
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions internal/state/diff/reconciler.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions internal/state/diff/reconciler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/state/evaluation.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions internal/state/evaluation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/state/feature.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions internal/state/persistence/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions internal/state/persistence/local_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/state/persistence/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/state/persistence/reader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/state/persistence/types.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions internal/state/persistence/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading

0 comments on commit bd680ee

Please sign in to comment.