Merge pull request #161 from JupiterOne/Jamf-resolve-comment

fixed review comments

src/steps/constants.ts

@@ -22,6 +22,7 @@ export enum IntegrationSteps {
   GROUPS = 'fetch-groups',
   ADMINS = 'fetch-admins',
   DEVICE_USERS = 'fetch-device-users',
+  COMPUTER_USES_PROFILE = 'build-computer-uses-profile-relationship',
 }
 
 export const Entities: Record<

src/steps/devices/__snapshots__/index.test.ts.snap

@@ -13644,14 +13644,6 @@ exports[`#fetchComputers should collect data: jobState 1`] = `
       "homeSize": "-1MB",
       "homeSizeMb": -1,
     },
-    {
-      "_class": "USES",
-      "_fromEntityKey": "C02T705EGTF1",
-      "_key": "C02T705EGTF1|uses|jamf_osx_configuration_profile_2",
-      "_toEntityKey": "jamf_osx_configuration_profile_2",
-      "_type": "user_endpoint_uses_jamf_osx_configuration_profile",
-      "displayName": "USES",
-    },
   ],
   "encounteredTypes": [
     "jamf_account",
@@ -13663,10 +13655,9 @@ exports[`#fetchComputers should collect data: jobState 1`] = `
     "jamf_account_has_user_endpoint",
     "user_endpoint_installed_application",
     "jamf_local_account_uses_user_endpoint",
-    "user_endpoint_uses_jamf_osx_configuration_profile",
   ],
   "numCollectedEntities": 9,
-  "numCollectedRelationships": 314,
+  "numCollectedRelationships": 313,
 }
 `;
 

src/steps/devices/index.ts

@@ -512,24 +512,24 @@ export async function fetchComputers({
 
       // build computer group and group relationship
       for (const groupName of computerDetail.groups_accounts
-        ?.computer_group_memberships) {
+        ?.computer_group_memberships || []) {
         const computerGroupKey = generateEntityKey(
           Entities.COMPUTER_GROUP._type,
           groupName,
         );
         const computerGroupEntity = await jobState.findEntity(computerGroupKey);
 
         if (computerGroupEntity != null) {
-          const groupHasComputerRelatioinship = createDirectRelationship({
+          const groupHasComputerRelationship = createDirectRelationship({
             _class: RelationshipClass.HAS,
             from: computerGroupEntity,
             to: computerEntity,
           });
 
           // Some large Jamf datasets are causing issues with duplicate relationships,
           // so check that we won't have a duplicate before creating.
-          if (!jobState.hasKey(groupHasComputerRelatioinship._key)) {
-            await jobState.addRelationship(groupHasComputerRelatioinship);
+          if (!jobState.hasKey(groupHasComputerRelationship._key)) {
+            await jobState.addRelationship(groupHasComputerRelationship);
           }
         }
       }
@@ -560,7 +560,12 @@ export async function fetchComputers({
     jobState,
     computerDeviceIdToGraphObjectKeyMap,
   );
+}
 
+export async function fetchComputerUsesProfile({
+  jobState,
+  logger,
+}: IntegrationStepExecutionContext<IntegrationConfig>) {
   await createComputerUsesProfileRelationships(logger, jobState);
 }
 
@@ -641,13 +646,24 @@ export const deviceSteps: IntegrationStep<IntegrationConfig>[] = [
     executionHandler: fetchMobileDevices,
     dependsOn: [IntegrationSteps.ACCOUNTS],
   },
+  {
+    id: IntegrationSteps.COMPUTER_USES_PROFILE,
+    name: 'Build Computer Uses Profile',
+    entities: [],
+    relationships: [Relationships.COMPUTER_USES_PROFILE],
+    ingestionSourceId: IngestionSources.COMPUTERS,
+    executionHandler: fetchComputerUsesProfile,
+    dependsOn: [
+      IntegrationSteps.COMPUTERS,
+      IntegrationSteps.MACOS_CONFIGURATION_PROFILES,
+    ],
+  },
   {
     id: IntegrationSteps.COMPUTERS,
     name: 'Fetch Computers',
     entities: [Entities.COMPUTER, Entities.COMPUTER_GROUP],
     relationships: [
       Relationships.ACCOUNT_HAS_COMPUTER,
-      Relationships.COMPUTER_USES_PROFILE,
       Relationships.COMPUTER_GROUP_HAS_COMPUTER,
     ],
     mappedRelationships: [