From d4c1d6d74c36d2cd535020e468e29c615a9d83cf Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Wed, 8 Nov 2023 10:51:52 -0400 Subject: [PATCH] chore: add @janus-idp/backstage-plugin-acr... (#734) * chore: add @janus-idp/backstage-plugin-acr 1.1.1 as peerDep in dynamic plugins imports Signed-off-by: Nick Boldt bump versions of peer Deps to match what's in https://github.com/janus-idp/backstage-plugins/tree/main/plugins Signed-off-by: Nick Boldt * chore: add @janus-idp/backstage-plugin-acr 1.2.4 as peerDep in dynamic plugins imports Signed-off-by: Nick Boldt bump versions of peer Deps to match what's in https://github.com/janus-idp/backstage-plugins/tree/main/plugins Signed-off-by: Nick Boldt add acr as default-disabled dynamic plugin Signed-off-by: Nick Boldt * add proxy config Signed-off-by: Nick Boldt * Update app-config.yaml * chore(): add changeset --------- Signed-off-by: Nick Boldt Co-authored-by: Tomas Kral --- .changeset/sharp-walls-wait.md | 7 +++++++ app-config.dynamic-plugins.yaml | 10 ++++++++++ app-config.yaml | 10 ++++++++++ dynamic-plugins.default.yaml | 16 ++++++++++++++++ dynamic-plugins/imports/package.json | 13 +++++++------ 5 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 .changeset/sharp-walls-wait.md diff --git a/.changeset/sharp-walls-wait.md b/.changeset/sharp-walls-wait.md new file mode 100644 index 000000000..2ae5bc287 --- /dev/null +++ b/.changeset/sharp-walls-wait.md @@ -0,0 +1,7 @@ +--- +'dynamic-plugins-imports': patch +'backend': patch +'app': patch +--- + +add @janus-idp/backstage-plugin-acr diff --git a/app-config.dynamic-plugins.yaml b/app-config.dynamic-plugins.yaml index 787724e6f..1102c54d6 100644 --- a/app-config.dynamic-plugins.yaml +++ b/app-config.dynamic-plugins.yaml @@ -142,6 +142,16 @@ dynamicPlugins: if: allOf: - isGitlabAvailable + janus-idp.backstage-plugin-acr: + mountPoints: + - mountPoint: entity.page.image-registry/cards + importName: AcrPage + config: + layout: + gridColumn: 1 / -1 + if: + anyOf: + - isAcrAvailable janus-idp.backstage-plugin-jfrog-artifactory: mountPoints: - mountPoint: entity.page.image-registry/cards diff --git a/app-config.yaml b/app-config.yaml index 1c74dc278..5b76a86dc 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -99,6 +99,16 @@ proxy: X-Atlassian-Token: 'no-check' User-Agent: ${JIRA_USER_AGENT} + # Plugin: ACR + '/acr/api': + target: ${ACR_URL} + changeOrigin: true + headers: + # If you use Bearer Token for authorization, please replace the 'Basic' with 'Bearer' in the following line. + Authorization: 'Bearer ${ACR_AUTH_TOKEN}' + # Change to "false" in case of using self hosted artifactory instance with a self-signed certificate + secure: true + # Plugin: Jfrog Artifactory '/jfrog-artifactory/api': target: ${ARTIFACTORY_URL} diff --git a/dynamic-plugins.default.yaml b/dynamic-plugins.default.yaml index 17dbf9d63..c2626a448 100644 --- a/dynamic-plugins.default.yaml +++ b/dynamic-plugins.default.yaml @@ -575,6 +575,22 @@ plugins: anyOf: - isNexusRepositoryManagerAvailable + - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-acr + disabled: true + pluginConfig: + dynamicPlugins: + frontend: + janus-idp.backstage-plugin-acr: + mountPoints: + - mountPoint: entity.page.image-registry/cards + importName: AcrPage + config: + layout: + gridColumn: 1 / -1 + if: + anyOf: + - isAcrAvailable + - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-jfrog-artifactory disabled: true pluginConfig: diff --git a/dynamic-plugins/imports/package.json b/dynamic-plugins/imports/package.json index e36e9b8c6..615430b46 100644 --- a/dynamic-plugins/imports/package.json +++ b/dynamic-plugins/imports/package.json @@ -15,11 +15,12 @@ "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-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-quay": "1.4.6", + "@janus-idp/backstage-plugin-tekton": "3.1.3", + "@janus-idp/backstage-plugin-topology": "1.16.4" } }