Add directory id to subscription

JupiterOne-Archives · Aug 28, 2024 · b0f9d91 · b0f9d91
1 parent 0e462d2
commit b0f9d91
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/steps/active-directory/converters.ts b/src/steps/active-directory/converters.ts
@@ -139,6 +139,7 @@ export function createAccountEntityWithOrganization(
         defaultDomain,
         verifiedDomains,
         securityDefaultsEnabled: securityDefaults?.isEnabled,
+        vendor: organization.displayName,
       },
     },
   });

diff --git a/src/steps/resource-manager/subscriptions/converters.ts b/src/steps/resource-manager/subscriptions/converters.ts
@@ -10,6 +10,7 @@ import { Subscription, Location } from '@azure/arm-subscriptions/esm/models';
 export function createSubscriptionEntity(
   webLinker: AzureWebLinker,
   data: Subscription,
+  directoryId: string,
 ): Entity {
   const tags = {};
   if ((data as any).tags != undefined) {
@@ -34,6 +35,8 @@ export function createSubscriptionEntity(
         ...tags,
         webLink: webLinker.portalResourceUrl(data.id),
         offerName: data.subscriptionPolicies?.quotaId,
+        tenantId: directoryId,
+        vendor: data.displayName,
       },
     },
   });

diff --git a/src/steps/resource-manager/subscriptions/executionHandlers/subscriptions.ts b/src/steps/resource-manager/subscriptions/executionHandlers/subscriptions.ts
@@ -26,6 +26,7 @@ export async function fetchSubscription(
   executionContext: IntegrationStepContext,
 ): Promise<void> {
   const { instance, logger, jobState } = executionContext;
+  const { directoryId } = instance.config;
   const accountEntity = await getAccountEntity(jobState);
   const webLinker = createAzureWebLinker(accountEntity.defaultDomain as string);
   const client = new J1SubscriptionClient(instance.config, logger);
@@ -43,6 +44,7 @@ export async function fetchSubscription(
     const subscriptionEntity = createSubscriptionEntity(
       webLinker,
       subscription,
+      directoryId,
     );
     await jobState.addEntity(subscriptionEntity);
   } else {
@@ -65,6 +67,7 @@ export async function fetchAllSkippedSubscriptions(
   const { instance, logger, jobState } = executionContext;
   const accountEntity = await getAccountEntity(jobState);
   const webLinker = createAzureWebLinker(accountEntity.defaultDomain as string);
+  const { directoryId } = instance.config;
   const client = new J1SubscriptionClient(instance.config, logger);
 
   const subscriptions = await client.fetchSubscriptions();
@@ -82,6 +85,7 @@ export async function fetchAllSkippedSubscriptions(
         const subscriptionEntity = createSubscriptionEntity(
           webLinker,
           subscriptionWithDetails as Subscription,
+          directoryId,
         );
         await jobState.addEntity(subscriptionEntity);
       }

diff --git a/test/helpers/getMockEntity.ts b/test/helpers/getMockEntity.ts
@@ -29,7 +29,11 @@ export function getMockResourceGroupEntity(
 }
 
 export function getMockSubscriptionEntity(config: IntegrationConfig) {
-  return createSubscriptionEntity(webLinker, {
-    id: `/subscriptions/${config.subscriptionId}`,
-  });
+  return createSubscriptionEntity(
+    webLinker,
+    {
+      id: `/subscriptions/${config.subscriptionId}`,
+    },
+    config.directoryId,
+  );
 }