Merge branch 'master' into feature/multiple_ldap_users_groups

Signed-off-by: Jente Sondervorst <jentesondervorst@gmail.com>

docs/integrations/azure/org.md

@@ -150,6 +150,18 @@ microsoftGraphOrg:
       loadPhotos: false
 ```
 
+If you are using `userGroupMember`, the configuration for `loadPhotos` should still be managed under `users:` while omitting `search` and `filters`.
+
+```yaml
+microsoftGraphOrg:
+  providerId:
+    user:
+      loadPhotos: false
+    userGroupMember:
+      filter: "displayName eq 'Backstage Users'"
+      search: '"description:One" AND ("displayName:Video" OR "displayName:Drive")'
+```
+
 ## Customizing Transformation
 
 Ingested entities can be customized by providing custom transformers.

docs/integrations/gitlab/discovery.md

@@ -120,8 +120,8 @@ export default async function createPlugin(
     }),
     // optional: alternatively, use schedule
     scheduler: env.scheduler,
+    events: env.events,
   });
-  env.eventBroker.subscribe(gitlabProvider);
   builder.addEntityProvider(gitlabProvider);
   /* highlight-add-end */
   const { processingEngine, router } = await builder.build();

docs/integrations/gitlab/org.md

@@ -130,9 +130,9 @@ export default async function createPlugin(
       }),
       // optional: alternatively, use schedule
       scheduler: env.scheduler,
+      events: env.events,
     },
   );
-  env.eventBroker.subscribe(gitlabOrgProvider);
   builder.addEntityProvider(gitlabOrgProvider);
   /* highlight-add-end */
   const { processingEngine, router } = await builder.build();

docs/integrations/ldap/org.md

@@ -309,11 +309,11 @@ map:
 In case you want to customize the ingested entities, the provider allows to pass
 transformers for users and groups.
 
-Transformers can be configured by extending `ldapOrgEntityProviderTransformExtensionPoint`. Here is an example:
+Transformers can be configured by extending `ldapOrgEntityProviderTransformsExtensionPoint`. Here is an example:
 
 ```ts title="packages/backend/src/index.ts"
 import { createBackendModule } from '@backstage/backend-plugin-api';
-import { ldapOrgEntityProviderTransformExtensionPoint } from '@backstage/plugin-catalog-backend-module-ldap';
+import { ldapOrgEntityProviderTransformsExtensionPoint } from '@backstage/plugin-catalog-backend-module-ldap';
 import { myUserTransformer, myGroupTransformer } from './transformers';
 
 backend.add(
@@ -324,7 +324,7 @@ backend.add(
       env.registerInit({
         deps: {
           /* highlight-add-start */
-          ldapTransformers: ldapOrgEntityProviderTransformExtensionPoint,
+          ldapTransformers: ldapOrgEntityProviderTransformsExtensionPoint,
           /* highlight-add-end */
         },
         async init({ ldapTransformers }) {