From 5a51da6f7754741306299541edfe0c539ccd0850 Mon Sep 17 00:00:00 2001 From: Gabriel Testault Date: Tue, 23 Aug 2022 10:27:52 +0200 Subject: [PATCH 1/3] fix(catalog-ms-graph): pass expand properties to EntityProvider Signed-off-by: Gabriel Testault --- .../src/processors/MicrosoftGraphOrgEntityProvider.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts b/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts index 4c38198b0d..67f3039873 100644 --- a/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts +++ b/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts @@ -282,6 +282,8 @@ export class MicrosoftGraphOrgEntityProvider implements EntityProvider { client, provider.tenantId, { + userExpand: provider.userExpand, + groupExpand: provider.groupExpand, userFilter: provider.userFilter, userGroupMemberFilter: provider.userGroupMemberFilter, userGroupMemberSearch: provider.userGroupMemberSearch, From c1d32d2b767bb1b2b5979df71391cbbbed69034f Mon Sep 17 00:00:00 2001 From: Gabriel Testault Date: Tue, 23 Aug 2022 10:38:47 +0200 Subject: [PATCH 2/3] fix(catalog-ms-graph): add changeset Signed-off-by: Gabriel Testault --- .changeset/afraid-radios-boil.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/afraid-radios-boil.md diff --git a/.changeset/afraid-radios-boil.md b/.changeset/afraid-radios-boil.md new file mode 100644 index 0000000000..d993525154 --- /dev/null +++ b/.changeset/afraid-radios-boil.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-backend-module-msgraph': patch +--- + +Fixed bug in MicrosoftGraphEntityProvider ignores userExpand and groupExpand configuration parameters From a8781e5f8b56135635263fa98b319fe5a55f917b Mon Sep 17 00:00:00 2001 From: gtestault Date: Tue, 23 Aug 2022 12:11:13 +0200 Subject: [PATCH 3/3] Fix changeset grammar and formatting Co-authored-by: Johan Haals Signed-off-by: gtestault --- .changeset/afraid-radios-boil.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/afraid-radios-boil.md b/.changeset/afraid-radios-boil.md index d993525154..a9533d55c0 100644 --- a/.changeset/afraid-radios-boil.md +++ b/.changeset/afraid-radios-boil.md @@ -2,4 +2,4 @@ '@backstage/plugin-catalog-backend-module-msgraph': patch --- -Fixed bug in MicrosoftGraphEntityProvider ignores userExpand and groupExpand configuration parameters +Fixed a bug in the `MicrosoftGraphEntityProvider` that ignored the `userExpand` and `groupExpand` configuration parameters