fix: [unibroker] add identifier field in connection

snyk · Jun 25, 2024 · 64f0cad · 64f0cad
1 parent f2f20ae
commit 64f0cad
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 2 deletions.
diff --git a/lib/client/config/remoteConfig.ts b/lib/client/config/remoteConfig.ts
@@ -43,7 +43,10 @@ export const retrieveConnectionsForDeployment = async (
       ].type = connections[i].attributes.type;
       connectionsObjectForFile.CONNECTIONS[
         `${connections[i].attributes.name}`
-      ].identifier = connections[i].id;
+      ].identifier = connections[i].identifier;
+      connectionsObjectForFile.CONNECTIONS[
+        `${connections[i].attributes.name}`
+      ].id = connections[i].id;
     }
     const universalConfigFileBuffer = readFileSync(universalFilePath);
     const universalConfigFile = JSON.parse(

diff --git a/lib/client/types/api.ts b/lib/client/types/api.ts
@@ -2,6 +2,7 @@ import { ConnectionValidation } from './config';
 
 export interface BrokerConnectionApiResponse {
   id: string;
+  identifier: string;
   type: string;
   attributes: BrokerConnectionAttributes;
 }

diff --git a/test/unit/remoteConfig.test.ts b/test/unit/remoteConfig.test.ts
@@ -19,7 +19,35 @@ describe('Remote config helpers', () => {
           {
             data: [
               {
-                id: 'BROKER_TOKEN_1',
+                id: 'CONNECTION_ID_1',
+                identifier: 'BROKER_TOKEN_1',
+                type: 'broker_connection',
+                attributes: {
+                  name: 'my github connection',
+                  type: 'github',
+                  configuration: {
+                    default: {},
+                    required: {
+                      GITHUB_TOKEN: 'GITHUB_TOKEN_XYZ',
+                    },
+                  },
+                },
+                deployment_id: '67890',
+              },
+            ],
+          },
+        ];
+      })
+      .get(
+        `/rest/tenants/12345/brokers/installs/12345/deployments/67891/connections?version=2024-04-02~experimental`,
+      )
+      .reply(() => {
+        return [
+          200,
+          {
+            data: [
+              {
+                id: 'CONNECTION_ID_1',
                 type: 'broker_connection',
                 attributes: {
                   name: 'my github connection',
@@ -82,6 +110,47 @@ describe('Remote config helpers', () => {
       'my github connection': {
         GITHUB_TOKEN: 'GITHUB_TOKEN_XYZ',
         identifier: 'BROKER_TOKEN_1',
+        id: 'CONNECTION_ID_1',
+        type: 'github',
+      },
+    });
+  });
+
+  it('Retrieve identifier less connection from install ID and deployment ID', async () => {
+    await loadBrokerConfig();
+    let config = getConfig();
+
+    const installId = '12345';
+    const tenantId = '12345';
+    const deploymentId = '67891';
+    const apiVersion = '2024-04-02~experimental';
+    const apiBaseUrl = 'http://restapihostname';
+    config.tenantId = tenantId;
+    config.installId = installId;
+    config.deploymentId = deploymentId;
+    config.apiVersion = apiVersion;
+    config.API_BASE_URL = apiBaseUrl;
+    process.env.SERVICE_ENV = 'universal';
+    process.env.CLIENT_ID = '123';
+    process.env.CLIENT_SECRET = '123';
+
+    const clientOps: ClientOpts = {
+      port: 0,
+      config,
+      filters: { public: [], private: [] },
+    };
+
+    await retrieveConnectionsForDeployment(
+      clientOps,
+      universalFilePathLocationForTests,
+    );
+    await loadBrokerConfig();
+    config = getConfig();
+
+    expect(config.connections).toEqual({
+      'my github connection': {
+        GITHUB_TOKEN: 'GITHUB_TOKEN_XYZ',
+        id: 'CONNECTION_ID_1',
         type: 'github',
       },
     });