From c0b3d5062539d5b10395a44efbad3ab85c533617 Mon Sep 17 00:00:00 2001 From: Kashish Mittal <113269381+04kash@users.noreply.github.com> Date: Wed, 6 Nov 2024 16:04:09 -0500 Subject: [PATCH] chore: add wrapper for scaffolder-backend-module-sonarqube (#1898) Signed-off-by: Kashish Mittal --- dynamic-plugins.default.yaml | 2 +- .../dist-dynamic/package.json | 8 ++-- .../dist-dynamic/yarn.lock | 4 +- .../package.json | 17 ++++---- .../src/index.ts | 1 + .../tsconfig.json | 2 +- .../turbo.json | 10 +++++ .../src/index.ts | 1 - .../turbo.json | 10 ----- .../src/components/InternalPluginsMap.ts | 4 +- yarn.lock | 43 ++++++++++--------- 11 files changed, 52 insertions(+), 50 deletions(-) rename dynamic-plugins/wrappers/{janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic => backstage-community-scaffolder-backend-module-sonarqube-dynamic}/dist-dynamic/package.json (87%) rename dynamic-plugins/wrappers/{janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic => backstage-community-scaffolder-backend-module-sonarqube-dynamic}/dist-dynamic/yarn.lock (84%) rename dynamic-plugins/wrappers/{janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic => backstage-community-scaffolder-backend-module-sonarqube-dynamic}/package.json (70%) create mode 100644 dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/src/index.ts rename dynamic-plugins/wrappers/{janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic => backstage-community-scaffolder-backend-module-sonarqube-dynamic}/tsconfig.json (58%) create mode 100644 dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/turbo.json delete mode 100644 dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/src/index.ts delete mode 100644 dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/turbo.json diff --git a/dynamic-plugins.default.yaml b/dynamic-plugins.default.yaml index 4c0da40abf..c970159f66 100644 --- a/dynamic-plugins.default.yaml +++ b/dynamic-plugins.default.yaml @@ -615,7 +615,7 @@ plugins: # The password to use for authentication. password: ${SERVICENOW_PASSWORD} - - package: ./dynamic-plugins/dist/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic + - package: ./dynamic-plugins/dist/backstage-community-scaffolder-backend-module-sonarqube-dynamic disabled: true - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-aap-backend-dynamic diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/package.json b/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/package.json similarity index 87% rename from dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/package.json rename to dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/package.json index bcaba17d28..393ee5a022 100644 --- a/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/package.json +++ b/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/package.json @@ -1,6 +1,6 @@ { - "name": "janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic", - "version": "2.2.0", + "name": "backstage-community-scaffolder-backend-module-sonarqube-dynamic", + "version": "2.2.2", "main": "./dist/index.cjs.js", "types": "src/index.ts", "license": "Apache-2.0", @@ -10,7 +10,7 @@ }, "backstage": { "role": "backend-plugin-module", - "supported-versions": "1.32.4", + "supported-versions": "1.32.5", "pluginId": "scaffolder", "pluginPackage": "@backstage/plugin-scaffolder-backend" }, @@ -30,7 +30,7 @@ "repository": { "type": "git", "url": "https://github.com/janus-idp/backstage-showcase", - "directory": "dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic" + "directory": "dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic" }, "maintainers": [ "@janus-idp/maintainers-showcase" diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/yarn.lock b/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/yarn.lock similarity index 84% rename from dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/yarn.lock rename to dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/yarn.lock index 017f7b00b7..8359cf1503 100644 --- a/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/yarn.lock +++ b/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/dist-dynamic/yarn.lock @@ -5,9 +5,9 @@ __metadata: version: 6 cacheKey: 8 -"janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic@workspace:.": +"backstage-community-scaffolder-backend-module-sonarqube-dynamic@workspace:.": version: 0.0.0-use.local - resolution: "janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic@workspace:." + resolution: "backstage-community-scaffolder-backend-module-sonarqube-dynamic@workspace:." dependencies: yaml: ^2.3.3 peerDependencies: diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/package.json b/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/package.json similarity index 70% rename from dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/package.json rename to dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/package.json index b4c9bc7611..d180cd7116 100644 --- a/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/package.json +++ b/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/package.json @@ -1,6 +1,6 @@ { - "name": "janus-idp-backstage-scaffolder-backend-module-sonarqube", - "version": "2.2.0", + "name": "backstage-community-scaffolder-backend-module-sonarqube", + "version": "2.2.2", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -10,7 +10,7 @@ }, "backstage": { "role": "backend-plugin-module", - "supported-versions": "1.32.4", + "supported-versions": "1.32.5", "pluginId": "scaffolder", "pluginPackage": "@backstage/plugin-scaffolder-backend" }, @@ -32,15 +32,16 @@ "test": "backstage-cli package test --passWithNoTests --coverage", "clean": "backstage-cli package clean", "clean-dynamic-sources": "yarn clean && rm -Rf node_modules", - "export-dynamic": "janus-cli package export-dynamic-plugin --embed-package @janus-idp/backstage-scaffolder-backend-module-sonarqube --override-interop default --no-embed-as-dependencies", - "export-dynamic:clean": "janus-cli package export-dynamic-plugin --embed-package @janus-idp/backstage-scaffolder-backend-module-sonarqube --override-interop default --no-embed-as-dependencies --clean" + "export-dynamic": "janus-cli package export-dynamic-plugin --embed-package @backstage-community/plugin-scaffolder-backend-module-sonarqube --override-interop default --no-embed-as-dependencies", + "export-dynamic:clean": "janus-cli package export-dynamic-plugin --embed-package @backstage-community/plugin-scaffolder-backend-module-sonarqube --override-interop default --no-embed-as-dependencies --clean" }, "dependencies": { - "@janus-idp/backstage-scaffolder-backend-module-sonarqube": "2.2.0" + "@backstage-community/plugin-scaffolder-backend-module-sonarqube": "2.2.2" }, "devDependencies": { "@backstage/cli": "0.28.2", - "@janus-idp/cli": "1.17.0" + "@janus-idp/cli": "1.17.0", + "typescript": "^5.6.3" }, "files": [ "dist", @@ -50,7 +51,7 @@ "repository": { "type": "git", "url": "https://github.com/janus-idp/backstage-showcase", - "directory": "dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic" + "directory": "dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic" }, "maintainers": [ "@janus-idp/maintainers-showcase" diff --git a/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/src/index.ts b/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/src/index.ts new file mode 100644 index 0000000000..0ef95a46cd --- /dev/null +++ b/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/src/index.ts @@ -0,0 +1 @@ +export { default } from '@backstage-community/plugin-scaffolder-backend-module-sonarqube'; diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/tsconfig.json b/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/tsconfig.json similarity index 58% rename from dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/tsconfig.json rename to dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/tsconfig.json index 338c87ae9b..c621673747 100644 --- a/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/tsconfig.json +++ b/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/tsconfig.json @@ -3,7 +3,7 @@ "include": ["src", "dev", "migrations"], "exclude": ["node_modules"], "compilerOptions": { - "outDir": "../../../dist-types/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic", + "outDir": "../../../dist-types/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic", "rootDir": "." } } diff --git a/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/turbo.json b/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/turbo.json new file mode 100644 index 0000000000..c08adf8cc1 --- /dev/null +++ b/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/turbo.json @@ -0,0 +1,10 @@ +{ + "extends": ["//"], + "tasks": { + "tsc": { + "outputs": [ + "../../../dist-types/dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic/**" + ] + } + } +} diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/src/index.ts b/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/src/index.ts deleted file mode 100644 index b190703cf0..0000000000 --- a/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default } from '@janus-idp/backstage-scaffolder-backend-module-sonarqube'; diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/turbo.json b/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/turbo.json deleted file mode 100644 index f4584c2b44..0000000000 --- a/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/turbo.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["//"], - "tasks": { - "tsc": { - "outputs": [ - "../../../dist-types/dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic/**" - ] - } - } -} diff --git a/plugins/dynamic-plugins-info/src/components/InternalPluginsMap.ts b/plugins/dynamic-plugins-info/src/components/InternalPluginsMap.ts index 0c55ed16dc..011b83ee17 100644 --- a/plugins/dynamic-plugins-info/src/components/InternalPluginsMap.ts +++ b/plugins/dynamic-plugins-info/src/components/InternalPluginsMap.ts @@ -72,8 +72,8 @@ export const InternalPluginsMap: Record = { './dynamic-plugins/dist/janus-idp-backstage-plugin-rbac', 'backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic': './dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic', - 'janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic': - '/dynamic-plugins/dist/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic', + 'backstage-community-scaffolder-backend-module-sonarqube-dynamic': + '/dynamic-plugins/dist/backstage-community-scaffolder-backend-module-sonarqube-dynamic', 'janus-idp-backstage-plugin-aap-backend-dynamic': './dynamic-plugins/dist/janus-idp-backstage-plugin-aap-backend-dynamic', 'backstage-community-plugin-3scale-backend-dynamic': diff --git a/yarn.lock b/yarn.lock index f03d7065cd..22ab4654a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3195,6 +3195,17 @@ __metadata: languageName: node linkType: hard +"@backstage-community/plugin-scaffolder-backend-module-sonarqube@npm:2.2.2": + version: 2.2.2 + resolution: "@backstage-community/plugin-scaffolder-backend-module-sonarqube@npm:2.2.2" + dependencies: + "@backstage/backend-plugin-api": ^1.0.1 + "@backstage/plugin-scaffolder-node": ^0.5.0 + yaml: ^2.3.3 + checksum: a5a0574ccfdd660c2d6ee16ebf114aae0cfa0f6bba22007e2bcd6567112737d50cecebeb8d71c2c207cb5441f051d2c2341901b0e32b1099687d7ced4b4d3b82 + languageName: node + linkType: hard + "@backstage-community/plugin-sonarqube-backend@npm:0.2.25": version: 0.2.25 resolution: "@backstage-community/plugin-sonarqube-backend@npm:0.2.25" @@ -9989,17 +10000,6 @@ __metadata: languageName: node linkType: hard -"@janus-idp/backstage-scaffolder-backend-module-sonarqube@npm:2.2.0": - version: 2.2.0 - resolution: "@janus-idp/backstage-scaffolder-backend-module-sonarqube@npm:2.2.0" - dependencies: - "@backstage/backend-plugin-api": ^1.0.1 - "@backstage/plugin-scaffolder-node": ^0.5.0 - yaml: ^2.3.3 - checksum: 4e1bb39c17507827291ee1052e7bdadcad1ad1476f000faef148c0441c11ee818a0a08f9d5cfbce25896f1875be6fbfe6bad7f924fd4af124220ef0c155e1abb - languageName: node - linkType: hard - "@janus-idp/cli@npm:1.17.0": version: 1.17.0 resolution: "@janus-idp/cli@npm:1.17.0" @@ -20367,6 +20367,17 @@ __metadata: languageName: unknown linkType: soft +"backstage-community-scaffolder-backend-module-sonarqube@workspace:dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic": + version: 0.0.0-use.local + resolution: "backstage-community-scaffolder-backend-module-sonarqube@workspace:dynamic-plugins/wrappers/backstage-community-scaffolder-backend-module-sonarqube-dynamic" + dependencies: + "@backstage-community/plugin-scaffolder-backend-module-sonarqube": 2.2.2 + "@backstage/cli": 0.28.2 + "@janus-idp/cli": 1.17.0 + typescript: ^5.6.3 + languageName: unknown + linkType: soft + "backstage-plugin-catalog-backend-module-bitbucket-cloud@workspace:dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-bitbucket-cloud-dynamic": version: 0.0.0-use.local resolution: "backstage-plugin-catalog-backend-module-bitbucket-cloud@workspace:dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-bitbucket-cloud-dynamic" @@ -29473,16 +29484,6 @@ __metadata: languageName: unknown linkType: soft -"janus-idp-backstage-scaffolder-backend-module-sonarqube@workspace:dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic": - version: 0.0.0-use.local - resolution: "janus-idp-backstage-scaffolder-backend-module-sonarqube@workspace:dynamic-plugins/wrappers/janus-idp-backstage-scaffolder-backend-module-sonarqube-dynamic" - dependencies: - "@backstage/cli": 0.28.2 - "@janus-idp/backstage-scaffolder-backend-module-sonarqube": 2.2.0 - "@janus-idp/cli": 1.17.0 - languageName: unknown - linkType: soft - "javascript-natural-sort@npm:^0.7.1": version: 0.7.1 resolution: "javascript-natural-sort@npm:0.7.1"