add required package variable source

Signed-off-by: perdasilva <[email protected]>

Author: perdasilva

internal/resolution/variable_sources/required_package/required_package.go

@@ -7,21 +7,22 @@ import (
 	"github.com/operator-framework/deppy/pkg/deppy"
 	"github.com/operator-framework/deppy/pkg/deppy/constraint"
 	"github.com/operator-framework/deppy/pkg/deppy/input"
-	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources"
+
+	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"
 )
 
 type RequiredPackageVariable struct {
 	*input.SimpleVariable
-	bundleEntities []*variable_sources.BundleEntity
+	bundleEntities []*olmentity.BundleEntity
 }
 
-func (r *RequiredPackageVariable) BundleEntities() []*variable_sources.BundleEntity {
+func (r *RequiredPackageVariable) BundleEntities() []*olmentity.BundleEntity {
 	return r.bundleEntities
 }
 
-func NewRequiredPackageVariable(packageName string, bundleEntities []*variable_sources.BundleEntity) *RequiredPackageVariable {
+func NewRequiredPackageVariable(packageName string, bundleEntities []*olmentity.BundleEntity) *RequiredPackageVariable {
 	id := deppy.IdentifierFromString(fmt.Sprintf("required package %s", packageName))
 	var entityIDs []deppy.Identifier
 	for _, bundle := range bundleEntities {
@@ -55,9 +56,9 @@ func (r *RequiredPackageVariableSource) GetVariables(ctx context.Context, entity
 		return nil, fmt.Errorf("package '%s' not found", r.packageName)
 	}
 	resultSet = resultSet.Sort(sort.ByChannelAndVersion)
-	var bundleEntities []*variable_sources.BundleEntity
+	var bundleEntities []*olmentity.BundleEntity
 	for i := 0; i < len(resultSet); i++ {
-		bundleEntities = append(bundleEntities, variable_sources.NewBundleEntity(&resultSet[i]))
+		bundleEntities = append(bundleEntities, olmentity.NewBundleEntity(&resultSet[i]))
 	}
 	return []deppy.Variable{
 		NewRequiredPackageVariable(r.packageName, bundleEntities),

internal/resolution/variable_sources/required_package/required_package_test.go

@@ -9,9 +9,10 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/operator-framework/deppy/pkg/deppy"
 	"github.com/operator-framework/deppy/pkg/deppy/input"
-	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources"
-	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/required_package"
 	"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/required_package"
 )
 
 func TestRequiredPackage(t *testing.T) {
@@ -23,21 +24,21 @@ var _ = Describe("RequiredPackageVariable", func() {
 	var (
 		rpv            *required_package.RequiredPackageVariable
 		packageName    string
-		bundleEntities []*variable_sources.BundleEntity
+		bundleEntities []*olmentity.BundleEntity
 	)
 
 	BeforeEach(func() {
 		packageName = "test-package"
-		bundleEntities = []*variable_sources.BundleEntity{
-			variable_sources.NewBundleEntity(input.NewEntity("bundle-1", map[string]string{
+		bundleEntities = []*olmentity.BundleEntity{
+			olmentity.NewBundleEntity(input.NewEntity("bundle-1", map[string]string{
 				property.TypePackage: `{"packageName": "test-package", "version": "1.0.0"}`,
 				property.TypeChannel: `{"channelName":"stable","priority":0}`,
 			})),
-			variable_sources.NewBundleEntity(input.NewEntity("bundle-2", map[string]string{
+			olmentity.NewBundleEntity(input.NewEntity("bundle-2", map[string]string{
 				property.TypePackage: `{"packageName": "test-package", "version": "2.0.0"}`,
 				property.TypeChannel: `{"channelName":"stable","priority":0}`,
 			})),
-			variable_sources.NewBundleEntity(input.NewEntity("bundle-3", map[string]string{
+			olmentity.NewBundleEntity(input.NewEntity("bundle-3", map[string]string{
 				property.TypePackage: `{"packageName": "test-package", "version": "3.0.0"}`,
 				property.TypeChannel: `{"channelName":"stable","priority":0}`,
 			})),
@@ -104,16 +105,16 @@ var _ = Describe("RequiredPackageVariableSource", func() {
 		Expect(reqPackageVar.Identifier()).To(Equal(deppy.IdentifierFromString(fmt.Sprintf("required package %s", packageName))))
 
 		// ensure bundle entities are in version order
-		Expect(reqPackageVar.BundleEntities()).To(Equal([]*variable_sources.BundleEntity{
-			variable_sources.NewBundleEntity(input.NewEntity("bundle-2", map[string]string{
+		Expect(reqPackageVar.BundleEntities()).To(Equal([]*olmentity.BundleEntity{
+			olmentity.NewBundleEntity(input.NewEntity("bundle-2", map[string]string{
 				property.TypePackage: `{"packageName": "test-package", "version": "3.0.0"}`,
 				property.TypeChannel: `{"channelName":"stable","priority":0}`,
 			})),
-			variable_sources.NewBundleEntity(input.NewEntity("bundle-3", map[string]string{
+			olmentity.NewBundleEntity(input.NewEntity("bundle-3", map[string]string{
 				property.TypePackage: `{"packageName": "test-package", "version": "2.0.0"}`,
 				property.TypeChannel: `{"channelName":"stable","priority":0}`,
 			})),
-			variable_sources.NewBundleEntity(input.NewEntity("bundle-1", map[string]string{
+			olmentity.NewBundleEntity(input.NewEntity("bundle-1", map[string]string{
 				property.TypePackage: `{"packageName": "test-package", "version": "1.0.0"}`,
 				property.TypeChannel: `{"channelName":"stable","priority":0}`})),
 		}))