From fc5150de4152cd0157cd6f99885c5748b7cb7a3a Mon Sep 17 00:00:00 2001 From: Oliver Sand Date: Thu, 14 Oct 2021 14:46:17 +0200 Subject: [PATCH] Fix typo Signed-off-by: Oliver Sand --- docs/integrations/azure/org.md | 2 +- .../src/processors/MicrosoftGraphOrgEntityProvider.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/integrations/azure/org.md b/docs/integrations/azure/org.md index c359960f4d..8e17bb2cc1 100644 --- a/docs/integrations/azure/org.md +++ b/docs/integrations/azure/org.md @@ -7,7 +7,7 @@ description: Importing users and groups from a Microsoft Azure Active Directory --- The Backstage catalog can be set up to ingest organizational data - users and -teams - directly from an tenant in Microsoft Azure Active Directory via the +teams - directly from a tenant in Microsoft Azure Active Directory via the Microsoft Graph API. More details on this are available in the diff --git a/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts b/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts index 47f9167fbc..55b0933b99 100644 --- a/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts +++ b/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts @@ -167,12 +167,12 @@ function trackProgress(logger: Logger) { // Makes sure that emitted entities have a proper location based on their uuid function withLocations(providerId: string, entity: Entity): Entity { - const dn = + const uuid = entity.metadata.annotations?.[MICROSOFT_GRAPH_USER_ID_ANNOTATION] || entity.metadata.annotations?.[MICROSOFT_GRAPH_GROUP_ID_ANNOTATION] || entity.metadata.annotations?.[MICROSOFT_GRAPH_TENANT_ID_ANNOTATION] || entity.metadata.name; - const location = `msgraph:${providerId}/${encodeURIComponent(dn)}`; + const location = `msgraph:${providerId}/${encodeURIComponent(uuid)}`; return merge( { metadata: {