Merge pull request openshift#7753 from zaneb/duplicate-manifest-owners

OCPBUGS-23539: Keep Machine manifests out of OpenShift Manifests asset

Author: openshift-merge-bot[bot]

pkg/asset/machines/master.go

@@ -761,16 +761,23 @@ func IsMachineManifest(file *asset.File) bool {
 	} else if matched {
 		return true
 	}
-	if matched, err := filepath.Match(masterMachineFileNamePattern, filename); err != nil {
-		panic("bad format for master machine file name pattern")
-	} else if matched {
-		return true
-	}
-	if matched, err := filepath.Match(workerMachineSetFileNamePattern, filename); err != nil {
-		panic("bad format for worker machine file name pattern")
-	} else {
-		return matched
+	for _, pattern := range []struct {
+		Pattern string
+		Type    string
+	}{
+		{Pattern: secretFileNamePattern, Type: "secret"},
+		{Pattern: networkConfigSecretFileNamePattern, Type: "network config secret"},
+		{Pattern: hostFileNamePattern, Type: "host"},
+		{Pattern: masterMachineFileNamePattern, Type: "master machine"},
+		{Pattern: workerMachineSetFileNamePattern, Type: "worker machineset"},
+	} {
+		if matched, err := filepath.Match(pattern.Pattern, filename); err != nil {
+			panic(fmt.Sprintf("bad format for %s file name pattern", pattern.Type))
+		} else if matched {
+			return true
+		}
 	}
+	return false
 }
 
 func createSecretAssetFiles(resources []corev1.Secret, fileName string) ([]*asset.File, error) {

pkg/asset/machines/master_test.go

@@ -307,23 +307,33 @@ func TestBaremetalGeneratedAssetFiles(t *testing.T) {
 
 	assert.Len(t, master.NetworkConfigSecretFiles, 1)
 	verifySecret(t, master.NetworkConfigSecretFiles[0], "openshift/99_openshift-cluster-api_host-network-config-secrets-0.yaml", "master-0-network-config-secret", "map[nmstate:[105 110 116 101 114 102 97 99 101 115 58 32 110 117 108 108 10]]")
+	verifyManifestOwnership(t, master)
 }
 
 func verifyHost(t *testing.T, a *asset.File, eFilename, eName string) {
+	t.Helper()
 	assert.Equal(t, a.Filename, eFilename)
 	var host v1alpha1.BareMetalHost
 	assert.NoError(t, yaml.Unmarshal(a.Data, &host))
 	assert.Equal(t, eName, host.Name)
 }
 
 func verifySecret(t *testing.T, a *asset.File, eFilename, eName, eData string) {
+	t.Helper()
 	assert.Equal(t, a.Filename, eFilename)
 	var secret corev1.Secret
 	assert.NoError(t, yaml.Unmarshal(a.Data, &secret))
 	assert.Equal(t, eName, secret.Name)
 	assert.Equal(t, eData, fmt.Sprintf("%v", secret.Data))
 }
 
+func verifyManifestOwnership(t *testing.T, a asset.WritableAsset) {
+	t.Helper()
+	for _, file := range a.Files() {
+		assert.True(t, IsMachineManifest(file), file.Filename)
+	}
+}
+
 func networkConfig(config string) *v1.JSON {
 	var nc v1.JSON
 	yaml.Unmarshal([]byte(config), &nc)