chore(api): utils package should be internal (#2368)

emosbaugh · web-flow · commit e801e7e21604 · 2025-06-24T14:55:59.000-07:00
diff --git a/api/controllers/console/controller.go b/api/controllers/console/controller.go
@@ -1,7 +1,7 @@
 package console
 
 import (
-	"github.com/replicatedhq/embedded-cluster/api/pkg/utils"
+	"github.com/replicatedhq/embedded-cluster/api/internal/utils"
 )
 
 type Controller interface {
diff --git a/api/controllers/linux/install/controller.go b/api/controllers/linux/install/controller.go
@@ -9,8 +9,8 @@ import (
 	"github.com/replicatedhq/embedded-cluster/api/internal/managers/preflight"
 	"github.com/replicatedhq/embedded-cluster/api/internal/statemachine"
 	"github.com/replicatedhq/embedded-cluster/api/internal/store"
+	"github.com/replicatedhq/embedded-cluster/api/internal/utils"
 	"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
-	"github.com/replicatedhq/embedded-cluster/api/pkg/utils"
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
 	"github.com/replicatedhq/embedded-cluster/pkg-new/hostutils"
diff --git a/api/controllers/linux/install/hostpreflight.go b/api/controllers/linux/install/hostpreflight.go
@@ -6,7 +6,7 @@ import (
 	"runtime/debug"
 
 	"github.com/replicatedhq/embedded-cluster/api/internal/managers/preflight"
-	"github.com/replicatedhq/embedded-cluster/api/pkg/utils"
+	"github.com/replicatedhq/embedded-cluster/api/internal/utils"
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	"github.com/replicatedhq/embedded-cluster/pkg/netutils"
 )
diff --git a/api/integration/auth_controller_test.go b/api/integration/auth_controller_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/replicatedhq/embedded-cluster/api/controllers/auth"
 	linuxinstall "github.com/replicatedhq/embedded-cluster/api/controllers/linux/install"
 	"github.com/replicatedhq/embedded-cluster/api/internal/managers/installation"
+	"github.com/replicatedhq/embedded-cluster/api/internal/utils"
 	"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
-	"github.com/replicatedhq/embedded-cluster/api/pkg/utils"
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/api/integration/console_test.go b/api/integration/console_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/replicatedhq/embedded-cluster/api"
 	"github.com/replicatedhq/embedded-cluster/api/controllers/console"
+	"github.com/replicatedhq/embedded-cluster/api/internal/utils"
 	"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
-	"github.com/replicatedhq/embedded-cluster/api/pkg/utils"
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/api/integration/install_test.go b/api/integration/install_test.go
@@ -24,8 +24,8 @@ import (
 	"github.com/replicatedhq/embedded-cluster/api/internal/managers/installation"
 	"github.com/replicatedhq/embedded-cluster/api/internal/managers/preflight"
 	preflightstore "github.com/replicatedhq/embedded-cluster/api/internal/store/preflight"
+	"github.com/replicatedhq/embedded-cluster/api/internal/utils"
 	"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
-	"github.com/replicatedhq/embedded-cluster/api/pkg/utils"
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
 	"github.com/replicatedhq/embedded-cluster/pkg-new/hostutils"
diff --git a/api/internal/managers/infra/install.go b/api/internal/managers/infra/install.go
@@ -6,7 +6,7 @@ import (
 	"runtime/debug"
 
 	k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
-	"github.com/replicatedhq/embedded-cluster/api/pkg/utils"
+	"github.com/replicatedhq/embedded-cluster/api/internal/utils"
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	"github.com/replicatedhq/embedded-cluster/cmd/installer/kotscli"
 	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
diff --git a/api/internal/managers/installation/config_test.go b/api/internal/managers/installation/config_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/mock"
 
 	"github.com/replicatedhq/embedded-cluster/api/internal/store/installation"
-	"github.com/replicatedhq/embedded-cluster/api/pkg/utils"
+	"github.com/replicatedhq/embedded-cluster/api/internal/utils"
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
 	"github.com/replicatedhq/embedded-cluster/pkg-new/hostutils"
diff --git a/api/internal/managers/installation/manager.go b/api/internal/managers/installation/manager.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/replicatedhq/embedded-cluster/api/internal/store/installation"
+	"github.com/replicatedhq/embedded-cluster/api/internal/utils"
 	"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
-	"github.com/replicatedhq/embedded-cluster/api/pkg/utils"
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	"github.com/replicatedhq/embedded-cluster/pkg-new/hostutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
diff --git a/api/internal/managers/preflight/hostpreflight_test.go b/api/internal/managers/preflight/hostpreflight_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	preflightstore "github.com/replicatedhq/embedded-cluster/api/internal/store/preflight"
+	"github.com/replicatedhq/embedded-cluster/api/internal/utils"
 	"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
-	"github.com/replicatedhq/embedded-cluster/api/pkg/utils"
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
 	"github.com/replicatedhq/embedded-cluster/pkg-new/preflights"
diff --git a/api/internal/managers/preflight/manager.go b/api/internal/managers/preflight/manager.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/replicatedhq/embedded-cluster/api/internal/store/preflight"
+	"github.com/replicatedhq/embedded-cluster/api/internal/utils"
 	"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
-	"github.com/replicatedhq/embedded-cluster/api/pkg/utils"
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	"github.com/replicatedhq/embedded-cluster/pkg-new/preflights"
 	"github.com/replicatedhq/embedded-cluster/pkg/metrics"
diff --git a/api/internal/utils/domains.go b/api/internal/utils/domains.go
diff --git a/api/internal/utils/netutils.go b/api/internal/utils/netutils.go
diff --git a/api/internal/utils/netutils_mock.go b/api/internal/utils/netutils_mock.go

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package console`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/replicatedhq/embedded-cluster/api/pkg/utils"`
	`4`	`+ "github.com/replicatedhq/embedded-cluster/api/internal/utils"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`type Controller interface {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"runtime/debug"`
`7`	`7`
`8`	`8`	`"github.com/replicatedhq/embedded-cluster/api/internal/managers/preflight"`
`9`		`- "github.com/replicatedhq/embedded-cluster/api/pkg/utils"`
	`9`	`+ "github.com/replicatedhq/embedded-cluster/api/internal/utils"`
`10`	`10`	`"github.com/replicatedhq/embedded-cluster/api/types"`
`11`	`11`	`"github.com/replicatedhq/embedded-cluster/pkg/netutils"`
`12`	`12`	`)`