From 7a9d0cf9db38dd369e3afb651185e4b5304e6ad3 Mon Sep 17 00:00:00 2001 From: Pavel Sviderski Date: Mon, 24 Mar 2025 14:41:50 +1000 Subject: [PATCH] refactor: move compose and deploy packages under client --- cmd/uncloud/caddy/deploy.go | 2 +- cmd/uncloud/deploy.go | 4 ++-- cmd/uncloud/service/run.go | 2 +- pkg/client/caddy.go | 2 +- pkg/{ => client}/compose/deploy.go | 2 +- pkg/{ => client}/compose/port.go | 0 pkg/{ => client}/compose/project.go | 0 pkg/{ => client}/compose/service.go | 0 pkg/client/deploy.go | 2 +- pkg/{ => client}/deploy/container.go | 0 pkg/{ => client}/deploy/deploy.go | 0 pkg/{ => client}/deploy/operation.go | 0 pkg/{ => client}/deploy/resolver.go | 0 pkg/{ => client}/deploy/strategy.go | 0 pkg/client/service.go | 2 +- test/e2e/assert.go | 2 +- test/e2e/compose_test.go | 2 +- test/e2e/service_test.go | 2 +- 18 files changed, 11 insertions(+), 11 deletions(-) rename pkg/{ => client}/compose/deploy.go (98%) rename pkg/{ => client}/compose/port.go (100%) rename pkg/{ => client}/compose/project.go (100%) rename pkg/{ => client}/compose/service.go (100%) rename pkg/{ => client}/deploy/container.go (100%) rename pkg/{ => client}/deploy/deploy.go (100%) rename pkg/{ => client}/deploy/operation.go (100%) rename pkg/{ => client}/deploy/resolver.go (100%) rename pkg/{ => client}/deploy/strategy.go (100%) diff --git a/cmd/uncloud/caddy/deploy.go b/cmd/uncloud/caddy/deploy.go index 17dfa7f9..9ca40635 100644 --- a/cmd/uncloud/caddy/deploy.go +++ b/cmd/uncloud/caddy/deploy.go @@ -10,7 +10,7 @@ import ( "github.com/psviderski/uncloud/internal/machine/api/pb" "github.com/psviderski/uncloud/pkg/api" "github.com/psviderski/uncloud/pkg/client" - "github.com/psviderski/uncloud/pkg/deploy" + "github.com/psviderski/uncloud/pkg/client/deploy" "github.com/spf13/cobra" "maps" "slices" diff --git a/cmd/uncloud/deploy.go b/cmd/uncloud/deploy.go index 8393da01..1f2c42b0 100644 --- a/cmd/uncloud/deploy.go +++ b/cmd/uncloud/deploy.go @@ -8,8 +8,8 @@ import ( "github.com/docker/compose/v2/pkg/progress" "github.com/psviderski/uncloud/internal/cli" "github.com/psviderski/uncloud/pkg/api" - "github.com/psviderski/uncloud/pkg/compose" - "github.com/psviderski/uncloud/pkg/deploy" + "github.com/psviderski/uncloud/pkg/client/compose" + "github.com/psviderski/uncloud/pkg/client/deploy" "github.com/spf13/cobra" "strings" ) diff --git a/cmd/uncloud/service/run.go b/cmd/uncloud/service/run.go index 9f3f9f08..f8fc905d 100644 --- a/cmd/uncloud/service/run.go +++ b/cmd/uncloud/service/run.go @@ -6,7 +6,7 @@ import ( "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/deploy" + "github.com/psviderski/uncloud/pkg/client/deploy" "github.com/spf13/cobra" "slices" "strings" diff --git a/pkg/client/caddy.go b/pkg/client/caddy.go index a144bb98..67ca31ac 100644 --- a/pkg/client/caddy.go +++ b/pkg/client/caddy.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/psviderski/uncloud/pkg/api" - "github.com/psviderski/uncloud/pkg/deploy" + "github.com/psviderski/uncloud/pkg/client/deploy" "regexp" ) diff --git a/pkg/compose/deploy.go b/pkg/client/compose/deploy.go similarity index 98% rename from pkg/compose/deploy.go rename to pkg/client/compose/deploy.go index 5cb2401f..d0d69dfa 100644 --- a/pkg/compose/deploy.go +++ b/pkg/client/compose/deploy.go @@ -7,7 +7,7 @@ import ( "github.com/compose-spec/compose-go/v2/graph" "github.com/compose-spec/compose-go/v2/types" "github.com/psviderski/uncloud/pkg/api" - "github.com/psviderski/uncloud/pkg/deploy" + "github.com/psviderski/uncloud/pkg/client/deploy" ) type Client interface { diff --git a/pkg/compose/port.go b/pkg/client/compose/port.go similarity index 100% rename from pkg/compose/port.go rename to pkg/client/compose/port.go diff --git a/pkg/compose/project.go b/pkg/client/compose/project.go similarity index 100% rename from pkg/compose/project.go rename to pkg/client/compose/project.go diff --git a/pkg/compose/service.go b/pkg/client/compose/service.go similarity index 100% rename from pkg/compose/service.go rename to pkg/client/compose/service.go diff --git a/pkg/client/deploy.go b/pkg/client/deploy.go index ebbe37f1..ef30b745 100644 --- a/pkg/client/deploy.go +++ b/pkg/client/deploy.go @@ -2,7 +2,7 @@ package client import ( "github.com/psviderski/uncloud/pkg/api" - "github.com/psviderski/uncloud/pkg/deploy" + "github.com/psviderski/uncloud/pkg/client/deploy" ) // NewDeployment creates a new deployment for the given service specification. diff --git a/pkg/deploy/container.go b/pkg/client/deploy/container.go similarity index 100% rename from pkg/deploy/container.go rename to pkg/client/deploy/container.go diff --git a/pkg/deploy/deploy.go b/pkg/client/deploy/deploy.go similarity index 100% rename from pkg/deploy/deploy.go rename to pkg/client/deploy/deploy.go diff --git a/pkg/deploy/operation.go b/pkg/client/deploy/operation.go similarity index 100% rename from pkg/deploy/operation.go rename to pkg/client/deploy/operation.go diff --git a/pkg/deploy/resolver.go b/pkg/client/deploy/resolver.go similarity index 100% rename from pkg/deploy/resolver.go rename to pkg/client/deploy/resolver.go diff --git a/pkg/deploy/strategy.go b/pkg/client/deploy/strategy.go similarity index 100% rename from pkg/deploy/strategy.go rename to pkg/client/deploy/strategy.go diff --git a/pkg/client/service.go b/pkg/client/service.go index a06e0bc1..1270a028 100644 --- a/pkg/client/service.go +++ b/pkg/client/service.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/psviderski/uncloud/internal/machine/api/pb" "github.com/psviderski/uncloud/pkg/api" - "github.com/psviderski/uncloud/pkg/deploy" + "github.com/psviderski/uncloud/pkg/client/deploy" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" diff --git a/test/e2e/assert.go b/test/e2e/assert.go index 30a8db5b..da22dc96 100644 --- a/test/e2e/assert.go +++ b/test/e2e/assert.go @@ -3,7 +3,7 @@ package e2e import ( mapset "github.com/deckarep/golang-set/v2" "github.com/psviderski/uncloud/pkg/api" - "github.com/psviderski/uncloud/pkg/deploy" + "github.com/psviderski/uncloud/pkg/client/deploy" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/test/e2e/compose_test.go b/test/e2e/compose_test.go index b56001f1..6139b680 100644 --- a/test/e2e/compose_test.go +++ b/test/e2e/compose_test.go @@ -5,7 +5,7 @@ import ( "errors" "github.com/psviderski/uncloud/internal/ucind" "github.com/psviderski/uncloud/pkg/api" - "github.com/psviderski/uncloud/pkg/compose" + "github.com/psviderski/uncloud/pkg/client/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 4eebbca2..589beffa 100644 --- a/test/e2e/service_test.go +++ b/test/e2e/service_test.go @@ -11,7 +11,7 @@ import ( "github.com/psviderski/uncloud/internal/ucind" "github.com/psviderski/uncloud/pkg/api" "github.com/psviderski/uncloud/pkg/client" - "github.com/psviderski/uncloud/pkg/deploy" + "github.com/psviderski/uncloud/pkg/client/deploy" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "net/netip"