Skip to content

Commit

Permalink
chore: update quay wrapper (#1931)
Browse files Browse the repository at this point in the history
* chore: update quay wrapper

Signed-off-by: Kashish Mittal <kmittal@redhat.com>

* regen yarn

Signed-off-by: Kashish Mittal <kmittal@redhat.com>

* run yarn build:dockerfile

Signed-off-by: Kashish Mittal <kmittal@redhat.com>

* fix tsc errors

Signed-off-by: Kashish Mittal <kmittal@redhat.com>

---------

Signed-off-by: Kashish Mittal <kmittal@redhat.com>
  • Loading branch information
04kash authored Nov 15, 2024
1 parent 624dc48 commit 21eb5f3
Show file tree
Hide file tree
Showing 16 changed files with 79 additions and 103 deletions.
2 changes: 1 addition & 1 deletion .ibm/pipelines/value_files/values_showcase-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ global:
disabled: false
- package: ./dynamic-plugins/dist/backstage-community-plugin-github-actions
disabled: false
- package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-quay
- package: ./dynamic-plugins/dist/backstage-community-plugin-quay
disabled: false
- package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic
disabled: false
Expand Down
2 changes: 1 addition & 1 deletion .ibm/pipelines/value_files/values_showcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ global:
disabled: false
- package: ./dynamic-plugins/dist/backstage-community-plugin-github-actions
disabled: false
- package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-quay
- package: ./dynamic-plugins/dist/backstage-community-plugin-quay
disabled: false
- package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic
disabled: false
Expand Down
2 changes: 1 addition & 1 deletion .rhdh/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffo
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-quay/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-quay/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/dist-dynamic/package.json
Expand Down Expand Up @@ -143,6 +142,7 @@ COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-redhat-argocd/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-redhat-argocd/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-rbac/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-rbac/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-quay/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-quay/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-ocm/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-ocm/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-ocm-backend-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-ocm-backend-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-ocm-backend-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-ocm-backend-dynamic/dist-dynamic/package.json
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Today, we have several plugins integrated into the showcase app as a way to demo
Our current list of plugins within the showcase app include:

- [OCM plugin](https://github.com/backstage/comunity-plugins/tree/main/workspaces/ocm/plugins/ocm)
- [Quay plugin](https://github.com/janus-idp/backstage-plugins/tree/main/plugins/quay)
- [Quay plugin](https://github.com/backstage/community-plugins/tree/main/workspaces/quay/plugins/quay)
- [Kubernetes plugin](https://github.com/backstage/backstage/tree/master/plugins/kubernetes)
- [Topology plugin](https://github.com/janus-idp/backstage-plugins/tree/main/plugins/topology)
- [ArgoCD plugin](https://github.com/RoadieHQ/roadie-backstage-plugins/tree/main/plugins/frontend/backstage-plugin-argo-cd)
Expand Down
2 changes: 1 addition & 1 deletion app-config.dynamic-plugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ dynamicPlugins:
allOf:
- isKind: resource
- isType: kubernetes-cluster
janus-idp.backstage-plugin-quay:
backstage-community.plugin-quay:
mountPoints:
- mountPoint: entity.page.image-registry/cards
importName: QuayPage
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffo
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-regex-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-quay/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-quay/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/dist-dynamic/package.json
Expand Down Expand Up @@ -144,6 +143,7 @@ COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-redhat-argocd/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-redhat-argocd/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-rbac/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-rbac/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-quay/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-quay/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-ocm/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-ocm/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-ocm-backend-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-ocm-backend-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-ocm-backend-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-ocm-backend-dynamic/dist-dynamic/package.json
Expand Down
4 changes: 2 additions & 2 deletions dynamic-plugins.default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -760,12 +760,12 @@ plugins:
allOf:
- isTektonCIAvailable

- package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-quay
- package: ./dynamic-plugins/dist/backstage-community-plugin-quay
disabled: true
pluginConfig:
dynamicPlugins:
frontend:
janus-idp.backstage-plugin-quay:
backstage-community.plugin-quay:
mountPoints:
- mountPoint: entity.page.image-registry/cards
importName: QuayPage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "janus-idp-backstage-plugin-quay",
"version": "1.14.0",
"name": "backstage-community-plugin-quay",
"version": "1.14.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
Expand All @@ -11,11 +11,11 @@
},
"backstage": {
"role": "frontend-plugin",
"supported-versions": "1.32.4",
"pluginId": "janus-idp-quay",
"pluginPackage": "janus-idp-quay",
"supported-versions": "1.32.5",
"pluginId": "backstage-community-quay",
"pluginPackage": "backstage-community-quay",
"pluginPackages": [
"janus-idp-backstage-plugin-quay"
"backstage-community-plugin-quay"
]
},
"sideEffects": false,
Expand All @@ -29,7 +29,7 @@
"export-dynamic:clean": "janus-cli package export-dynamic-plugin --in-place --clean"
},
"dependencies": {
"@janus-idp/backstage-plugin-quay": "1.14.0"
"@backstage-community/plugin-quay": "1.14.2"
},
"devDependencies": {
"@backstage/cli": "0.28.2",
Expand All @@ -40,15 +40,15 @@
"dist-scalprum"
],
"scalprum": {
"name": "janus-idp.backstage-plugin-quay",
"name": "backstage-community.plugin-quay",
"exposedModules": {
"PluginRoot": "./src/index.ts"
}
},
"repository": {
"type": "git",
"url": "https://github.com/janus-idp/backstage-showcase",
"directory": "dynamic-plugins/wrappers/janus-idp-backstage-plugin-quay"
"directory": "dynamic-plugins/wrappers/backstage-community-plugin-quay"
},
"maintainers": [
"@janus-idp/maintainers-showcase"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from '@backstage-community/plugin-quay';

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"include": ["src", "dev", "migrations"],
"exclude": ["node_modules"],
"compilerOptions": {
"outDir": "../../../dist-types/dynamic-plugins/wrappers/janus-idp-backstage-plugin-quay",
"outDir": "../../../dist-types/dynamic-plugins/wrappers/backstage-community-plugin-quay",
"rootDir": "."
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": ["//"],
"tasks": {
"tsc": {
"outputs": [
"../../../dist-types/dynamic-plugins/wrappers/backstage-community-plugin-quay/**"
]
}
}
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ export const InternalPluginsMap: Record<string, string> = {
'./dynamic-plugins/dist/roadiehq-backstage-plugin-datadog',
'backstage-community-plugin-tekton':
'./dynamic-plugins/dist/backstage-community-plugin-tekton',
'janus-idp-backstage-plugin-quay':
'./dynamic-plugins/dist/janus-idp-backstage-plugin-quay',
'backstage-community-plugin-quay':
'./dynamic-plugins/dist/backstage-community-plugin-quay',
'backstage-community-plugin-nexus-repository-manager':
'./dynamic-plugins/dist/backstage-community-plugin-nexus-repository-manager',
'backstage-community-plugin-acr':
Expand Down
4 changes: 2 additions & 2 deletions scripts/rhdh-openshift-setup/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ global:
# if:
# allOf:
# - isTektonCIAvailable
- package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-quay
- package: ./dynamic-plugins/dist/backstage-community-plugin-quay
disabled: false
pluginConfig:
dynamicPlugins:
frontend:
janus-idp.backstage-plugin-quay:
backstage-community.plugin-quay:
mountPoints:
- mountPoint: entity.page.image-registry/cards
importName: QuayPage
Expand Down
114 changes: 45 additions & 69 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3216,6 +3216,41 @@ __metadata:
languageName: node
linkType: hard

"@backstage-community/plugin-quay-common@npm:^1.3.2":
version: 1.3.2
resolution: "@backstage-community/plugin-quay-common@npm:1.3.2"
peerDependencies:
"@backstage/plugin-permission-common": ^0.8.1
react: 16.13.1 || ^17.0.0 || ^18.0.0
checksum: 0ad5ca6d6255f0678a9f5802abb8f873ff1d448be57191f3b7e88776d7b18a9ba26b6d039ad9245db830c002b768d70fcf69d3eb99c1839eade08c68a57c3885
languageName: node
linkType: hard

"@backstage-community/plugin-quay@npm:1.14.2":
version: 1.14.2
resolution: "@backstage-community/plugin-quay@npm:1.14.2"
dependencies:
"@backstage-community/plugin-quay-common": ^1.3.2
"@backstage/catalog-model": ^1.7.0
"@backstage/core-components": ^0.15.1
"@backstage/core-plugin-api": ^1.10.0
"@backstage/plugin-catalog-common": ^1.1.0
"@backstage/plugin-catalog-react": ^1.14.0
"@backstage/plugin-permission-react": ^0.4.27
"@backstage/theme": ^0.6.0
"@janus-idp/shared-react": ^2.13.1
"@material-ui/core": ^4.12.2
"@material-ui/icons": ^4.11.3
"@material-ui/lab": 4.0.0-alpha.61
react-use: ^17.4.0
peerDependencies:
react: ^16.13.1 || ^17.0.0 || ^18.0.0
react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
react-router-dom: ^6.0.0
checksum: 580772a73220c1c0af00e8c9ccff8fd74188e0b66f88e6b11bd0fa3c71b2cecb4525abd4ff89bf1a3e03a4debd607492ac5bed3da4f4611687ec9cc2d92d736e
languageName: node
linkType: hard

"@backstage-community/plugin-rbac-backend@npm:5.2.4":
version: 5.2.4
resolution: "@backstage-community/plugin-rbac-backend@npm:5.2.4"
Expand Down Expand Up @@ -9875,41 +9910,6 @@ __metadata:
languageName: node
linkType: hard

"@janus-idp/backstage-plugin-quay-common@npm:^1.3.0":
version: 1.3.0
resolution: "@janus-idp/backstage-plugin-quay-common@npm:1.3.0"
peerDependencies:
"@backstage/plugin-permission-common": ^0.8.1
react: 16.13.1 || ^17.0.0 || ^18.0.0
checksum: 8d7931f7b93c7a441d27eb1a359ab9d669b2a2ae0b27f2405ac38f8814f3f604bee66cb3be0880f53adaba34a9e70679678a499f2577f6976dff50e91bb407ec
languageName: node
linkType: hard

"@janus-idp/backstage-plugin-quay@npm:1.14.0":
version: 1.14.0
resolution: "@janus-idp/backstage-plugin-quay@npm:1.14.0"
dependencies:
"@backstage/catalog-model": ^1.7.0
"@backstage/core-components": ^0.15.1
"@backstage/core-plugin-api": ^1.10.0
"@backstage/plugin-catalog-common": ^1.1.0
"@backstage/plugin-catalog-react": ^1.14.0
"@backstage/plugin-permission-react": ^0.4.27
"@backstage/theme": ^0.6.0
"@janus-idp/backstage-plugin-quay-common": ^1.3.0
"@janus-idp/shared-react": ^2.13.0
"@material-ui/core": ^4.12.2
"@material-ui/icons": ^4.11.3
"@material-ui/lab": 4.0.0-alpha.61
react-use: ^17.4.0
peerDependencies:
react: ^16.13.1 || ^17.0.0 || ^18.0.0
react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
react-router-dom: ^6.0.0
checksum: 3674fe35f6f06cbd05a92778d7dbcc26f0acbb0b9a9d689c2cfe3f3292a97ab37a75f1b2291f4a518b57edf56a730dabd429794673b3e93458de2445788adbbc
languageName: node
linkType: hard

"@janus-idp/backstage-plugin-rbac-common@npm:1.12.0":
version: 1.12.0
resolution: "@janus-idp/backstage-plugin-rbac-common@npm:1.12.0"
Expand Down Expand Up @@ -10114,30 +10114,6 @@ __metadata:
languageName: node
linkType: hard

"@janus-idp/shared-react@npm:^2.13.0":
version: 2.13.0
resolution: "@janus-idp/shared-react@npm:2.13.0"
dependencies:
"@backstage/catalog-model": ^1.7.0
"@backstage/core-components": ^0.15.1
"@backstage/core-plugin-api": ^1.10.0
"@backstage/plugin-kubernetes-common": ^0.8.3
"@backstage/plugin-kubernetes-react": ^0.4.4
"@kubernetes/client-node": ^0.22.1
"@material-ui/core": ^4.12.4
"@mui/icons-material": 5.15.17
classnames: ^2.3.2
date-fns: ^2.30.0
file-saver: ^2.0.5
lodash: ^4.17.21
mathjs: ^11.11.2
react-use: ^17.5.0
peerDependencies:
react: ^16.13.1 || ^17.0.0 || ^18.0.0
checksum: 646bf1013f61926481b6c1457186d7b2f54df1f97c8249e40c66051d6ac81c360bfe1e7f4b3fb80596ee0f3e7a712724e564c96e3079e18fcb9e98a4f5bf1983
languageName: node
linkType: hard

"@janus-idp/shared-react@npm:^2.13.1":
version: 2.13.1
resolution: "@janus-idp/shared-react@npm:2.13.1"
Expand Down Expand Up @@ -20462,6 +20438,16 @@ __metadata:
languageName: unknown
linkType: soft

"backstage-community-plugin-quay@workspace:dynamic-plugins/wrappers/backstage-community-plugin-quay":
version: 0.0.0-use.local
resolution: "backstage-community-plugin-quay@workspace:dynamic-plugins/wrappers/backstage-community-plugin-quay"
dependencies:
"@backstage-community/plugin-quay": 1.14.2
"@backstage/cli": 0.28.2
"@janus-idp/cli": 1.17.0
languageName: unknown
linkType: soft

"backstage-community-plugin-rbac@workspace:dynamic-plugins/wrappers/backstage-community-plugin-rbac":
version: 0.0.0-use.local
resolution: "backstage-community-plugin-rbac@workspace:dynamic-plugins/wrappers/backstage-community-plugin-rbac"
Expand Down Expand Up @@ -29567,16 +29553,6 @@ __metadata:
languageName: unknown
linkType: soft

"janus-idp-backstage-plugin-quay@workspace:dynamic-plugins/wrappers/janus-idp-backstage-plugin-quay":
version: 0.0.0-use.local
resolution: "janus-idp-backstage-plugin-quay@workspace:dynamic-plugins/wrappers/janus-idp-backstage-plugin-quay"
dependencies:
"@backstage/cli": 0.28.2
"@janus-idp/backstage-plugin-quay": 1.14.0
"@janus-idp/cli": 1.17.0
languageName: unknown
linkType: soft

"janus-idp-backstage-scaffolder-backend-module-quay@workspace:dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic":
version: 0.0.0-use.local
resolution: "janus-idp-backstage-scaffolder-backend-module-quay@workspace:dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-quay-dynamic"
Expand Down

0 comments on commit 21eb5f3

Please sign in to comment.