Address feedbacks (second round)

Signed-off-by: Vu Dinh <[email protected]>

Author: dinhxuanvu

bundles/prometheus.0.22.2/metadata/dependencies.yaml

@@ -1,4 +1,4 @@
 dependencies:
   - type: olm.package
-    packageName: test-operator
-    version: ">0.2.0"
+    packageName: testoperator
+    version: "> 0.2.0"

pkg/api/registry.pb.go

@@ -12,7 +12,7 @@ service Registry {
 	rpc GetChannelEntriesThatProvide(GetAllProvidersRequest) returns (stream ChannelEntry) {}
 	rpc GetLatestChannelEntriesThatProvide(GetLatestProvidersRequest) returns (stream ChannelEntry) {}
 	rpc GetDefaultBundleThatProvides(GetDefaultProviderRequest) returns (Bundle) {}
-  rpc ListBundles(ListBundlesRequest) returns (stream Bundle) {}
+      rpc ListBundles(ListBundlesRequest) returns (stream Bundle) {}
 }
 
 
@@ -40,10 +40,7 @@ message GroupVersionKind{
 
 message Dependency{
   string type = 1;
-  string name = 2;
-  string group = 3;
-  string version = 4;
-  string kind = 5;
+  string value = 2;
 }
 
 message Bundle{
@@ -57,7 +54,7 @@ message Bundle{
 	repeated GroupVersionKind requiredApis = 8;
 	string version = 9;
 	string skipRange = 10;
-  repeated Dependency dependencies = 11;
+      repeated Dependency dependencies = 11;
 }
 
 message ChannelEntry{

pkg/api/registry.proto

@@ -35,7 +35,7 @@ type Bundle struct {
 	BundleImage  string
 	csv          *ClusterServiceVersion
 	crds         []*v1beta1.CustomResourceDefinition
-	Dependencies []Dependency
+	Dependencies []*Dependency
 	cacheStale   bool
 }
 

pkg/registry/bundle.go

@@ -2,6 +2,7 @@ package registry
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -16,9 +17,9 @@ import (
 	"github.com/operator-framework/operator-registry/pkg/image"
 )
 
-const (
-	DependenciesFileName = "dependencies.yaml"
-)
+type Dependencies struct {
+	RawMessage []map[string]string `json:"dependencies" yaml:"dependencies"`
+}
 
 // DirectoryPopulator loads an unpacked operator bundle from a directory into the database.
 type DirectoryPopulator struct {
@@ -62,13 +63,12 @@ func (i *DirectoryPopulator) Populate(mode Mode) error {
 			log.Info("found annotations file searching for csv")
 			continue
 		}
-		if f.Name() == DependenciesFileName {
-			err = decodeFile(filepath.Join(metadata, f.Name()), dependenciesFile)
-			if err != nil {
-				log.Info("unable to parse dependencies.yaml file")
-			} else {
-				log.Info("found dependencies file searching for csv")
-			}
+
+		err = parseDependenciesFile(filepath.Join(metadata, f.Name()), dependenciesFile)
+		if err != nil || len(dependenciesFile.Dependencies) < 1 {
+			continue
+		} else {
+			log.Info("found dependencies file searching for csv")
 		}
 	}
 
@@ -112,7 +112,7 @@ func (i *DirectoryPopulator) loadManifests(manifests string, annotationsFile *An
 	// set the bundleimage on the bundle
 	bundle.BundleImage = i.to.String()
 	// set the dependencies on the bundle
-	bundle.Dependencies = dependenciesFile.Dependencies
+	bundle.Dependencies = dependenciesFile.GetDependencies()
 
 	bundle.Name = csvName
 	bundle.Package = annotationsFile.Annotations.PackageName
@@ -340,3 +340,36 @@ func decodeFile(path string, into interface{}) error {
 
 	return decoder.Decode(into)
 }
+
+func parseDependenciesFile(path string, depFile *DependenciesFile) error {
+	deps := Dependencies{}
+	err := decodeFile(path, &deps)
+	if err != nil || len(deps.RawMessage) == 0 {
+		return fmt.Errorf("Unable to decode the dependencies file %s", path)
+	}
+	depList := []Dependency{}
+	for _, v := range deps.RawMessage {
+		// convert map to json
+		jsonStr, _ := json.Marshal(v)
+		fmt.Println(string(jsonStr))
+
+		// Check dependency type
+		dep := Dependency{}
+		err := json.Unmarshal(jsonStr, &dep)
+		if err != nil {
+			return err
+		}
+
+		switch dep.GetType() {
+		case "olm.gvk", "olm.package":
+			dep.Value = string(jsonStr)
+		default:
+			return fmt.Errorf("Unsupported dependency type %s", dep.GetType())
+		}
+		depList = append(depList, dep)
+	}
+
+	depFile.Dependencies = depList
+
+	return nil
+}

pkg/registry/populator.go

@@ -118,10 +118,8 @@ func TestQuerierForImage(t *testing.T) {
 		SkipRange: "",
 		Dependencies: []*api.Dependency{
 			{
-				Type:    "olm.gvk",
-				Group:   "testapi.coreos.com",
-				Kind:    "testapi",
-				Version: "v1",
+				Type:  "olm.gvk",
+				Value: `{"group":"testapi.coreos.com","kind":"testapi","type":"olm.gvk","version":"v1"}`,
 			},
 		},
 		ProvidedApis: []*api.GroupVersionKind{
@@ -351,15 +349,12 @@ func TestQuerierForDependencies(t *testing.T) {
 
 	expectedDependencies := []*api.Dependency{
 		{
-			Type:    "olm.package",
-			Name:    "test-operator",
-			Version: ">0.2.0",
+			Type:  "olm.package",
+			Value: `{"packageName":"testoperator","type":"olm.package","version":"\u003e 0.2.0"}`,
 		},
 		{
-			Type:    "olm.gvk",
-			Group:   "testapi.coreos.com",
-			Kind:    "testapi",
-			Version: "v1",
+			Type:  "olm.gvk",
+			Value: `{"group":"testapi.coreos.com","kind":"testapi","type":"olm.gvk","version":"v1"}`,
 		},
 	}
 
@@ -401,15 +396,12 @@ func TestListBundles(t *testing.T) {
 
 	expectedDependencies := []*api.Dependency{
 		{
-			Type:    "olm.package",
-			Name:    "test-operator",
-			Version: ">0.2.0",
+			Type:  "olm.package",
+			Value: `{"packageName":"testoperator","type":"olm.package","version":"\u003e 0.2.0"}`,
 		},
 		{
-			Type:    "olm.gvk",
-			Group:   "testapi.coreos.com",
-			Kind:    "testapi",
-			Version: "v1",
+			Type:  "olm.gvk",
+			Value: `{"group":"testapi.coreos.com","kind":"testapi","type":"olm.gvk","version":"v1"}`,
 		},
 	}
 
@@ -418,7 +410,6 @@ func TestListBundles(t *testing.T) {
 	require.NoError(t, err)
 	for _, b := range bundles {
 		dep := b.Dependencies
-		fmt.Printf("Dep: %v\n", dep)
 		dependencies = append(dependencies, dep...)
 	}
 	require.ElementsMatch(t, expectedDependencies, dependencies)