revert api signatures

Signed-off-by: Ankita Thomas <[email protected]>

Author: ankitathomas

pkg/registry/interface.go

@@ -13,7 +13,7 @@ type Load interface {
 	AddBundlePackageChannels(manifest PackageManifest, bundle *Bundle) error
 	RemovePackage(packageName string) error
 	RemoveStrandedBundles() error
-	DeprecateBundle(name, version, path string) error
+	DeprecateBundle(path string) error
 	ClearNonHeadBundles() error
 }
 

pkg/sqlite/deprecate.go

@@ -38,25 +38,19 @@ func (d *BundleDeprecator) Deprecate() error {
 	log.Info("deprecating bundles")
 
 	var errs []error
-	type nameVersion struct {
-		name    string
-		version string
-	}
-	bundleInfo := make(map[string]nameVersion)
 	// Check if all bundlepaths are valid
 	for _, bundlePath := range d.bundles {
-		name, version, err := d.querier.GetBundleNameAndVersionForImage(context.TODO(), bundlePath)
+		_, _, err := d.querier.GetBundleNameAndVersionForImage(context.TODO(), bundlePath)
 		if err != nil {
 			errs = append(errs, fmt.Errorf("error deprecating bundle %s: %s", bundlePath, err))
 		}
-		bundleInfo[bundlePath] = nameVersion{name, version}
 	}
 
 	if len(errs) != 0 {
 		return utilerrors.NewAggregate(errs)
 	}
 
-	for bundlePath, bundle := range bundleInfo {
+	for _, bundlePath := range d.bundles {
 		// verify that bundle is still present
 		_, _, err := d.querier.GetBundleNameAndVersionForImage(context.TODO(), bundlePath)
 		if err != nil {
@@ -65,7 +59,7 @@ func (d *BundleDeprecator) Deprecate() error {
 			}
 			continue
 		}
-		if err := d.store.DeprecateBundle(bundle.name, bundle.version, bundlePath); err != nil {
+		if err := d.store.DeprecateBundle(bundlePath); err != nil {
 			if !errors.Is(err, registry.ErrRemovingDefaultChannelDuringDeprecation) {
 				return utilerrors.NewAggregate(append(errs, fmt.Errorf("error deprecating bundle %s: %s", bundlePath, err)))
 			}

pkg/sqlite/load.go

@@ -1367,7 +1367,28 @@ func getTailFromBundle(tx *sql.Tx, name string) (bundles []string, err error) {
 
 }
 
-func (s *sqlLoader) DeprecateBundle(name, version, path string) error {
+func getBundleNameAndVersionForImage(tx *sql.Tx, path string) (string, string, error) {
+	query := `SELECT name, version FROM operatorbundle WHERE bundlepath=? LIMIT 1`
+	rows, err := tx.QueryContext(context.TODO(), query, path)
+	if err != nil {
+		return "", "", err
+	}
+	defer rows.Close()
+
+	var name sql.NullString
+	var version sql.NullString
+	if rows.Next() {
+		if err := rows.Scan(&name, &version); err != nil {
+			return "", "", err
+		}
+	}
+	if name.Valid && version.Valid {
+		return name.String, version.String, nil
+	}
+	return "", "", registry.ErrBundleImageNotInDatabase
+}
+
+func (s *sqlLoader) DeprecateBundle(path string) error {
 	tx, err := s.db.Begin()
 	if err != nil {
 		return err
@@ -1382,6 +1403,10 @@ func (s *sqlLoader) DeprecateBundle(name, version, path string) error {
 	}
 	defer nullifyBundleReplaces.Close()
 
+	name, version, err := getBundleNameAndVersionForImage(tx, path)
+	if err != nil {
+		return fmt.Errorf("error deprecating bundle %s: %s", path, err)
+	}
 	tailBundles, err := getTailFromBundle(tx, name)
 	if err != nil {
 		return err