Merge branch 'main' of https://github.com/janus-idp/backstage-plugins …

…into scaffolderFrom-processor Signed-off-by: Frank Kong <[email protected]>
janus-idp · May 17, 2024 · 8e84c7b · 8e84c7b
2 parents 7ddd70c + e2a41d8
commit 8e84c7b
Show file tree

Hide file tree

Showing 124 changed files with 3,317 additions and 1,063 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -3,36 +3,105 @@
     "config:best-practices",
     ":gitSignOff",
     ":rebaseStalePrs",
-    "group:allNonMajor",
     "group:linters",
-    "group:test",
     ":preserveSemverRanges",
     ":pinOnlyDevDependencies",
     "helpers:pinGitHubActionDigests"
   ],
-  "labels": ["kind/dependency upgrade"],
-  "baseBranches": ["main", "/^1\\..*\\.x/"],
+  "ignorePresets": [
+    "group:monorepos"
+  ],
+  "labels": [
+    "kind/dependency upgrade"
+  ],
   "npm": {
     "minimumReleaseAge": "1 day"
   },
+  "major": {
+    "dependencyDashboardApproval": true
+  },
   "packageRules": [
     {
       "description": "Do automerge and pin actions in GH workflows, except for versions starting with 0",
       "enabled": true,
-      "matchManagers": ["github-actions"],
+      "matchManagers": [
+        "github-actions"
+      ],
       "matchCurrentVersion": "!/^0/",
       "groupName": "GitHub Actions",
-      "matchUpdateTypes": ["minor", "patch"],
+      "matchUpdateTypes": [
+        "minor",
+        "patch"
+      ],
       "automerge": true
     },
     {
-      "matchDepTypes": ["devDependencies"],
-      "matchUpdateTypes": ["patch", "minor"],
-      "groupName": "DevDependencies (non-major)",
+      "matchDepTypes": [
+        "dependencies",
+        "peerDependencies"
+      ],
+      "groupName": "{{additionalBranchPrefix}} Dependencies (minor)",
+      "matchUpdateTypes": [
+        "minor",
+        "patch"
+      ]
+    },
+    {
+      "matchDepTypes": [
+        "dependencies",
+        "peerDependencies"
+      ],
+      "groupName": "{{additionalBranchPrefix}} Dependencies",
+      "matchUpdateTypes": [
+        "major"
+      ]
+    },
+    {
+      "matchDepTypes": [
+        "devDependencies"
+      ],
+      "matchUpdateTypes": [
+        "patch",
+        "minor"
+      ],
+      "matchCurrentVersion": "!/^0/",      
+      "groupName": "{{additionalBranchPrefix}} DevDependencies (minor)",
       "automerge": true
     },
     {
-      "matchDepPatterns": ["^@backstage/"],
+      "matchDepTypes": [
+        "devDependencies"
+      ],
+      "matchUpdateTypes": [
+        "major"
+      ],
+      "groupName": "{{additionalBranchPrefix}} DevDependencies"
+    },
+    {
+      "extends": [
+        "packages:test"
+      ],
+      "matchUpdateTypes": [
+        "patch",
+        "minor"
+      ],
+      "matchCurrentVersion": "!/^0/",      
+      "groupName": "{{additionalBranchPrefix}}  Test packages (minor)",
+      "automerge": true
+    },
+    {
+      "extends": [
+        "packages:test"
+      ],
+      "matchUpdateTypes": [
+        "major"
+      ],
+      "groupName": "{{additionalBranchPrefix}} Test packages"
+    },
+    {
+      "matchDepPatterns": [
+        "^@backstage/"
+      ],
       "groupName": "Core Backstage packages",
       "enabled": false
     },
@@ -47,23 +116,124 @@
     {
       "description": "disable updates to the keycloak admin client - see https://github.com/janus-idp/backstage-plugins/issues/47 https://github.com/janus-idp/backstage-plugins/issues/1046",
       "enabled": false,
-      "matchDatasources": ["npm"],
-      "matchPackageNames": ["@keycloak/keycloak-admin-client"],
+      "matchDatasources": [
+        "npm"
+      ],
+      "matchPackageNames": [
+        "@keycloak/keycloak-admin-client"
+      ],
       "groupName": "Keycloak dependency"
     },
     {
       "description": "ignore updates to the axios to version that keycloak 18 needs",
       "enabled": false,
-      "matchDatasources": ["npm"],
-      "matchPackageNames": ["axios"],
+      "matchDatasources": [
+        "npm"
+      ],
+      "matchPackageNames": [
+        "axios"
+      ],
       "matchCurrentVersion": "0.26.1",
       "groupName": "Keycloak dependency"
+    },
+    {
+      "matchFileNames": [
+        "plugins/orchestrator*/**"
+      ],
+      "additionalBranchPrefix": "orchestrator ",
+      "addLabels": [
+        "team/orchestrator"
+      ]
+    },
+    {
+      "matchFileNames": [
+        "plugins/notifications*/**"
+      ],
+      "additionalBranchPrefix": "notifications ",
+      "addLabels": [
+        "team/notifications"
+      ]
+    },
+    {
+      "matchFileNames": [
+        "plugins/kiali*/**"
+      ],
+      "additionalBranchPrefix": "kiali ",
+      "addLabels": [
+        "team/kiali"
+      ]
+    },
+    {
+      "matchFileNames": [
+        "plugins/*matomo*/**",
+        "plugins/analytics-module-matomo*/**",
+        "plugins/feedback*/**"
+      ],
+      "additionalBranchPrefix": "devex ",
+      "addLabels": [
+        "team/devex"
+      ]
+    },
+    {
+      "matchFileNames": [
+        "plugins/quay*/**",
+        "plugins/tekton*/**",
+        "plugins/argocd*/**"        
+      ],
+      "additionalBranchPrefix": "rhtap ",
+      "addLabels": [
+        "team/rhtap"
+      ]
+    },
+    {
+      "matchFileNames": [
+        "plugins/analytics-provider-segment*/**",        
+        "plugins/bulk-import*/**",    
+        "plugins/dynamic-plugins-info*/**",
+        "plugins/keycloak*/**",
+        "plugins/ocm*/**",
+        "plugins/quay-actions*/**",
+        "plugins/rbac*/**",
+        "plugins/regex-actions*/**",
+        "plugins/scaffolder-annotator-action*/**",  
+        "plugins/shared-react*/**",                
+        "plugins/topology*/**",
+        "packages/**",
+        "package.json" 
+      ],
+      "additionalBranchPrefix": "rhdh ",
+      "addLabels": [
+        "team/rhdh"
+      ]
+    },
+    {
+      "matchFileNames": [
+        "plugins/3scale-backend*/**",
+        "plugins/aap-backend*/**",
+        "plugins/acr*/**",
+        "plugins/jfrog-artifactory*/**",
+        "plugins/kubernetes-actions*/**",
+        "plugins/nexus-repository-manager*/**",
+        "plugins/openshift-image-registry*/**",
+        "plugins/servicenow-actions*/**",
+        "plugins/sonarqube-actions*/**", 
+        "plugins/web-terminal*/**"
+      ],
+      "additionalBranchPrefix": "community ",
+      "addLabels": [
+        "team/community"
+      ]
     }
   ],
-  "ignorePaths": ["**/dist-dynamic/**"],
+  "ignorePaths": [
+    "**/dist-dynamic/**"
+  ],
   "vulnerabilityAlerts": {
+    "additionalBranchPrefix": "",
     "enabled": true,
-    "addLabels": ["kind/security"]
+    "addLabels": [
+      "kind/security"
+    ]
   },
   "osvVulnerabilityAlerts": true
 }
diff --git a/package.json b/package.json
@@ -61,6 +61,8 @@
   "resolutions": {
     "@types/react": "^18",
     "@types/react-dom": "^18",
+    "react": "^18",
+    "react-dom": "^18",
     "vscode-languageserver-types": "3.17.1",
     "@typescript-eslint/typescript-estree": "^7.3.1"
   },

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -60,10 +60,10 @@
   "devDependencies": {
     "@backstage/cli": "0.26.4",
     "@backstage/test-utils": "1.5.4",
-    "@testing-library/dom": "9.0.0",
-    "@testing-library/jest-dom": "6.0.0",
-    "@testing-library/react": "14.0.0",
-    "@testing-library/user-event": "14.0.0",
+    "@testing-library/dom": "9.3.4",
+    "@testing-library/jest-dom": "6.4.5",
+    "@testing-library/react": "14.3.1",
+    "@testing-library/user-event": "14.5.2",
     "@types/node": "18.19.31",
     "@types/react": "18.2.79",
     "@types/react-dom": "18.2.25"

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,3 +1,5 @@
+## @janus-idp/cli [1.8.7](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-05-16)
+
 ## @janus-idp/cli [1.8.6](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-05-09)
 
 ## @janus-idp/cli [1.8.5](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-05-02)

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@janus-idp/cli",
   "description": "CLI for developing Backstage plugins and apps",
-  "version": "1.8.6",
+  "version": "1.8.7",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "chokidar": "^3.3.1",
     "commander": "^9.1.0",
     "css-loader": "^6.5.1",
-    "esbuild": "^0.19.0",
+    "esbuild": "^0.21.0",
     "esbuild-loader": "^2.18.0",
     "eslint": "^8.49.0",
     "eslint-config-prettier": "^8.10.0",
@@ -83,7 +83,7 @@
     "semver": "^7.5.4",
     "style-loader": "^3.3.1",
     "swc-loader": "^0.2.3",
-    "typescript-json-schema": "^0.62.0",
+    "typescript-json-schema": "^0.63.0",
     "webpack": "^5.89.0",
     "webpack-dev-server": "^4.15.1",
     "yml-loader": "^2.1.0",

diff --git a/packages/storybook/package.json b/packages/storybook/package.json
@@ -17,7 +17,7 @@
   "devDependencies": {
     "@storybook/react-webpack5": "7.5.3",
     "@storybook/testing-library": "0.2.2",
-    "@testing-library/jest-dom": "6.4.2",
+    "@testing-library/jest-dom": "6.4.5",
     "@types/react": "18.2.48",
     "@types/react-dom": "18.2.18",
     "@swc/core": "1.3.96",

diff --git a/plugins/3scale-backend/CHANGELOG.md b/plugins/3scale-backend/CHANGELOG.md
@@ -1,3 +1,13 @@
+## @janus-idp/backstage-plugin-3scale-backend [1.5.8](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-05-17)
+
+## @janus-idp/backstage-plugin-3scale-backend [1.5.7](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-05-16)
+
+
+
+### Dependencies
+
+* **@janus-idp/cli:** upgraded to 1.8.7
+
 ## @janus-idp/backstage-plugin-3scale-backend [1.5.6](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-05-09)
 
 

diff --git a/plugins/3scale-backend/dist-dynamic/package.json b/plugins/3scale-backend/dist-dynamic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@janus-idp/backstage-plugin-3scale-backend-dynamic",
-  "version": "1.5.6",
+  "version": "1.5.8",
   "license": "Apache-2.0",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",

diff --git a/plugins/3scale-backend/package.json b/plugins/3scale-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@janus-idp/backstage-plugin-3scale-backend",
-  "version": "1.5.6",
+  "version": "1.5.8",
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -51,9 +51,9 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.26.4",
-    "@janus-idp/cli": "1.8.6",
+    "@janus-idp/cli": "1.8.7",
     "@types/supertest": "2.0.16",
-    "msw": "1.3.2",
+    "msw": "1.3.3",
     "supertest": "6.3.3"
   },
   "files": [

diff --git a/plugins/aap-backend/CHANGELOG.md b/plugins/aap-backend/CHANGELOG.md
@@ -1,3 +1,13 @@
+## @janus-idp/backstage-plugin-aap-backend [1.6.8](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-05-17)
+
+## @janus-idp/backstage-plugin-aap-backend [1.6.7](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-05-16)
+
+
+
+### Dependencies
+
+* **@janus-idp/cli:** upgraded to 1.8.7
+
 ## @janus-idp/backstage-plugin-aap-backend [1.6.6](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-05-09)
 
 

diff --git a/plugins/aap-backend/dist-dynamic/package.json b/plugins/aap-backend/dist-dynamic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@janus-idp/backstage-plugin-aap-backend-dynamic",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
   "license": "Apache-2.0",

diff --git a/plugins/aap-backend/package.json b/plugins/aap-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@janus-idp/backstage-plugin-aap-backend",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -51,9 +51,9 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.26.4",
-    "@janus-idp/cli": "1.8.6",
+    "@janus-idp/cli": "1.8.7",
     "@types/supertest": "2.0.16",
-    "msw": "1.3.2",
+    "msw": "1.3.3",
     "supertest": "6.3.3"
   },
   "files": [