refactor variable_sources/utils to util for parity with top level util pkg (#131)

perdasilva · web-flow · commit 88392cbd068a · 2023-02-23T16:13:03.000+01:00
Signed-off-by: perdasilva &lt;perdasilva@redhat.com&gt;
diff --git a/internal/resolution/variable_sources/bundles_and_dependencies/bundles_and_dependencies.go b/internal/resolution/variable_sources/bundles_and_dependencies/bundles_and_dependencies.go
@@ -12,8 +12,8 @@ import (
 
 	olmentity "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/entity"
 	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/required_package"
-	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/utils/predicates"
-	entitysort "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/utils/sort"
+	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/util/predicates"
+	entitysort "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/util/sort"
 )
 
 type BundleVariable struct {
diff --git a/internal/resolution/variable_sources/required_package/required_package.go b/internal/resolution/variable_sources/required_package/required_package.go
@@ -9,8 +9,8 @@ import (
 	"github.com/operator-framework/deppy/pkg/deppy/input"
 
 	olmentity "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/entity"
-	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/utils/predicates"
-	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/utils/sort"
+	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/util/predicates"
+	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/util/sort"
 )
 
 type RequiredPackageVariable struct {
diff --git a/internal/resolution/variable_sources/util/predicates/predicates.go b/internal/resolution/variable_sources/util/predicates/predicates.go
diff --git a/internal/resolution/variable_sources/util/predicates/predicates_test.go b/internal/resolution/variable_sources/util/predicates/predicates_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/operator-framework/operator-registry/alpha/property"
 
 	olmentity "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/entity"
-	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/utils/predicates"
+	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/util/predicates"
 )
 
 func TestPredicates(t *testing.T) {
diff --git a/internal/resolution/variable_sources/util/sort/sort.go b/internal/resolution/variable_sources/util/sort/sort.go
diff --git a/internal/resolution/variable_sources/util/sort/sort_test.go b/internal/resolution/variable_sources/util/sort/sort_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/operator-framework/deppy/pkg/deppy/input"
 	"github.com/operator-framework/operator-registry/alpha/property"
 
-	entitysort "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/utils/sort"
+	entitysort "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/util/sort"
 )
 
 func TestSort(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ import (`
`12`	`12`
`13`	`13`	`olmentity "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/entity"`
`14`	`14`	`"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/required_package"`
`15`		`- "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/utils/predicates"`
`16`		`- entitysort "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/utils/sort"`
	`15`	`+ "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/util/predicates"`
	`16`	`+ entitysort "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/util/sort"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`type BundleVariable struct {`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ import (`
`9`	`9`	`"github.com/operator-framework/deppy/pkg/deppy/input"`
`10`	`10`
`11`	`11`	`olmentity "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/entity"`
`12`		`- "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/utils/predicates"`
`13`		`- "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/utils/sort"`
	`12`	`+ "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/util/predicates"`
	`13`	`+ "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/util/sort"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`type RequiredPackageVariable struct {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/operator-framework/operator-registry/alpha/property"`
`11`	`11`
`12`	`12`	`olmentity "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/entity"`
`13`		`- "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/utils/predicates"`
	`13`	`+ "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/util/predicates"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func TestPredicates(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/operator-framework/deppy/pkg/deppy/input"`
`10`	`10`	`"github.com/operator-framework/operator-registry/alpha/property"`
`11`	`11`
`12`		`- entitysort "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/utils/sort"`
	`12`	`+ entitysort "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/util/sort"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func TestSort(t *testing.T) {`