Updates imports and paths after package move

Mikalai Radchuk · m1kola · commit 54f05bc45221 · 2023-05-30T15:55:31.000+01:00
Signed-off-by: Mikalai Radchuk &lt;mradchuk@redhat.com&gt;
diff --git a/internal/controllers/operator_controller.go b/internal/controllers/operator_controller.go
@@ -34,7 +34,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/operator-framework/operator-controller/controllers/validators"
+	"github.com/operator-framework/operator-controller/internal/controllers/validators"
 
 	operatorsv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
 	"github.com/operator-framework/operator-controller/internal/resolution"
diff --git a/internal/controllers/operator_controller_test.go b/internal/controllers/operator_controller_test.go
@@ -19,8 +19,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	operatorsv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
-	"github.com/operator-framework/operator-controller/controllers"
 	"github.com/operator-framework/operator-controller/internal/conditionsets"
+	"github.com/operator-framework/operator-controller/internal/controllers"
 	"github.com/operator-framework/operator-controller/internal/resolution"
 )
 
diff --git a/internal/controllers/suite_test.go b/internal/controllers/suite_test.go
@@ -54,8 +54,8 @@ var _ = BeforeSuite(func() {
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
 		CRDDirectoryPaths: []string{
-			filepath.Join("..", "config", "crd", "bases"),
-			filepath.Join("..", "testdata", "crds")},
+			filepath.Join("..", "..", "config", "crd", "bases"),
+			filepath.Join("..", "..", "testdata", "crds")},
 		ErrorIfCRDPathMissing: true,
 	}
 
diff --git a/internal/controllers/validators/validators_test.go b/internal/controllers/validators/validators_test.go
@@ -5,7 +5,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/operator-framework/operator-controller/api/v1alpha1"
-	"github.com/operator-framework/operator-controller/controllers/validators"
+	"github.com/operator-framework/operator-controller/internal/controllers/validators"
 )
 
 var _ = Describe("Validators", func() {
diff --git a/main.go b/main.go
@@ -32,7 +32,7 @@ import (
 
 	catalogd "github.com/operator-framework/catalogd/pkg/apis/core/v1beta1"
 	operatorsv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
-	"github.com/operator-framework/operator-controller/controllers"
+	"github.com/operator-framework/operator-controller/internal/controllers"
 	"github.com/operator-framework/operator-controller/internal/resolution"
 	"github.com/operator-framework/operator-controller/internal/resolution/entitysources"
 )

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ import (`
`19`	`19`	`"sigs.k8s.io/controller-runtime/pkg/client/fake"`
`20`	`20`
`21`	`21`	`operatorsv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"`
`22`		`- "github.com/operator-framework/operator-controller/controllers"`
`23`	`22`	`"github.com/operator-framework/operator-controller/internal/conditionsets"`
	`23`	`+ "github.com/operator-framework/operator-controller/internal/controllers"`
`24`	`24`	`"github.com/operator-framework/operator-controller/internal/resolution"`
`25`	`25`	`)`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`. "github.com/onsi/gomega"`
`6`	`6`
`7`	`7`	`"github.com/operator-framework/operator-controller/api/v1alpha1"`
`8`		`- "github.com/operator-framework/operator-controller/controllers/validators"`
	`8`	`+ "github.com/operator-framework/operator-controller/internal/controllers/validators"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`var _ = Describe("Validators", func() {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import (`
`32`	`32`
`33`	`33`	`catalogd "github.com/operator-framework/catalogd/pkg/apis/core/v1beta1"`
`34`	`34`	`operatorsv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"`
`35`		`- "github.com/operator-framework/operator-controller/controllers"`
	`35`	`+ "github.com/operator-framework/operator-controller/internal/controllers"`
`36`	`36`	`"github.com/operator-framework/operator-controller/internal/resolution"`
`37`	`37`	`"github.com/operator-framework/operator-controller/internal/resolution/entitysources"`
`38`	`38`	`)`