snyk 1.747.0 → 1.748.0

package/dist/cli/64.index.js

@@ -192305,29 +192305,34 @@ async function printIfEcho(line) {
         debugLog(maybeMatch[1]);
     }
 }
-async function getInjectedScriptPath() {
+function getPluginFileName(options) {
+    return options.gradleAcceptLegacyConfigRoles
+        ? 'init.gradle'
+        : 'legacy-init.gradle';
+}
+async function injectedPlugin(scriptName) {
     let initGradleAsset = null;
     if (/index.js$/.test(__filename)) {
         // running from ./dist
         // path.join call has to be exactly in this format, needed by "pkg" to build a standalone Snyk CLI binary:
         // https://www.npmjs.com/package/pkg#detecting-assets-in-source-code
-        initGradleAsset = path.join(__dirname, '../lib/init.gradle');
+        initGradleAsset = path.join(__dirname, '../lib', scriptName);
     }
     else if (/index.ts$/.test(__filename)) {
         // running from ./lib
-        initGradleAsset = path.join(__dirname, 'init.gradle');
+        initGradleAsset = path.join(__dirname, scriptName);
     }
     else {
-        throw new Error('Cannot locate Snyk init.gradle script');
+        throw new Error(`Cannot locate Snyk ${scriptName} script`);
     }
     // We could be running from a bundled CLI generated by `pkg`.
     // The Node filesystem in that case is not real: https://github.com/zeit/pkg#snapshot-filesystem
     // Copying the injectable script into a temp file.
     try {
-        const tmpInitGradle = tmp.fileSync({ postfix: '-init.gradle' });
+        const tmpInitGradle = tmp.fileSync({ postfix: `-${scriptName}` });
         fs.writeSync(tmpInitGradle.fd, fs.readFileSync(initGradleAsset));
         return {
-            injectedScripPath: tmpInitGradle.name,
+            injectedPluginFilePath: tmpInitGradle.name,
             cleanupCallback: tmpInitGradle.removeCallback,
         };
     }
@@ -192378,8 +192383,7 @@ function getVersionBuildInfo(gradleVersionOutput) {
         debugLog('version build info not present, skipping ahead: ' + error);
     }
 }
-async function getAllDeps(root, targetFile, options) {
-    const command = getCommand(root, targetFile);
+async function getGradleVersion(root, command) {
     debugLog('`gradle -v` command run: ' + command);
     let gradleVersionOutput = '[COULD NOT RUN gradle -v]';
     try {
@@ -192390,29 +192394,40 @@ async function getAllDeps(root, targetFile, options) {
     catch (_) {
         // intentionally empty
     }
-    if (gradleVersionOutput.match(/Gradle 1/)) {
-        throw new Error('Gradle 1.x is not supported');
-    }
-    const { injectedScripPath, cleanupCallback } = await getInjectedScriptPath();
-    const args = buildArgs(root, targetFile, injectedScripPath, options);
+    return gradleVersionOutput;
+}
+async function getAllDepsWithPlugin(root, targetFile, options) {
+    const command = getCommand(root, targetFile);
+    const pluginFileName = getPluginFileName(options);
+    const { injectedPluginFilePath, cleanupCallback } = await injectedPlugin(pluginFileName);
+    const args = buildArgs(root, targetFile, injectedPluginFilePath, options);
     const fullCommandText = 'gradle command: ' + command + ' ' + args.join(' ');
     debugLog('Executing ' + fullCommandText);
+    const stdoutText = await subProcess.execute(command, args, { cwd: root }, printIfEcho);
+    if (cleanupCallback) {
+        cleanupCallback();
+    }
+    const extractedJSON = extractJsonFromScriptOutput(stdoutText);
+    const jsonAttrsPretty = gradle_attributes_pretty_1.getGradleAttributesPretty(stdoutText);
+    logger(`The following attributes and their possible values were found in your configurations: ${jsonAttrsPretty}`);
+    return extractedJSON;
+}
+async function getAllDeps(root, targetFile, options) {
+    const command = getCommand(root, targetFile);
+    const gradleVersion = await getGradleVersion(root, command);
+    if (gradleVersion.match(/Gradle 1/)) {
+        throw new Error('Gradle 1.x is not supported');
+    }
     try {
-        const stdoutText = await subProcess.execute(command, args, { cwd: root }, printIfEcho);
-        if (cleanupCallback) {
-            cleanupCallback();
-        }
-        const extractedJSON = extractJsonFromScriptOutput(stdoutText);
-        const jsonAttrsPretty = gradle_attributes_pretty_1.getGradleAttributesPretty(stdoutText);
-        logger(`The following attributes and their possible values were found in your configurations: ${jsonAttrsPretty}`);
-        const versionBuildInfo = getVersionBuildInfo(gradleVersionOutput);
+        const extractedJSON = await getAllDepsWithPlugin(root, targetFile, options);
+        const versionBuildInfo = getVersionBuildInfo(gradleVersion);
         if (versionBuildInfo) {
             extractedJSON.versionBuildInfo = versionBuildInfo;
         }
         return await processProjectsInExtractedJSON(root, extractedJSON);
     }
-    catch (error0) {
-        const error = error0;
+    catch (err) {
+        const error = err;
         const gradleErrorMarkers = /^\s*>\s.*$/;
         const gradleErrorEssence = error.message
             .split('\n')
@@ -192420,7 +192435,7 @@ async function getAllDeps(root, targetFile, options) {
             .join('\n');
         const orange = chalk.rgb(255, 128, 0);
         const blackOnYellow = chalk.bgYellowBright.black;
-        gradleVersionOutput = orange(gradleVersionOutput);
+        const gradleVersionOutput = orange(gradleVersion);
         let mainErrorMessage = `Error running Gradle dependency analysis.
 
 Please ensure you are calling the \`snyk\` command with correct arguments.
@@ -192471,7 +192486,6 @@ to
         error.message = `${chalk.red.bold('Gradle Error (short):\n' + gradleErrorEssence)}
 
 ${blackOnYellow('===== DEBUG INFORMATION START =====')}
-${orange(fullCommandText)}
 ${orange(gradleVersionOutput)}
 ${orange(error.message)}
 ${blackOnYellow('===== DEBUG INFORMATION END =====')}
@@ -192609,6 +192623,7 @@ exports.exportsForTests = {
     getVersionBuildInfo,
     toCamelCase,
     getGradleAttributesPretty: gradle_attributes_pretty_1.getGradleAttributesPretty,
+    getPluginFileName,
 };
 //# sourceMappingURL=index.js.map