rhdh ado

redhat/ocp4/4.16/2024.12.rhdh.ado.md

@@ -88,22 +88,43 @@ global:
       # so we switch to upstream version
       - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-azure-dynamic
         disabled: true
+      # https://www.npmjs.com/package/@backstage/plugin-scaffolder-backend-module-azure?activeTab=versions
       - package: '@backstage/[email protected]'
         disabled: false
         integrity: sha512-ZXYsvjPHImrc+qnS4uJjLJ23TUjduVzbQeN9BIIyr+EHMHOWujwFc81Y5F9Gb5dA7ui1o4N5S92ukHQ/9+vCkA==
+
       # Azure Devops
       - package: ./dynamic-plugins/dist/backstage-plugin-azure-devops
         disabled: false
+      # # https://www.npmjs.com/package/@backstage-community/plugin-azure-devops?activeTab=versions
+      # - package: '@backstage-community/[email protected]'
+      #   disabled: false
+      #   integrity: sha512-hODbGeYajIqz8Anp2noTQLm0/7JvX2lB/4Icuq341IXSv58jkkYtbA+P9MDTRVm8jEokjzrzghQUxJn5QaDF0g==
+      # # https://www.npmjs.com/package/@backstage-community/plugin-azure-devops-common?activeTab=versions
+      # - package: '@backstage-community/[email protected]'
+      #   disabled: false
+      #   integrity: sha512-e5704CZJbeFR0+RXD+Nyeg0Uw6GkgR8u8un+0mb8Pn30M0CmyezEahQ/lmZOp1B/oQ1YD2c++Q+VDixxVOMzWQ==
+
       # Azure Devops
       - package: ./dynamic-plugins/dist/backstage-plugin-azure-devops-backend-dynamic
         disabled: false
+      # # https://www.npmjs.com/package/@backstage-community/plugin-azure-devops-backend?activeTab=versions
+      # - package: '@backstage-community/[email protected]'
+      #   disabled: false
+      #   integrity: sha512-6FU6yM5l00VjpTuURX5s9g3Daz9viggvjFa1HBUwMRq7yIUAZfFeUJbGWJfi4cqdkSJJGsPQ0A0EC0aBOYonOA==
+
       # Azure Repositories
       # - package: ./dynamic-plugins/dist/parfuemerie-douglas-scaffolder-backend-module-azure-repositories
       #   disabled: false
+
       # MS Graph
       # this is used to import users from azure ad.
       - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-msgraph-dynamic
+        disabled: true
+      # https://www.npmjs.com/package/@backstage/plugin-catalog-backend-module-msgraph?activeTab=versions
+      - package: '@backstage/[email protected]'
         disabled: false
+        integrity: sha512-0meX1qyKcfm0tXIha7N2geURGJJB/l/XYtGuoe0pp/lNquXCtXViaYUjl/iWD9uXWnkYTWMXUD5YQVKifIcemg==
 upstream:
   backstage:
     # patch for app config
@@ -201,6 +222,8 @@ data:
             - clientId: \${AZURE_DEVOPS_CLIENT_ID}
               clientSecret: \${AZURE_DEVOPS_CLIENT_SECRET}
               tenantId: \${AZURE_DEVOPS_TENANT_ID}
+              # organizations:
+              #   - \$AZURE_DEVOPS_ORG
 
     catalog:
       rules:
@@ -223,14 +246,15 @@ data:
             tenantId: \${AZURE_TENANT_ID}
             clientId: \${AZURE_CLIENT_ID}
             clientSecret: \${AZURE_CLIENT_SECRET}
-            user:
-              loadPhotos: true
-              filter: accountEnabled eq true and userType eq 'member'
+            headers:
+              ConsistencyLevel: eventual
+            # user:
+            #   loadPhotos: true
+            userGroupMember:
+              filter: "displayName eq 'L1Support' or displayName eq 'L2Support' or displayName eq 'L3Support'"
             group:
               filter: >
-                securityEnabled eq false
-                and mailEnabled eq true
-                and groupTypes/any(c:c+eq+'Unified')
+                endswith(displayName, 'Support')
             schedule:
               frequency: { hours: 1 }
               timeout: { minutes: 50 }
@@ -239,7 +263,7 @@ data:
           yourProviderId: # identifies your dataset / provider independent of config changes
             organization: \$AZURE_DEVOPS_ORG
             project: '*'
-            repository: '*' # this will match all repos starting with service-*
+            repository: '*' # this will match all repos 
             path: /catalog-info.yaml
             schedule: # optional; same options as in TaskScheduleDefinition
               # supports cron, ISO duration, "human duration" as used in code