fix: correctly use dynamic plugin config schemas

Signed-off-by: David Festal <dfestal@redhat.com>
janus-idp · Nov 8, 2023 · 67a0e02 · 67a0e02
1 parent 7ed4465
commit 67a0e02
Show file tree

Hide file tree

Showing 39 changed files with 326 additions and 38 deletions.
diff --git a/dynamic-plugins/imports/package.json b/dynamic-plugins/imports/package.json
@@ -18,7 +18,7 @@
     "@janus-idp/backstage-plugin-acr": "1.2.4",
     "@janus-idp/backstage-plugin-jfrog-artifactory": "1.2.4",
     "@janus-idp/backstage-plugin-nexus-repository-manager": "1.4.4",
-    "@janus-idp/backstage-plugin-ocm": "3.3.4",
+    "@janus-idp/backstage-plugin-ocm": "3.5.0",
     "@janus-idp/backstage-plugin-quay": "1.4.6",
     "@janus-idp/backstage-plugin-tekton": "3.1.3",
     "@janus-idp/backstage-plugin-topology": "1.16.4"

diff --git a/dynamic-plugins/quay.io plugin.txt b/dynamic-plugins/quay.io plugin.txt
@@ -0,0 +1,29 @@
+  dynamic:
+    plugins:
+      - package: '@janus-idp/backstage-plugin-quay@1.4.2'
+        integrity: sha512-a6Xu5VTbgJ8qFN2inyper2L+KAwcFHjGfRwNdXt1NoldR419aJstxg5qgvWEkskMCez5+vjGwIzEghA3gfEzhQ==
+        pluginConfig:
+          dynamicPlugins:                        # Placement in the UI
+            frontend:
+              janus-idp.backstage-plugin-quay:
+                mountPoints:
+                  - importName: QuayPage
+                    module: QuayPlugin
+                    mountPoint: image-registry
+          proxy:                                 # Readme configuration
+            /quay/api:
+              changeOrigin: true
+              headers:
+                X-Requested-With: XMLHttpRequest
+              secure: true
+              target: 'https://quay.io'
+          quay:
+            uiUrl: 'https://quay.io'
+
+  dynamic:
+    includes:
+      - dynamic-plugins.default.yaml
+    plugins:
+      - disabled: false
+        package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-quay
+
diff --git a/dynamic-plugins/wrappers/backstage-plugin-azure-devops-backend-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-azure-devops-backend-dynamic/package.json
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-azure-devops/package.json b/dynamic-plugins/wrappers/backstage-plugin-azure-devops/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-github-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-github-dynamic/package.json
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/...-plugins/wrappers/backstage-plugin-catalog-backend-module-github-org-dynamic/package.json b/...-plugins/wrappers/backstage-plugin-catalog-backend-module-github-org-dynamic/package.json
@@ -31,7 +31,7 @@
     "@backstage/plugin-catalog-backend-module-github": "0.4.4"
   },
   "devDependencies": {
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-gitlab-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-gitlab-dynamic/package.json
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-dynatrace/package.json b/dynamic-plugins/wrappers/backstage-plugin-dynatrace/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-github-actions/package.json b/dynamic-plugins/wrappers/backstage-plugin-github-actions/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-github-issues/package.json b/dynamic-plugins/wrappers/backstage-plugin-github-issues/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-jenkins-backend-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-jenkins-backend-dynamic/package.json
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-jenkins/package.json b/dynamic-plugins/wrappers/backstage-plugin-jenkins/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-kubernetes-backend-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-kubernetes-backend-dynamic/package.json
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-kubernetes/package.json b/dynamic-plugins/wrappers/backstage-plugin-kubernetes/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-lighthouse/package.json b/dynamic-plugins/wrappers/backstage-plugin-lighthouse/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-pagerduty/package.json b/dynamic-plugins/wrappers/backstage-plugin-pagerduty/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/...c-plugins/wrappers/backstage-plugin-scaffolder-backend-module-gitlab-dynamic/package.json b/...c-plugins/wrappers/backstage-plugin-scaffolder-backend-module-gitlab-dynamic/package.json
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-sonarqube-backend-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-sonarqube-backend-dynamic/package.json
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-sonarqube/package.json b/dynamic-plugins/wrappers/backstage-plugin-sonarqube/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-techdocs-backend-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-techdocs-backend-dynamic/package.json
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/...mic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic/package.json b/...mic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic/package.json
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab/package.json b/dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-keycloak-backend-dynamic/package.json b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-keycloak-backend-dynamic/package.json
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-ocm-backend-dynamic/package.json b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-ocm-backend-dynamic/package.json
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-argo-cd-backend-dynamic/package.json b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-argo-cd-backend-dynamic/package.json
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-argo-cd/package.json b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-argo-cd/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-datadog/package.json b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-datadog/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-github-insights/package.json b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-github-insights/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-github-pull-requests/package.json b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-github-pull-requests/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-jira/package.json b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-jira/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/roadiehq-backstage-plugin-security-insights/package.json b/dynamic-plugins/wrappers/roadiehq-backstage-plugin-security-insights/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/roadiehq-scaffolder-backend-argocd-dynamic/package.json b/dynamic-plugins/wrappers/roadiehq-scaffolder-backend-argocd-dynamic/package.json
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/roadiehq-scaffolder-backend-module-utils-dynamic/package.json b/dynamic-plugins/wrappers/roadiehq-scaffolder-backend-module-utils-dynamic/package.json
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@janus-idp/cli": "1.3.3"
+    "@janus-idp/cli": "1.4.0"
   },
   "files": [
     "dist",

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -17,6 +17,9 @@
   },
   "dependencies": {
     "@backstage/backend-common": "0.19.8",
+    "@backstage/backend-app-api": "0.5.7",
+    "@backstage/backend-plugin-api": "0.6.6",
+    "@backstage/config-loader": "1.5.2",
     "@backstage/backend-plugin-manager": "npm:@janus-idp/backend-plugin-manager@0.0.2-janus.5",
     "@backstage/backend-tasks": "0.5.11",
     "@backstage/catalog-client": "1.4.5",
@@ -48,10 +51,12 @@
     "express-promise-router": "4.1.1",
     "isolated-vm": "4.6.0",
     "pg": "8.11.3",
+    "lodash": "4.17.21",
     "prom-client": "15.0.0",
     "winston": "3.11.0",
     "fs-extra": "10.1.0",
-    "express-rate-limit": "7.1.3"
+    "express-rate-limit": "7.1.3",
+    "@manypkg/get-packages": "1.1.3"
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",

diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
@@ -34,6 +34,10 @@ import permission from './plugins/permission';
 import proxy from './plugins/proxy';
 import scaffolder from './plugins/scaffolder';
 import search from './plugins/search';
+import {
+  gatherDynamicPluginsSchemas,
+  injectDynamicPluginsSchemasInLogger,
+} from './schemas';
 
 // TODO(davidfestal): The following import is a temporary workaround for a bug
 // in the upstream @backstage/backend-plugin-manager package.
@@ -178,6 +182,13 @@ async function main() {
     undefined,
     new CommonJSModuleLoader(logger),
   );
+
+  const dynamicPluginsSchemas = await gatherDynamicPluginsSchemas(
+    pluginManager,
+    logger,
+  );
+  injectDynamicPluginsSchemasInLogger(dynamicPluginsSchemas, logger, config);
+
   const createEnv = makeCreateEnv(config, pluginManager);
 
   const appEnv = useHotMemoize(module, () => createEnv('app'));
@@ -296,7 +307,7 @@ async function main() {
     name: 'app',
     service,
     root: '',
-    router: await app(appEnv),
+    router: await app(appEnv, dynamicPluginsSchemas),
   });
   await service.start().catch(err => {
     console.log(err);