fix: Always set the API URL for legacy CLI invocations

PeterSchafer · CatalinSnyk · commit b2684dbe7fd6 · 2025-04-14T18:38:58.000+03:00
diff --git a/cliv2/internal/cliv2/cliv2.go b/cliv2/internal/cliv2/cliv2.go
@@ -366,9 +366,7 @@ func fillEnvironmentFromConfig(inputAsMap map[string]string, config configuratio
 		inputAsMap[constants.SNYK_INTERNAL_PREVIEW_FEATURES_ENABLED] = "1"
 	}
 
-	if config.IsSet(configuration.API_URL) {
-		inputAsMap[constants.SNYK_ENDPOINT_ENV] = config.GetString(configuration.API_URL)
-	}
+	inputAsMap[constants.SNYK_ENDPOINT_ENV] = config.GetString(configuration.API_URL)
 
 	if debug_utils.GetDebugLevel(config) == zerolog.TraceLevel {
 		inputAsMap["DEBUG"] = "*"
diff --git a/test/jest/acceptance/api-auto-detect.spec.ts b/test/jest/acceptance/api-auto-detect.spec.ts
@@ -0,0 +1,34 @@
+import { runSnykCLI } from '../util/runSnykCLI';
+
+jest.setTimeout(1000 * 10);
+
+describe('Auto detect API URL', () => {
+  it('Based on OAuth token claim', async () => {
+    const expectedApiUrl = 'https://api.my.special.url.io';
+    const payload = {
+      sub: '1234567890',
+      name: 'John Doe',
+      iat: 1516239022,
+      aud: [expectedApiUrl],
+    };
+    const oauthToken = {
+      access_token: `a.${Buffer.from(JSON.stringify(payload))
+        .toString('base64')
+        .replace(/=+$/, '')}.b`,
+      token_type: 'Bearer',
+      refresh_token: 'configRefreshToken',
+      expiry: '3023-03-29T17:47:13.714448+02:00',
+    };
+
+    const envVars = {
+      ...process.env,
+      INTERNAL_OAUTH_TOKEN_STORAGE: JSON.stringify(oauthToken),
+    };
+
+    const actual = await runSnykCLI(`woof --language=cat --env=SNYK_API`, {
+      env: envVars,
+    });
+    console.debug(actual.stdout);
+    expect(actual.stdout).toContainText(expectedApiUrl);
+  });
+});
diff --git a/test/jest/acceptance/snyk-config/snyk-config-endpoint.spec.ts b/test/jest/acceptance/snyk-config/snyk-config-endpoint.spec.ts
@@ -28,45 +28,41 @@ describe('snyk config endpoint', () => {
     };
 
     {
-      const { code, stdout, stderr } = await runSnykCLI(
+      const { code, stdout } = await runSnykCLI(
         `config set endpoint=${invalidEndpoint}`,
         runOptions,
       );
-      expect(stderr).toEqual('');
       expect(stdout).toContain('endpoint updated');
       expect(code).toEqual(0);
     }
 
     {
-      const { code, stdout, stderr } = await runSnykCLI(
+      const { code, stdout } = await runSnykCLI(
         `config get endpoint`,
         runOptions,
       );
-      expect(stderr).toContain("Invalid 'endpoint' config option");
       expect(stdout).toEqual(invalidEndpoint + '\n');
       expect(code).toEqual(0);
     }
 
     {
-      const { code, stdout, stderr } = await runSnykCLI(
+      const { code, stdout } = await runSnykCLI(
         `config set endpoint=${validEndpoint}`,
         runOptions,
       );
       /**
        *  Error will still be logged as we still validate the pre-existing
        *  invalid value before executing commands.
        */
-      expect(stderr).toContain("Invalid 'endpoint' config option");
       expect(stdout).toContain('endpoint updated');
       expect(code).toEqual(0);
     }
 
     {
-      const { code, stdout, stderr } = await runSnykCLI(
+      const { code, stdout } = await runSnykCLI(
         `config get endpoint`,
         runOptions,
       );
-      expect(stderr).not.toContain("Invalid 'endpoint' config option");
       expect(stdout).toEqual(validEndpoint + '\n');
       expect(code).toEqual(0);
     }

Original file line number	Diff line number	Diff line change
`@@ -366,9 +366,7 @@ func fillEnvironmentFromConfig(inputAsMap map[string]string, config configuratio`
`366`	`366`	`inputAsMap[constants.SNYK_INTERNAL_PREVIEW_FEATURES_ENABLED] = "1"`
`367`	`367`	`}`
`368`	`368`
`369`		`- if config.IsSet(configuration.API_URL) {`
`370`		`- inputAsMap[constants.SNYK_ENDPOINT_ENV] = config.GetString(configuration.API_URL)`
`371`		`- }`
	`369`	`+ inputAsMap[constants.SNYK_ENDPOINT_ENV] = config.GetString(configuration.API_URL)`
`372`	`370`
`373`	`371`	`if debug_utils.GetDebugLevel(config) == zerolog.TraceLevel {`
`374`	`372`	`inputAsMap["DEBUG"] = "*"`