chore: refactoring the signing test to make it more robust (#657)

<!-- markdownlint-disable MD041 -->
#### What this PR does / why we need it

#### Which issue(s) this PR fixes
<!--
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->

Signed-off-by: Gergely Brautigam <[email protected]>

Author: Skarlso

e2e/create_test_component.go

@@ -35,13 +35,9 @@ func createTestComponentVersionUnsigned(t *testing.T, componentNameIdentifier st
 		Setup(setup.AddComponentVersions(podinfo(t, nil, "", componentNameIdentifier, testPath, version)))
 }
 
-func createTestComponentVersionSigned(t *testing.T, featureString string, privateKey []byte, keyName string, publicKey []byte, componentNameIdentifier string, testPath string, version string) *features.FeatureBuilder {
+func createTestComponentVersionSigned(t *testing.T, featureString string, privateKey []byte, keyName string, componentNameIdentifier string, testPath string, version string) *features.FeatureBuilder {
 	t.Helper()
-	secretData := map[string][]byte{
-		keyName: publicKey,
-	}
 	return features.New(featureString).
-		WithStep("create secret", 1, shared.CreateSecret(keyName, secretData, nil, "")).
 		WithStep("", 2, setup.AddComponentVersions(podinfoBackend(t, privateKey, keyName, componentNameIdentifier, testPath, version))).
 		WithStep("", 2, setup.AddComponentVersions(podinfoFrontend(t, privateKey, keyName, componentNameIdentifier, testPath, version))).
 		WithStep("", 2, setup.AddComponentVersions(podinfoRedis(t, privateKey, keyName, componentNameIdentifier, testPath, version))).

e2e/main_test.go

@@ -120,12 +120,8 @@ func TestSignedComponentUploadToLocalOCIRegistry(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	_, invalidPublicKey, err := createRSAKeys()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	setupComponent := createTestComponentVersionSigned(t, "Add signed components to component-version", privateKey, keyName, invalidPublicKey, componentNameIdentifier, testSignedComponentsPath, version1)
+	createSigningSecret := features.New("Create signing secret").WithStep("create valid rsa key secret", 1, shared.CreateSecret(keyName, map[string][]byte{keyName: publicKey}, nil, ""))
+	setupComponent := createTestComponentVersionSigned(t, "Add signed components to component-version", privateKey, keyName, componentNameIdentifier, testSignedComponentsPath, version1)
 	validation := features.New("Validate if signed OCM Components are present in OCI Registry").
 		Setup(setup.AddScheme(v1alpha1.AddToScheme)).
 		Setup(setup.AddScheme(sourcev1.AddToScheme)).
@@ -136,16 +132,14 @@ func TestSignedComponentUploadToLocalOCIRegistry(t *testing.T) {
 		Assess("Validate Component "+podinfoComponentName, checkRepositoryExistsInRegistry(componentNamePrefix+componentNameIdentifier+podinfoComponentName)).
 		Assess("Validate Component "+podinfoBackendComponentName, checkRepositoryExistsInRegistry(componentNamePrefix+componentNameIdentifier+podinfoBackendComponentName)).
 		Assess("Validate Component "+podinfoFrontendComponentName, checkRepositoryExistsInRegistry(componentNamePrefix+componentNameIdentifier+podinfoFrontendComponentName)).
-		Assess("Validate Component "+redisComponentName, checkRepositoryExistsInRegistry(componentNamePrefix+componentNameIdentifier+redisComponentName)).
-		Teardown(shared.DeleteSecret(keyName))
+		Assess("Validate Component "+redisComponentName, checkRepositoryExistsInRegistry(componentNamePrefix+componentNameIdentifier+redisComponentName))
 
 	signatureVerification := features.New("Validate if signed Component Versions of OCM Components exist").
-		WithStep("create valid rsa key secret", 1, shared.CreateSecret(keyName, map[string][]byte{keyName: publicKey}, nil, "")).
-		Assess("Check that component version "+cvName+" is ready and signature was verified", checkIsComponentVersionReady(cvName, ocmNamespace)).
-		Teardown(shared.DeleteSecret(keyName))
+		Assess("Check that component version "+cvName+" is ready and signature was verified", checkIsComponentVersionReady(cvName, ocmNamespace))
 
 	testEnv.Test(t,
 		setupComponent.Feature(),
+		createSigningSecret.Feature(),
 		validation.Feature(),
 		signatureVerification.Feature(),
 	)