From 23355b892d0bd1ecae2d4da2d23d492d1d7a3397 Mon Sep 17 00:00:00 2001 From: Bethany Griggs Date: Mon, 3 Feb 2025 17:50:27 +0000 Subject: [PATCH] chore: remove backstage-plugin-aap-backend (#2303) A new plugin for Red Hat Ansible Automation Platform (RHAAP) is available, replacing @janus-idp/backstage-plugin-aap-backend. Refs: https://issues.redhat.com/browse/RHIDP-5501 Signed-off-by: Beth Griggs --- .../value_files/sanity-check-plugins.yaml | 9 --- .rhdh/docker/Dockerfile | 1 - README.md | 1 - docker/Dockerfile | 1 - dynamic-plugins.default.yaml | 10 --- .../.eslintignore | 2 - .../.eslintrc.js | 1 - .../package.json | 68 ------------------- .../src/index.ts | 1 - .../tsconfig.json | 9 --- .../turbo.json | 10 --- .../__fixtures__/data.ts | 9 --- .../__fixtures__/expected_result.ts | 6 -- .../src/components/InternalPluginsMap.ts | 2 - yarn.lock | 23 ------- 15 files changed, 153 deletions(-) delete mode 100644 dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/.eslintignore delete mode 100644 dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/.eslintrc.js delete mode 100644 dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json delete mode 100644 dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/src/index.ts delete mode 100644 dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/tsconfig.json delete mode 100644 dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/turbo.json diff --git a/.ibm/pipelines/value_files/sanity-check-plugins.yaml b/.ibm/pipelines/value_files/sanity-check-plugins.yaml index 1484741d5e..4306655aa4 100644 --- a/.ibm/pipelines/value_files/sanity-check-plugins.yaml +++ b/.ibm/pipelines/value_files/sanity-check-plugins.yaml @@ -89,15 +89,6 @@ global: password: 'temp' - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-sonarqube-dynamic disabled: false - - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-aap-backend-dynamic - disabled: false - pluginConfig: - catalog: - providers: - aap: - prod: - baseUrl: 'temp' - authorization: "temp" - package: ./dynamic-plugins/dist/backstage-community-plugin-3scale-backend-dynamic disabled: false - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-cloud-dynamic diff --git a/.rhdh/docker/Dockerfile b/.rhdh/docker/Dockerfile index 077ea9e100..cf3a7b5108 100644 --- a/.rhdh/docker/Dockerfile +++ b/.rhdh/docker/Dockerfile @@ -81,7 +81,6 @@ COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/red-hat-developer-hub-back COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/parfuemerie-douglas-scaffolder-backend-module-azure-repositories-dynamic/package.json ./dynamic-plugins/wrappers/parfuemerie-douglas-scaffolder-backend-module-azure-repositories-dynamic/package.json COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin/package.json COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/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/immobiliarelabs-backstage-plugin-gitlab/package.json ./dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab/package.json COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic/package.json ./dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic/package.json COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-plugin-techdocs/package.json ./dynamic-plugins/wrappers/backstage-plugin-techdocs/package.json diff --git a/README.md b/README.md index a09075290a..948921078b 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,6 @@ Our current list of plugins include: - [Gitlab Scaffolder actions](https://github.com/backstage/backstage/tree/master/plugins/scaffolder-backend-module-gitlab) - [Utils Scaffolder actions](https://github.com/RoadieHQ/roadie-backstage-plugins/tree/main/plugins/scaffolder-actions/scaffolder-backend-module-utils) - [Nexus Repository Manager plugin](https://github.com/backstage/community-plugins/tree/main/workspaces/nexus-repository-manager/plugins/nexus-repository-manager) -- [AAP Backend plugin](https://github.com/janus-idp/backstage-plugins/tree/main/plugins/aap-backend) ## Getting Started diff --git a/docker/Dockerfile b/docker/Dockerfile index f1651eb9ea..bddac1256e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -82,7 +82,6 @@ COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/red-hat-developer-hub-back COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/parfuemerie-douglas-scaffolder-backend-module-azure-repositories-dynamic/package.json ./dynamic-plugins/wrappers/parfuemerie-douglas-scaffolder-backend-module-azure-repositories-dynamic/package.json COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin/package.json COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/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/immobiliarelabs-backstage-plugin-gitlab/package.json ./dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab/package.json COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic/package.json ./dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic/package.json COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-plugin-techdocs/package.json ./dynamic-plugins/wrappers/backstage-plugin-techdocs/package.json diff --git a/dynamic-plugins.default.yaml b/dynamic-plugins.default.yaml index d78902cdbd..3f8657a0f8 100644 --- a/dynamic-plugins.default.yaml +++ b/dynamic-plugins.default.yaml @@ -718,16 +718,6 @@ plugins: - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-sonarqube-dynamic disabled: true - - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-aap-backend-dynamic - disabled: true - pluginConfig: - catalog: - providers: - aap: - prod: - baseUrl: '${AAP_BASE_URL}' - authorization: "${AAP_AUTH_TOKEN}" - - package: ./dynamic-plugins/dist/backstage-community-plugin-3scale-backend-dynamic disabled: true pluginConfig: diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/.eslintignore b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/.eslintignore deleted file mode 100644 index 55289f4a23..0000000000 --- a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -dist-dynamic -dist-scalprum diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/.eslintrc.js b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/.eslintrc.js deleted file mode 100644 index e2a53a6ad2..0000000000 --- a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@backstage/cli/config/eslint-factory')(__dirname); 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 deleted file mode 100644 index af9bb9978c..0000000000 --- a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "name": "janus-idp-backstage-plugin-aap-backend", - "version": "2.2.0", - "main": "src/index.ts", - "types": "src/index.ts", - "license": "Apache-2.0", - "private": true, - "publishConfig": { - "access": "public" - }, - "backstage": { - "role": "backend-plugin", - "supported-versions": "1.35.0", - "pluginId": "janus-idp-aap-backend", - "pluginPackages": [ - "janus-idp-backstage-plugin-aap-backend" - ] - }, - "exports": { - ".": "./src/index.ts", - "./package.json": "./package.json" - }, - "typesVersions": { - "*": { - "package.json": [ - "package.json" - ] - } - }, - "scripts": { - "tsc": "tsc", - "build": "backstage-cli package build", - "lint:check": "backstage-cli package lint", - "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-plugin-aap-backend", - "export-dynamic:clean": "run export-dynamic --clean" - }, - "dependencies": { - "@janus-idp/backstage-plugin-aap-backend": "2.2.0" - }, - "devDependencies": { - "@backstage/cli": "0.29.5", - "@janus-idp/cli": "3.0.0", - "typescript": "5.7.3" - }, - "files": [ - "dist", - "dist-dynamic/*.*", - "dist-dynamic/dist/**" - ], - "repository": { - "type": "git", - "url": "https://github.com/redhat-developer/rhdh", - "directory": "dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic" - }, - "maintainers": [ - "@janus-idp/maintainers-showcase" - ], - "author": "Red Hat", - "homepage": "https://red.ht/rhdh", - "bugs": "https://issues.redhat.com/browse/RHIDP", - "keywords": [ - "support:tech-preview", - "lifecycle:active" - ] -} diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/src/index.ts b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/src/index.ts deleted file mode 100644 index 87530ff849..0000000000 --- a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default } from '@janus-idp/backstage-plugin-aap-backend'; diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/tsconfig.json b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/tsconfig.json deleted file mode 100644 index 5cd1f38a6f..0000000000 --- a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev", "migrations"], - "exclude": ["node_modules"], - "compilerOptions": { - "outDir": "../../../dist-types/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic", - "rootDir": "." - } -} diff --git a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/turbo.json b/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/turbo.json deleted file mode 100644 index 71128277b6..0000000000 --- a/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/turbo.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["//"], - "tasks": { - "tsc": { - "outputs": [ - "../../../dist-types/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/**" - ] - } - } -} diff --git a/plugins/dynamic-plugins-info-backend/__fixtures__/data.ts b/plugins/dynamic-plugins-info-backend/__fixtures__/data.ts index 4e996cf309..e2a8296a90 100644 --- a/plugins/dynamic-plugins-info-backend/__fixtures__/data.ts +++ b/plugins/dynamic-plugins-info-backend/__fixtures__/data.ts @@ -1,14 +1,5 @@ // BEGIN-NOSCAN export const plugins = [ - { - name: 'backstage-plugin-aap-backend-wrapped-dynamic', - version: '1.2.2-dynamic.0', - platform: 'node', - role: 'backend-plugin-module', - installer: { - kind: 'legacy', - }, - }, { name: 'backstage-plugin-argo-cd-backend-wrapped-dynamic', version: '2.11.3-dynamic.0', diff --git a/plugins/dynamic-plugins-info-backend/__fixtures__/expected_result.ts b/plugins/dynamic-plugins-info-backend/__fixtures__/expected_result.ts index 58f01367bc..d854f91e52 100644 --- a/plugins/dynamic-plugins-info-backend/__fixtures__/expected_result.ts +++ b/plugins/dynamic-plugins-info-backend/__fixtures__/expected_result.ts @@ -1,11 +1,5 @@ // BEGIN-NOSCAN export const expectedList = [ - { - name: 'backstage-plugin-aap-backend-wrapped-dynamic', - version: '1.2.2-dynamic.0', - platform: 'node', - role: 'backend-plugin-module', - }, { name: 'backstage-plugin-argo-cd-backend-wrapped-dynamic', version: '2.11.3-dynamic.0', diff --git a/plugins/dynamic-plugins-info/src/components/InternalPluginsMap.ts b/plugins/dynamic-plugins-info/src/components/InternalPluginsMap.ts index 01cf030d04..370a467be2 100644 --- a/plugins/dynamic-plugins-info/src/components/InternalPluginsMap.ts +++ b/plugins/dynamic-plugins-info/src/components/InternalPluginsMap.ts @@ -95,8 +95,6 @@ export const InternalPluginsMap: Record = { './dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic', 'backstage-community-plugin-scaffolder-backend-module-sonarqube-dynamic': '/dynamic-plugins/dist/backstage-community-plugin-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': './dynamic-plugins/dist/backstage-community-plugin-3scale-backend-dynamic', 'backstage-community-plugin-catalog-backend-module-keycloak-dynamic': diff --git a/yarn.lock b/yarn.lock index f6146957cf..d14fab6b6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10818,18 +10818,6 @@ __metadata: languageName: node linkType: hard -"@janus-idp/backstage-plugin-aap-backend@npm:2.2.0": - version: 2.2.0 - resolution: "@janus-idp/backstage-plugin-aap-backend@npm:2.2.0" - dependencies: - "@backstage/backend-plugin-api": ^1.0.1 - "@backstage/catalog-model": ^1.7.0 - "@backstage/errors": ^1.2.4 - "@backstage/plugin-catalog-node": ^1.13.1 - checksum: 40359b8caa03008bcbe565d7c6e04f23e6f569a1d0cb2790806ebf82ff1822dee5d5b29afcdc0957d42a31d9af1319c29d7c285f03b8fefda43ac64a084e6efe - languageName: node - linkType: hard - "@janus-idp/backstage-plugin-audit-log-node@npm:1.7.2, @janus-idp/backstage-plugin-audit-log-node@npm:^1.7.1": version: 1.7.2 resolution: "@janus-idp/backstage-plugin-audit-log-node@npm:1.7.2" @@ -32242,17 +32230,6 @@ __metadata: languageName: node linkType: hard -"janus-idp-backstage-plugin-aap-backend@workspace:dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic": - version: 0.0.0-use.local - resolution: "janus-idp-backstage-plugin-aap-backend@workspace:dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic" - dependencies: - "@backstage/cli": 0.29.5 - "@janus-idp/backstage-plugin-aap-backend": 2.2.0 - "@janus-idp/cli": 3.0.0 - typescript: 5.7.3 - languageName: unknown - linkType: soft - "javascript-natural-sort@npm:^0.7.1": version: 0.7.1 resolution: "javascript-natural-sort@npm:0.7.1"