feat: propagate org name

the change propagates org name returned from sast-settings. This will be
either a default org or org provided in the CLI options (and verified to
exist)

package.json

@@ -64,7 +64,7 @@
     "@open-policy-agent/opa-wasm": "^1.6.0",
     "@snyk/cli-interface": "2.11.0",
     "@snyk/cloud-config-parser": "^1.13.1",
-    "@snyk/code-client": "^4.6.1",
+    "@snyk/code-client": "^4.7.0",
     "@snyk/dep-graph": "^1.27.1",
     "@snyk/docker-registry-v2-client": "^2.6.1",
     "@snyk/fix": "file:packages/snyk-fix",

src/lib/plugins/sast/analysis.ts

@@ -80,8 +80,14 @@ async function getCodeAnalysis(
     analysisContext: {
       initiator: 'CLI',
       flow: source,
-      orgDisplayName: config.org,
+      orgDisplayName: sastSettings.org,
       projectName: config.PROJECT_NAME,
+      org: {
+        name: sastSettings.org || 'unknown',
+        displayName: 'unknown',
+        publicId: 'unknown',
+        flags: {},
+      },
     },
   });
 

test/jest/unit/snyk-code/snyk-code-test.spec.ts

@@ -369,6 +369,50 @@ describe('Test snyk code', () => {
     });
   });
 
+  it('should pass org returned by settings to analysis context', async () => {
+    const options: ArgsOptions = {
+      path: '',
+      traverseNodeModules: false,
+      showVulnPaths: 'none',
+      code: true,
+      _: [],
+      _doubleDashArgs: [],
+      org: 'anyOrg',
+    };
+
+    analyzeFoldersMock.mockResolvedValue(sampleAnalyzeFoldersResponse);
+    isSastEnabledForOrgSpy.mockResolvedValueOnce({
+      sastEnabled: true,
+      localCodeEngine: {
+        enabled: false,
+      },
+      org: 'defaultOrg',
+    });
+    trackUsageSpy.mockResolvedValue({});
+
+    try {
+      await snykTest('some/path', options);
+    } catch (error) {
+      expect(analyzeFoldersMock).toHaveBeenCalledWith({
+        analysisContext: {
+          flow: 'snyk-cli',
+          initiator: 'CLI',
+          orgDisplayName: 'defaultOrg',
+          projectName: undefined,
+          org: {
+            displayName: 'unknown',
+            flags: {},
+            name: 'defaultOrg',
+            publicId: 'unknown',
+          },
+        },
+        analysisOptions: expect.any(Object),
+        connection: expect.any(Object),
+        fileOptions: expect.any(Object),
+      });
+    }
+  });
+
   it.each([
     ['sarif', { sarif: true }],
     ['json', { json: true }],
@@ -592,6 +636,7 @@ describe('Test snyk code', () => {
       analysisContext: {
         flow: 'snyk-cli',
         initiator: 'CLI',
+        org: expect.anything(),
       },
     };
 
@@ -683,6 +728,7 @@ describe('Test snyk code', () => {
         analysisContext: {
           flow: 'snyk-cli',
           initiator: 'CLI',
+          org: expect.anything(),
         },
       };