diff --git a/cmd/uncloud/caddy/deploy.go b/cmd/uncloud/caddy/deploy.go index 07c703ef..a836726c 100644 --- a/cmd/uncloud/caddy/deploy.go +++ b/cmd/uncloud/caddy/deploy.go @@ -6,13 +6,13 @@ import ( "fmt" "github.com/docker/cli/cli/streams" "github.com/docker/compose/v2/pkg/progress" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/pkg/client" "github.com/spf13/cobra" "maps" "slices" "strings" - "github.com/psviderski/uncloud/internal/cli" - "github.com/psviderski/uncloud/internal/cli/client" - "github.com/psviderski/uncloud/internal/machine/api/pb" ) type deployOptions struct { diff --git a/cmd/uncloud/deploy.go b/cmd/uncloud/deploy.go index c4be821f..fe7dd1e6 100644 --- a/cmd/uncloud/deploy.go +++ b/cmd/uncloud/deploy.go @@ -6,11 +6,11 @@ import ( "fmt" "github.com/compose-spec/compose-go/v2/types" "github.com/docker/compose/v2/pkg/progress" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/pkg/client" + "github.com/psviderski/uncloud/pkg/compose" "github.com/spf13/cobra" "strings" - "github.com/psviderski/uncloud/internal/cli" - "github.com/psviderski/uncloud/internal/cli/client" - "github.com/psviderski/uncloud/internal/compose" ) type deployOptions struct { diff --git a/cmd/uncloud/dns/reserve.go b/cmd/uncloud/dns/reserve.go index 9d6e10af..66a6d9f9 100644 --- a/cmd/uncloud/dns/reserve.go +++ b/cmd/uncloud/dns/reserve.go @@ -4,13 +4,13 @@ import ( "context" "errors" "fmt" + "github.com/psviderski/uncloud/cmd/uncloud/caddy" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/pkg/client" "github.com/spf13/cobra" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/psviderski/uncloud/cmd/uncloud/caddy" - "github.com/psviderski/uncloud/internal/cli" - "github.com/psviderski/uncloud/internal/cli/client" - "github.com/psviderski/uncloud/internal/machine/api/pb" ) const DefaultUncloudDNSAPIEndpoint = "https://dns.uncloud.run/v1" diff --git a/cmd/uncloud/dns/show.go b/cmd/uncloud/dns/show.go index 44fe4d48..4edccb85 100644 --- a/cmd/uncloud/dns/show.go +++ b/cmd/uncloud/dns/show.go @@ -4,9 +4,9 @@ import ( "context" "errors" "fmt" - "github.com/spf13/cobra" "github.com/psviderski/uncloud/internal/cli" - "github.com/psviderski/uncloud/internal/cli/client" + "github.com/psviderski/uncloud/pkg/client" + "github.com/spf13/cobra" ) type showOptions struct { diff --git a/cmd/uncloud/machine/add.go b/cmd/uncloud/machine/add.go index 09f4cd9d..7e74636a 100644 --- a/cmd/uncloud/machine/add.go +++ b/cmd/uncloud/machine/add.go @@ -6,17 +6,17 @@ import ( "fmt" "github.com/cenkalti/backoff/v4" "github.com/docker/compose/v2/pkg/progress" + "github.com/psviderski/uncloud/cmd/uncloud/caddy" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/cli/config" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/pkg/client" "github.com/spf13/cobra" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" "net/netip" "time" - "github.com/psviderski/uncloud/cmd/uncloud/caddy" - "github.com/psviderski/uncloud/internal/cli" - "github.com/psviderski/uncloud/internal/cli/client" - "github.com/psviderski/uncloud/internal/cli/config" - "github.com/psviderski/uncloud/internal/machine/api/pb" ) type addOptions struct { diff --git a/cmd/uncloud/service/run.go b/cmd/uncloud/service/run.go index 661ecb5a..19f14242 100644 --- a/cmd/uncloud/service/run.go +++ b/cmd/uncloud/service/run.go @@ -3,13 +3,13 @@ package service import ( "context" "fmt" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/pkg/api" + "github.com/psviderski/uncloud/pkg/client" "github.com/spf13/cobra" "slices" "strings" - "github.com/psviderski/uncloud/internal/api" - "github.com/psviderski/uncloud/internal/cli" - "github.com/psviderski/uncloud/internal/cli/client" - "github.com/psviderski/uncloud/internal/machine/api/pb" ) type runOptions struct { diff --git a/cmd/uncloud/service/scale.go b/cmd/uncloud/service/scale.go index 976b15de..c06e7ebe 100644 --- a/cmd/uncloud/service/scale.go +++ b/cmd/uncloud/service/scale.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/charmbracelet/huh" "github.com/docker/compose/v2/pkg/progress" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/pkg/api" "github.com/spf13/cobra" "strconv" - "github.com/psviderski/uncloud/internal/api" - "github.com/psviderski/uncloud/internal/cli" ) type scaleOptions struct { diff --git a/internal/cli/cli.go b/internal/cli/cli.go index 6d851816..bab8ba53 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -5,15 +5,15 @@ import ( "errors" "fmt" "github.com/docker/cli/cli/streams" - "net/netip" - "os" - "github.com/psviderski/uncloud/internal/cli/client" - "github.com/psviderski/uncloud/internal/cli/client/connector" "github.com/psviderski/uncloud/internal/cli/config" "github.com/psviderski/uncloud/internal/fs" "github.com/psviderski/uncloud/internal/machine" "github.com/psviderski/uncloud/internal/machine/api/pb" "github.com/psviderski/uncloud/internal/sshexec" + "github.com/psviderski/uncloud/pkg/client" + "github.com/psviderski/uncloud/pkg/client/connector" + "net/netip" + "os" "github.com/charmbracelet/huh" "google.golang.org/protobuf/types/known/emptypb" diff --git a/internal/machine/caddyfile/config.go b/internal/machine/caddyfile/config.go index 2273892d..82c94d61 100644 --- a/internal/machine/caddyfile/config.go +++ b/internal/machine/caddyfile/config.go @@ -8,14 +8,14 @@ import ( "github.com/caddyserver/caddy/v2/caddyconfig" "github.com/caddyserver/caddy/v2/modules/caddyhttp" "github.com/caddyserver/caddy/v2/modules/caddyhttp/reverseproxy" + "github.com/psviderski/uncloud/internal/machine/docker" + "github.com/psviderski/uncloud/pkg/api" "log/slog" "maps" "net" "net/http" "slices" "strconv" - "github.com/psviderski/uncloud/internal/api" - "github.com/psviderski/uncloud/internal/machine/docker" ) func GenerateConfig(containers []api.Container, verifyResponse string) (*caddy.Config, error) { diff --git a/internal/machine/caddyfile/config_test.go b/internal/machine/caddyfile/config_test.go index 57eccd2d..eeed638d 100644 --- a/internal/machine/caddyfile/config_test.go +++ b/internal/machine/caddyfile/config_test.go @@ -4,12 +4,12 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" + "github.com/psviderski/uncloud/internal/machine/docker" + "github.com/psviderski/uncloud/pkg/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "strings" "testing" - "github.com/psviderski/uncloud/internal/api" - "github.com/psviderski/uncloud/internal/machine/docker" ) func TestGenerateConfig(t *testing.T) { diff --git a/internal/machine/caddyfile/controller.go b/internal/machine/caddyfile/controller.go index 6a0868d9..8980ce76 100644 --- a/internal/machine/caddyfile/controller.go +++ b/internal/machine/caddyfile/controller.go @@ -4,12 +4,12 @@ import ( "context" "encoding/json" "fmt" + "github.com/psviderski/uncloud/internal/fs" + "github.com/psviderski/uncloud/internal/machine/store" + "github.com/psviderski/uncloud/pkg/api" "log/slog" "os" "path/filepath" - "github.com/psviderski/uncloud/internal/api" - "github.com/psviderski/uncloud/internal/fs" - "github.com/psviderski/uncloud/internal/machine/store" ) const ( diff --git a/internal/machine/docker/manager.go b/internal/machine/docker/manager.go index 4e9ec55c..065ac5ac 100644 --- a/internal/machine/docker/manager.go +++ b/internal/machine/docker/manager.go @@ -8,10 +8,10 @@ import ( "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" + "github.com/psviderski/uncloud/internal/machine/store" + "github.com/psviderski/uncloud/pkg/api" "log/slog" "time" - "github.com/psviderski/uncloud/internal/api" - "github.com/psviderski/uncloud/internal/machine/store" ) const ( diff --git a/internal/machine/store/container.go b/internal/machine/store/container.go index e7896f4e..5b9a9667 100644 --- a/internal/machine/store/container.go +++ b/internal/machine/store/container.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" sq "github.com/Masterminds/squirrel" + "github.com/psviderski/uncloud/pkg/api" "log/slog" "strings" "time" - "github.com/psviderski/uncloud/internal/api" ) const ( diff --git a/internal/ucind/machine.go b/internal/ucind/machine.go index 5654e69e..eb7e7d70 100644 --- a/internal/ucind/machine.go +++ b/internal/ucind/machine.go @@ -9,14 +9,14 @@ import ( "github.com/docker/docker/api/types/image" dockerclient "github.com/docker/docker/client" "github.com/docker/go-connections/nat" + "github.com/psviderski/uncloud/internal/secret" + "github.com/psviderski/uncloud/pkg/client" + "github.com/psviderski/uncloud/pkg/client/connector" "google.golang.org/protobuf/types/known/emptypb" "io" "net" "net/netip" "time" - "github.com/psviderski/uncloud/internal/cli/client" - "github.com/psviderski/uncloud/internal/cli/client/connector" - "github.com/psviderski/uncloud/internal/secret" ) const ( diff --git a/internal/api/container.go b/pkg/api/container.go similarity index 100% rename from internal/api/container.go rename to pkg/api/container.go diff --git a/internal/api/container_test.go b/pkg/api/container_test.go similarity index 100% rename from internal/api/container_test.go rename to pkg/api/container_test.go diff --git a/internal/api/port.go b/pkg/api/port.go similarity index 100% rename from internal/api/port.go rename to pkg/api/port.go diff --git a/internal/api/port_test.go b/pkg/api/port_test.go similarity index 100% rename from internal/api/port_test.go rename to pkg/api/port_test.go diff --git a/internal/api/service.go b/pkg/api/service.go similarity index 100% rename from internal/api/service.go rename to pkg/api/service.go index 0a13ae8e..b70b1aea 100644 --- a/internal/api/service.go +++ b/pkg/api/service.go @@ -6,11 +6,11 @@ import ( "encoding/json" "fmt" "github.com/distribution/reference" + "github.com/psviderski/uncloud/internal/machine/api/pb" "maps" "reflect" "regexp" "slices" - "github.com/psviderski/uncloud/internal/machine/api/pb" ) const ( diff --git a/internal/cli/client/caddy.go b/pkg/client/caddy.go similarity index 98% rename from internal/cli/client/caddy.go rename to pkg/client/caddy.go index 4e724ef6..50490f91 100644 --- a/internal/cli/client/caddy.go +++ b/pkg/client/caddy.go @@ -6,7 +6,7 @@ import ( "github.com/distribution/reference" "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/v1/remote" - "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/pkg/api" "regexp" ) diff --git a/internal/cli/client/caddy_test.go b/pkg/client/caddy_test.go similarity index 97% rename from internal/cli/client/caddy_test.go rename to pkg/client/caddy_test.go index 7f2ead53..489d51c3 100644 --- a/internal/cli/client/caddy_test.go +++ b/pkg/client/caddy_test.go @@ -1,10 +1,10 @@ package client import ( + "github.com/psviderski/uncloud/pkg/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" - "github.com/psviderski/uncloud/internal/api" ) func TestClient_NewCaddyDeployment(t *testing.T) { diff --git a/internal/cli/client/client.go b/pkg/client/client.go similarity index 100% rename from internal/cli/client/client.go rename to pkg/client/client.go diff --git a/internal/cli/client/cluster.go b/pkg/client/cluster.go similarity index 100% rename from internal/cli/client/cluster.go rename to pkg/client/cluster.go index a2f4c70c..bc424af7 100644 --- a/internal/cli/client/cluster.go +++ b/pkg/client/cluster.go @@ -2,8 +2,8 @@ package client import ( "context" - "google.golang.org/protobuf/types/known/emptypb" "github.com/psviderski/uncloud/internal/machine/api/pb" + "google.golang.org/protobuf/types/known/emptypb" ) func (cli *Client) InspectMachine(ctx context.Context, id string) (*pb.MachineMember, error) { diff --git a/internal/cli/client/compose.go b/pkg/client/compose.go similarity index 97% rename from internal/cli/client/compose.go rename to pkg/client/compose.go index b59c1293..bc611bd2 100644 --- a/internal/cli/client/compose.go +++ b/pkg/client/compose.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/compose-spec/compose-go/v2/graph" "github.com/compose-spec/compose-go/v2/types" - "github.com/psviderski/uncloud/internal/api" - "github.com/psviderski/uncloud/internal/compose" + "github.com/psviderski/uncloud/pkg/api" + "github.com/psviderski/uncloud/pkg/compose" ) func (cli *Client) NewComposeDeployment(ctx context.Context, project *types.Project) (*ComposeDeployment, error) { diff --git a/internal/cli/client/connector/ssh.go b/pkg/client/connector/ssh.go similarity index 100% rename from internal/cli/client/connector/ssh.go rename to pkg/client/connector/ssh.go diff --git a/internal/cli/client/connector/tcp.go b/pkg/client/connector/tcp.go similarity index 100% rename from internal/cli/client/connector/tcp.go rename to pkg/client/connector/tcp.go diff --git a/internal/cli/client/connector/wireguard.go b/pkg/client/connector/wireguard.go similarity index 97% rename from internal/cli/client/connector/wireguard.go rename to pkg/client/connector/wireguard.go index 1bae7e9c..92681e21 100644 --- a/internal/cli/client/connector/wireguard.go +++ b/pkg/client/connector/wireguard.go @@ -3,16 +3,16 @@ package connector import ( "context" "fmt" + "github.com/psviderski/uncloud/internal/cli/config" + machine2 "github.com/psviderski/uncloud/internal/machine" + "github.com/psviderski/uncloud/internal/machine/network" + "github.com/psviderski/uncloud/internal/machine/network/tunnel" + "github.com/psviderski/uncloud/pkg/client" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "net" "net/netip" "strconv" - "github.com/psviderski/uncloud/internal/cli/client" - "github.com/psviderski/uncloud/internal/cli/config" - machine2 "github.com/psviderski/uncloud/internal/machine" - "github.com/psviderski/uncloud/internal/machine/network" - "github.com/psviderski/uncloud/internal/machine/network/tunnel" ) // WireGuardConnector establishes a connection to the cluster API through a WireGuard tunnel diff --git a/internal/cli/client/container.go b/pkg/client/container.go similarity index 99% rename from internal/cli/client/container.go rename to pkg/client/container.go index 9b502be2..74762b40 100644 --- a/internal/cli/client/container.go +++ b/pkg/client/container.go @@ -10,12 +10,12 @@ import ( dockerclient "github.com/docker/docker/client" "github.com/docker/docker/pkg/jsonmessage" "github.com/docker/go-connections/nat" + machinedocker "github.com/psviderski/uncloud/internal/machine/docker" + "github.com/psviderski/uncloud/internal/secret" + "github.com/psviderski/uncloud/pkg/api" "google.golang.org/grpc/status" "strconv" "strings" - "github.com/psviderski/uncloud/internal/api" - machinedocker "github.com/psviderski/uncloud/internal/machine/docker" - "github.com/psviderski/uncloud/internal/secret" ) // CreateContainer creates a new container for the given service on the specified machine. diff --git a/internal/cli/client/deploy.go b/pkg/client/deploy.go similarity index 98% rename from internal/cli/client/deploy.go rename to pkg/client/deploy.go index ab5ea1dc..bbff09e3 100644 --- a/internal/cli/client/deploy.go +++ b/pkg/client/deploy.go @@ -4,8 +4,8 @@ import ( "context" "errors" "fmt" - "github.com/psviderski/uncloud/internal/api" "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/pkg/api" ) // Deployment manages the process of creating or updating a service to match a desired state. diff --git a/internal/cli/client/dns.go b/pkg/client/dns.go similarity index 100% rename from internal/cli/client/dns.go rename to pkg/client/dns.go index 78d1c581..6818f047 100644 --- a/internal/cli/client/dns.go +++ b/pkg/client/dns.go @@ -6,14 +6,14 @@ import ( "fmt" "github.com/cenkalti/backoff/v4" "github.com/docker/compose/v2/pkg/progress" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/machine/caddyfile" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "io" "net/http" "sync" "time" - "github.com/psviderski/uncloud/internal/machine/api/pb" - "github.com/psviderski/uncloud/internal/machine/caddyfile" ) // GetDomain returns the cluster domain name or ErrNotFound if it hasn't been reserved yet. diff --git a/internal/cli/client/operation.go b/pkg/client/operation.go similarity index 99% rename from internal/cli/client/operation.go rename to pkg/client/operation.go index 29cbb84a..327ca535 100644 --- a/internal/cli/client/operation.go +++ b/pkg/client/operation.go @@ -4,8 +4,8 @@ import ( "context" "fmt" "github.com/docker/docker/api/types/container" + "github.com/psviderski/uncloud/pkg/api" "strings" - "github.com/psviderski/uncloud/internal/api" ) // Operation represents a single atomic operation in a deployment process. diff --git a/internal/cli/client/resolver.go b/pkg/client/resolver.go similarity index 98% rename from internal/cli/client/resolver.go rename to pkg/client/resolver.go index 41e9280f..7f8073af 100644 --- a/internal/cli/client/resolver.go +++ b/pkg/client/resolver.go @@ -3,8 +3,8 @@ package client import ( "fmt" "github.com/distribution/reference" - "github.com/psviderski/uncloud/internal/api" "github.com/psviderski/uncloud/internal/secret" + "github.com/psviderski/uncloud/pkg/api" "strings" ) diff --git a/internal/cli/client/service.go b/pkg/client/service.go similarity index 99% rename from internal/cli/client/service.go rename to pkg/client/service.go index 14021ccb..d8ced27a 100644 --- a/internal/cli/client/service.go +++ b/pkg/client/service.go @@ -7,13 +7,13 @@ import ( "github.com/docker/compose/v2/pkg/progress" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/pkg/api" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "slices" "sync" - "github.com/psviderski/uncloud/internal/api" - "github.com/psviderski/uncloud/internal/machine/api/pb" ) func (cli *Client) PrepareDeploymentSpec(ctx context.Context, spec api.ServiceSpec) (api.ServiceSpec, error) { diff --git a/internal/cli/client/strategy.go b/pkg/client/strategy.go similarity index 99% rename from internal/cli/client/strategy.go rename to pkg/client/strategy.go index 5cea2c10..29bc0d11 100644 --- a/internal/cli/client/strategy.go +++ b/pkg/client/strategy.go @@ -3,11 +3,11 @@ package client import ( "context" "fmt" - "math/rand/v2" - "slices" - "github.com/psviderski/uncloud/internal/api" "github.com/psviderski/uncloud/internal/machine/api/pb" "github.com/psviderski/uncloud/internal/secret" + "github.com/psviderski/uncloud/pkg/api" + "math/rand/v2" + "slices" ) // Strategy defines how a service should be deployed or updated. Different implementations can provide various diff --git a/internal/cli/client/user.go b/pkg/client/user.go similarity index 100% rename from internal/cli/client/user.go rename to pkg/client/user.go index 81583ebe..96c23b5c 100644 --- a/internal/cli/client/user.go +++ b/pkg/client/user.go @@ -2,10 +2,10 @@ package client import ( "fmt" - "golang.zx2c4.com/wireguard/wgctrl/wgtypes" - "net/netip" "github.com/psviderski/uncloud/internal/machine/network" "github.com/psviderski/uncloud/internal/secret" + "golang.zx2c4.com/wireguard/wgctrl/wgtypes" + "net/netip" ) type User struct { diff --git a/internal/compose/port.go b/pkg/compose/port.go similarity index 96% rename from internal/compose/port.go rename to pkg/compose/port.go index 5045ccac..79af6065 100644 --- a/internal/compose/port.go +++ b/pkg/compose/port.go @@ -3,7 +3,7 @@ package compose import ( "fmt" "github.com/compose-spec/compose-go/v2/types" - "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/pkg/api" ) const PortsExtensionKey = "x-ports" diff --git a/internal/compose/project.go b/pkg/compose/project.go similarity index 100% rename from internal/compose/project.go rename to pkg/compose/project.go diff --git a/internal/compose/service.go b/pkg/compose/service.go similarity index 95% rename from internal/compose/service.go rename to pkg/compose/service.go index 3fdf3c89..18c7fef0 100644 --- a/internal/compose/service.go +++ b/pkg/compose/service.go @@ -3,7 +3,7 @@ package compose import ( "fmt" "github.com/compose-spec/compose-go/v2/types" - "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/pkg/api" ) func ServiceSpecFromCompose(name string, service types.ServiceConfig) (api.ServiceSpec, error) { diff --git a/test/e2e/assert.go b/test/e2e/assert.go index dd140f9f..d6817c5c 100644 --- a/test/e2e/assert.go +++ b/test/e2e/assert.go @@ -2,11 +2,11 @@ package e2e import ( mapset "github.com/deckarep/golang-set/v2" + "github.com/psviderski/uncloud/pkg/api" + "github.com/psviderski/uncloud/pkg/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" - "github.com/psviderski/uncloud/internal/api" - "github.com/psviderski/uncloud/internal/cli/client" ) func assertServiceMatchesSpec(t *testing.T, svc api.Service, spec api.ServiceSpec) { diff --git a/test/e2e/cluster_test.go b/test/e2e/cluster_test.go index eaaee7d8..f7025c56 100644 --- a/test/e2e/cluster_test.go +++ b/test/e2e/cluster_test.go @@ -4,6 +4,9 @@ import ( "context" "errors" dockerclient "github.com/docker/docker/client" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/ucind" + "github.com/psviderski/uncloud/pkg/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" @@ -11,9 +14,6 @@ import ( "os" "testing" "time" - "github.com/psviderski/uncloud/internal/cli/client" - "github.com/psviderski/uncloud/internal/machine/api/pb" - "github.com/psviderski/uncloud/internal/ucind" ) func createTestCluster( diff --git a/test/e2e/compose_test.go b/test/e2e/compose_test.go index ff1216d3..6b8a85c7 100644 --- a/test/e2e/compose_test.go +++ b/test/e2e/compose_test.go @@ -3,10 +3,10 @@ package e2e import ( "context" "errors" - "github.com/psviderski/uncloud/internal/api" - "github.com/psviderski/uncloud/internal/cli/client" - "github.com/psviderski/uncloud/internal/compose" "github.com/psviderski/uncloud/internal/ucind" + "github.com/psviderski/uncloud/pkg/api" + "github.com/psviderski/uncloud/pkg/client" + "github.com/psviderski/uncloud/pkg/compose" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/test/e2e/service_test.go b/test/e2e/service_test.go index ade653f8..2a3f9ef4 100644 --- a/test/e2e/service_test.go +++ b/test/e2e/service_test.go @@ -5,17 +5,17 @@ import ( "errors" "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" + "github.com/psviderski/uncloud/internal/machine/api/pb" + machinedocker "github.com/psviderski/uncloud/internal/machine/docker" + "github.com/psviderski/uncloud/internal/secret" + "github.com/psviderski/uncloud/internal/ucind" + "github.com/psviderski/uncloud/pkg/api" + "github.com/psviderski/uncloud/pkg/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "net/netip" "strings" "testing" - "github.com/psviderski/uncloud/internal/api" - "github.com/psviderski/uncloud/internal/cli/client" - "github.com/psviderski/uncloud/internal/machine/api/pb" - machinedocker "github.com/psviderski/uncloud/internal/machine/docker" - "github.com/psviderski/uncloud/internal/secret" - "github.com/psviderski/uncloud/internal/ucind" ) func newServiceID() string {