Address feedbacks and fix test cases

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

Author: dinhxuanvu

bundles/etcd.0.9.2/metadata/dependencies.yaml

@@ -0,0 +1,5 @@
+dependencies:
+  - type: olm.gvk
+    group: testapi.coreos.com
+    kind: testapi
+    version: v1

bundles/prometheus.0.22.2/metadata/dependencies.yaml

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

pkg/registry/populator.go

@@ -65,9 +65,9 @@ func (i *DirectoryPopulator) Populate(mode Mode) error {
 		if f.Name() == DependenciesFileName {
 			err = decodeFile(filepath.Join(metadata, f.Name()), dependenciesFile)
 			if err != nil {
-				log.Info("found dependencies file searching for csv")
-			} else {
 				log.Info("unable to parse dependencies.yaml file")
+			} else {
+				log.Info("found dependencies file searching for csv")
 			}
 		}
 	}

pkg/registry/populator_test.go

@@ -127,7 +127,7 @@ type Dependency struct {
 	Type string `json:"type" yaml:"type"`
 
 	// The name of dependency such as 'etcd'
-	Name string `json:"name" yaml:"packgeName"`
+	Name string `json:"packageName" yaml:"packageName"`
 
 	// The group of GVK based dependency
 	Group string `json:"group" yaml:"group"`

pkg/registry/types.go

@@ -31,6 +31,20 @@ func (s *RegistryServer) ListPackages(req *api.ListPackageRequest, stream api.Re
 	return nil
 }
 
+func (s *RegistryServer) ListBundles(req *api.ListBundlesRequest, stream api.Registry_ListBundlesServer) error {
+	bundles, err := s.store.ListBundles(stream.Context())
+	if err != nil {
+		return err
+	}
+	for _, b := range bundles {
+		if err := stream.Send(b); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (s *RegistryServer) GetPackage(ctx context.Context, req *api.GetPackageRequest) (*api.Package, error) {
 	packageManifest, err := s.store.GetPackage(ctx, req.GetName())
 	if err != nil {

pkg/server/server.go

@@ -755,14 +755,6 @@ func (s *SQLLoader) AddBundlePackageChannels(manifest registry.PackageManifest,
 }
 
 func (s *SQLLoader) addDependencies(tx *sql.Tx, bundle *registry.Bundle) error {
-	tx, err := s.db.Begin()
-	if err != nil {
-		return err
-	}
-	defer func() {
-		tx.Rollback()
-	}()
-
 	addDep, err := tx.Prepare("insert into dependencies(type, package_name, group_name, version, kind, operatorbundle_name, operatorbundle_version, operatorbundle_path) values(?, ?, ?, ?, ?, ?, ?, ?)")
 	if err != nil {
 		return err