Merge remote-tracking branch 'upstream/main' into RHIDP-735

janus-idp · Dec 9, 2024 · df6bb71 · df6bb71
2 parents 5ac7cc6 + d871ec6
commit df6bb71
Show file tree

Hide file tree

Showing 915 changed files with 77,042 additions and 245,138 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -3,11 +3,11 @@
 **/dist
 **/node_modules
 plugins
-!plugins/scalprum-backend
+!plugins/auth-backend-module-oidc-provider
 !plugins/dynamic-plugins-info
 !plugins/dynamic-plugins-info-backend
-!plugins/auth-backend-module-oidc-provider
 !plugins/licensed-users-info-backend
+!plugins/scalprum-backend
 *.local.yaml
 coverage
 dist-types

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,6 +3,9 @@ contact_links:
   - name: ❓ Red Hat Developer Hub JIRA
     url: https://issues.redhat.com/browse/RHIDP
     about: Please report any showcase/RHDH issues or feature requests in JIRA - https://issues.redhat.com/browse/RHIDP
+  - name: ❓ Janus-IDP Plugins
+    url: https://issues.redhat.com/browse/RHIDP
+    about: Please report any issues with https://github.com/janus-idp/backstage-plugins in JIRA - https://issues.redhat.com/browse/RHIDP
   - name: ❓ Backstage Community Plugins
     url: https://github.com/backstage/community-plugins/issues
     about: Please report any plugin issues or feature requests in https://github.com/backstage/community-plugins/issues
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -5,144 +5,237 @@
     ":rebaseStalePrs",
     "group:allNonMajor",
     "default:pinDigestsDisabled",
-    "default:automergeBranchPush"
+    ":automergeBranch"
+  ],
+  "labels": [
+    "kind/dependency upgrade"
   ],
-  "python": {
-    "groupName": "python  ",
-    "additionalBranchPrefix": "python ",
-    "dependencyDashboardApproval": true,
-    "description": "require dashboard approval for all python dependencies due to potential conflicts"
-  },
-  "labels": ["kind/dependency upgrade"],
   "npm": {
     "minimumReleaseAge": "1 day"
   },
   "pip_requirements": {
-    "fileMatch": ["requirements.*\\.in"]
-  },
-  "docker": {
-    "digest": {
-      "enabled": false
-    }
+    "fileMatch": [
+      "requirements.*\\.in"
+    ]
   },
   "major": {
     "dependencyDashboardApproval": true
   },
+  "recreateWhen": "never",
   "packageRules": [
     {
-      "matchDatasources": ["docker"],
-      "groupName": ["Docker base images"]
+      "matchCategories": [
+        "python"
+      ],
+      "groupName": "python  ",
+      "additionalBranchPrefix": "python ",
+      "dependencyDashboardApproval": true,
+      "description": "require dashboard approval for all python dependencies due to potential conflicts"
+    },
+    {
+      "matchCategories": [
+        "docker"
+      ],
+      "digest": {
+        "enabled": false
+      }
+    },
+    {
+      "matchDatasources": [
+        "docker"
+      ],
+      "groupName": "Docker base images"
     },
     {
-      "matchDepTypes": ["devDependencies"],
-      "matchUpdateTypes": ["patch", "minor"],
+      "matchDepTypes": [
+        "devDependencies"
+      ],
+      "matchUpdateTypes": [
+        "patch",
+        "minor"
+      ],
       "matchCurrentVersion": "!/^0/",
-      "groupName": ["DevDependencies (non-major)"],
+      "groupName": "DevDependencies (non-major)",
       "automerge": true
     },
     {
-      "matchDepTypes": ["devDependencies"],
-      "matchUpdateTypes": ["major"],
-      "groupName": ["DevDependencies "]
+      "matchDepTypes": [
+        "devDependencies"
+      ],
+      "matchUpdateTypes": [
+        "major"
+      ],
+      "groupName": "DevDependencies "
     },
     {
-      "matchDepTypes": ["dependencies", "peerDependencies"],
+      "matchDepTypes": [
+        "dependencies",
+        "peerDependencies"
+      ],
       "groupName": "Dependencies (non-major)",
-      "matchUpdateTypes": ["minor", "patch"]
+      "matchUpdateTypes": [
+        "minor",
+        "patch"
+      ]
     },
     {
-      "matchDepTypes": ["dependencies", "peerDependencies"],
+      "matchDepTypes": [
+        "dependencies",
+        "peerDependencies"
+      ],
       "groupName": "Dependencies",
-      "matchUpdateTypes": ["major"]
+      "matchUpdateTypes": [
+        "major"
+      ]
     },
     {
-      "extends": ["packages:test"],
-      "matchUpdateTypes": ["patch", "minor"],
+      "extends": [
+        "packages:test"
+      ],
+      "matchUpdateTypes": [
+        "patch",
+        "minor"
+      ],
       "matchCurrentVersion": "!/^0/",
       "groupName": "Test packages (non-major)",
       "automerge": true
     },
     {
-      "extends": ["packages:test"],
-      "matchUpdateTypes": ["major"],
+      "extends": [
+        "packages:test"
+      ],
+      "matchUpdateTypes": [
+        "major"
+      ],
       "groupName": "Test packages "
     },
     {
-      "extends": ["packages:linters"],
-      "matchUpdateTypes": ["patch", "minor"],
+      "extends": [
+        "packages:linters"
+      ],
+      "matchUpdateTypes": [
+        "patch",
+        "minor"
+      ],
       "matchCurrentVersion": "!/^0/",
       "groupName": "linters  (non-major)",
       "automerge": true
     },
     {
-      "extends": ["packages:linters"],
-      "matchUpdateTypes": ["major"],
+      "extends": [
+        "packages:linters"
+      ],
+      "matchUpdateTypes": [
+        "major"
+      ],
       "groupName": "linters"
     },
     {
-      "extends": "monorepo:material-ui",
-      "matchUpdateTypes": ["patch", "minor"],
+      "extends": [
+        "monorepo:material-ui"
+      ],
+      "matchUpdateTypes": [
+        "patch",
+        "minor"
+      ],
       "groupName": "material-ui (non-major)",
       "automerge": true
     },
     {
-      "extends": "monorepo:material-ui",
-      "matchUpdateTypes": ["major"],
+      "extends": [
+        "monorepo:material-ui"
+      ],
+      "matchUpdateTypes": [
+        "major"
+      ],
       "groupName": "material-ui"
     },
     {
-      "extends": "monorepo:react",
-      "matchUpdateTypes": ["patch", "minor"],
+      "extends": [
+        "monorepo:react"
+      ],
+      "matchUpdateTypes": [
+        "patch",
+        "minor"
+      ],
       "groupName": "react (non-major)",
       "automerge": true
     },
     {
-      "extends": "monorepo:react",
-      "matchUpdateTypes": ["major"],
+      "extends": [
+        "monorepo:react"
+      ],
+      "matchUpdateTypes": [
+        "major"
+      ],
       "groupName": "react"
     },
     {
-      "extends": "monorepo:emotion",
-      "matchUpdateTypes": ["patch", "minor"],
+      "extends": [
+        "monorepo:emotion"
+      ],
+      "matchUpdateTypes": [
+        "patch",
+        "minor"
+      ],
       "groupName": "emotion (non-major)",
       "automerge": true
     },
     {
-      "extends": "monorepo:emotion",
-      "matchUpdateTypes": ["major"],
+      "extends": [
+        "monorepo:emotion"
+      ],
+      "matchUpdateTypes": [
+        "major"
+      ],
       "groupName": "emotion"
     },
     {
-      "matchPackagePrefixes": ["@types/"],
-      "matchUpdateTypes": ["patch", "minor"],
-      "groupName": "types (non-major)"
+      "matchUpdateTypes": [
+        "patch",
+        "minor"
+      ],
+      "groupName": "types (non-major)",
+      "matchPackageNames": [
+        "@types/{/,}**"
+      ]
     },
     {
-      "matchPackagePrefixes": ["@types/"],
-      "matchUpdateTypes": ["major"],
-      "groupName": "types "
+      "matchUpdateTypes": [
+        "major"
+      ],
+      "groupName": "types ",
+      "matchPackageNames": [
+        "@types/{/,}**"
+      ]
     },
     {
-      "matchPackagePatterns": [
-        "^@backstage/",
-        "^@backstage-community/",
-        "^@janus-idp/",
-        "^@immobiliarelabs/",
-        "^@roadiehq/",
-        "^@pagerduty/",
-        "^@internal/"
-      ],
       "description": "ignore updates to all backstage updates and 3rd party plugins",
-      "groupName": ["Backstage packages"],
+      "groupName": "Backstage packages",
       "dependencyDashboardApproval": true,
-      "enabled": false
+      "enabled": false,
+      "matchPackageNames": [
+        "/^@backstage//",
+        "/^@backstage-community//",
+        "/^@janus-idp//",
+        "/^@immobiliarelabs//",
+        "/^@roadiehq//",
+        "/^@pagerduty//",
+        "/^@internal//"
+      ]
     }
   ],
-  "ignorePaths": ["**/dist-dynamic/**"],
-  "ignoreDeps": ["@roadiehq/backstage-plugin-argo-cd"],
+  "ignorePaths": [
+    "**/dist-dynamic/**"
+  ],
+  "ignoreDeps": [
+    "@roadiehq/backstage-plugin-argo-cd"
+  ],
   "vulnerabilityAlerts": {
     "enabled": true,
-    "addLabels": ["kind/security"]
+    "addLabels": [
+      "kind/security"
+    ]
   },
   "osvVulnerabilityAlerts": true
 }
diff --git a/.github/workflows/cache-cleanup.yaml b/.github/workflows/cache-cleanup.yaml
@@ -1,6 +1,6 @@
 # based on https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#managing-caches
 
-name: cleanup caches by a branch
+name: Cleanup caches by a branch
 on:
   pull_request:
     types: