pkg/asset/imagebased/configimage: added support for json files in extramanifests directory

added additional code to support `.json` files in the extra-manifests directory when creating a config iso.
updated test cases as well to test added functionality.

Fixes #9134

Signed-off-by: xphyr <[email protected]>

Author: xphyr

pkg/asset/imagebased/configimage/extramanifests.go

@@ -48,9 +48,14 @@ func (em *ExtraManifests) Load(f asset.FileFetcher) (found bool, err error) {
 	if err != nil {
 		return false, fmt.Errorf("failed to load *.yml files: %w", err)
 	}
+	jsonFileList, err := f.FetchByPattern(filepath.Join(extraManifestsDir, "*.json"))
+	if err != nil {
+		return false, fmt.Errorf("failed to load *.json files: %w", err)
+	}
 
 	em.FileList = append(em.FileList, yamlFileList...)
 	em.FileList = append(em.FileList, ymlFileList...)
+	em.FileList = append(em.FileList, jsonFileList...)
 	asset.SortFiles(em.FileList)
 
 	return len(em.FileList) > 0, nil

pkg/asset/imagebased/configimage/extramanifests_test.go

@@ -19,6 +19,7 @@ func TestExtraManifests_Load(t *testing.T) {
 		files          []string
 		yamlFetchError error
 		ymlFetchError  error
+		jsonFetchError error
 
 		expectedFound bool
 		expectedFiles []string
@@ -46,16 +47,25 @@ func TestExtraManifests_Load(t *testing.T) {
 			expectedFiles: []string{"/extra-manifests/another-test.yml"},
 		},
 		{
-			name: "both",
+			name:  "only-json",
+			files: []string{"/extra-manifests/test.json"},
+
+			expectedFound: true,
+			expectedFiles: []string{"/extra-manifests/test.json"},
+		},
+		{
+			name: "all",
 			files: []string{
 				"/extra-manifests/test.yaml",
 				"/extra-manifests/another-test.yml",
+				"/extra-manifests/test.json",
 			},
 
 			expectedFound: true,
 			expectedFiles: []string{
 				"/extra-manifests/test.yaml",
 				"/extra-manifests/another-test.yml",
+				"/extra-manifests/test.json",
 			},
 		},
 		{
@@ -70,12 +80,19 @@ func TestExtraManifests_Load(t *testing.T) {
 
 			expectedError: "failed to load *.yml files: file does not exist",
 		},
+		{
+			name:           "error",
+			jsonFetchError: os.ErrNotExist,
+
+			expectedError: "failed to load *.json files: file does not exist",
+		},
 	}
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
 			yamlFiles := []*asset.File{}
 			ymlFiles := []*asset.File{}
+			jsonFiles := []*asset.File{}
 			for _, f := range tc.files {
 				assetFile := &asset.File{
 					Filename: f,
@@ -87,6 +104,8 @@ func TestExtraManifests_Load(t *testing.T) {
 					yamlFiles = append(yamlFiles, assetFile)
 				case ".yml":
 					ymlFiles = append(ymlFiles, assetFile)
+				case ".json":
+					jsonFiles = append(jsonFiles, assetFile)
 				default:
 					t.Error("invalid extension")
 				}
@@ -101,7 +120,7 @@ func TestExtraManifests_Load(t *testing.T) {
 					[]*asset.File{},
 					tc.yamlFetchError,
 				)
-			} else {
+			} else if tc.ymlFetchError != nil {
 				fileFetcher.EXPECT().FetchByPattern("extra-manifests/*.yaml").Return(yamlFiles, nil)
 
 				if tc.ymlFetchError != nil {
@@ -112,6 +131,18 @@ func TestExtraManifests_Load(t *testing.T) {
 				} else {
 					fileFetcher.EXPECT().FetchByPattern("extra-manifests/*.yml").Return(ymlFiles, nil)
 				}
+			} else {
+				fileFetcher.EXPECT().FetchByPattern("extra-manifests/*.yaml").Return(yamlFiles, nil)
+				fileFetcher.EXPECT().FetchByPattern("extra-manifests/*.yml").Return(ymlFiles, nil)
+
+				if tc.jsonFetchError != nil {
+					fileFetcher.EXPECT().FetchByPattern("extra-manifests/*.json").Return(
+						[]*asset.File{},
+						tc.jsonFetchError,
+					)
+				} else {
+					fileFetcher.EXPECT().FetchByPattern("extra-manifests/*.json").Return(jsonFiles, nil)
+				}
 			}
 
 			extraManifestsAsset := &ExtraManifests{}