diff --git a/cli/app/backup.go b/cli/app/backup.go index daff42319..f1fe6f885 100644 --- a/cli/app/backup.go +++ b/cli/app/backup.go @@ -10,7 +10,7 @@ import ( "strings" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/config" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cli/app/check.go b/cli/app/check.go index a519a203b..b329a4e4e 100644 --- a/cli/app/check.go +++ b/cli/app/check.go @@ -7,7 +7,7 @@ import ( "strings" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/config" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cli/app/config.go b/cli/app/config.go index 0a2018751..87c221370 100644 --- a/cli/app/config.go +++ b/cli/app/config.go @@ -6,7 +6,7 @@ import ( "os/exec" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/config" "github.com/AlecAivazis/survey/v2" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/cli/app/cp.go b/cli/app/cp.go index 33178751f..86c784a91 100644 --- a/cli/app/cp.go +++ b/cli/app/cp.go @@ -8,8 +8,8 @@ import ( "strings" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/client" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/config" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/pkg/archive" diff --git a/cli/app/deploy.go b/cli/app/deploy.go index 79d226753..15013aa86 100644 --- a/cli/app/deploy.go +++ b/cli/app/deploy.go @@ -5,9 +5,9 @@ import ( "fmt" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/client" - stack "coopcloud.tech/abra/client/stack" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/client" + stack "coopcloud.tech/abra/pkg/client/stack" + "coopcloud.tech/abra/pkg/config" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cli/app/list.go b/cli/app/list.go index 649aae95e..11d424aa2 100644 --- a/cli/app/list.go +++ b/cli/app/list.go @@ -4,7 +4,7 @@ import ( "sort" abraFormatter "coopcloud.tech/abra/cli/formatter" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/config" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cli/app/logs.go b/cli/app/logs.go index 0936765e1..693d5de6a 100644 --- a/cli/app/logs.go +++ b/cli/app/logs.go @@ -9,8 +9,8 @@ import ( "sync" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/client" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/config" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" dockerClient "github.com/docker/docker/client" diff --git a/cli/app/new.go b/cli/app/new.go index 2a3fe2017..0536e7c40 100644 --- a/cli/app/new.go +++ b/cli/app/new.go @@ -5,12 +5,12 @@ import ( "fmt" "path" - "coopcloud.tech/abra/catalogue" abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/config" - "coopcloud.tech/abra/recipe" - "coopcloud.tech/abra/secret" + "coopcloud.tech/abra/pkg/catalogue" + "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/recipe" + "coopcloud.tech/abra/pkg/secret" "github.com/AlecAivazis/survey/v2" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/cli/app/ps.go b/cli/app/ps.go index 0aace8e6c..b9cd9457d 100644 --- a/cli/app/ps.go +++ b/cli/app/ps.go @@ -7,8 +7,8 @@ import ( abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/client" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/config" "github.com/docker/cli/cli/command/formatter" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" diff --git a/cli/app/remove.go b/cli/app/remove.go index 53d6ab7e8..4fda2ae11 100644 --- a/cli/app/remove.go +++ b/cli/app/remove.go @@ -7,8 +7,8 @@ import ( "os" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/client" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/config" "github.com/AlecAivazis/survey/v2" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" diff --git a/cli/app/restore.go b/cli/app/restore.go index 30a974018..17c0b4853 100644 --- a/cli/app/restore.go +++ b/cli/app/restore.go @@ -10,7 +10,7 @@ import ( "strings" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/config" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cli/app/run.go b/cli/app/run.go index e37e66d6a..a0165ebd4 100644 --- a/cli/app/run.go +++ b/cli/app/run.go @@ -6,9 +6,9 @@ import ( "fmt" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/client" - "coopcloud.tech/abra/client/container" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/client/container" + "coopcloud.tech/abra/pkg/config" "github.com/docker/cli/cli/command" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" diff --git a/cli/app/secret.go b/cli/app/secret.go index b9dc2762d..300a55cfd 100644 --- a/cli/app/secret.go +++ b/cli/app/secret.go @@ -8,9 +8,9 @@ import ( abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/client" - "coopcloud.tech/abra/config" - "coopcloud.tech/abra/secret" + "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/secret" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/sirupsen/logrus" diff --git a/cli/app/undeploy.go b/cli/app/undeploy.go index 68c041d59..6c51c917b 100644 --- a/cli/app/undeploy.go +++ b/cli/app/undeploy.go @@ -5,9 +5,9 @@ import ( "errors" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/client" - stack "coopcloud.tech/abra/client/stack" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/client" + stack "coopcloud.tech/abra/pkg/client/stack" + "coopcloud.tech/abra/pkg/config" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cli/app/version.go b/cli/app/version.go index 2264f3418..6ada7fd1f 100644 --- a/cli/app/version.go +++ b/cli/app/version.go @@ -8,8 +8,8 @@ import ( abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/client/stack" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/client/stack" + "coopcloud.tech/abra/pkg/config" "github.com/docker/distribution/reference" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/cli/app/volume.go b/cli/app/volume.go index 0aa03098b..c4a5dbd83 100644 --- a/cli/app/volume.go +++ b/cli/app/volume.go @@ -6,8 +6,8 @@ import ( abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/client" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/config" "github.com/AlecAivazis/survey/v2" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/cli/internal/validate.go b/cli/internal/validate.go index ed19092a7..d8f8df29e 100644 --- a/cli/internal/validate.go +++ b/cli/internal/validate.go @@ -3,7 +3,7 @@ package internal import ( "errors" - "coopcloud.tech/abra/recipe" + "coopcloud.tech/abra/pkg/recipe" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cli/recipe/recipe.go b/cli/recipe/recipe.go index 0675fe01b..1ade7f792 100644 --- a/cli/recipe/recipe.go +++ b/cli/recipe/recipe.go @@ -11,15 +11,15 @@ import ( "strings" "text/template" - "coopcloud.tech/abra/catalogue" "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/client" - "coopcloud.tech/abra/client/stack" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/catalogue" + "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/client/stack" + "coopcloud.tech/abra/pkg/config" "coopcloud.tech/tagcmp" - loader "coopcloud.tech/abra/client/stack" + loader "coopcloud.tech/abra/pkg/client/stack" "github.com/AlecAivazis/survey/v2" "github.com/docker/distribution/reference" "github.com/go-git/go-git/v5" diff --git a/cli/server/add.go b/cli/server/add.go index ec1ad54a5..ab60fa516 100644 --- a/cli/server/add.go +++ b/cli/server/add.go @@ -3,7 +3,7 @@ package server import ( "fmt" - "coopcloud.tech/abra/client" + "coopcloud.tech/abra/pkg/client" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cli/server/init.go b/cli/server/init.go index f54af290f..f33b416d2 100644 --- a/cli/server/init.go +++ b/cli/server/init.go @@ -8,7 +8,7 @@ import ( "time" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/client" + "coopcloud.tech/abra/pkg/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/sirupsen/logrus" diff --git a/cli/server/list.go b/cli/server/list.go index 63ec32cb2..41a20a1c2 100644 --- a/cli/server/list.go +++ b/cli/server/list.go @@ -4,8 +4,8 @@ import ( "strings" "coopcloud.tech/abra/cli/formatter" - "coopcloud.tech/abra/client" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/config" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cli/server/remove.go b/cli/server/remove.go index 8955d90db..6ffd98068 100644 --- a/cli/server/remove.go +++ b/cli/server/remove.go @@ -4,7 +4,7 @@ import ( "errors" "coopcloud.tech/abra/cli/internal" - "coopcloud.tech/abra/client" + "coopcloud.tech/abra/pkg/client" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/catalogue/catalogue.go b/pkg/catalogue/catalogue.go similarity index 98% rename from catalogue/catalogue.go rename to pkg/catalogue/catalogue.go index 94b154d79..d53922098 100644 --- a/catalogue/catalogue.go +++ b/pkg/catalogue/catalogue.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "coopcloud.tech/abra/config" - "coopcloud.tech/abra/web" + "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/web" ) // RecipeCatalogueURL is the only current recipe catalogue available. diff --git a/client/client.go b/pkg/client/client.go similarity index 100% rename from client/client.go rename to pkg/client/client.go diff --git a/client/connection.go b/pkg/client/connection.go similarity index 100% rename from client/connection.go rename to pkg/client/connection.go diff --git a/client/container/LICENSE b/pkg/client/container/LICENSE similarity index 100% rename from client/container/LICENSE rename to pkg/client/container/LICENSE diff --git a/client/container/README.md b/pkg/client/container/README.md similarity index 100% rename from client/container/README.md rename to pkg/client/container/README.md diff --git a/client/container/exec.go b/pkg/client/container/exec.go similarity index 100% rename from client/container/exec.go rename to pkg/client/container/exec.go diff --git a/client/container/hijack.go b/pkg/client/container/hijack.go similarity index 100% rename from client/container/hijack.go rename to pkg/client/container/hijack.go diff --git a/client/container/tty.go b/pkg/client/container/tty.go similarity index 100% rename from client/container/tty.go rename to pkg/client/container/tty.go diff --git a/client/context.go b/pkg/client/context.go similarity index 100% rename from client/context.go rename to pkg/client/context.go diff --git a/client/context_test.go b/pkg/client/context_test.go similarity index 100% rename from client/context_test.go rename to pkg/client/context_test.go diff --git a/client/convert/LICENSE b/pkg/client/convert/LICENSE similarity index 100% rename from client/convert/LICENSE rename to pkg/client/convert/LICENSE diff --git a/client/convert/README.md b/pkg/client/convert/README.md similarity index 100% rename from client/convert/README.md rename to pkg/client/convert/README.md diff --git a/client/convert/compose.go b/pkg/client/convert/compose.go similarity index 100% rename from client/convert/compose.go rename to pkg/client/convert/compose.go diff --git a/client/convert/compose_test.go b/pkg/client/convert/compose_test.go similarity index 100% rename from client/convert/compose_test.go rename to pkg/client/convert/compose_test.go diff --git a/client/convert/service.go b/pkg/client/convert/service.go similarity index 100% rename from client/convert/service.go rename to pkg/client/convert/service.go diff --git a/client/convert/service_test.go b/pkg/client/convert/service_test.go similarity index 100% rename from client/convert/service_test.go rename to pkg/client/convert/service_test.go diff --git a/client/convert/volume.go b/pkg/client/convert/volume.go similarity index 100% rename from client/convert/volume.go rename to pkg/client/convert/volume.go diff --git a/client/convert/volume_test.go b/pkg/client/convert/volume_test.go similarity index 100% rename from client/convert/volume_test.go rename to pkg/client/convert/volume_test.go diff --git a/client/registry.go b/pkg/client/registry.go similarity index 99% rename from client/registry.go rename to pkg/client/registry.go index 91618e1c8..f374266ef 100644 --- a/client/registry.go +++ b/pkg/client/registry.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "coopcloud.tech/abra/web" + "coopcloud.tech/abra/pkg/web" "github.com/docker/distribution/reference" ) diff --git a/client/secret.go b/pkg/client/secret.go similarity index 100% rename from client/secret.go rename to pkg/client/secret.go diff --git a/client/stack/loader.go b/pkg/client/stack/loader.go similarity index 100% rename from client/stack/loader.go rename to pkg/client/stack/loader.go diff --git a/client/stack/options.go b/pkg/client/stack/options.go similarity index 100% rename from client/stack/options.go rename to pkg/client/stack/options.go diff --git a/client/stack/remove.go b/pkg/client/stack/remove.go similarity index 100% rename from client/stack/remove.go rename to pkg/client/stack/remove.go diff --git a/client/stack/stack.go b/pkg/client/stack/stack.go similarity index 99% rename from client/stack/stack.go rename to pkg/client/stack/stack.go index 45ddf5992..dc8f2ac09 100644 --- a/client/stack/stack.go +++ b/pkg/client/stack/stack.go @@ -4,8 +4,8 @@ import ( "context" "strings" - abraClient "coopcloud.tech/abra/client" - "coopcloud.tech/abra/client/convert" + abraClient "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/client/convert" composetypes "github.com/docker/cli/cli/compose/types" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" diff --git a/client/volumes.go b/pkg/client/volumes.go similarity index 100% rename from client/volumes.go rename to pkg/client/volumes.go diff --git a/config/app.go b/pkg/config/app.go similarity index 98% rename from config/app.go rename to pkg/config/app.go index 6b7b3948f..048e607cf 100644 --- a/config/app.go +++ b/pkg/config/app.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "coopcloud.tech/abra/client/convert" - loader "coopcloud.tech/abra/client/stack" - stack "coopcloud.tech/abra/client/stack" + "coopcloud.tech/abra/pkg/client/convert" + loader "coopcloud.tech/abra/pkg/client/stack" + stack "coopcloud.tech/abra/pkg/client/stack" composetypes "github.com/docker/cli/cli/compose/types" "github.com/docker/distribution/reference" "github.com/sirupsen/logrus" diff --git a/config/app_test.go b/pkg/config/app_test.go similarity index 100% rename from config/app_test.go rename to pkg/config/app_test.go diff --git a/config/env.go b/pkg/config/env.go similarity index 100% rename from config/env.go rename to pkg/config/env.go diff --git a/config/env_test.go b/pkg/config/env_test.go similarity index 100% rename from config/env_test.go rename to pkg/config/env_test.go diff --git a/recipe/recipe.go b/pkg/recipe/recipe.go similarity index 97% rename from recipe/recipe.go rename to pkg/recipe/recipe.go index 1f398f0d0..bf8c99779 100644 --- a/recipe/recipe.go +++ b/pkg/recipe/recipe.go @@ -6,7 +6,7 @@ import ( "path" "strings" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/config" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" ) diff --git a/secret/pass.go b/pkg/secret/pass.go similarity index 100% rename from secret/pass.go rename to pkg/secret/pass.go diff --git a/secret/secret.go b/pkg/secret/secret.go similarity index 98% rename from secret/secret.go rename to pkg/secret/secret.go index b4c778c16..e8437c114 100644 --- a/secret/secret.go +++ b/pkg/secret/secret.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "coopcloud.tech/abra/client" - "coopcloud.tech/abra/config" + "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/config" "github.com/schultz-is/passgen" ) diff --git a/web/web.go b/pkg/web/web.go similarity index 100% rename from web/web.go rename to pkg/web/web.go