ocpbugs-60999: fix issue when using full true in m2m (#1256)

Before this fix during m2m when using full: true, the dispatch func was
trying to retrieve a rebuilt catalog image from cache. This behavior was
wrong since full: true does not rebuild the catalog.

This PR fixes this behavior, it gets the original catalog image in case no RebuiltTag was found for the catalog image.

Author: aguidirh

v2/internal/pkg/api/v2alpha1/type_internal.go

@@ -195,6 +195,8 @@ type RelatedImage struct {
 	//Used to identify if a related image is from an operator catalog on disk (oci:// on ImageSetConfiguration)
 	//TODO remove me when the migration from oc-mirror v1 to v2 ends
 	OriginFromOperatorCatalogOnDisk bool
+	// Used to identify if it is a full catalog (full: true && zero packages)
+	FullCatalog bool
 }
 
 type CollectorSchema struct {

v2/internal/pkg/operator/common.go

@@ -467,9 +467,13 @@ func (d CatalogImageDispatcher) dispatch(img v2alpha1.RelatedImage) ([]v2alpha1.
 	if err != nil {
 		return []v2alpha1.CopyImageSchema{}, err
 	}
-	var toCacheImage, fromRebuiltImage, toDestImage string
+	var toCacheImage, from, toDestImage string
+	// OCPBUGS-60999 - if full: true with zero packages, it gets the original catalog image otherwise get the rebuilt catalog image from cache
+	from = imgSpec.ReferenceWithTransport
+	if !img.FullCatalog {
+		from = rebuiltCtlgRef(imgSpec, img, d.cacheRegistry)
+	}
 	toCacheImage = saveCtlgToCacheRef(imgSpec, img, d.cacheRegistry)
-	fromRebuiltImage = rebuiltCtlgRef(imgSpec, img, d.cacheRegistry)
 	toDestImage = destCtlgRef(imgSpec, img, d.destinationRegistry)
 	cacheCopy := v2alpha1.CopyImageSchema{
 		Source:      imgSpec.ReferenceWithTransport,
@@ -479,7 +483,7 @@ func (d CatalogImageDispatcher) dispatch(img v2alpha1.RelatedImage) ([]v2alpha1.
 		Type:        img.Type,
 	}
 	destCopy := v2alpha1.CopyImageSchema{
-		Source:      fromRebuiltImage,
+		Source:      from,
 		Destination: toDestImage,
 		Origin:      imgSpec.ReferenceWithTransport,
 		RebuiltTag:  img.RebuiltTag,
@@ -535,7 +539,6 @@ func rebuiltCtlgRef(spec image.ImageSpec, img v2alpha1.RelatedImage, cacheRegist
 	// applies only to catalogs
 	case img.RebuiltTag != "":
 		rebuiltCtlgSrc = rebuiltCtlgSrc + ":" + img.RebuiltTag
-	case len(img.TargetTag) > 0:
 	case img.Type == v2alpha1.TypeOperatorCatalog && len(img.TargetTag) > 0:
 		rebuiltCtlgSrc = rebuiltCtlgSrc + ":" + img.TargetTag
 	case spec.Tag == "" && spec.Transport == ociProtocol:

v2/internal/pkg/operator/filtered_collector.go

@@ -267,6 +267,7 @@ func (o FilterCollector) collectOperator( //nolint:cyclop // TODO: this needs fu
 			TargetTag:     targetTag,
 			TargetCatalog: op.TargetCatalog,
 			RebuiltTag:    rebuiltTag,
+			FullCatalog:   isFullCatalog(op),
 		},
 	}
 	return result, nil

v2/internal/pkg/operator/filtered_collector_test.go

@@ -705,7 +705,7 @@ func TestFilterCollectorM2M(t *testing.T) {
 					Type:        v2alpha1.TypeOperatorCatalog,
 				},
 				{
-					Source:      "docker://localhost:9999/redhat/community-operator-index:v4.18",
+					Source:      "docker://registry.redhat.io/redhat/community-operator-index:v4.18",
 					Destination: "docker://localhost:5000/test/redhat/community-operator-index:v4.18",
 					Origin:      "docker://registry.redhat.io/redhat/community-operator-index:v4.18",
 					Type:        v2alpha1.TypeOperatorCatalog,