Switching the Showcase to the new backend system & 1.23.0-next.3 pre-…

…release (#897) * Fix wrong names in `dynamic-plugins.default.yaml` Signed-off-by: David Festal <dfestal@redhat.com> * Move to 1.23.0-next.1 Signed-off-by: David Festal <dfestal@redhat.com> * Switch to the new backend system Signed-off-by: David Festal <dfestal@redhat.com> * Update wrappers Signed-off-by: David Festal <dfestal@redhat.com> * Update the imported dynamic backend plugins ... ... to use those new versions supporting the new backend system. Signed-off-by: David Festal <dfestal@redhat.com> * Update configuration for `githubOrg` provider Signed-off-by: David Festal <dfestal@redhat.com> * Add changeset Signed-off-by: David Festal <dfestal@redhat.com> * Now use the new backend support added in the rbac plugin itself Signed-off-by: David Festal <dfestal@redhat.com> * Bump backstage version to 1.23.0-next.3 Signed-off-by: David Festal <dfestal@redhat.com> * Include upstream fix for dynamic plugins config schemas Signed-off-by: David Festal <dfestal@redhat.com> * embed `@backstage/plugin-bitbucket-cloud-common` in the wrapper Signed-off-by: David Festal <dfestal@redhat.com> * Fix issue backstage/backstage#22932 in the wrapper... ... by removing the events support, before fixing it later in upstream backstage. Signed-off-by: David Festal <dfestal@redhat.com> * fix Signed-off-by: David Festal <dfestal@redhat.com> * Add the same schedule default as with the old backend... ... for the embedded catalog providers. Signed-off-by: David Festal <dfestal@redhat.com> * Add scaffolder actions which are not builtin anymore in the new backend system. Signed-off-by: David Festal <dfestal@redhat.com> * Update packages/backend/src/modules/rbacDynamicPluginsModule.ts Co-authored-by: Paul Schultz <pschultz@pobox.com> * Pin all dependencies Signed-off-by: David Festal <dfestal@redhat.com> * Update packages/backend/src/index.ts Co-authored-by: Paul Schultz <pschultz@pobox.com> * Add PR link Signed-off-by: David Festal <dfestal@redhat.com> --------- Signed-off-by: David Festal <dfestal@redhat.com> Co-authored-by: Paul Schultz <pschultz@pobox.com>
janus-idp · Feb 15, 2024 · 1f5f080 · 1f5f080
1 parent 6bf2af6
commit 1f5f080
Show file tree

Hide file tree

Showing 186 changed files with 6,252 additions and 4,082 deletions.
diff --git a/.changeset/eighty-icons-grin.md b/.changeset/eighty-icons-grin.md
@@ -0,0 +1,26 @@
+---
+'backstage-plugin-scaffolder-backend-module-gitlab': patch
+'backstage-plugin-scaffolder-backend-module-github': patch
+'backstage-plugin-scaffolder-backend-module-azure': patch
+'backstage-plugin-scaffolder-backend-module-gerrit': patch
+'backstage-plugin-scaffolder-backend-module-bitbucket-cloud': patch
+'backstage-plugin-scaffolder-backend-module-bitbucket-server': patch
+'backstage-plugin-catalog-backend-module-github-org': patch
+'immobiliarelabs-backstage-plugin-gitlab-backend': patch
+'backstage-plugin-catalog-backend-module-github': patch
+'backstage-plugin-catalog-backend-module-gitlab': patch
+'roadiehq-backstage-plugin-argo-cd-backend': patch
+'roadiehq-scaffolder-backend-module-utils': patch
+'backstage-plugin-azure-devops-backend': patch
+'backstage-plugin-kubernetes-backend': patch
+'backstage-plugin-sonarqube-backend': patch
+'roadiehq-scaffolder-backend-argocd': patch
+'backstage-plugin-techdocs-backend': patch
+'backstage-plugin-jenkins-backend': patch
+'@internal/plugin-dynamic-plugins-info-backend': patch
+'@internal/plugin-scalprum-backend': patch
+'backend': patch
+'dynamic-plugins-imports': patch
+---
+
+Switching to the new backend
diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.22.2"
+  "version": "1.23.0-next.3"
 }
diff --git a/dynamic-plugins.default.yaml b/dynamic-plugins.default.yaml
@@ -1,5 +1,6 @@
 plugins:
   # Group: Github
+  - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-github-dynamic
   - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic
     disabled: true
     pluginConfig:
@@ -14,9 +15,17 @@ plugins:
       catalog:
         providers:
           githubOrg:
-            default:
-              id: production
-              orgUrl: "${GITHUB_ORG_URL}"
+            id: production
+            githubUrl: "${GITHUB_URL}"
+            orgs: [ "${GITHUB_ORG}" ]
+            schedule:
+              frequency:
+                minutes: 60
+              initialDelay:
+                seconds: 15
+              timeout:
+                minutes: 15
+
   - package: ./dynamic-plugins/dist/backstage-plugin-github-actions
     disabled: true
     pluginConfig:
@@ -111,6 +120,7 @@ plugins:
                       - isSecurityInsightsAvailable
 
   # Group: Gitlab
+  - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gitlab-dynamic
   - package: ./dynamic-plugins/dist/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic
     disabled: true
     pluginConfig:
@@ -165,8 +175,6 @@ plugins:
       catalog:
         providers:
           gitlab: {}
-  - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gitlab-dynamic
-    disabled: true
 
   # Group: Kubernetes
   - package: ./dynamic-plugins/dist/backstage-plugin-kubernetes-backend-dynamic
@@ -288,6 +296,7 @@ plugins:
                       - isArgocdAvailable
 
   # Group: Azure Devops
+  - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-azure-dynamic
   - package: ./dynamic-plugins/dist/backstage-plugin-azure-devops-backend-dynamic
     disabled: true
     pluginConfig:
@@ -493,12 +502,15 @@ plugins:
                     icon: docs
 
   # Standalone plugins
+
+  - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gerrit-dynamic
+
   - package: ./dynamic-plugins/dist/roadiehq-scaffolder-backend-module-utils-dynamic
 
   - package: ./dynamic-plugins/dist/janus-idp-backstage-scaffolder-backend-module-quay-dynamic
 
   - package: ./dynamic-plugins/dist/janus-idp-backstage-scaffolder-backend-module-regex-dynamic
-    
+
   - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-dynamic-plugins-info
     disabled: true
     pluginConfig:
@@ -516,7 +528,7 @@ plugins:
                     gridColumn: "1 / -1"
                     width: 100vw
 
-  - package: ./dynamic-plugins/dist/janus-idp-plugin-rbac
+  - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-rbac
     disabled: true
     pluginConfig:
       dynamicPlugins:
@@ -536,7 +548,7 @@ plugins:
               - path: /admin/rbac
                 module: RbacPlugin
                 importName: RbacPage
-  
+
   - package: ./dynamic-plugins/dist/janus-idp-backstage-scaffolder-backend-module-servicenow-dynamic
     disabled: true
     pluginConfig:
@@ -583,8 +595,16 @@ plugins:
               realm: "${KEYCLOAK_REALM}"
               clientId: "${KEYCLOAK_CLIENT_ID}"
               clientSecret: "${KEYCLOAK_CLIENT_SECRET}"
+              schedule:
+                frequency:
+                  minutes: 60
+                initialDelay:
+                  seconds: 15
+                timeout:
+                  minutes: 50
 
-  - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-bitbucket-cloud
+  - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-cloud-dynamic
+  - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-bitbucket-cloud-dynamic
     disabled: true
     pluginConfig:
       # https://backstage.io/docs/integrations/bitbucketCloud/discovery#configuration
@@ -593,8 +613,16 @@ plugins:
           bitbucketCloud:
             default: # identifies your ingested dataset
               workspace: ${BITBUCKET_WORKSPACE}
+              schedule:
+                frequency:
+                  minutes: 30
+                initialDelay:
+                  minutes: 1
+                timeout:
+                  minutes: 3
 
-  - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-bitbucket-server
+  - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-server-dynamic
+  - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-bitbucket-server-dynamic
     disabled: true
     pluginConfig:
       # https://backstage.io/docs/integrations/bitbucketServer/discovery#configuration
@@ -603,6 +631,13 @@ plugins:
           bitbucketServer:
             default: # identifies your ingested dataset
               host: ${BITBUCKET_HOST}
+              schedule:
+                frequency:
+                  minutes: 30
+                initialDelay:
+                  minutes: 1
+                timeout:
+                  minutes: 3
 
   - package: ./dynamic-plugins/dist/backstage-plugin-dynatrace
     disabled: true
@@ -732,7 +767,7 @@ plugins:
                     anyOf:
                     - isJfrogArtifactoryAvailable
 
-  - package: ./dynamic-plugins/dist/backstage-plugin-pagerduty
+  - package: ./dynamic-plugins/dist/pagerduty-backstage-plugin
     disabled: true
     pluginConfig:
       dynamicPlugins:

diff --git a/dynamic-plugins/_utils/package.json b/dynamic-plugins/_utils/package.json
@@ -11,6 +11,6 @@
     "lint": "backstage-cli package lint"
   },
   "devDependencies": {
-    "@backstage/cli": "0.25.1"
+    "@backstage/cli": "0.25.2-next.3"
   }
 }
diff --git a/dynamic-plugins/imports/package.json b/dynamic-plugins/imports/package.json
@@ -12,27 +12,27 @@
     "lint": "backstage-cli package lint"
   },
   "devDependencies": {
-    "@backstage/cli": "0.25.1",
+    "@backstage/cli": "0.25.2-next.3",
     "tar": "6.2.0"
   },
   "peerDependencies": {
-    "@janus-idp/backstage-plugin-3scale-backend": "1.3.12",
-    "@janus-idp/backstage-plugin-aap-backend": "1.4.12",
+    "@janus-idp/backstage-plugin-3scale-backend": "1.4.1",
+    "@janus-idp/backstage-plugin-aap-backend": "1.5.0",
     "@janus-idp/backstage-plugin-acr": "1.2.21",
     "@janus-idp/backstage-plugin-analytics-provider-segment": "1.2.5",
     "@janus-idp/backstage-plugin-dynamic-plugins-info": "1.0.1",
     "@janus-idp/backstage-plugin-jfrog-artifactory": "1.2.21",
-    "@janus-idp/backstage-plugin-keycloak-backend": "1.7.13",
+    "@janus-idp/backstage-plugin-keycloak-backend": "1.8.0",
     "@janus-idp/backstage-plugin-nexus-repository-manager": "1.4.21",
-    "@janus-idp/backstage-plugin-ocm": "3.6.1",
-    "@janus-idp/backstage-plugin-ocm-backend": "3.4.12",
+    "@janus-idp/backstage-plugin-ocm": "3.7.0",
+    "@janus-idp/backstage-plugin-ocm-backend": "3.5.1",
     "@janus-idp/backstage-plugin-quay": "1.5.2",
     "@janus-idp/backstage-plugin-rbac": "1.14.2",
     "@janus-idp/backstage-plugin-tekton": "3.5.5",
     "@janus-idp/backstage-plugin-topology": "1.18.3",
-    "@janus-idp/backstage-scaffolder-backend-module-quay": "1.2.7",
-    "@janus-idp/backstage-scaffolder-backend-module-regex": "1.2.7",
-    "@janus-idp/backstage-scaffolder-backend-module-servicenow": "1.2.9",
-    "@janus-idp/backstage-scaffolder-backend-module-sonarqube": "1.2.6"
+    "@janus-idp/backstage-scaffolder-backend-module-quay": "1.3.0",
+    "@janus-idp/backstage-scaffolder-backend-module-regex": "1.3.0",
+    "@janus-idp/backstage-scaffolder-backend-module-servicenow": "1.3.0",
+    "@janus-idp/backstage-scaffolder-backend-module-sonarqube": "1.3.0"
   }
 }
diff --git a/...-plugins/wrappers/backstage-plugin-azure-devops-backend-dynamic/dist-dynamic/package.json b/...-plugins/wrappers/backstage-plugin-azure-devops-backend-dynamic/dist-dynamic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backstage-plugin-azure-devops-backend-dynamic",
-  "version": "0.5.1",
+  "version": "0.5.2-next.3",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
   "license": "Apache-2.0",
@@ -11,7 +11,7 @@
     "types": "dist/index.d.ts"
   },
   "backstage": {
-    "role": "backend-plugin-module"
+    "role": "backend-plugin"
   },
   "exports": {
     ".": {
@@ -45,14 +45,13 @@
   ],
   "bundleDependencies": true,
   "peerDependencies": {
-    "@backstage/backend-common": "0.20.1",
-    "@backstage/backend-plugin-api": "0.6.9",
-    "@backstage/backend-dynamic-feature-service": "0.1.0",
-    "@backstage/catalog-model": "^1.4.3",
+    "@backstage/backend-common": "^0.21.0-next.3",
+    "@backstage/backend-plugin-api": "^0.6.10-next.3",
+    "@backstage/catalog-model": "^1.4.4-next.0",
     "@backstage/config": "^1.1.1",
-    "@backstage/integration": "^1.8.0",
-    "@backstage/plugin-catalog-common": "^1.0.20",
-    "@backstage/plugin-catalog-node": "^1.6.1"
+    "@backstage/integration": "^1.9.0-next.1",
+    "@backstage/plugin-catalog-common": "^1.0.21-next.0",
+    "@backstage/plugin-catalog-node": "^1.6.2-next.3"
   },
   "overrides": {
     "@aws-sdk/util-utf8-browser": {