Fixes replace based upgrades

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

Author: Mikalai Radchuk

internal/resolution/entities/bundle_entity.go

@@ -11,9 +11,7 @@ import (
 )
 
 const PropertyBundlePath = "olm.bundle.path"
-
-// TODO: Is this the right place for these?
-// ----
+const PropertyBundleReplaces = "olm.replaces"
 const PropertyBundleMediaType = "olm.bundle.mediatype"
 
 type MediaType string
@@ -140,7 +138,7 @@ func (b *BundleEntity) loadReplaces() error {
 	b.mu.Lock()
 	defer b.mu.Unlock()
 	if b.replaces == nil {
-		replaces, err := loadFromEntity[Replaces](b.Entity, "olm.replaces", optional)
+		replaces, err := loadFromEntity[Replaces](b.Entity, PropertyBundleReplaces, optional)
 		if err != nil {
 			return fmt.Errorf("error determining replaces for entity '%s': %w", b.ID, err)
 		}

internal/resolution/entitysources/catalogdsource.go

@@ -110,9 +110,10 @@ func getEntities(ctx context.Context, client client.Client) (input.EntityList, e
 				if catalogScopedEntryName == bundle.Name {
 					channelValue, _ := json.Marshal(property.Channel{ChannelName: ch.Name, Priority: 0})
 					props[property.TypeChannel] = string(channelValue)
-					// TODO(jmprusi): Add the proper PropertyType for this
-					replacesValue, _ := json.Marshal(replacesProperty{Replaces: b.Replaces})
-					props["olm.replaces"] = string(replacesValue)
+					replacesValue, _ := json.Marshal(replacesProperty{
+						Replaces: fmt.Sprintf("%s-%s%s%s", bundle.Spec.Catalog.Name, b.Replaces, bundle.Spec.Package, ch.Name),
+					})
+					props[entities.PropertyBundleReplaces] = string(replacesValue)
 					entity := input.Entity{
 						ID:         deppy.IdentifierFromString(fmt.Sprintf("%s%s%s", bundle.Name, bundle.Spec.Package, ch.Name)),
 						Properties: props,

internal/resolution/variablesources/installed_package.go

@@ -46,16 +46,7 @@ func (r *InstalledPackageVariableSource) GetVariables(ctx context.Context, entit
 	// now find the bundles that replace the installed bundle
 	// TODO: this algorithm does not yet consider skips and skipRange
 	//       we simplify the process here by just searching for the bundle that replaces the installed bundle
-	packageName, err := installedBundle.PackageName()
-	if err != nil {
-		return nil, err
-	}
-	version, err := installedBundle.Version()
-	if err != nil {
-		return nil, err
-	}
-	bundleID := fmt.Sprintf("%s.v%s", packageName, version.String())
-	resultSet, err = entitySource.Filter(ctx, predicates.Replaces(bundleID))
+	resultSet, err = entitySource.Filter(ctx, predicates.Replaces(installedBundle.ID.String()))
 	if err != nil {
 		return nil, err
 	}
@@ -68,7 +59,7 @@ func (r *InstalledPackageVariableSource) GetVariables(ctx context.Context, entit
 	// you can always upgrade to yourself, i.e. not upgrade
 	upgradeEdges = append(upgradeEdges, installedBundle)
 	return []deppy.Variable{
-		variables.NewInstalledPackageVariable(bundleID, upgradeEdges),
+		variables.NewInstalledPackageVariable(installedBundle.ID.String(), upgradeEdges),
 	}, nil
 }
 

testdata/catalogs/test-catalog/catalog.yaml

@@ -9,9 +9,9 @@ package: prometheus
 entries:
   - name: prometheus-operator.0.37.0
   - name: prometheus-operator.0.47.0
-    replaces: "prometheus.v0.37.0"
+    replaces: prometheus-operator.0.37.0
   - name: prometheus-operator.0.65.1
-    replaces: prometheus.v0.47.0
+    replaces: prometheus-operator.0.47.0
 ---
 schema: olm.bundle
 name: prometheus-operator.0.37.0