Skip to content

Commit

Permalink
Merge pull request #28 from johanneswuerbach/bump-humanitec-plugin
Browse files Browse the repository at this point in the history 
chore: update humanitec plugin with new backend system
  • Loading branch information
@johanneswuerbach
johanneswuerbach authored May 7, 2024
2 parents 13e110a + 54abca1 commit 407c72e
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 76 deletions.
3 changes: 2 additions & 1 deletion packages/backend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
"@backstage/plugin-search-backend-module-techdocs": "^0.1.22",
"@backstage/plugin-search-backend-node": "^1.2.21",
"@backstage/plugin-techdocs-backend": "^1.10.4",
"@humanitec/backstage-plugin-backend": "^0.5.1",
"@humanitec/backstage-plugin-backend": "^0.6.0",
"@humanitec/backstage-plugin-scaffolder-backend-module": "^0.1.0",
"app": "link:../app",
"better-sqlite3": "^9.0.0",
"dockerode": "^3.3.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/backend/src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/

import { createBackend } from '@backstage/backend-defaults';
import { legacyPlugin } from '@backstage/backend-common';

const backend = createBackend();

Expand Down Expand Up @@ -40,6 +39,7 @@ backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha'));
backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));

// humanitec
backend.add(legacyPlugin('humanitec', import('./plugins/humanitec')));
backend.add(import('@humanitec/backstage-plugin-backend'));
backend.add(import('@humanitec/backstage-plugin-scaffolder-backend-module'));

backend.start();
12 changes: 0 additions & 12 deletions packages/backend/src/plugins/humanitec.ts
View file

This file was deleted.

98 changes: 37 additions & 61 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@
winston "^3.2.1"
winston-transport "^4.5.0"

"@backstage/backend-common@^0.21.7":
"@backstage/backend-common@^0.21.3", "@backstage/backend-common@^0.21.7":
version "0.21.7"
resolved "https://registry.yarnpkg.com/@backstage/backend-common/-/backend-common-0.21.7.tgz#5ae796d8adccebc484edeeb2326464c28e14849e"
integrity sha512-wWpnjLYxEstFnAherkfwZIlAazdu1dfJ/5KjK1aSeMZYGyRWcelegs+Dz9MLZ53e/5qtSJ5+caltNfiItda86w==
Expand Down Expand Up @@ -2320,7 +2320,7 @@
openapi-merge "^1.3.2"
openapi3-ts "^3.1.2"

"@backstage/backend-plugin-api@^0.6.17":
"@backstage/backend-plugin-api@^0.6.13", "@backstage/backend-plugin-api@^0.6.17":
version "0.6.17"
resolved "https://registry.yarnpkg.com/@backstage/backend-plugin-api/-/backend-plugin-api-0.6.17.tgz#3d00b167cccb36e2341ae5cc4026352904938322"
integrity sha512-eEYNM09SHlB3kjmcJSoVNK4D7HSBVbvv3ZCeSbRBeVRBOpW6ndw25iejT5CeAQE6N1NVTTaQ3g3UTIoXyIhahA==
Expand Down Expand Up @@ -2363,7 +2363,7 @@
cross-fetch "^4.0.0"
uri-template "^2.0.0"

"@backstage/catalog-model@^1.4.5":
"@backstage/catalog-model@^1.4.4", "@backstage/catalog-model@^1.4.5":
version "1.4.5"
resolved "https://registry.yarnpkg.com/@backstage/catalog-model/-/catalog-model-1.4.5.tgz#b8f6309ff12b72dffdfe852d615c553ae13452c0"
integrity sha512-I4QOCy0pSXJikQWgC8MWj2zDRCgQnnmvnNOOnPFcg7hIIIzeV0sGp6d3Qi7bc2tvzXt3fT3biSOCgGOWi1IJKA==
Expand Down Expand Up @@ -2734,7 +2734,7 @@
"@material-ui/icons" "^4.9.1"
"@types/react" "^16.13.1 || ^17.0.0"

"@backstage/integration@^1.10.0":
"@backstage/integration@^1.10.0", "@backstage/integration@^1.9.0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@backstage/integration/-/integration-1.10.0.tgz#81f37dcb506a4c6febaf9b3be88b5c4d2a40e6ec"
integrity sha512-OSXo6yHKl8kZ2xKAk7CM8d3jfWuoRXjhg1oOxxLq0t2CNzCRfD8f8swCFKs3PJl0HDygwf/vFjTsbP7UXlAtkA==
Expand Down Expand Up @@ -3561,67 +3561,34 @@
zen-observable "^0.10.0"
zod "^3.22.4"

"@backstage/plugin-scaffolder-backend@^1.22.5":
version "1.22.5"
resolved "https://registry.yarnpkg.com/@backstage/plugin-scaffolder-backend/-/plugin-scaffolder-backend-1.22.5.tgz#db81592e28ff1399742fc15f50187fab8729d97c"
integrity sha512-HJ9FxafG4di0tq9MZsnNoh4aY5pzLUfsE8JJiQvzEEO2geOozhs3BFEHfQ/x6wCJuleUq9FPLX4+ymmLgTIgQw==
"@backstage/plugin-scaffolder-common@^1.5.0", "@backstage/plugin-scaffolder-common@^1.5.1":
version "1.5.1"
resolved "https://registry.yarnpkg.com/@backstage/plugin-scaffolder-common/-/plugin-scaffolder-common-1.5.1.tgz#cd79c2b222ae03a6906f1599d71c1ef385710f57"
integrity sha512-4ULWyWb7U8N4iUP6LR7SleS1G3pmMkeAvZ/u2OFWyWp1kU2Mgx+SfskZDYNgVb8T4viNlU6nKlsYCkcOSrf4Hw==
dependencies:
"@backstage/backend-common" "^0.21.7"
"@backstage/backend-plugin-api" "^0.6.17"
"@backstage/backend-tasks" "^0.5.22"
"@backstage/catalog-client" "^1.6.4"
"@backstage/catalog-model" "^1.4.5"
"@backstage/config" "^1.2.0"
"@backstage/errors" "^1.2.4"
"@backstage/integration" "^1.10.0"
"@backstage/plugin-auth-node" "^0.4.12"
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model" "^0.1.15"
"@backstage/plugin-catalog-node" "^1.11.1"
"@backstage/plugin-permission-common" "^0.7.13"
"@backstage/plugin-permission-node" "^0.7.28"
"@backstage/plugin-scaffolder-backend-module-azure" "^0.1.9"
"@backstage/plugin-scaffolder-backend-module-bitbucket" "^0.2.7"
"@backstage/plugin-scaffolder-backend-module-bitbucket-cloud" "^0.1.7"
"@backstage/plugin-scaffolder-backend-module-bitbucket-server" "^0.1.7"
"@backstage/plugin-scaffolder-backend-module-gerrit" "^0.1.9"
"@backstage/plugin-scaffolder-backend-module-gitea" "^0.1.7"
"@backstage/plugin-scaffolder-backend-module-github" "^0.2.7"
"@backstage/plugin-scaffolder-backend-module-gitlab" "^0.3.3"
"@backstage/plugin-scaffolder-common" "^1.5.1"
"@backstage/plugin-scaffolder-node" "^0.4.3"
"@backstage/types" "^1.1.1"
"@types/express" "^4.17.6"
"@types/luxon" "^3.0.0"
express "^4.17.1"
express-promise-router "^4.1.0"

"@backstage/plugin-scaffolder-node@^0.3.3":
version "0.3.3"
resolved "https://registry.yarnpkg.com/@backstage/plugin-scaffolder-node/-/plugin-scaffolder-node-0.3.3.tgz#debce42879e6e8bc0235a856d3dbdbedb0108296"
integrity sha512-+g6FDcog99AkVp1RQwF8XowjDSU/cjHSawVi9kIB8b34CUJNDSX2IISjmK55BUiSpoTrJy73h1fUp8CcMiCxiQ==
dependencies:
"@backstage/backend-common" "^0.21.3"
"@backstage/backend-plugin-api" "^0.6.13"
"@backstage/catalog-model" "^1.4.4"
"@backstage/errors" "^1.2.3"
"@backstage/integration" "^1.9.0"
"@backstage/plugin-scaffolder-common" "^1.5.0"
"@backstage/types" "^1.1.1"
fs-extra "^11.2.0"
globby "^11.0.0"
isbinaryfile "^5.0.0"
isolated-vm "^4.5.0"
jsonschema "^1.2.6"
knex "^3.0.0"
lodash "^4.17.21"
logform "^2.3.2"
luxon "^3.0.0"
nunjucks "^3.2.3"
p-limit "^3.1.0"
p-queue "^6.6.2"
prom-client "^15.0.0"
uuid "^9.0.0"
winston "^3.2.1"
winston-transport "^4.7.0"
yaml "^2.0.0"
zen-observable "^0.10.0"
zod "^3.22.4"

"@backstage/plugin-scaffolder-common@^1.5.1":
version "1.5.1"
resolved "https://registry.yarnpkg.com/@backstage/plugin-scaffolder-common/-/plugin-scaffolder-common-1.5.1.tgz#cd79c2b222ae03a6906f1599d71c1ef385710f57"
integrity sha512-4ULWyWb7U8N4iUP6LR7SleS1G3pmMkeAvZ/u2OFWyWp1kU2Mgx+SfskZDYNgVb8T4viNlU6nKlsYCkcOSrf4Hw==
dependencies:
"@backstage/catalog-model" "^1.4.5"
"@backstage/plugin-permission-common" "^0.7.13"
"@backstage/types" "^1.1.1"
zod-to-json-schema "^3.20.4"

"@backstage/plugin-scaffolder-node@^0.4.3":
version "0.4.3"
Expand Down Expand Up @@ -4898,20 +4865,19 @@
"@tanstack/react-virtual" "^3.0.0-beta.60"
client-only "^0.0.1"

"@humanitec/backstage-plugin-backend@^0.5.1":
version "0.5.1"
resolved "https://registry.yarnpkg.com/@humanitec/backstage-plugin-backend/-/backstage-plugin-backend-0.5.1.tgz#e3d97a510500c48b6b36f0441365ecc72dad38cb"
integrity sha512-Lb0nSFBkOTgtv/+2TqbCtM1B02APBSda7qyfjC27mKsW8ysdHpFvaMUvoZKmLz//QCCyt4qMVdWIqKMhRatuzg==
"@humanitec/backstage-plugin-backend@^0.6.0":
version "0.6.0"
resolved "https://registry.yarnpkg.com/@humanitec/backstage-plugin-backend/-/backstage-plugin-backend-0.6.0.tgz#6fcaf827a30972089d3ab2b64ac2868ed5c61e6e"
integrity sha512-IoZTsWQgA8DFzETjIZiZlySxdizl8wF2DWZQyzdFtMd0mlaCsSBtFijE3poIUCK7Jerfem5MXMq998nRM2FE+Q==
dependencies:
"@backstage/backend-common" "^0.21.7"
"@backstage/backend-plugin-api" "^0.6.17"
"@backstage/config" "^1.2.0"
"@backstage/plugin-scaffolder-backend" "^1.22.5"
"@humanitec/backstage-plugin-common" "^0.5.1"
"@types/express" "*"
cross-fetch "^4.0.0"
express "^4.17.1"
express-promise-router "^4.1.0"
js-yaml "^4.1.0"
node-fetch "^2.6.7"
winston "^3.2.1"
yn "^4.0.0"
Expand All @@ -4925,6 +4891,16 @@
exponential-backoff "^3.1.0"
zod "^3.17.3"

"@humanitec/backstage-plugin-scaffolder-backend-module@^0.1.0":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@humanitec/backstage-plugin-scaffolder-backend-module/-/backstage-plugin-scaffolder-backend-module-0.1.0.tgz#243370bf96f225ae60f63ff4ecec30acdf9d685d"
integrity sha512-MS+WcoAaRM4tMvUFeKHmjaTJRTDk07GHQX4+PRaQnynrAFz0mtwuy6bdgX+LJKFlVzqBUegGLROCqdtmC6ZWpw==
dependencies:
"@backstage/backend-plugin-api" "^0.6.17"
"@backstage/plugin-scaffolder-node" "^0.3.3"
"@humanitec/backstage-plugin-common" "^0.5.1"
js-yaml "^4.1.0"

"@humanitec/backstage-plugin@^0.5.1":
version "0.5.1"
resolved "https://registry.yarnpkg.com/@humanitec/backstage-plugin/-/backstage-plugin-0.5.1.tgz#be99d69ff0525d0bd45b93325b8b7c7cd219aed6"
Expand Down

0 comments on commit 407c72e

Please sign in to comment.