chore: add useGoMVS, enablePythonBestEffortsInstallation and usePipDe…

…pTree settings Signed-off-by: Ilona Shishov <[email protected]>
fabric8-analytics · Mar 21, 2024 · a195d27 · a195d27
1 parent 5c061e8
commit a195d27
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "dist"
   ],
   "dependencies": {
-    "@RHEcosystemAppEng/exhort-javascript-api": "^0.1.1-ea.25",
+    "@RHEcosystemAppEng/exhort-javascript-api": "^0.1.1-ea.26",
     "@xml-tools/ast": "^5.0.5",
     "@xml-tools/parser": "^1.0.11",
     "json-to-ast": "^2.1.0",

diff --git a/src/componentAnalysis.ts b/src/componentAnalysis.ts
@@ -165,7 +165,10 @@ async function executeComponentAnalysis (diagnosticFilePath: string, contents: s
         'RHDA_TOKEN': globalConfig.telemetryId,
         'RHDA_SOURCE': globalConfig.utmSource,
         'MATCH_MANIFEST_VERSIONS': globalConfig.matchManifestVersions,
-        'EXHORT_PYTHON_VIRTUAL_ENV': globalConfig.setPythonVirtualEnvironment,
+        'EXHORT_PYTHON_VIRTUAL_ENV': globalConfig.usePythonVirtualEnvironment,
+        'EXHORT_GO_MVS_LOGIC_ENABLED': globalConfig.useGoMVS,
+        'EXHORT_PYTHON_INSTALL_BEST_EFFORTS': globalConfig.enablePythonBestEffortsInstallation,
+        'EXHORT_PIP_USE_DEP_TREE': globalConfig.usePipDepTree,
         'EXHORT_MVN_PATH': globalConfig.exhortMvnPath,
         'EXHORT_NPM_PATH': globalConfig.exhortNpmPath,
         'EXHORT_GO_PATH': globalConfig.exhortGoPath,

diff --git a/src/config.ts b/src/config.ts
@@ -16,7 +16,10 @@ class Config
     utmSource:                                      string;
     exhortSnykToken:                                string;
     matchManifestVersions:                          string;
-    setPythonVirtualEnvironment:                    string;
+    usePythonVirtualEnvironment:                    string;
+    useGoMVS:                                       string;
+    enablePythonBestEffortsInstallation:            string;
+    usePipDepTree:                                  string;
     vulnerabilityAlertSeverity:                     string;
     exhortMvnPath:                                  string;
     exhortNpmPath:                                  string;
@@ -40,7 +43,10 @@ class Config
         this.utmSource = process.env.VSCEXT_UTM_SOURCE || '';
         this.exhortSnykToken = process.env.VSCEXT_EXHORT_SNYK_TOKEN || '';
         this.matchManifestVersions = process.env.VSCEXT_MATCH_MANIFEST_VERSIONS || 'true';
-        this.setPythonVirtualEnvironment = process.env.VSCEXT_SET_PYTHON_VIRTUAL_ENVIRONMENT || 'false';
+        this.usePythonVirtualEnvironment = process.env.VSCEXT_USE_PYTHON_VIRTUAL_ENVIRONMENT || 'false';
+        this.useGoMVS = process.env.VSCEXT_USE_GO_MVS || 'false';
+        this.enablePythonBestEffortsInstallation = process.env.VSCEXT_ENABLE_PYTHON_BEST_EFFORTS_INSTALLATION || 'false';
+        this.usePipDepTree = process.env.VSCEXT_USE_PIP_DEP_TREE || 'false';
         this.vulnerabilityAlertSeverity = process.env.VSCEXT_VULNERABILITY_ALERT_SEVERITY || 'Error';
         this.exhortMvnPath = process.env.VSCEXT_EXHORT_MVN_PATH || 'mvn';
         this.exhortNpmPath = process.env.VSCEXT_EXHORT_NPM_PATH || 'npm';
@@ -57,7 +63,10 @@ class Config
      */
     updateConfig( rhdaData: any ) {
         this.matchManifestVersions = rhdaData.matchManifestVersions ? 'true' : 'false';
-        this.setPythonVirtualEnvironment = rhdaData.setPythonVirtualEnvironment ? 'true' : 'false';
+        this.usePythonVirtualEnvironment = rhdaData.usePythonVirtualEnvironment ? 'true' : 'false';
+        this.useGoMVS = rhdaData.useGoMVS ? 'true' : 'false';
+        this.enablePythonBestEffortsInstallation = rhdaData.enablePythonBestEffortsInstallation ? 'true' : 'false';
+        this.usePipDepTree = rhdaData.usePipDepTree ? 'true' : 'false';
         this.vulnerabilityAlertSeverity = rhdaData.vulnerabilityAlertSeverity;
         this.exhortMvnPath = rhdaData.mvn.executable.path || 'mvn';
         this.exhortNpmPath = rhdaData.npm.executable.path || 'npm';

diff --git a/test/config.test.ts b/test/config.test.ts
@@ -18,7 +18,10 @@ describe('Config tests', () => {
     const rhdaData = {
         exhortSnykToken: 'mockToken',
         matchManifestVersions: false,
-        setPythonVirtualEnvironment: true,
+        usePythonVirtualEnvironment: true,
+        useGoMVS: true,
+        enablePythonBestEffortsInstallation: true,
+        usePipDepTree: true,
         mvn: {
             executable: { path: 'mockPath' }
         },
@@ -45,7 +48,10 @@ describe('Config tests', () => {
     const partialRhdaData = {
         exhortSnykToken: 'mockToken',
         matchManifestVersions: true,
-        setPythonVirtualEnvironment: false,
+        usePythonVirtualEnvironment: false,
+        useGoMVS: false,
+        enablePythonBestEffortsInstallation: false,
+        usePipDepTree: false,
         mvn: {
         executable: { path: '' }
         },
@@ -76,7 +82,10 @@ describe('Config tests', () => {
         expect(mockConfig.utmSource).to.eq('');
         expect(mockConfig.exhortSnykToken).to.eq('');
         expect(mockConfig.matchManifestVersions).to.eq('true');
-        expect(mockConfig.setPythonVirtualEnvironment).to.eq('false');
+        expect(mockConfig.usePythonVirtualEnvironment).to.eq('false');
+        expect(mockConfig.useGoMVS).to.eq('false');
+        expect(mockConfig.enablePythonBestEffortsInstallation).to.eq('false');
+        expect(mockConfig.usePipDepTree).to.eq('false');
         expect(mockConfig.exhortMvnPath).to.eq('mvn');
         expect(mockConfig.exhortNpmPath).to.eq('npm');
         expect(mockConfig.exhortGoPath).to.eq('go');
@@ -91,7 +100,10 @@ describe('Config tests', () => {
         mockConfig.updateConfig(rhdaData);
 
         expect(mockConfig.matchManifestVersions).to.eq('false');
-        expect(mockConfig.setPythonVirtualEnvironment).to.eq('true');
+        expect(mockConfig.usePythonVirtualEnvironment).to.eq('true');
+        expect(mockConfig.useGoMVS).to.eq('true');
+        expect(mockConfig.enablePythonBestEffortsInstallation).to.eq('true');
+        expect(mockConfig.usePipDepTree).to.eq('true');
         expect(mockConfig.exhortMvnPath).to.eq('mockPath');
         expect(mockConfig.exhortNpmPath).to.eq('mockPath');
         expect(mockConfig.exhortGoPath).to.eq('mockPath');
@@ -106,7 +118,10 @@ describe('Config tests', () => {
         mockConfig.updateConfig(partialRhdaData);
 
         expect(mockConfig.matchManifestVersions).to.eq('true');
-        expect(mockConfig.setPythonVirtualEnvironment).to.eq('false');
+        expect(mockConfig.usePythonVirtualEnvironment).to.eq('false');
+        expect(mockConfig.useGoMVS).to.eq('false');
+        expect(mockConfig.enablePythonBestEffortsInstallation).to.eq('false');
+        expect(mockConfig.usePipDepTree).to.eq('false');
         expect(mockConfig.exhortMvnPath).to.eq('mvn');
         expect(mockConfig.exhortNpmPath).to.eq('npm');
         expect(mockConfig.exhortGoPath).to.eq('go');