Update to move logic to executor

v2/internal/pkg/cli/executor.go

@@ -725,6 +725,15 @@ func (o *ExecutorSchema) RunMirrorToDisk(cmd *cobra.Command, args []string) erro
 			copiedSchema = cs
 		}
 
+		// as the signatures are extracted for release in the mirror-to-disk workflow
+		// we create the configmap here to be included in the tar.
+		// this avoids adding this logic in both mirror-to-mirror and disk-to-mirror flows
+		err = o.ClusterResources.GenerateSignatureConfigMap()
+		if err != nil {
+			// as this is not a seriously fatal error we just log the error
+			o.Log.Warn("%s", err)
+		}
+
 		// prepare tar.gz when mirror to disk
 		// first stop the registry
 		interruptSig := NormalStorageInterruptErrorf("end of mirroring to disk. Stopping local storage to prepare the archive")

v2/internal/pkg/cli/executor_test.go

@@ -63,6 +63,7 @@ func TestExecutorMirroring(t *testing.T) {
 	fakeStorageInterruptChan := make(chan error)
 	go skipSignalsToInterruptStorage(fakeStorageInterruptChan)
 
+	cr := MockClusterResources{}
 	opts := &mirror.CopyOptions{
 		Global:              global,
 		DeprecatedTLSVerify: deprecatedTLSVerifyOpt,
@@ -108,6 +109,7 @@ func TestExecutorMirroring(t *testing.T) {
 			localStorageInterruptChannel: fakeStorageInterruptChan,
 			MakeDir:                      MakeDir{},
 			LogsDir:                      "/tmp/",
+			ClusterResources:             cr,
 		}
 
 		res := &cobra.Command{}
@@ -142,6 +144,7 @@ func TestExecutorMirroring(t *testing.T) {
 			localStorageInterruptChannel: fakeStorageInterruptChan,
 			MakeDir:                      MakeDir{},
 			LogsDir:                      "/tmp/",
+			ClusterResources:             cr,
 		}
 
 		res := &cobra.Command{}
@@ -1115,7 +1118,7 @@ func (o MockClusterResources) UpdateServiceGenerator(graphImage, releaseImage st
 func (o MockClusterResources) CatalogSourceGenerator(allRelatedImages []v2alpha1.CopyImageSchema) error {
 	return nil
 }
-func (o MockClusterResources) GenerateSignatureConfigMap(digest string, id int, data []byte) error {
+func (o MockClusterResources) GenerateSignatureConfigMap() error {
 	return nil
 }
 

v2/internal/pkg/clusterresources/clusterresources.go

@@ -608,7 +608,7 @@ func toRFC1035(r rune) rune {
 	}
 }
 
-func (o *ClusterResourcesGenerator) GenerateSignatureConfigMap(digest string, id int, data []byte) error {
+func (o *ClusterResourcesGenerator) GenerateSignatureConfigMap() error {
 	o.Log.Info("📄 Generating Signature Configmap...")
 	// create and store config map
 	cm := &cm.ConfigMap{
@@ -624,28 +624,44 @@ func (o *ClusterResourcesGenerator) GenerateSignatureConfigMap(digest string, id
 		},
 		BinaryData: make(map[string]string),
 	}
-	// base64 encode data
-	b64 := base64.RawStdEncoding.EncodeToString(data)
-	index := fmt.Sprintf(configMapBinaryDataIndexFormat, digest, id+1)
-	cm.BinaryData[index] = b64
-	jsonData, err := json.Marshal(cm)
+	// read the signatures directory
+	sigDir := filepath.Join(o.WorkingDir, signatureDir)
+	signatures, err := os.ReadDir(sigDir)
 	if err != nil {
-		return fmt.Errorf("[GenerateSignatureConfigMap] %v", err)
+		return fmt.Errorf(signatureConfigMapMsg, err)
 	}
-	// write to cluster-resources directory
-	ferr := os.WriteFile(filepath.Join(o.WorkingDir, clusterResourcesDir)+"/"+index+".json", jsonData, 0644)
-	if ferr != nil {
-		return fmt.Errorf("[GenerateSignatureConfigMap] %v", ferr)
-	}
-	yamlData, err := yaml.Marshal(cm)
-	if err != nil {
-		return fmt.Errorf("[GenerateSignatureConfigMap] %v", err)
-	}
-	// write to cluster-resources directory
-	ferr = os.WriteFile(filepath.Join(o.WorkingDir, clusterResourcesDir)+"/"+index+".yaml", yamlData, 0644)
-	if ferr != nil {
-		return fmt.Errorf("[GenerateSignatureConfigMap] %v", ferr)
+
+	if len(signatures) == 0 {
+		return fmt.Errorf(signatureConfigMapMsg, "signature files not found, could not generate signature configmap")
 	}
 
+	for id, file := range signatures {
+		data, err := os.ReadFile(sigDir + "/" + file.Name())
+		if err != nil {
+			return fmt.Errorf(signatureConfigMapMsg, err)
+		}
+		// base64 encode data
+		b64 := base64.RawStdEncoding.EncodeToString(data)
+		index := fmt.Sprintf(configMapBinaryDataIndexFormat, file.Name(), id+1)
+		cm.BinaryData[index] = b64
+		jsonData, err := json.Marshal(cm)
+		if err != nil {
+			return fmt.Errorf(signatureConfigMapMsg, err)
+		}
+		// write to cluster-resources directory
+		ferr := os.WriteFile(filepath.Join(o.WorkingDir, clusterResourcesDir)+"/"+index+".json", jsonData, 0644)
+		if ferr != nil {
+			return fmt.Errorf(signatureConfigMapMsg, ferr)
+		}
+		yamlData, err := yaml.Marshal(cm)
+		if err != nil {
+			return fmt.Errorf(signatureConfigMapMsg, err)
+		}
+		// write to cluster-resources directory
+		ferr = os.WriteFile(filepath.Join(o.WorkingDir, clusterResourcesDir)+"/"+index+".yaml", yamlData, 0644)
+		if ferr != nil {
+			return fmt.Errorf(signatureConfigMapMsg, ferr)
+		}
+	}
 	return nil
 }

v2/internal/pkg/clusterresources/clusterresources_test.go

@@ -15,6 +15,7 @@ import (
 	updateservicev1 "github.com/openshift/oc-mirror/v2/internal/pkg/clusterresources/updateservice/v1"
 	"github.com/openshift/oc-mirror/v2/internal/pkg/common"
 	clog "github.com/openshift/oc-mirror/v2/internal/pkg/log"
+	"github.com/otiai10/copy"
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -1019,23 +1020,26 @@ func TestGenerateSignatureConfigMap(t *testing.T) {
 		tmpDir := t.TempDir()
 		workingDir := filepath.Join(tmpDir, "working-dir")
 		err := os.MkdirAll(workingDir+"/"+clusterResourcesDir, 0755)
+		err = os.MkdirAll(workingDir+"/"+signatureDir, 0755)
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.RemoveAll(workingDir)
+
+		err = copy.Copy("../../../tests/37433b71c073c6cbfc8173ec7ab2d99032c8e6d6fe29de06e062d85e33e34531",
+			workingDir+"/"+signatureDir+"/37433b71c073c6cbfc8173ec7ab2d99032c8e6d6fe29de06e062d85e33e34531")
 		if err != nil {
 			t.Fatal(err)
 		}
-		//defer os.RemoveAll(workingDir)
 
 		log := clog.New("trace")
 		cmJson := cm.ConfigMap{}
 		cr := &ClusterResourcesGenerator{
 			Log:        log,
 			WorkingDir: workingDir,
 		}
-		data, err := os.ReadFile("../../../tests/test.sig")
-		if err != nil {
-			t.Fatal(err)
-		}
-		digest := "37433b71c073c6cbfc8173ec7ab2d99032c8e6d6fe29de06e062d85e33e34531"
-		err = cr.GenerateSignatureConfigMap(digest, 0, data)
+
+		err = cr.GenerateSignatureConfigMap()
 		if err != nil {
 			t.Fatal(err)
 		}

v2/internal/pkg/clusterresources/const.go

@@ -10,4 +10,6 @@ const (
 	configMapBinaryDataIndexFormat        = "sha256-%s-%d"
 	signatureNamespace                    = "openshift-config-managed"
 	signatureLabel                        = "release.openshift.io/verification-signatures"
+	signatureConfigMapMsg                 = "[GenerateSignatureConfigMap] %v"
+	signatureDir                          = "signatures"
 )

v2/internal/pkg/clusterresources/interface.go

@@ -8,5 +8,5 @@ type GeneratorInterface interface {
 	IDMS_ITMSGenerator(allRelatedImages []v2alpha1.CopyImageSchema, forceRepositoryScope bool) error
 	UpdateServiceGenerator(graphImage, releaseImage string) error
 	CatalogSourceGenerator(allRelatedImages []v2alpha1.CopyImageSchema) error
-	GenerateSignatureConfigMap(digest string, id int, data []byte) error
+	GenerateSignatureConfigMap() error
 }

v2/internal/pkg/release/signature.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/openshift/oc-mirror/v2/internal/pkg/api/v2alpha1"
-	"github.com/openshift/oc-mirror/v2/internal/pkg/clusterresources"
+	//"github.com/openshift/oc-mirror/v2/internal/pkg/clusterresources"
 	"github.com/openshift/oc-mirror/v2/internal/pkg/image"
 	clog "github.com/openshift/oc-mirror/v2/internal/pkg/log"
 	"github.com/openshift/oc-mirror/v2/internal/pkg/mirror"
@@ -60,7 +60,7 @@ func (o SignatureSchema) GenerateReleaseSignatures(ctx context.Context, images [
 	}
 	httpClient := &http.Client{Transport: tr}
 
-	for id, img := range images {
+	for _, img := range images {
 		imgSpec, err := image.ParseRef(img.Source)
 		if err != nil {
 			return []v2alpha1.CopyImageSchema{}, fmt.Errorf("parsing image digest")
@@ -175,13 +175,6 @@ func (o SignatureSchema) GenerateReleaseSignatures(ctx context.Context, images [
 				o.Log.Error("%v", ferr)
 			}
 			imgs = append(imgs, img)
-
-			cr := clusterresources.New(o.Log, o.Opts.Global.WorkingDir, o.Config, "")
-			err = cr.GenerateSignatureConfigMap(digest, id, data)
-			if err != nil {
-				o.Log.Error("%v", err)
-			}
-
 		} else {
 			o.Log.Warn("no signature found for %s", digest)
 			return []v2alpha1.CopyImageSchema{}, fmt.Errorf("no signature found for %s image %s", digest, img.Source)