Merge pull request #5177 from backstage/freben/group-members

Make sure that Group  is taken into account when filling out an org hierarchy

.changeset/old-hounds-doubt.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Make sure that Group `spec.members` is taken into account when filling out an org hierarchy

plugins/catalog-backend/src/ingestion/processors/util/org.test.ts

@@ -73,4 +73,22 @@ describe('buildMemberOf', () => {
     buildMemberOf(groups, [u]);
     expect(u.spec.memberOf).toEqual(expect.arrayContaining(['a', 'b', 'c']));
   });
+
+  it('takes group spec.members into account', () => {
+    const a = g('a', undefined, []);
+    const b = g('b', 'a', []);
+    const c = g('c', 'b', []);
+    c.spec.members = ['n'];
+    const u: UserEntity = {
+      apiVersion: 'backstage.io/v1alpha1',
+      kind: 'User',
+      metadata: { name: 'n' },
+      spec: { profile: {}, memberOf: [] },
+    };
+
+    const groups = [a, b, c];
+    buildOrgHierarchy(groups);
+    buildMemberOf(groups, [u]);
+    expect(u.spec.memberOf).toEqual(expect.arrayContaining(['a', 'b', 'c']));
+  });
 });

plugins/catalog-backend/src/ingestion/processors/util/org.ts

@@ -57,7 +57,13 @@ export function buildMemberOf(groups: GroupEntity[], users: UserEntity[]) {
   users.forEach(user => {
     const transitiveMemberOf = new Set<string>();
 
-    const todo = [...user.spec.memberOf];
+    const todo = [
+      ...user.spec.memberOf,
+      ...groups
+        .filter(g => g.spec.members?.includes(user.metadata.name))
+        .map(g => g.metadata.name),
+    ];
+
     for (;;) {
       const current = todo.pop();
       if (!current) {