From dc04cf5ff73f2e7d3eb38fbdf0fc35d28e27b502 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 21 Oct 2021 19:35:13 +0200 Subject: [PATCH] chore: migrate all upstream code to own dir --- cli/app/deploy.go | 2 +- cli/app/rollback.go | 2 +- cli/app/run.go | 2 +- cli/app/undeploy.go | 2 +- cli/app/upgrade.go | 2 +- cli/app/version.go | 2 +- pkg/app/app.go | 2 +- pkg/compose/compose.go | 4 ++-- pkg/config/app.go | 6 +++--- pkg/recipe/recipe.go | 4 ++-- pkg/{client => upstream}/container/exec.go | 0 pkg/{client => upstream}/container/hijack.go | 0 pkg/{client => upstream}/container/tty.go | 0 pkg/{client => upstream}/convert/compose.go | 0 pkg/{client => upstream}/convert/service.go | 0 pkg/{client => upstream}/convert/volume.go | 0 pkg/{client => upstream}/stack/loader.go | 0 pkg/{client => upstream}/stack/options.go | 0 pkg/{client => upstream}/stack/remove.go | 0 pkg/{client => upstream}/stack/stack.go | 2 +- 20 files changed, 15 insertions(+), 15 deletions(-) rename pkg/{client => upstream}/container/exec.go (100%) rename pkg/{client => upstream}/container/hijack.go (100%) rename pkg/{client => upstream}/container/tty.go (100%) rename pkg/{client => upstream}/convert/compose.go (100%) rename pkg/{client => upstream}/convert/service.go (100%) rename pkg/{client => upstream}/convert/volume.go (100%) rename pkg/{client => upstream}/stack/loader.go (100%) rename pkg/{client => upstream}/stack/options.go (100%) rename pkg/{client => upstream}/stack/remove.go (100%) rename pkg/{client => upstream}/stack/stack.go (99%) diff --git a/cli/app/deploy.go b/cli/app/deploy.go index 025dec6e..841b1d17 100644 --- a/cli/app/deploy.go +++ b/cli/app/deploy.go @@ -8,9 +8,9 @@ import ( "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/catalogue" "coopcloud.tech/abra/pkg/client" - stack "coopcloud.tech/abra/pkg/client/stack" "coopcloud.tech/abra/pkg/config" "coopcloud.tech/abra/pkg/recipe" + stack "coopcloud.tech/abra/pkg/upstream/stack" "github.com/AlecAivazis/survey/v2" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/cli/app/rollback.go b/cli/app/rollback.go index 43c2a477..c5a4a3a0 100644 --- a/cli/app/rollback.go +++ b/cli/app/rollback.go @@ -4,9 +4,9 @@ import ( "fmt" "coopcloud.tech/abra/pkg/catalogue" - stack "coopcloud.tech/abra/pkg/client/stack" "coopcloud.tech/abra/pkg/config" "coopcloud.tech/abra/pkg/recipe" + stack "coopcloud.tech/abra/pkg/upstream/stack" "coopcloud.tech/tagcmp" "coopcloud.tech/abra/cli/internal" diff --git a/cli/app/run.go b/cli/app/run.go index 28d1bbba..0003ce55 100644 --- a/cli/app/run.go +++ b/cli/app/run.go @@ -6,8 +6,8 @@ import ( "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/client" - "coopcloud.tech/abra/pkg/client/container" "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/upstream/container" "github.com/docker/cli/cli/command" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" diff --git a/cli/app/undeploy.go b/cli/app/undeploy.go index 035fca68..d052c40b 100644 --- a/cli/app/undeploy.go +++ b/cli/app/undeploy.go @@ -5,8 +5,8 @@ import ( "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/client" - stack "coopcloud.tech/abra/pkg/client/stack" "coopcloud.tech/abra/pkg/config" + stack "coopcloud.tech/abra/pkg/upstream/stack" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cli/app/upgrade.go b/cli/app/upgrade.go index 9333571a..66557c2f 100644 --- a/cli/app/upgrade.go +++ b/cli/app/upgrade.go @@ -6,9 +6,9 @@ import ( "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/catalogue" "coopcloud.tech/abra/pkg/client" - stack "coopcloud.tech/abra/pkg/client/stack" "coopcloud.tech/abra/pkg/config" "coopcloud.tech/abra/pkg/recipe" + stack "coopcloud.tech/abra/pkg/upstream/stack" "coopcloud.tech/tagcmp" "github.com/AlecAivazis/survey/v2" "github.com/sirupsen/logrus" diff --git a/cli/app/version.go b/cli/app/version.go index 8ba4f206..427540b7 100644 --- a/cli/app/version.go +++ b/cli/app/version.go @@ -8,8 +8,8 @@ import ( "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/catalogue" "coopcloud.tech/abra/pkg/client" - "coopcloud.tech/abra/pkg/client/stack" "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/upstream/stack" "github.com/docker/distribution/reference" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/pkg/app/app.go b/pkg/app/app.go index e9036bae..eb564a2f 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "coopcloud.tech/abra/pkg/client/stack" "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/upstream/stack" apiclient "github.com/docker/docker/client" "github.com/sirupsen/logrus" ) diff --git a/pkg/compose/compose.go b/pkg/compose/compose.go index c7b9efc5..dda1b96f 100644 --- a/pkg/compose/compose.go +++ b/pkg/compose/compose.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - "coopcloud.tech/abra/pkg/client/stack" - loader "coopcloud.tech/abra/pkg/client/stack" "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/upstream/stack" + loader "coopcloud.tech/abra/pkg/upstream/stack" composetypes "github.com/docker/cli/cli/compose/types" "github.com/docker/distribution/reference" "github.com/sirupsen/logrus" diff --git a/pkg/config/app.go b/pkg/config/app.go index faf692ff..c767b400 100644 --- a/pkg/config/app.go +++ b/pkg/config/app.go @@ -9,9 +9,9 @@ import ( "strings" "coopcloud.tech/abra/cli/formatter" - "coopcloud.tech/abra/pkg/client/convert" - loader "coopcloud.tech/abra/pkg/client/stack" - stack "coopcloud.tech/abra/pkg/client/stack" + "coopcloud.tech/abra/pkg/upstream/convert" + loader "coopcloud.tech/abra/pkg/upstream/stack" + stack "coopcloud.tech/abra/pkg/upstream/stack" composetypes "github.com/docker/cli/cli/compose/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/recipe/recipe.go b/pkg/recipe/recipe.go index 64a0a9a7..057d3487 100644 --- a/pkg/recipe/recipe.go +++ b/pkg/recipe/recipe.go @@ -6,11 +6,11 @@ import ( "path/filepath" "strings" - "coopcloud.tech/abra/pkg/client/stack" - loader "coopcloud.tech/abra/pkg/client/stack" "coopcloud.tech/abra/pkg/compose" "coopcloud.tech/abra/pkg/config" gitPkg "coopcloud.tech/abra/pkg/git" + "coopcloud.tech/abra/pkg/upstream/stack" + loader "coopcloud.tech/abra/pkg/upstream/stack" composetypes "github.com/docker/cli/cli/compose/types" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" diff --git a/pkg/client/container/exec.go b/pkg/upstream/container/exec.go similarity index 100% rename from pkg/client/container/exec.go rename to pkg/upstream/container/exec.go diff --git a/pkg/client/container/hijack.go b/pkg/upstream/container/hijack.go similarity index 100% rename from pkg/client/container/hijack.go rename to pkg/upstream/container/hijack.go diff --git a/pkg/client/container/tty.go b/pkg/upstream/container/tty.go similarity index 100% rename from pkg/client/container/tty.go rename to pkg/upstream/container/tty.go diff --git a/pkg/client/convert/compose.go b/pkg/upstream/convert/compose.go similarity index 100% rename from pkg/client/convert/compose.go rename to pkg/upstream/convert/compose.go diff --git a/pkg/client/convert/service.go b/pkg/upstream/convert/service.go similarity index 100% rename from pkg/client/convert/service.go rename to pkg/upstream/convert/service.go diff --git a/pkg/client/convert/volume.go b/pkg/upstream/convert/volume.go similarity index 100% rename from pkg/client/convert/volume.go rename to pkg/upstream/convert/volume.go diff --git a/pkg/client/stack/loader.go b/pkg/upstream/stack/loader.go similarity index 100% rename from pkg/client/stack/loader.go rename to pkg/upstream/stack/loader.go diff --git a/pkg/client/stack/options.go b/pkg/upstream/stack/options.go similarity index 100% rename from pkg/client/stack/options.go rename to pkg/upstream/stack/options.go diff --git a/pkg/client/stack/remove.go b/pkg/upstream/stack/remove.go similarity index 100% rename from pkg/client/stack/remove.go rename to pkg/upstream/stack/remove.go diff --git a/pkg/client/stack/stack.go b/pkg/upstream/stack/stack.go similarity index 99% rename from pkg/client/stack/stack.go rename to pkg/upstream/stack/stack.go index 03dd9e9d..d90f6339 100644 --- a/pkg/client/stack/stack.go +++ b/pkg/upstream/stack/stack.go @@ -6,7 +6,7 @@ import ( "strings" abraClient "coopcloud.tech/abra/pkg/client" - "coopcloud.tech/abra/pkg/client/convert" + "coopcloud.tech/abra/pkg/upstream/convert" composetypes "github.com/docker/cli/cli/compose/types" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container"