Merge pull request #51 from cloudgraphdev/fix/generate-unique-ids-using-data

fix: replace cuid usage, remove conditional cuid generation for root ids

Author: hjaraujof

package.json

@@ -73,7 +73,7 @@
     "@azure/identity": "^2.0.4",
     "@azure/storage-blob": "^12.8.0",
     "@azure/storage-queue": "^12.9.0",
-    "@cloudgraph/sdk": "0.20.0",
+    "@cloudgraph/sdk": "0.22.0",
     "@graphql-tools/load-files": "^6.5.3",
     "@graphql-tools/merge": "^8.2.3",
     "@microsoft/microsoft-graph-client": "^3.0.2",

src/services/actionGroup/format.ts

@@ -1,4 +1,4 @@
-import cuid from 'cuid'
+import { generateUniqueId } from '@cloudgraph/sdk'
 import { RawAzureActionGroup } from './data'
 import { AzureActionGroup } from '../../types/generated'
 import { formatTagsFromMap } from '../../utils/format'
@@ -24,17 +24,35 @@ export default ({
     Tags = {},
   } = service
   return {
-    id: id || cuid(),
+    id,
     name,
     type,
     region,
     subscriptionId,
     resourceGroupId,
     enabled,
     groupShortName,
-    emailReceivers: emailReceivers.map(e => ({ id: cuid(), ...e })),
-    smsReceivers: smsReceivers.map(s => ({ id: cuid(), ...s })),
-    webhookReceivers: webhookReceivers.map(w => ({ id: cuid(), ...w })),
+    emailReceivers: emailReceivers.map(e => ({
+      id: generateUniqueId({
+        id,
+        ...e,
+      }),
+      ...e,
+    })),
+    smsReceivers: smsReceivers.map(s => ({
+      id: generateUniqueId({
+        id,
+        ...s,
+      }),
+      ...s,
+    })),
+    webhookReceivers: webhookReceivers.map(w => ({
+      id: generateUniqueId({
+        id,
+        ...w,
+      }),
+      ...w,
+    })),
     tags: formatTagsFromMap(Tags),
   }
 }

src/services/activityLogAlerts/format.ts

@@ -1,15 +1,15 @@
-import cuid from 'cuid'
+import { generateUniqueId } from '@cloudgraph/sdk'
 import { RawAzureActivityLogAlert } from './data'
 import { AzureActivityLogAlert } from '../../types/generated'
 import { formatTagsFromMap } from '../../utils/format'
 
 export default ({
   service,
-  account: subscriptionId
+  account: subscriptionId,
 }: {
   service: RawAzureActivityLogAlert
   account: string
-}) : AzureActivityLogAlert  => {
+}): AzureActivityLogAlert => {
   const {
     id,
     name,
@@ -23,7 +23,7 @@ export default ({
     Tags = {},
   } = service
   return {
-    id: id || cuid(),
+    id,
     name,
     type,
     region,
@@ -32,7 +32,7 @@ export default ({
     enabled,
     condition: {
       allOf: condition?.allOf?.map(leaf => ({
-        id: cuid(),
+        id: generateUniqueId({ id, ...leaf }),
         field: leaf?.field,
         equals: leaf?.equals,
       })),
@@ -41,11 +41,17 @@ export default ({
       actionGroups: actions?.actionGroups?.map(group => ({
         id: group.actionGroupId,
         actionGroupId: group.actionGroupId,
-        webhookProperties: Object.entries(group?.webhookProperties || {}).map(([key, value]) => ({
-          id: cuid(),
-          key,
-          value
-        })),
+        webhookProperties: Object.entries(group?.webhookProperties || {}).map(
+          ([key, value]) => ({
+            id: generateUniqueId({
+              id,
+              actionGroupId: group.actionGroupId,
+              key
+            }),
+            key,
+            value,
+          })
+        ),
       })),
     },
     description,

src/services/adApplication/format.ts

@@ -1,4 +1,3 @@
-import cuid from 'cuid'
 import { AzureAdApplication } from '../../types/generated'
 import { formatTagsFromMap } from '../../utils/format'
 import { RawAzureADApplication } from './data'
@@ -42,7 +41,7 @@ export default ({
     } = {},
   } = service
   return {
-    id: id || cuid(),
+    id,
     region,
     appId,
     applicationTemplateId,
@@ -52,7 +51,7 @@ export default ({
       ({ appId: preAuthAppId }) => preAuthAppId
     ),
     appRoles: appRoles.map(({ id: appRoleId, ...restOfAppRole }) => ({
-      id: appRoleId || cuid(),
+      id: appRoleId,
       ...restOfAppRole,
     })),
     createdDateTime,

src/services/adGroup/format.ts

@@ -1,4 +1,4 @@
-import cuid from 'cuid'
+import { generateUniqueId } from '@cloudgraph/sdk'
 import { AzureAdGroup } from '../../types/generated'
 import { RawAzureADGroup } from './data'
 
@@ -38,7 +38,7 @@ export default ({ service }: { service: RawAzureADGroup }): AzureAdGroup => {
     settings = [],
   } = service
   return {
-    id: id || cuid(),
+    id,
     deletedDateTime,
     classification,
     createdDateTime,
@@ -67,11 +67,20 @@ export default ({ service }: { service: RawAzureADGroup }): AzureAdGroup => {
     allowExternalSenders,
     isSubscribedByMail,
     isArchived,
-    appRoleAssignments: appRoleAssignments.map(aRA => ({ id: cuid(), ...aRA })),
-    permissionGrants: permissionGrants.map(pG => ({ id: cuid(), ...pG })),
+    appRoleAssignments: appRoleAssignments.map(aRA => ({
+      id: aRA.id,
+      ...aRA,
+    })),
+    permissionGrants: permissionGrants.map(pG => ({
+      id: pG.id,
+      ...pG,
+    })),
     settings: settings.map(({ id: sId, values: sValues = [], ...s }) => ({
-      id: sId || cuid(),
-      values: sValues.map(sValue => ({ id: cuid(), ...sValue })),
+      id: sId,
+      values: sValues.map(sValue => ({
+        id: generateUniqueId({ id, ...sValue }),
+        ...sValue,
+      })),
       ...s,
     })),
   }

src/services/adIdentitySecurityDefaultsEnforcementPolicy/format.ts

@@ -1,4 +1,3 @@
-import cuid from 'cuid'
 import { AzureAdIdentitySecurityDefaultsEnforcementPolicy } from '../../types/generated'
 import { RawAzureADIdentitySecurityDefaultsEnforcementPolicyClient } from './data'
 
@@ -8,15 +7,9 @@ export default ({
   service: RawAzureADIdentitySecurityDefaultsEnforcementPolicyClient
   account: string
 }): AzureAdIdentitySecurityDefaultsEnforcementPolicy => {
-  const {
-    id,
-    region,
-    description,
-    displayName,
-    isEnabled,
-  } = service
+  const { id, region, description, displayName, isEnabled } = service
   return {
-    id: id || cuid(),
+    id,
     region,
     description,
     displayName,

src/services/adServicePrincipal/format.ts

@@ -1,4 +1,3 @@
-import cuid from 'cuid'
 import { AzureAdServicePrincipal } from '../../types/generated'
 import { formatTagsFromMap } from '../../utils/format'
 import { RawAzureADServicePrincipal } from './data'
@@ -42,7 +41,7 @@ export default ({
     endpoints = [],
   } = service
   return {
-    id: id || cuid(),
+    id,
     region,
     deletedDateTime,
     accountEnabled,
@@ -54,7 +53,7 @@ export default ({
     appOwnerOrganizationId,
     appRoleAssignmentRequired,
     appRoles: appRoles.map(({ id: aRId, ...aR }) => ({
-      id: aRId || cuid(),
+      id: aRId,
       ...aR,
     })),
     description,
@@ -73,15 +72,15 @@ export default ({
     tags: formatTagsFromMap(Tags),
     tokenEncryptionKeyId,
     appRoleAssignedTo: appRoleAssignedTo.map(({ id: aRaTId, ...aRaT }) => ({
-      id: aRaTId || cuid(),
+      id: aRaTId,
       ...aRaT,
     })),
     appRoleAssignments: appRoleAssignments.map(({ id: aRAId, ...aRA }) => ({
-      id: aRAId || cuid(),
+      id: aRAId,
       ...aRA,
     })),
     endpoints: endpoints.map(({ id: eId, ...e }) => ({
-      id: eId || cuid(),
+      id: eId,
       ...e,
     })),
   }

src/services/adUser/format.ts

@@ -1,4 +1,3 @@
-import cuid from 'cuid'
 import { AzureAdUser } from '../../types/generated'
 import { RawAzureADUser } from './data'
 
@@ -52,7 +51,7 @@ export default ({
     appRoleAssignments = [],
   } = service
   return {
-    id: id || cuid(),
+    id,
     deletedDateTime,
     accountEnabled,
     ageGroup,
@@ -91,6 +90,9 @@ export default ({
     userType,
     preferredName,
     responsibilities,
-    appRoleAssignments: appRoleAssignments.map(aRA => ({ id: cuid(), ...aRA })),
+    appRoleAssignments: appRoleAssignments.map(aRA => ({
+      id: aRA.id,
+      ...aRA,
+    })),
   }
 }

src/services/aksManagedCluster/format.ts

@@ -3,7 +3,7 @@ import {
   ManagedClusterAADProfile,
   ManagedClusterAgentPoolProfile,
 } from '@azure/arm-containerservice'
-import cuid from 'cuid'
+import { generateUniqueId } from '@cloudgraph/sdk'
 import {
   AzureAksManagedCluster,
   AzureAksManagedClusterAadProfile,
@@ -26,7 +26,7 @@ const formatAgentPoolProfiles = (
       tags,
       ...rest
     }) => ({
-      id: cuid(),
+      id: generateUniqueId({ powerStateCode, upgradeMaxSurge, ...rest }),
       powerStateCode,
       upgradeMaxSurge,
       ...rest,
@@ -113,7 +113,7 @@ export default ({
     {}
 
   return {
-    id: id || cuid(),
+    id,
     subscriptionId: account,
     name,
     type,

src/services/appInsights/format.ts

@@ -1,5 +1,3 @@
-import cuid from 'cuid'
-
 import { AzureAppInsights } from '../../types/generated'
 import { formatTagsFromMap } from '../../utils/format'
 import { RawAzureAppInsight } from './data'
@@ -36,7 +34,7 @@ export default ({
   } = service
 
   return {
-    id: id || cuid(),
+    id,
     type,
     etag,
     resourceGroupId,