snyk 1.720.0 → 1.721.0

package/dist/cli/64.index.js

@@ -183441,10 +183441,6 @@ function createAssets() {
     // https://www.npmjs.com/package/pkg#detecting-assets-in-source-code
     return [
         path.join(__dirname, '../gosrc/resolve-deps.go'),
-        path.join(__dirname, '../gosrc/resolver/pkg.go'),
-        path.join(__dirname, '../gosrc/resolver/resolver.go'),
-        path.join(__dirname, '../gosrc/resolver/dirwalk/dirwalk.go'),
-        path.join(__dirname, '../gosrc/resolver/graph/graph.go'),
     ];
 }
 function writeFile(writeFilePath, contents) {
@@ -183505,7 +183501,7 @@ async function getDependencies(root, targetFile) {
         }
         const args = ['run', goResolveTool, ignorePkgsParam];
         debug('executing go deps resolver', { cmd: 'go' + args.join(' ') });
-        const graphStr = await subProcess.execute('go', args, { cwd: root });
+        const graphStr = await runGo(args, { cwd: root, env: { GO111MODULE: 'off' } });
         tempDirObj.removeCallback();
         debug('loading deps resolver graph output to graphlib', { jsonSize: graphStr.length });
         const graph = graphlib.json.read(JSON.parse(graphStr));
@@ -183693,9 +183689,12 @@ async function buildDepGraphFromImportsAndModules(root = '.', targetFile = 'go.m
     let goDepsOutput;
     try {
         const goModAbsolutPath = path.resolve(root, path.dirname(targetFile));
-        goDepsOutput = await subProcess.execute('go list', ['-json', '-deps', './...'], { cwd: goModAbsolutPath });
+        goDepsOutput = await runGo(['list', '-json', '-deps', './...'], { cwd: goModAbsolutPath });
     }
     catch (err) {
+        if (/cannot find main module, but found/.test(err)) {
+            return depGraphBuilder.build();
+        }
         const userError = new custom_error_1.CustomError(err);
         userError.userMessage = "'go list -json -deps ./...' command failed with error: " + userError.message;
         throw userError;
@@ -183725,6 +183724,21 @@ async function buildDepGraphFromImportsAndModules(root = '.', targetFile = 'go.m
     return depGraphBuilder.build();
 }
 exports.buildDepGraphFromImportsAndModules = buildDepGraphFromImportsAndModules;
+async function runGo(args, options, additionalGoCommands = []) {
+    try {
+        return await subProcess.execute('go', args, options);
+    }
+    catch (err) {
+        const [command] = /(go mod download)|(go get [^"]*)/.exec(err) || [];
+        if (command && !additionalGoCommands.includes(command)) {
+            debug('running command:', command);
+            const [_, ...newArgs] = command.split(' ');
+            await subProcess.execute('go', newArgs, options);
+            return runGo(args, options, additionalGoCommands.concat(command));
+        }
+        throw err;
+    }
+}
 function buildGraph(depGraphBuilder, depPackages, packagesByName, currentParent, childrenChain, ancestorsChain) {
     var _a;
     const depPackagesLen = depPackages.length;
@@ -183812,9 +183826,12 @@ function execute(command, args, options) {
         // Even just running `go version > 1.txt` in the terminal produces an empty file.
     }
     const spawnOptions = { shell: true };
-    if (options && options.cwd) {
+    if (options === null || options === void 0 ? void 0 : options.cwd) {
         spawnOptions.cwd = options.cwd;
     }
+    if (options === null || options === void 0 ? void 0 : options.env) {
+        spawnOptions.env = Object.assign(Object.assign({}, process.env), options.env);
+    }
     return new Promise((resolve, reject) => {
         let stdout = '';
         let stderr = '';