Skip to content

Commit

Permalink
fix: correctly use dynamic plugin config schemas
Browse files Browse the repository at this point in the history
Signed-off-by: David Festal <dfestal@redhat.com>
  • Loading branch information
davidfestal committed Nov 8, 2023
1 parent 47d52ff commit e1662d5
Show file tree
Hide file tree
Showing 39 changed files with 335 additions and 49 deletions.
12 changes: 6 additions & 6 deletions dynamic-plugins/imports/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
"tar": "6.2.0"
},
"peerDependencies": {
"@janus-idp/backstage-plugin-jfrog-artifactory": "1.2.3",
"@janus-idp/backstage-plugin-nexus-repository-manager": "1.4.3",
"@janus-idp/backstage-plugin-ocm": "3.3.3",
"@janus-idp/backstage-plugin-quay": "1.4.5",
"@janus-idp/backstage-plugin-tekton": "3.1.2",
"@janus-idp/backstage-plugin-topology": "1.16.3"
"@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.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"
}
}
29 changes: 29 additions & 0 deletions dynamic-plugins/quay.io plugin.txt
Original file line number Diff line number Diff line change
@@ -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

Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"devDependencies": {
"@backstage/cli": "0.23.1",
"@janus-idp/cli": "1.3.3"
"@janus-idp/cli": "1.4.0"
},
"files": [
"dist",
Expand Down
9 changes: 7 additions & 2 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@
},
"//": "The extra configuration options in the start script are needed for local development",
"scripts": {
"start": "cross-env LEGACY_BACKEND_START=true backstage-cli package start --config ../../app-config.yaml --config ../../app-config.example.yaml",
"start": "cross-env LEGACY_BACKEND_START=true backstage-cli package start --config ../../app-config.yaml --config ../../app-config.example.yaml --config ../../app-config.dynamic-plugins.yaml",
"build": "backstage-cli package build",
"lint": "backstage-cli package lint",
"test": "backstage-cli package test --coverage",
"clean": "backstage-cli package clean"
},
"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",
Expand Down Expand Up @@ -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",
Expand Down
Loading

0 comments on commit e1662d5

Please sign in to comment.