refactor variable_sources/utils to util for parity with top level uti…

…l pkg (#131) Signed-off-by: perdasilva <perdasilva@redhat.com>
operator-framework · Feb 23, 2023 · 88392cb · 88392cb
1 parent a6a8091
commit 88392cb
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
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/...le_sources/utils/predicates/predicates.go → ...ble_sources/util/predicates/predicates.go b/...le_sources/utils/predicates/predicates.go → ...ble_sources/util/predicates/predicates.go
diff --git a/...urces/utils/predicates/predicates_test.go → ...ources/util/predicates/predicates_test.go b/...urces/utils/predicates/predicates_test.go → ...ources/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/...ution/variable_sources/utils/sort/sort.go → ...lution/variable_sources/util/sort/sort.go b/...ution/variable_sources/utils/sort/sort.go → ...lution/variable_sources/util/sort/sort.go
diff --git a/.../variable_sources/utils/sort/sort_test.go → ...n/variable_sources/util/sort/sort_test.go b/.../variable_sources/utils/sort/sort_test.go → ...n/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) {