Clean up the variable source code

Signed-off-by: Mikalai Radchuk <[email protected]>

Author: Mikalai Radchuk

internal/controllers/variable_source.go

@@ -78,10 +78,7 @@ func (v *VariableSource) GetVariables(ctx context.Context) ([]deppy.Variable, er
 		return nil, err
 	}
 
-	bundleUniqueness, err := variablesources.MakeBundleUniquenessVariables(bundles)
-	if err != nil {
-		return nil, err
-	}
+	bundleUniqueness := variablesources.MakeBundleUniquenessVariables(bundles)
 
 	result := []deppy.Variable{}
 	for _, v := range requiredPackages {

internal/resolution/variablesources/bundle.go

@@ -1,15 +1,13 @@
 package variablesources
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"sort"
 
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	"github.com/operator-framework/deppy/pkg/deppy"
-	"github.com/operator-framework/deppy/pkg/deppy/input"
 
 	"github.com/operator-framework/operator-controller/internal/catalogmetadata"
 	catalogfilter "github.com/operator-framework/operator-controller/internal/catalogmetadata/filter"
@@ -93,53 +91,3 @@ func filterBundleDependencies(allBundles []*catalogmetadata.Bundle, bundle *cata
 
 	return dependencies, nil
 }
-
-type BundlesAndDepsVariableSource struct {
-	catalogClient   BundleProvider
-	variableSources []input.VariableSource
-}
-
-func NewBundlesAndDepsVariableSource(catalogClient BundleProvider, inputVariableSources ...input.VariableSource) *BundlesAndDepsVariableSource {
-	return &BundlesAndDepsVariableSource{
-		catalogClient:   catalogClient,
-		variableSources: inputVariableSources,
-	}
-}
-
-func (b *BundlesAndDepsVariableSource) GetVariables(ctx context.Context) ([]deppy.Variable, error) {
-	variables := []deppy.Variable{}
-
-	for _, variableSource := range b.variableSources {
-		inputVariables, err := variableSource.GetVariables(ctx)
-		if err != nil {
-			return nil, err
-		}
-		variables = append(variables, inputVariables...)
-	}
-
-	allBundles, err := b.catalogClient.Bundles(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	requiredPackages := []*olmvariables.RequiredPackageVariable{}
-	installedPackages := []*olmvariables.InstalledPackageVariable{}
-	for _, variable := range variables {
-		switch v := variable.(type) {
-		case *olmvariables.RequiredPackageVariable:
-			requiredPackages = append(requiredPackages, v)
-		case *olmvariables.InstalledPackageVariable:
-			installedPackages = append(installedPackages, v)
-		}
-	}
-
-	bundles, err := MakeBundleVariables(allBundles, requiredPackages, installedPackages)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, v := range bundles {
-		variables = append(variables, v)
-	}
-	return variables, nil
-}