fix some scans which weren't working

Signed-off-by: MarkAckert <[email protected]>
zowe · Feb 2, 2024 · e7fafc8 · e7fafc8
1 parent e88903c
commit e7fafc8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/licenses/dependency-scan/resources/repoRules.json b/licenses/dependency-scan/resources/repoRules.json
@@ -33,6 +33,21 @@
 			]
 		}
 	},
+	"sample-angular-app": {	
+		"analyzer": {
+			"allow_dynamic_versions": true
+		}
+	},
+	"sample-iframe-app": {	
+		"analyzer": {
+			"allow_dynamic_versions": true
+		}
+	},
+	"sample-react-app": {	
+		"analyzer": {
+			"allow_dynamic_versions": true
+		}
+	},
 	"vscode-extension-for-zowe": {
 		"excludes": {
 			"paths": [

diff --git a/licenses/dependency-scan/src/actions/ort/OrtScanAction.ts b/licenses/dependency-scan/src/actions/ort/OrtScanAction.ts
@@ -59,7 +59,13 @@ export class OrtScanAction implements IAction {
         console.log("Scanning individual project " + projectDir);
 
         const analyzerFlags = this.repoRules.getOrtAnalyzerFlags(projectDir);
-
+
+        if (projectDir.includes("orion-editor-component")) {
+            console.log("Fixing orion-editor-components old references to gizaartifactory...");
+            const fixedPkgLock = fs.readFileSync(projectDir + path.sep + "package-lock.json").toString()
+                .replaceAll('gizaartifactory', 'zowe');
+            fs.writeFileSync(projectDir + path.sep + "package-lock.json", fixedPkgLock);
+        }
 
         const licenseProcess = spawn("ort", [Constants.ORT_LOG_LEVEL, analyzerFlags, "analyze", "-i",
                 projectDir,

diff --git a/licenses/dependency-scan/src/constants/Constants.ts b/licenses/dependency-scan/src/constants/Constants.ts
@@ -71,7 +71,7 @@ export class Constants {
     // only change if re-running builds / modifying manifest or other metadata locally
     public static readonly DOWNLOAD_MANIFEST: boolean = Utilities.getEnv("ZOWE_DL_MANIFEST", true);
 
-    public static readonly ZOWE_MANIFEST_BRANCH: string = Utilities.getEnvStr("ZOWE_MANIFEST_BRANCH", "v1.7.0");
+    public static readonly ZOWE_MANIFEST_BRANCH: string = Utilities.getEnvStr("ZOWE_MANIFEST_BRANCH", "v2.x/rc");
 
     public static readonly EXEC_CLONE: boolean = Utilities.getEnv("ZOWE_STEP_CLONE", true);