Merge pull request #2474 from newrelic/andrew/data-source-keywords

feat: Remove keywords if they're not present
newrelic · Jul 10, 2024 · cb84117 · cb84117
2 parents 269e82d + cff22f9
commit cb84117
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/utils/__tests__/validate_icon.test.js b/utils/__tests__/validate_icon.test.js
@@ -8,7 +8,7 @@ jest.mock('fs');
 
 describe('validate Icon tests', () => {
   afterEach(() => {
-    jest.restoreAllMocks();
+    jest.resetAllMocks();
   });
 
   describe('validateIcon', () => {
@@ -130,7 +130,6 @@ describe('validate Icon tests', () => {
       expect(logMock).toHaveBeenCalledWith(
         'No errors found. Icon validation passed.'
       );
-      expect(process.exitCode).toBe(undefined);
     });
 
     test('when given errors, prints each error and sets exitCode to 1', () => {
@@ -139,7 +138,6 @@ describe('validate Icon tests', () => {
       handleErrors(['error1', 'error2', 'error3', 'error4']);
 
       expect(logMock).toBeCalledTimes(4);
-      expect(process.exitCode).toBe(1);
     });
   });
 });
diff --git a/utils/lib/DataSource.ts b/utils/lib/DataSource.ts
@@ -96,8 +96,8 @@ class DataSource extends Component<DataSourceConfig, string> {
       displayName: displayName && displayName.trim(),
       icon: this._getIconUrl(),
       install: this._parseInstall(),
-      categoryTerms: categoryTerms && categoryTerms.map((t) => t.trim()),
-      keywords: keywords && keywords.map((k) => k.trim()),
+      categoryTerms: categoryTerms ? categoryTerms.map((t) => t.trim()): [],
+      keywords: keywords ? keywords.map((k) => k.trim()) : [],
       description: description && description.trim(),
     };
 

diff --git a/utils/validate_icons.ts b/utils/validate_icons.ts
@@ -44,8 +44,6 @@ export const handleErrors = (
   }
 
   if (errorMessages.length > 0) {
-    process.exitCode = 1; // fail the workflow
-
     for (const errorMessage of errorMessages) {
       console.log(errorMessage);
     }
@@ -58,6 +56,10 @@ const main = () => {
   var errorMessages: string[] = validateIcon(mainConfigPaths);
   handleErrors(errorMessages);
   console.log(''); // add an extra new line for more visual separation in the workflow
+
+  if(errorMessages.length) {
+    process.exit(1);
+  }
 };
 
 /**