@jupiterone/integration-sdk-cli 9.4.0 → 9.5.0

package/src/commands/generate-ingestion-sources-config.test.ts

@@ -63,6 +63,33 @@ describe('#generateIngestionSourcesConfig', () => {
   });
 
   it('should return the ingestionConfig with childIngestionSources', () => {
+    const stepFetchVulnerabilityAlerts = {
+      id: 'fetch-vulnerability-alerts',
+      name: 'Fetch Vulnerability Alerts',
+      entities: [
+        {
+          resourceName: 'GitHub Vulnerability Alerts',
+          _type: 'github_finding',
+          _class: ['Finding'],
+        },
+      ],
+      relationships: [],
+      dependsOn: ['fetch-repos'],
+      ingestionSourceId: INGESTION_SOURCE_IDS.FINDING_ALERTS,
+    };
+    const stepFetchIssues = {
+      id: 'fetch-issues',
+      name: 'Fetch Issues',
+      entities: [
+        {
+          resourceName: 'GitHub Issue',
+          _type: 'github_issue',
+          _class: ['Issue'],
+        },
+      ],
+      relationships: [],
+      dependsOn: ['fetch-repos', 'fetch-users', 'fetch-collaborators'],
+    };
     const integrationSteps: IntegrationStep<IntegrationInstanceConfig>[] = [
       {
         id: 'fetch-repos',
@@ -80,32 +107,11 @@ describe('#generateIngestionSourcesConfig', () => {
         executionHandler: jest.fn(),
       },
       {
-        id: 'fetch-vulnerability-alerts',
-        name: 'Fetch Vulnerability Alerts',
-        entities: [
-          {
-            resourceName: 'GitHub Vulnerability Alerts',
-            _type: 'github_finding',
-            _class: ['Finding'],
-          },
-        ],
-        relationships: [],
-        dependsOn: ['fetch-repos'],
-        ingestionSourceId: INGESTION_SOURCE_IDS.FINDING_ALERTS,
+        ...stepFetchVulnerabilityAlerts,
         executionHandler: jest.fn(),
       },
       {
-        id: 'fetch-issues',
-        name: 'Fetch Issues',
-        entities: [
-          {
-            resourceName: 'GitHub Issue',
-            _type: 'github_issue',
-            _class: ['Issue'],
-          },
-        ],
-        relationships: [],
-        dependsOn: ['fetch-repos', 'fetch-users', 'fetch-collaborators'],
+        ...stepFetchIssues,
         executionHandler: jest.fn(),
       },
       {
@@ -135,7 +141,9 @@ describe('#generateIngestionSourcesConfig', () => {
     expect(
       ingestionSourcesConfig[INGESTION_SOURCE_IDS.FETCH_REPOS]
         .childIngestionSources,
-    ).toEqual(['fetch-vulnerability-alerts', 'fetch-issues']);
+    ).toEqual(
+      expect.arrayContaining([stepFetchVulnerabilityAlerts, stepFetchIssues]),
+    );
     // For FINDING_ALERTS the ingestionConfig keep exactly the same
     expect(
       ingestionSourcesConfig[INGESTION_SOURCE_IDS.FINDING_ALERTS],

package/src/commands/generate-ingestion-sources-config.ts

@@ -4,6 +4,7 @@ import {
   IntegrationSourceId,
   Step,
   StepExecutionContext,
+  StepMetadata,
 } from '@jupiterone/integration-sdk-core';
 import { createCommand } from 'commander';
 import { loadConfigFromTarget } from '../config';
@@ -59,7 +60,7 @@ export function generateIngestionSourcesConfigCommand() {
 
 export type EnhancedIntegrationIngestionConfigFieldMap = Record<
   IntegrationSourceId,
-  IntegrationIngestionConfigField & { childIngestionSources?: string[] }
+  IntegrationIngestionConfigField & { childIngestionSources?: StepMetadata[] }
 >;
 
 /**
@@ -91,18 +92,19 @@ export function generateIngestionSourcesConfig<
         // Skip iteration if there are no steps pointing to the current ingestionSourceId
         return;
       }
-      // Get the stepIds that have any dependencies on the matched step ids
-      const childIngestionSources = integrationSteps
-        .filter((step) =>
-          step.dependsOn?.some((value) =>
-            matchedIntegrationStepIds.includes(value),
-          ),
-        )
-        .map(({ id }) => id);
+      // Get the dependent steps for the given matchedIntegrationStepIds
+      const childIngestionSources = integrationSteps.filter((step) =>
+        step.dependsOn?.some((value) =>
+          matchedIntegrationStepIds.includes(value),
+        ),
+      );
       // Generate ingestionConfig with the childIngestionSources
       newIngestionConfig[key] = {
         ...ingestionConfig[key],
-        childIngestionSources,
+        // Drop execution handler from returned object
+        childIngestionSources: childIngestionSources.map(
+          ({ executionHandler, ...keepAttrs }) => keepAttrs,
+        ),
       };
     } else {
       log.warn(`The key ${key} does not exist in the ingestionConfig`);