Merge branch 'main' into RHIDP-4049-new

janus-idp · Nov 8, 2024 · fd6a03e · fd6a03e
2 parents a6f0269 + 096947a
commit fd6a03e
Show file tree

Hide file tree

Showing 22 changed files with 381 additions and 262 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -5,144 +5,236 @@
     ":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
   },
   "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/.ibm/pipelines/value_files/values_showcase-rbac.yaml b/.ibm/pipelines/value_files/values_showcase-rbac.yaml
@@ -92,9 +92,9 @@ global:
       - package: ./dynamic-plugins/dist/backstage-community-plugin-ocm
         disabled: false
       # Enable Bulk import plugins.
-      - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-bulk-import-backend-dynamic
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic
         disabled: false
-      - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-bulk-import
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import
         disabled: false
       # Enable tech-radar plugin.
       - package: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar

diff --git a/.ibm/pipelines/value_files/values_showcase.yaml b/.ibm/pipelines/value_files/values_showcase.yaml
@@ -90,9 +90,9 @@ global:
       - package: ./dynamic-plugins/dist/backstage-community-plugin-ocm
         disabled: false
       # Enable bulk import plugins.
-      - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-bulk-import-backend-dynamic
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic
         disabled: false
-      - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-bulk-import
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import
         disabled: false
       # Enable tech-radar plugin.
       - package: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar

diff --git a/app-config.dynamic-plugins.yaml b/app-config.dynamic-plugins.yaml
@@ -230,7 +230,7 @@ dynamicPlugins:
             if:
               anyOf:
               - isQuayAvailable
-    janus-idp.backstage-plugin-bulk-import:
+    red-hat-developer-hub.backstage-plugin-bulk-import:
       appIcons:
         - name: bulkImportIcon
           importName: BulkImportIcon

diff --git a/dynamic-plugins.default.yaml b/dynamic-plugins.default.yaml
@@ -463,14 +463,14 @@ plugins:
                     - isType: kubernetes-cluster
 
   # Group: Bulk import
-  - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-bulk-import-backend-dynamic
+  - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic
     disabled: true
-  - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-bulk-import
+  - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import
     disabled: true
     pluginConfig:
       dynamicPlugins:
         frontend:
-          janus-idp.backstage-plugin-bulk-import:
+          red-hat-developer-hub.backstage-plugin-bulk-import:
             appIcons:
               - name: bulkImportIcon
                 importName: BulkImportIcon

diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-bulk-import-backend-dynamic/src/index.ts b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-bulk-import-backend-dynamic/src/index.ts
diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-bulk-import-backend-dynamic/turbo.json b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-bulk-import-backend-dynamic/turbo.json
diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-bulk-import/src/index.ts b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-bulk-import/src/index.ts
diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-bulk-import/turbo.json b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-bulk-import/turbo.json