Internalize test pkgs (#2148)

dtfranz · web-flow · commit 3ad622560d78 · 2025-08-13T20:39:54.000Z
Moves the test utils package to internal/

Signed-off-by: Daniel Franz &lt;dfranz@redhat.com&gt;
diff --git a/Makefile b/Makefile
@@ -229,7 +229,7 @@ extension-developer-e2e: $(OPERATOR_SDK) $(KUSTOMIZE) #EXHELP Run extension crea
 	test/extension-developer-e2e/setup.sh $(OPERATOR_SDK) $(CONTAINER_RUNTIME) $(KUSTOMIZE) ${LOCAL_REGISTRY_HOST} ${CLUSTER_REGISTRY_HOST}
 	go test -count=1 -v ./test/extension-developer-e2e/...
 
-UNIT_TEST_DIRS := $(shell go list ./... | grep -v /test/)
+UNIT_TEST_DIRS := $(shell go list ./... | grep -vE "/test/|/testutils")
 COVERAGE_UNIT_DIR := $(ROOT_DIR)/coverage/unit
 
 .PHONY: envtest-k8s-bins #HELP Uses setup-envtest to download and install the binaries required to run ENVTEST-test based locally at the project/bin directory.
diff --git a/internal/shared/util/testutils/artifacts.go b/internal/shared/util/testutils/artifacts.go
@@ -1,4 +1,4 @@
-package utils
+package testutils
 
 import (
 	"context"
diff --git a/internal/shared/util/testutils/summary.go b/internal/shared/util/testutils/summary.go
@@ -1,4 +1,4 @@
-package utils
+package testutils
 
 import (
 	"context"
diff --git a/internal/shared/util/testutils/templates/alert.md.tmpl b/internal/shared/util/testutils/templates/alert.md.tmpl
diff --git a/internal/shared/util/testutils/templates/mermaid_chart.md.tmpl b/internal/shared/util/testutils/templates/mermaid_chart.md.tmpl
diff --git a/internal/shared/util/testutils/templates/summary.md.tmpl b/internal/shared/util/testutils/templates/summary.md.tmpl
diff --git a/internal/shared/util/testutils/utils.go b/internal/shared/util/testutils/utils.go
@@ -1,4 +1,4 @@
-package utils
+package testutils
 
 import (
 	"os/exec"
diff --git a/test/e2e/cluster_extension_install_test.go b/test/e2e/cluster_extension_install_test.go
@@ -25,7 +25,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
-	"github.com/operator-framework/operator-controller/test/utils"
+	utils "github.com/operator-framework/operator-controller/internal/shared/util/testutils"
 )
 
 const (
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -16,7 +16,7 @@ import (
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/scheme"
-	utils "github.com/operator-framework/operator-controller/test/utils"
+	utils "github.com/operator-framework/operator-controller/internal/shared/util/testutils"
 )
 
 var (
diff --git a/test/e2e/metrics_test.go b/test/e2e/metrics_test.go
@@ -25,7 +25,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/util/rand"
 
-	"github.com/operator-framework/operator-controller/test/utils"
+	utils "github.com/operator-framework/operator-controller/internal/shared/util/testutils"
 )
 
 // TestOperatorControllerMetricsExportedEndpoint verifies that the metrics endpoint for the operator controller
diff --git a/test/e2e/network_policy_test.go b/test/e2e/network_policy_test.go
@@ -15,7 +15,7 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/operator-framework/operator-controller/test/utils"
+	utils "github.com/operator-framework/operator-controller/internal/shared/util/testutils"
 )
 
 const (
diff --git a/test/experimental-e2e/experimental_e2e_test.go b/test/experimental-e2e/experimental_e2e_test.go
@@ -27,7 +27,7 @@ import (
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/scheme"
-	"github.com/operator-framework/operator-controller/test/utils"
+	utils "github.com/operator-framework/operator-controller/internal/shared/util/testutils"
 )
 
 const (
diff --git a/test/upgrade-e2e/post_upgrade_test.go b/test/upgrade-e2e/post_upgrade_test.go
@@ -19,7 +19,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
-	"github.com/operator-framework/operator-controller/test/utils"
+	utils "github.com/operator-framework/operator-controller/internal/shared/util/testutils"
 )
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package utils`
	`1`	`+package testutils`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`26`	`26`
`27`	`27`	`ocv1 "github.com/operator-framework/operator-controller/api/v1"`
`28`		`- "github.com/operator-framework/operator-controller/test/utils"`
	`28`	`+ utils "github.com/operator-framework/operator-controller/internal/shared/util/testutils"`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`
`17`	`17`	`ocv1 "github.com/operator-framework/operator-controller/api/v1"`
`18`	`18`	`"github.com/operator-framework/operator-controller/internal/operator-controller/scheme"`
`19`		`- utils "github.com/operator-framework/operator-controller/test/utils"`
	`19`	`+ utils "github.com/operator-framework/operator-controller/internal/shared/util/testutils"`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`var (`