diff --git a/src/cmd/connect.go b/src/cmd/connect.go index 35fbe4e828..131faa0f7c 100644 --- a/src/cmd/connect.go +++ b/src/cmd/connect.go @@ -11,7 +11,7 @@ import ( "syscall" "github.com/defenseunicorns/zarf/src/config/lang" - "github.com/defenseunicorns/zarf/src/internal/cluster" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/k8s" "github.com/defenseunicorns/zarf/src/pkg/message" "github.com/defenseunicorns/zarf/src/pkg/utils/exec" diff --git a/src/cmd/destroy.go b/src/cmd/destroy.go index 455b44f076..ff6beff29c 100644 --- a/src/cmd/destroy.go +++ b/src/cmd/destroy.go @@ -11,8 +11,8 @@ import ( "github.com/defenseunicorns/zarf/src/config" "github.com/defenseunicorns/zarf/src/config/lang" - "github.com/defenseunicorns/zarf/src/internal/cluster" "github.com/defenseunicorns/zarf/src/internal/packager/helm" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/message" "github.com/defenseunicorns/zarf/src/pkg/utils" "github.com/defenseunicorns/zarf/src/pkg/utils/exec" diff --git a/src/cmd/internal.go b/src/cmd/internal.go index 404dba5baa..f0b9590de7 100644 --- a/src/cmd/internal.go +++ b/src/cmd/internal.go @@ -13,8 +13,8 @@ import ( "github.com/defenseunicorns/zarf/src/cmd/common" "github.com/defenseunicorns/zarf/src/config/lang" "github.com/defenseunicorns/zarf/src/internal/agent" - "github.com/defenseunicorns/zarf/src/internal/cluster" "github.com/defenseunicorns/zarf/src/internal/packager/git" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/message" "github.com/defenseunicorns/zarf/src/pkg/utils/helpers" "github.com/defenseunicorns/zarf/src/types" diff --git a/src/cmd/package.go b/src/cmd/package.go index c7c2042550..03bd367e7e 100644 --- a/src/cmd/package.go +++ b/src/cmd/package.go @@ -22,7 +22,7 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/defenseunicorns/zarf/src/config" - "github.com/defenseunicorns/zarf/src/internal/cluster" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/packager" "github.com/defenseunicorns/zarf/src/pkg/utils/helpers" "github.com/spf13/cobra" diff --git a/src/cmd/tools/crane.go b/src/cmd/tools/crane.go index 5e68f8f7e1..fb7274eeff 100644 --- a/src/cmd/tools/crane.go +++ b/src/cmd/tools/crane.go @@ -12,7 +12,7 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/defenseunicorns/zarf/src/config" "github.com/defenseunicorns/zarf/src/config/lang" - "github.com/defenseunicorns/zarf/src/internal/cluster" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/message" "github.com/defenseunicorns/zarf/src/pkg/transform" "github.com/defenseunicorns/zarf/src/pkg/utils/exec" diff --git a/src/cmd/tools/zarf.go b/src/cmd/tools/zarf.go index dfd5f9e68a..effa209882 100644 --- a/src/cmd/tools/zarf.go +++ b/src/cmd/tools/zarf.go @@ -14,9 +14,9 @@ import ( "github.com/defenseunicorns/zarf/src/cmd/common" "github.com/defenseunicorns/zarf/src/config" "github.com/defenseunicorns/zarf/src/config/lang" - "github.com/defenseunicorns/zarf/src/internal/cluster" "github.com/defenseunicorns/zarf/src/internal/packager/git" "github.com/defenseunicorns/zarf/src/internal/packager/helm" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/message" "github.com/defenseunicorns/zarf/src/pkg/oci" "github.com/defenseunicorns/zarf/src/pkg/packager/sources" diff --git a/src/extensions/bigbang/test/bigbang_test.go b/src/extensions/bigbang/test/bigbang_test.go index 3ac99359a9..ef52824ec5 100644 --- a/src/extensions/bigbang/test/bigbang_test.go +++ b/src/extensions/bigbang/test/bigbang_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/defenseunicorns/zarf/src/internal/cluster" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/utils/exec" test "github.com/defenseunicorns/zarf/src/test" "github.com/stretchr/testify/require" diff --git a/src/internal/packager/git/gitea.go b/src/internal/packager/git/gitea.go index 609095f6ad..4aa1cf7b78 100644 --- a/src/internal/packager/git/gitea.go +++ b/src/internal/packager/git/gitea.go @@ -14,7 +14,7 @@ import ( netHttp "net/http" "github.com/defenseunicorns/zarf/src/config" - "github.com/defenseunicorns/zarf/src/internal/cluster" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/k8s" "github.com/defenseunicorns/zarf/src/pkg/message" ) diff --git a/src/internal/packager/helm/common.go b/src/internal/packager/helm/common.go index 74b6d476cf..4eb2b60990 100644 --- a/src/internal/packager/helm/common.go +++ b/src/internal/packager/helm/common.go @@ -7,7 +7,7 @@ package helm import ( "path/filepath" - "github.com/defenseunicorns/zarf/src/internal/cluster" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/types" "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/chart" diff --git a/src/internal/packager/helm/destroy.go b/src/internal/packager/helm/destroy.go index 987203c5e2..f558270d2e 100644 --- a/src/internal/packager/helm/destroy.go +++ b/src/internal/packager/helm/destroy.go @@ -7,7 +7,7 @@ package helm import ( "regexp" - "github.com/defenseunicorns/zarf/src/internal/cluster" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/message" "helm.sh/helm/v3/pkg/action" ) diff --git a/src/internal/packager/helm/zarf.go b/src/internal/packager/helm/zarf.go index 8503690ab1..1e7e790f15 100644 --- a/src/internal/packager/helm/zarf.go +++ b/src/internal/packager/helm/zarf.go @@ -7,8 +7,8 @@ package helm import ( "fmt" - "github.com/defenseunicorns/zarf/src/internal/cluster" "github.com/defenseunicorns/zarf/src/internal/packager/git" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/k8s" "github.com/defenseunicorns/zarf/src/pkg/message" "github.com/defenseunicorns/zarf/src/pkg/transform" diff --git a/src/internal/packager/images/push.go b/src/internal/packager/images/push.go index d47971f477..57482c0dd8 100644 --- a/src/internal/packager/images/push.go +++ b/src/internal/packager/images/push.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/defenseunicorns/zarf/src/config" - "github.com/defenseunicorns/zarf/src/internal/cluster" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/k8s" "github.com/defenseunicorns/zarf/src/pkg/message" "github.com/defenseunicorns/zarf/src/pkg/transform" diff --git a/src/internal/cluster/common.go b/src/pkg/cluster/common.go similarity index 100% rename from src/internal/cluster/common.go rename to src/pkg/cluster/common.go diff --git a/src/internal/cluster/data.go b/src/pkg/cluster/data.go similarity index 100% rename from src/internal/cluster/data.go rename to src/pkg/cluster/data.go diff --git a/src/internal/cluster/injector.go b/src/pkg/cluster/injector.go similarity index 100% rename from src/internal/cluster/injector.go rename to src/pkg/cluster/injector.go diff --git a/src/internal/cluster/namespace.go b/src/pkg/cluster/namespace.go similarity index 100% rename from src/internal/cluster/namespace.go rename to src/pkg/cluster/namespace.go diff --git a/src/internal/cluster/secrets.go b/src/pkg/cluster/secrets.go similarity index 100% rename from src/internal/cluster/secrets.go rename to src/pkg/cluster/secrets.go diff --git a/src/internal/cluster/state.go b/src/pkg/cluster/state.go similarity index 100% rename from src/internal/cluster/state.go rename to src/pkg/cluster/state.go diff --git a/src/internal/cluster/tunnel.go b/src/pkg/cluster/tunnel.go similarity index 100% rename from src/internal/cluster/tunnel.go rename to src/pkg/cluster/tunnel.go diff --git a/src/internal/cluster/zarf.go b/src/pkg/cluster/zarf.go similarity index 100% rename from src/internal/cluster/zarf.go rename to src/pkg/cluster/zarf.go diff --git a/src/internal/cluster/zarf_test.go b/src/pkg/cluster/zarf_test.go similarity index 100% rename from src/internal/cluster/zarf_test.go rename to src/pkg/cluster/zarf_test.go diff --git a/src/pkg/packager/common.go b/src/pkg/packager/common.go index 202c327c98..77ed76c6e3 100644 --- a/src/pkg/packager/common.go +++ b/src/pkg/packager/common.go @@ -14,14 +14,15 @@ import ( "strings" "time" + "slices" + "github.com/Masterminds/semver/v3" "github.com/defenseunicorns/zarf/src/config/lang" - "github.com/defenseunicorns/zarf/src/internal/cluster" "github.com/defenseunicorns/zarf/src/internal/packager/sbom" "github.com/defenseunicorns/zarf/src/internal/packager/template" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/types" "github.com/mholt/archiver/v3" - "k8s.io/utils/strings/slices" "github.com/defenseunicorns/zarf/src/config" "github.com/defenseunicorns/zarf/src/pkg/interactive" diff --git a/src/pkg/packager/common_test.go b/src/pkg/packager/common_test.go index d8f4469ac8..690837f6c3 100644 --- a/src/pkg/packager/common_test.go +++ b/src/pkg/packager/common_test.go @@ -7,7 +7,7 @@ import ( "github.com/defenseunicorns/zarf/src/config" "github.com/defenseunicorns/zarf/src/config/lang" - "github.com/defenseunicorns/zarf/src/internal/cluster" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/k8s" "github.com/defenseunicorns/zarf/src/types" "github.com/stretchr/testify/require" diff --git a/src/pkg/packager/deploy.go b/src/pkg/packager/deploy.go index 7f8f8d30cb..d630d0647d 100644 --- a/src/pkg/packager/deploy.go +++ b/src/pkg/packager/deploy.go @@ -14,11 +14,11 @@ import ( "time" "github.com/defenseunicorns/zarf/src/config" - "github.com/defenseunicorns/zarf/src/internal/cluster" "github.com/defenseunicorns/zarf/src/internal/packager/git" "github.com/defenseunicorns/zarf/src/internal/packager/helm" "github.com/defenseunicorns/zarf/src/internal/packager/images" "github.com/defenseunicorns/zarf/src/internal/packager/template" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/k8s" "github.com/defenseunicorns/zarf/src/pkg/layout" "github.com/defenseunicorns/zarf/src/pkg/message" diff --git a/src/pkg/packager/remove.go b/src/pkg/packager/remove.go index 7ccb55cfdd..80192bb29b 100644 --- a/src/pkg/packager/remove.go +++ b/src/pkg/packager/remove.go @@ -12,8 +12,8 @@ import ( "slices" "github.com/defenseunicorns/zarf/src/config" - "github.com/defenseunicorns/zarf/src/internal/cluster" "github.com/defenseunicorns/zarf/src/internal/packager/helm" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/message" "github.com/defenseunicorns/zarf/src/pkg/packager/sources" "github.com/defenseunicorns/zarf/src/pkg/utils/helpers" diff --git a/src/pkg/packager/sources/cluster.go b/src/pkg/packager/sources/cluster.go index b33a2b2931..a623b85b27 100644 --- a/src/pkg/packager/sources/cluster.go +++ b/src/pkg/packager/sources/cluster.go @@ -8,8 +8,8 @@ import ( "fmt" "path/filepath" - "github.com/defenseunicorns/zarf/src/internal/cluster" "github.com/defenseunicorns/zarf/src/internal/packager/validate" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/layout" "github.com/defenseunicorns/zarf/src/pkg/utils" "github.com/defenseunicorns/zarf/src/types" diff --git a/src/test/e2e/21_connect_creds_test.go b/src/test/e2e/21_connect_creds_test.go index e903f4f75a..4fe560f6a8 100644 --- a/src/test/e2e/21_connect_creds_test.go +++ b/src/test/e2e/21_connect_creds_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "github.com/defenseunicorns/zarf/src/internal/cluster" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/stretchr/testify/require" ) diff --git a/src/test/e2e/22_git_and_gitops_test.go b/src/test/e2e/22_git_and_gitops_test.go index e8379b3d2d..e09280a5b4 100644 --- a/src/test/e2e/22_git_and_gitops_test.go +++ b/src/test/e2e/22_git_and_gitops_test.go @@ -13,8 +13,8 @@ import ( "testing" "github.com/defenseunicorns/zarf/src/config" - "github.com/defenseunicorns/zarf/src/internal/cluster" "github.com/defenseunicorns/zarf/src/internal/packager/git" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/stretchr/testify/require" ) diff --git a/src/test/e2e/23_data_injection_test.go b/src/test/e2e/23_data_injection_test.go index 1b9df53f34..d22dd6e990 100644 --- a/src/test/e2e/23_data_injection_test.go +++ b/src/test/e2e/23_data_injection_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/defenseunicorns/zarf/src/internal/cluster" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/utils/exec" "github.com/stretchr/testify/require" ) diff --git a/src/test/e2e/26_simple_packages_test.go b/src/test/e2e/26_simple_packages_test.go index 7c0b9cf48e..996982d383 100644 --- a/src/test/e2e/26_simple_packages_test.go +++ b/src/test/e2e/26_simple_packages_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "testing" - "github.com/defenseunicorns/zarf/src/internal/cluster" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/stretchr/testify/require" ) diff --git a/src/test/e2e/99_yolo_test.go b/src/test/e2e/99_yolo_test.go index 08c560f95e..1f10634bc9 100644 --- a/src/test/e2e/99_yolo_test.go +++ b/src/test/e2e/99_yolo_test.go @@ -9,7 +9,7 @@ import ( "net/http" "testing" - "github.com/defenseunicorns/zarf/src/internal/cluster" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/stretchr/testify/require" ) diff --git a/src/test/external/ext_in_cluster_test.go b/src/test/external/ext_in_cluster_test.go index c52d3c682f..a0a4aae7c4 100644 --- a/src/test/external/ext_in_cluster_test.go +++ b/src/test/external/ext_in_cluster_test.go @@ -11,7 +11,7 @@ import ( "net/http" "testing" - "github.com/defenseunicorns/zarf/src/internal/cluster" + "github.com/defenseunicorns/zarf/src/pkg/cluster" "github.com/defenseunicorns/zarf/src/pkg/utils/exec" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite"