From c00f3d63ac41197da74d1e26d13252d781a8fab9 Mon Sep 17 00:00:00 2001 From: Marcin Owsiany Date: Wed, 26 Nov 2025 12:00:29 +0100 Subject: [PATCH] chore: pkg/ -> internal/ --- cmd/deploy.go | 6 +++--- cmd/env.go | 2 +- cmd/subshell.go | 6 +++--- cmd/teardown.go | 4 ++-- .../clusterdefaults/clusterdefaults.go | 2 +- .../clusterdefaults/clusterdefaults_test.go | 2 +- {pkg => internal}/containerutil/detect.go | 0 {pkg => internal}/containerutil/detect_test.go | 0 {pkg => internal}/deployer/constants.go | 0 {pkg => internal}/deployer/crs.go | 0 {pkg => internal}/deployer/deploy_via_helm.go | 2 +- {pkg => internal}/deployer/deploy_via_operator.go | 4 ++-- {pkg => internal}/deployer/deployer.go | 14 +++++++------- {pkg => internal}/deployer/kubectl.go | 0 {pkg => internal}/deployer/operator.go | 2 +- {pkg => internal}/deployer/operator_olm.go | 0 {pkg => internal}/deployer/override.go | 0 {pkg => internal}/deployer/roxctl.go | 0 {pkg => internal}/dockerauth/dockerauth.go | 2 +- {pkg => internal}/dockerauth/dockerauth_test.go | 2 +- {pkg => internal}/env/env.go | 2 +- {pkg => internal}/env/env_test.go | 0 {pkg => internal}/env/example_test.go | 2 +- {pkg => internal}/helpers/helpers.go | 0 {pkg => internal}/helpers/helpers_test.go | 0 {pkg => internal}/helpers/tag.go | 0 {pkg => internal}/imagecache/imagecache.go | 4 ++-- {pkg => internal}/imagecache/imagecache_test.go | 2 +- {pkg => internal}/logger/logger.go | 0 {pkg => internal}/portforward/portforward.go | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) rename {pkg => internal}/clusterdefaults/clusterdefaults.go (99%) rename {pkg => internal}/clusterdefaults/clusterdefaults_test.go (99%) rename {pkg => internal}/containerutil/detect.go (100%) rename {pkg => internal}/containerutil/detect_test.go (100%) rename {pkg => internal}/deployer/constants.go (100%) rename {pkg => internal}/deployer/crs.go (100%) rename {pkg => internal}/deployer/deploy_via_helm.go (99%) rename {pkg => internal}/deployer/deploy_via_operator.go (99%) rename {pkg => internal}/deployer/deployer.go (98%) rename {pkg => internal}/deployer/kubectl.go (100%) rename {pkg => internal}/deployer/operator.go (99%) rename {pkg => internal}/deployer/operator_olm.go (100%) rename {pkg => internal}/deployer/override.go (100%) rename {pkg => internal}/deployer/roxctl.go (100%) rename {pkg => internal}/dockerauth/dockerauth.go (99%) rename {pkg => internal}/dockerauth/dockerauth_test.go (98%) rename {pkg => internal}/env/env.go (99%) rename {pkg => internal}/env/env_test.go (100%) rename {pkg => internal}/env/example_test.go (88%) rename {pkg => internal}/helpers/helpers.go (100%) rename {pkg => internal}/helpers/helpers_test.go (100%) rename {pkg => internal}/helpers/tag.go (100%) rename {pkg => internal}/imagecache/imagecache.go (98%) rename {pkg => internal}/imagecache/imagecache_test.go (98%) rename {pkg => internal}/logger/logger.go (100%) rename {pkg => internal}/portforward/portforward.go (98%) diff --git a/cmd/deploy.go b/cmd/deploy.go index 02319db3..b8b225d2 100644 --- a/cmd/deploy.go +++ b/cmd/deploy.go @@ -8,9 +8,9 @@ import ( "time" "github.com/spf13/cobra" - "github.com/stackrox/roxie/pkg/deployer" - "github.com/stackrox/roxie/pkg/env" - "github.com/stackrox/roxie/pkg/logger" + "github.com/stackrox/roxie/internal/deployer" + "github.com/stackrox/roxie/internal/env" + "github.com/stackrox/roxie/internal/logger" ) func newDeployCmd() *cobra.Command { diff --git a/cmd/env.go b/cmd/env.go index c92b2af7..b5bc4c68 100644 --- a/cmd/env.go +++ b/cmd/env.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/spf13/cobra" - "github.com/stackrox/roxie/pkg/env" + "github.com/stackrox/roxie/internal/env" ) func newEnvCmd() *cobra.Command { diff --git a/cmd/subshell.go b/cmd/subshell.go index aa056b9e..5a1c97d1 100644 --- a/cmd/subshell.go +++ b/cmd/subshell.go @@ -8,9 +8,9 @@ import ( "time" "github.com/fatih/color" - "github.com/stackrox/roxie/pkg/deployer" - "github.com/stackrox/roxie/pkg/env" - "github.com/stackrox/roxie/pkg/logger" + "github.com/stackrox/roxie/internal/deployer" + "github.com/stackrox/roxie/internal/env" + "github.com/stackrox/roxie/internal/logger" ) func spawnSubshell(d *deployer.Deployer, log *logger.Logger) error { diff --git a/cmd/teardown.go b/cmd/teardown.go index ffdb39a3..a8027fe6 100644 --- a/cmd/teardown.go +++ b/cmd/teardown.go @@ -6,8 +6,8 @@ import ( "time" "github.com/spf13/cobra" - "github.com/stackrox/roxie/pkg/deployer" - "github.com/stackrox/roxie/pkg/logger" + "github.com/stackrox/roxie/internal/deployer" + "github.com/stackrox/roxie/internal/logger" ) func newTeardownCmd() *cobra.Command { diff --git a/pkg/clusterdefaults/clusterdefaults.go b/internal/clusterdefaults/clusterdefaults.go similarity index 99% rename from pkg/clusterdefaults/clusterdefaults.go rename to internal/clusterdefaults/clusterdefaults.go index 95f2b821..a2f5693c 100644 --- a/pkg/clusterdefaults/clusterdefaults.go +++ b/internal/clusterdefaults/clusterdefaults.go @@ -3,7 +3,7 @@ package clusterdefaults import ( "strings" - "github.com/stackrox/roxie/pkg/logger" + "github.com/stackrox/roxie/internal/logger" ) // ClusterType represents different types of Kubernetes clusters diff --git a/pkg/clusterdefaults/clusterdefaults_test.go b/internal/clusterdefaults/clusterdefaults_test.go similarity index 99% rename from pkg/clusterdefaults/clusterdefaults_test.go rename to internal/clusterdefaults/clusterdefaults_test.go index 4e379173..ad5d1c3c 100644 --- a/pkg/clusterdefaults/clusterdefaults_test.go +++ b/internal/clusterdefaults/clusterdefaults_test.go @@ -3,7 +3,7 @@ package clusterdefaults import ( "testing" - "github.com/stackrox/roxie/pkg/logger" + "github.com/stackrox/roxie/internal/logger" ) func TestDefaultDetector_Detect(t *testing.T) { diff --git a/pkg/containerutil/detect.go b/internal/containerutil/detect.go similarity index 100% rename from pkg/containerutil/detect.go rename to internal/containerutil/detect.go diff --git a/pkg/containerutil/detect_test.go b/internal/containerutil/detect_test.go similarity index 100% rename from pkg/containerutil/detect_test.go rename to internal/containerutil/detect_test.go diff --git a/pkg/deployer/constants.go b/internal/deployer/constants.go similarity index 100% rename from pkg/deployer/constants.go rename to internal/deployer/constants.go diff --git a/pkg/deployer/crs.go b/internal/deployer/crs.go similarity index 100% rename from pkg/deployer/crs.go rename to internal/deployer/crs.go diff --git a/pkg/deployer/deploy_via_helm.go b/internal/deployer/deploy_via_helm.go similarity index 99% rename from pkg/deployer/deploy_via_helm.go rename to internal/deployer/deploy_via_helm.go index 9f2502a2..c6b8f0b0 100644 --- a/pkg/deployer/deploy_via_helm.go +++ b/internal/deployer/deploy_via_helm.go @@ -11,7 +11,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/stackrox/roxie/pkg/helpers" + "github.com/stackrox/roxie/internal/helpers" ) // deployCentralHelm deploys Central using Helm charts diff --git a/pkg/deployer/deploy_via_operator.go b/internal/deployer/deploy_via_operator.go similarity index 99% rename from pkg/deployer/deploy_via_operator.go rename to internal/deployer/deploy_via_operator.go index be8c574a..4b558490 100644 --- a/pkg/deployer/deploy_via_operator.go +++ b/internal/deployer/deploy_via_operator.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/stackrox/roxie/pkg/env" - "github.com/stackrox/roxie/pkg/helpers" + "github.com/stackrox/roxie/internal/env" + "github.com/stackrox/roxie/internal/helpers" "gopkg.in/yaml.v3" ) diff --git a/pkg/deployer/deployer.go b/internal/deployer/deployer.go similarity index 98% rename from pkg/deployer/deployer.go rename to internal/deployer/deployer.go index e43c773f..788b3278 100644 --- a/pkg/deployer/deployer.go +++ b/internal/deployer/deployer.go @@ -12,13 +12,13 @@ import ( "github.com/fatih/color" - "github.com/stackrox/roxie/pkg/clusterdefaults" - "github.com/stackrox/roxie/pkg/dockerauth" - "github.com/stackrox/roxie/pkg/env" - "github.com/stackrox/roxie/pkg/helpers" - "github.com/stackrox/roxie/pkg/imagecache" - "github.com/stackrox/roxie/pkg/logger" - "github.com/stackrox/roxie/pkg/portforward" + "github.com/stackrox/roxie/internal/clusterdefaults" + "github.com/stackrox/roxie/internal/dockerauth" + "github.com/stackrox/roxie/internal/env" + "github.com/stackrox/roxie/internal/helpers" + "github.com/stackrox/roxie/internal/imagecache" + "github.com/stackrox/roxie/internal/logger" + "github.com/stackrox/roxie/internal/portforward" ) var ( diff --git a/pkg/deployer/kubectl.go b/internal/deployer/kubectl.go similarity index 100% rename from pkg/deployer/kubectl.go rename to internal/deployer/kubectl.go diff --git a/pkg/deployer/operator.go b/internal/deployer/operator.go similarity index 99% rename from pkg/deployer/operator.go rename to internal/deployer/operator.go index eaa14f32..505db6b1 100644 --- a/pkg/deployer/operator.go +++ b/internal/deployer/operator.go @@ -15,7 +15,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/stackrox/roxie/pkg/helpers" + "github.com/stackrox/roxie/internal/helpers" ) const ( diff --git a/pkg/deployer/operator_olm.go b/internal/deployer/operator_olm.go similarity index 100% rename from pkg/deployer/operator_olm.go rename to internal/deployer/operator_olm.go diff --git a/pkg/deployer/override.go b/internal/deployer/override.go similarity index 100% rename from pkg/deployer/override.go rename to internal/deployer/override.go diff --git a/pkg/deployer/roxctl.go b/internal/deployer/roxctl.go similarity index 100% rename from pkg/deployer/roxctl.go rename to internal/deployer/roxctl.go diff --git a/pkg/dockerauth/dockerauth.go b/internal/dockerauth/dockerauth.go similarity index 99% rename from pkg/dockerauth/dockerauth.go rename to internal/dockerauth/dockerauth.go index 9889eb9b..3f0dde6b 100644 --- a/pkg/dockerauth/dockerauth.go +++ b/internal/dockerauth/dockerauth.go @@ -10,7 +10,7 @@ import ( "os/exec" "path/filepath" - "github.com/stackrox/roxie/pkg/logger" + "github.com/stackrox/roxie/internal/logger" ) const ( diff --git a/pkg/dockerauth/dockerauth_test.go b/internal/dockerauth/dockerauth_test.go similarity index 98% rename from pkg/dockerauth/dockerauth_test.go rename to internal/dockerauth/dockerauth_test.go index 45abad0c..aca6be89 100644 --- a/pkg/dockerauth/dockerauth_test.go +++ b/internal/dockerauth/dockerauth_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/stackrox/roxie/pkg/logger" + "github.com/stackrox/roxie/internal/logger" ) func TestGetAndVerifyCredentialsFromEnv(t *testing.T) { diff --git a/pkg/env/env.go b/internal/env/env.go similarity index 99% rename from pkg/env/env.go rename to internal/env/env.go index f182a4cd..af9ca407 100644 --- a/pkg/env/env.go +++ b/internal/env/env.go @@ -7,7 +7,7 @@ import ( "os/exec" "strings" - "github.com/stackrox/roxie/pkg/containerutil" + "github.com/stackrox/roxie/internal/containerutil" ) var ( diff --git a/pkg/env/env_test.go b/internal/env/env_test.go similarity index 100% rename from pkg/env/env_test.go rename to internal/env/env_test.go diff --git a/pkg/env/example_test.go b/internal/env/example_test.go similarity index 88% rename from pkg/env/example_test.go rename to internal/env/example_test.go index 1521ae3e..c789afca 100644 --- a/pkg/env/example_test.go +++ b/internal/env/example_test.go @@ -3,7 +3,7 @@ package env_test import ( "fmt" - "github.com/stackrox/roxie/pkg/env" + "github.com/stackrox/roxie/internal/env" ) // ExampleDetectClusterType demonstrates how to use the cluster type detection diff --git a/pkg/helpers/helpers.go b/internal/helpers/helpers.go similarity index 100% rename from pkg/helpers/helpers.go rename to internal/helpers/helpers.go diff --git a/pkg/helpers/helpers_test.go b/internal/helpers/helpers_test.go similarity index 100% rename from pkg/helpers/helpers_test.go rename to internal/helpers/helpers_test.go diff --git a/pkg/helpers/tag.go b/internal/helpers/tag.go similarity index 100% rename from pkg/helpers/tag.go rename to internal/helpers/tag.go diff --git a/pkg/imagecache/imagecache.go b/internal/imagecache/imagecache.go similarity index 98% rename from pkg/imagecache/imagecache.go rename to internal/imagecache/imagecache.go index aa0dbcd8..db135f1f 100644 --- a/pkg/imagecache/imagecache.go +++ b/internal/imagecache/imagecache.go @@ -7,8 +7,8 @@ import ( "path/filepath" "sync" - "github.com/stackrox/roxie/pkg/helpers" - "github.com/stackrox/roxie/pkg/logger" + "github.com/stackrox/roxie/internal/helpers" + "github.com/stackrox/roxie/internal/logger" ) // ImageCache manages cache of verified pullable Docker images diff --git a/pkg/imagecache/imagecache_test.go b/internal/imagecache/imagecache_test.go similarity index 98% rename from pkg/imagecache/imagecache_test.go rename to internal/imagecache/imagecache_test.go index 9c4bc68f..c3ca3de1 100644 --- a/pkg/imagecache/imagecache_test.go +++ b/internal/imagecache/imagecache_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/stackrox/roxie/pkg/logger" + "github.com/stackrox/roxie/internal/logger" ) func TestImageCacheLoadSaveRoundtrip(t *testing.T) { diff --git a/pkg/logger/logger.go b/internal/logger/logger.go similarity index 100% rename from pkg/logger/logger.go rename to internal/logger/logger.go diff --git a/pkg/portforward/portforward.go b/internal/portforward/portforward.go similarity index 98% rename from pkg/portforward/portforward.go rename to internal/portforward/portforward.go index 07d5ba06..3c864a85 100644 --- a/pkg/portforward/portforward.go +++ b/internal/portforward/portforward.go @@ -7,7 +7,7 @@ import ( "syscall" "time" - "github.com/stackrox/roxie/pkg/logger" + "github.com/stackrox/roxie/internal/logger" ) // Manager manages a kubectl port-forward subprocess and exposes a localhost endpoint