From 6276ae5950bb4efeae341a0ce3eeeeb75b4d639f Mon Sep 17 00:00:00 2001 From: perdasilva Date: Tue, 21 Feb 2023 11:38:58 +0100 Subject: [PATCH] refactor variable_sources/utils to util for parity with top level util pkg Signed-off-by: perdasilva --- .../bundles_and_dependencies/bundles_and_dependencies.go | 4 ++-- .../variable_sources/required_package/required_package.go | 4 ++-- .../variable_sources/{utils => util}/predicates/predicates.go | 0 .../{utils => util}/predicates/predicates_test.go | 2 +- .../resolution/variable_sources/{utils => util}/sort/sort.go | 0 .../variable_sources/{utils => util}/sort/sort_test.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename internal/resolution/variable_sources/{utils => util}/predicates/predicates.go (100%) rename internal/resolution/variable_sources/{utils => util}/predicates/predicates_test.go (98%) rename internal/resolution/variable_sources/{utils => util}/sort/sort.go (100%) rename internal/resolution/variable_sources/{utils => util}/sort/sort_test.go (99%) 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 index 9749341e2..730ed1504 100644 --- 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 index f05104ca5..36dbb4b5c 100644 --- 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/utils/predicates/predicates.go b/internal/resolution/variable_sources/util/predicates/predicates.go similarity index 100% rename from internal/resolution/variable_sources/utils/predicates/predicates.go rename to internal/resolution/variable_sources/util/predicates/predicates.go diff --git a/internal/resolution/variable_sources/utils/predicates/predicates_test.go b/internal/resolution/variable_sources/util/predicates/predicates_test.go similarity index 98% rename from internal/resolution/variable_sources/utils/predicates/predicates_test.go rename to internal/resolution/variable_sources/util/predicates/predicates_test.go index 87cac3c59..58d5e38f3 100644 --- a/internal/resolution/variable_sources/utils/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/utils/sort/sort.go b/internal/resolution/variable_sources/util/sort/sort.go similarity index 100% rename from internal/resolution/variable_sources/utils/sort/sort.go rename to internal/resolution/variable_sources/util/sort/sort.go diff --git a/internal/resolution/variable_sources/utils/sort/sort_test.go b/internal/resolution/variable_sources/util/sort/sort_test.go similarity index 99% rename from internal/resolution/variable_sources/utils/sort/sort_test.go rename to internal/resolution/variable_sources/util/sort/sort_test.go index f63a0e657..4ca179eeb 100644 --- a/internal/resolution/variable_sources/utils/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) {