PoC: Resolution CLI

cmd/manager/main.go

@@ -37,7 +37,6 @@ import (
 	operatorsv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
 	"github.com/operator-framework/operator-controller/internal/controllers"
 	"github.com/operator-framework/operator-controller/internal/resolution/entitysources"
-	"github.com/operator-framework/operator-controller/internal/resolution/variablesources"
 	"github.com/operator-framework/operator-controller/pkg/features"
 )
 
@@ -105,7 +104,7 @@ func main() {
 		Scheme: mgr.GetScheme(),
 		Resolver: solver.NewDeppySolver(
 			entitysources.NewCatalogdEntitySource(mgr.GetClient()),
-			variablesources.NewOperatorVariableSource(mgr.GetClient()),
+			controllers.NewVariableSource(mgr.GetClient()),
 		),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Operator")

cmd/resolutioncli/entity_source.go

@@ -0,0 +1,161 @@
+/*
+Copyright 2023.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+
+	"github.com/operator-framework/deppy/pkg/deppy"
+	"github.com/operator-framework/deppy/pkg/deppy/input"
+	"github.com/operator-framework/operator-registry/alpha/action"
+	"github.com/operator-framework/operator-registry/alpha/declcfg"
+	"github.com/operator-framework/operator-registry/alpha/model"
+	"github.com/operator-framework/operator-registry/alpha/property"
+
+	olmentity "github.com/operator-framework/operator-controller/internal/resolution/entities"
+)
+
+type indexRefEntitySource struct {
+	renderer      action.Render
+	entitiesCache input.EntityList
+}
+
+func newIndexRefEntitySourceEntitySource(indexRef string) *indexRefEntitySource {
+	return &indexRefEntitySource{
+		renderer: action.Render{
+			Refs:           []string{indexRef},
+			AllowedRefMask: action.RefDCImage | action.RefDCDir,
+		},
+	}
+}
+
+func (es *indexRefEntitySource) Get(_ context.Context, _ deppy.Identifier) (*input.Entity, error) {
+	panic("not implemented")
+}
+
+func (es *indexRefEntitySource) Filter(ctx context.Context, filter input.Predicate) (input.EntityList, error) {
+	entities, err := es.entities(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	resultSet := input.EntityList{}
+	for i := range entities {
+		if filter(&entities[i]) {
+			resultSet = append(resultSet, entities[i])
+		}
+	}
+	return resultSet, nil
+}
+
+func (es *indexRefEntitySource) GroupBy(ctx context.Context, fn input.GroupByFunction) (input.EntityListMap, error) {
+	entities, err := es.entities(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	resultSet := input.EntityListMap{}
+	for i := range entities {
+		keys := fn(&entities[i])
+		for _, key := range keys {
+			resultSet[key] = append(resultSet[key], entities[i])
+		}
+	}
+	return resultSet, nil
+}
+
+func (es *indexRefEntitySource) Iterate(ctx context.Context, fn input.IteratorFunction) error {
+	entities, err := es.entities(ctx)
+	if err != nil {
+		return err
+	}
+
+	for i := range entities {
+		if err := fn(&entities[i]); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (es *indexRefEntitySource) entities(ctx context.Context) (input.EntityList, error) {
+	if es.entitiesCache == nil {
+		cfg, err := es.renderer.Run(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		model, err := declcfg.ConvertToModel(*cfg)
+		if err != nil {
+			return nil, err
+		}
+
+		entities, err := modelToEntities(model)
+		if err != nil {
+			return nil, err
+		}
+
+		es.entitiesCache = entities
+	}
+
+	return es.entitiesCache, nil
+}
+
+// TODO: Reduce code duplication: share a function with catalogdEntitySource (see getEntities)
+// We don't want to maintain two functions performing conversion into input.EntityList.
+// For this we need some common format. So we need a package which will be able
+// to convert from declfcg structs into CRD structs directly or via model.Model.
+// One option would be to make this piece of code from catalogd reusable and exportable:
+// https://github.com/operator-framework/catalogd/blob/9fe45a628de2e74d9cd73c3650fa2582aaac5213/pkg/controllers/core/catalog_controller.go#L200-L360
+func modelToEntities(model model.Model) (input.EntityList, error) {
+	entities := input.EntityList{}
+
+	for _, pkg := range model {
+		for _, ch := range pkg.Channels {
+			for _, bundle := range ch.Bundles {
+				props := map[string]string{}
+
+				for _, prop := range bundle.Properties {
+					switch prop.Type {
+					case property.TypePackage:
+						// this is already a json marshalled object, so it doesn't need to be marshalled
+						// like the other ones
+						props[property.TypePackage] = string(prop.Value)
+					}
+				}
+
+				imgValue, err := json.Marshal(bundle.Image)
+				if err != nil {
+					return nil, err
+				}
+				props[olmentity.PropertyBundlePath] = string(imgValue)
+
+				channelValue, _ := json.Marshal(property.Channel{ChannelName: ch.Name, Priority: 0})
+				props[property.TypeChannel] = string(channelValue)
+				entity := input.Entity{
+					ID:         deppy.IdentifierFromString(fmt.Sprintf("%s%s%s", bundle.Name, bundle.Package.Name, ch.Name)),
+					Properties: props,
+				}
+				entities = append(entities, entity)
+			}
+		}
+	}
+
+	return entities, nil
+}

cmd/resolutioncli/input_manifests.go

@@ -0,0 +1,60 @@
+/*
+Copyright 2023.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+func readManifestFiles(directory string) ([]runtime.Object, error) {
+	var objects []runtime.Object
+
+	err := filepath.Walk(directory, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if info.IsDir() {
+			return nil
+		}
+
+		fileContent, err := os.ReadFile(path)
+		if err != nil {
+			return fmt.Errorf("failed to read file %s: %w", path, err)
+		}
+
+		decoder := codecs.UniversalDecoder(scheme.PrioritizedVersionsAllGroups()...)
+		object, _, err := decoder.Decode(fileContent, nil, nil)
+		if err != nil {
+			return fmt.Errorf("failed to decode file %s: %w", path, err)
+		}
+
+		objects = append(objects, object)
+
+		return nil
+	})
+
+	if err != nil {
+		return nil, fmt.Errorf("failed to read files: %w", err)
+	}
+
+	return objects, nil
+}