Merge pull request #37 from JupiterOne/fix-account-set-data

Fix account set data

CHANGELOG.md

@@ -8,6 +8,13 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [2.0.1] - 221-08-27
+
+### Fixed
+
+- Fixed bug where `accountEntity` and `protectionServiceEntity` singletons were
+  not added to `jobState.setData()`
+
 ## [2.0.0] - 2021-08-26
 
 ### Changed

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupiterone/graph-crowdstrike",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A template for JupiterOne graph converters.",
   "main": "src/index.js",
   "types": "src/index.d.ts",

src/steps/getAccount.ts

@@ -6,22 +6,24 @@ import {
   JobState,
   RelationshipClass,
   Step,
-} from "@jupiterone/integration-sdk-core";
-import { Entities, Relationships, SetDataKeys, StepIds } from "../constants";
+} from '@jupiterone/integration-sdk-core';
+import { Entities, Relationships, SetDataKeys, StepIds } from '../constants';
 import {
   createAccountEntity,
   createProtectionServiceEntity,
-} from "../jupiterone/converters";
-import { CrowdStrikeIntegrationInstanceConfig } from "../types";
+} from '../jupiterone/converters';
+import { CrowdStrikeIntegrationInstanceConfig } from '../types';
 
 export async function getAccountEntityFromJobState(
   jobState: JobState,
 ): Promise<Entity> {
-  const accountEntity = await jobState.findEntity(SetDataKeys.ACCOUNT_ENTITY);
+  const accountEntity = await jobState.getData<Entity>(
+    SetDataKeys.ACCOUNT_ENTITY,
+  );
 
   if (!accountEntity) {
     throw new IntegrationError({
-      code: "MISSING_ACCOUNT_ENTITY",
+      code: 'MISSING_ACCOUNT_ENTITY',
       message: `The ${Entities.ACCOUNT._type} entity could not be found in the job state.`,
     });
   }
@@ -31,30 +33,33 @@ export async function getAccountEntityFromJobState(
 export async function getProtectionServiceEntityFromJobState(
   jobState: JobState,
 ): Promise<Entity> {
-  const protectionServiceEntity = await jobState.findEntity(
+  const protectionServiceEntity = await jobState.getData<Entity>(
     SetDataKeys.PROTECTION_SERVICE_ENTITY,
   );
 
   if (!protectionServiceEntity) {
     throw new IntegrationError({
-      code: "MISSING_PROTECTION_SERVICE_ENTITY",
+      code: 'MISSING_PROTECTION_SERVICE_ENTITY',
       message: `The ${Entities.PROTECTION_SERVICE._type} entity could not be found in the job state.`,
     });
   }
   return protectionServiceEntity;
 }
 
 export async function getAccount(
-  context: IntegrationStepExecutionContext<
-    CrowdStrikeIntegrationInstanceConfig
-  >,
+  context: IntegrationStepExecutionContext<CrowdStrikeIntegrationInstanceConfig>,
 ): Promise<void> {
   const { instance, jobState } = context;
   const accountEntity = await jobState.addEntity(createAccountEntity(instance));
+  await jobState.setData(SetDataKeys.ACCOUNT_ENTITY, accountEntity);
 
   const protectionServiceEntity = await jobState.addEntity(
     createProtectionServiceEntity(instance),
   );
+  await jobState.setData(
+    SetDataKeys.PROTECTION_SERVICE_ENTITY,
+    protectionServiceEntity,
+  );
 
   await jobState.addRelationship(
     createDirectRelationship({
@@ -65,11 +70,11 @@ export async function getAccount(
   );
 }
 
-export const getAccountStep: Step<IntegrationStepExecutionContext<
-  CrowdStrikeIntegrationInstanceConfig
->> = {
+export const getAccountStep: Step<
+  IntegrationStepExecutionContext<CrowdStrikeIntegrationInstanceConfig>
+> = {
   id: StepIds.ACCOUNT,
-  name: "Get Account",
+  name: 'Get Account',
   entities: [Entities.ACCOUNT, Entities.PROTECTION_SERVICE],
   relationships: [Relationships.ACCOUNT_HAS_PROTECTION_SERVICE],
   executionHandler: getAccount,