From aa5f94ac694944636e5145becc163a98291aaf59 Mon Sep 17 00:00:00 2001 From: William Siqueira Date: Fri, 28 Jun 2024 10:43:35 -0300 Subject: [PATCH] RHIDP-2339: Switch to upstream GitLab catalog providers with event support --- .../package.json | 7 +- yarn.lock | 238 +----------------- 2 files changed, 6 insertions(+), 239 deletions(-) diff --git a/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-gitlab-org-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-gitlab-org-dynamic/package.json index 6773527135..31e2bb3bee 100644 --- a/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-gitlab-org-dynamic/package.json +++ b/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-gitlab-org-dynamic/package.json @@ -27,11 +27,8 @@ "export-dynamic": "janus-cli package export-dynamic-plugin --embed-package @backstage/plugin-catalog-backend-module-gitlab --override-interop default --no-embed-as-dependencies" }, "dependencies": { - "@backstage/backend-common": "0.21.7", - "@backstage/backend-plugin-api": "0.6.17", - "@backstage/plugin-catalog-backend-module-gitlab": "0.3.16", - "@backstage/plugin-catalog-node": "^1.12.3", - "@backstage/plugin-events-node": "^0.3.7" + "@backstage/backend-common": "^0.22.0", + "@backstage/plugin-catalog-backend-module-gitlab": "0.3.16" }, "devDependencies": { "@backstage/cli": "0.26.4", diff --git a/yarn.lock b/yarn.lock index 545f6f5eb1..58aa716e7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4116,75 +4116,6 @@ yauzl "^3.0.0" yn "^4.0.0" -"@backstage/backend-common@^0.23.2": - version "0.23.2" - resolved "https://registry.yarnpkg.com/@backstage/backend-common/-/backend-common-0.23.2.tgz#d6374b5b8c4ebbedc58a2cd1560d0545231dda62" - integrity sha512-wCTvXvVxyCUJrHGoFGm941RWyxluzBOeuP4indoCtiJFngO0I0xsxkx7x1N/N9EVpi8/4gPzRhPEG8no3Dw2rQ== - dependencies: - "@aws-sdk/abort-controller" "^3.347.0" - "@aws-sdk/client-codecommit" "^3.350.0" - "@aws-sdk/client-s3" "^3.350.0" - "@aws-sdk/credential-providers" "^3.350.0" - "@aws-sdk/types" "^3.347.0" - "@backstage/backend-dev-utils" "^0.1.4" - "@backstage/backend-plugin-api" "^0.6.21" - "@backstage/cli-common" "^0.1.14" - "@backstage/config" "^1.2.0" - "@backstage/config-loader" "^1.8.1" - "@backstage/errors" "^1.2.4" - "@backstage/integration" "^1.12.0" - "@backstage/integration-aws-node" "^0.1.12" - "@backstage/plugin-auth-node" "^0.4.16" - "@backstage/types" "^1.1.1" - "@google-cloud/storage" "^7.0.0" - "@keyv/memcache" "^1.3.5" - "@keyv/redis" "^2.5.3" - "@kubernetes/client-node" "0.20.0" - "@manypkg/get-packages" "^1.1.3" - "@octokit/rest" "^19.0.3" - "@types/cors" "^2.8.6" - "@types/dockerode" "^3.3.0" - "@types/express" "^4.17.6" - "@types/luxon" "^3.0.0" - "@types/webpack-env" "^1.15.2" - archiver "^6.0.0" - base64-stream "^1.0.0" - compression "^1.7.4" - concat-stream "^2.0.0" - cors "^2.8.5" - dockerode "^4.0.0" - express "^4.17.1" - express-promise-router "^4.1.0" - fs-extra "^11.2.0" - git-url-parse "^14.0.0" - helmet "^6.0.0" - isomorphic-git "^1.23.0" - jose "^5.0.0" - keyv "^4.5.2" - knex "^3.0.0" - lodash "^4.17.21" - logform "^2.3.2" - luxon "^3.0.0" - minimatch "^9.0.0" - minimist "^1.2.5" - morgan "^1.10.0" - mysql2 "^3.0.0" - node-fetch "^2.6.7" - node-forge "^1.3.1" - p-limit "^3.1.0" - path-to-regexp "^6.2.1" - pg "^8.11.3" - raw-body "^2.4.1" - selfsigned "^2.0.0" - stoppable "^1.1.0" - tar "^6.1.12" - triple-beam "^1.4.1" - uuid "^9.0.0" - winston "^3.2.1" - winston-transport "^4.5.0" - yauzl "^3.0.0" - yn "^4.0.0" - "@backstage/backend-defaults@0.2.17": version "0.2.17" resolved "https://registry.yarnpkg.com/@backstage/backend-defaults/-/backend-defaults-0.2.17.tgz#cbb2b7e0ac2c9b340513e38d762f7bc2d06e0ce0" @@ -4439,23 +4370,6 @@ express "^4.17.1" knex "^3.0.0" -"@backstage/backend-plugin-api@^0.6.21": - version "0.6.21" - resolved "https://registry.yarnpkg.com/@backstage/backend-plugin-api/-/backend-plugin-api-0.6.21.tgz#0d1b9222a8e69cfd500a0789edaff7d14a77dffe" - integrity sha512-Cek3jgJmUY6oGDAYd7o/M6fezSnOIHzCBEsJHeE4vakdZ2vYOGVWPGIQmWSylEhK/oEL54JUslB5VjHo1onL9A== - dependencies: - "@backstage/cli-common" "^0.1.14" - "@backstage/config" "^1.2.0" - "@backstage/errors" "^1.2.4" - "@backstage/plugin-auth-node" "^0.4.16" - "@backstage/plugin-permission-common" "^0.7.14" - "@backstage/types" "^1.1.1" - "@types/express" "^4.17.6" - "@types/luxon" "^3.0.0" - express "^4.17.1" - knex "^3.0.0" - luxon "^3.0.0" - "@backstage/backend-tasks@^0.5.15", "@backstage/backend-tasks@^0.5.18", "@backstage/backend-tasks@^0.5.21": version "0.5.21" resolved "https://registry.npmjs.org/@backstage/backend-tasks/-/backend-tasks-0.5.21.tgz#5f8c76f903bfd782f7c9099a19b8ca34f540f8ca" @@ -4592,11 +4506,6 @@ resolved "https://registry.yarnpkg.com/@backstage/cli-common/-/cli-common-0.1.13.tgz#cbeda6a359ca4437fc782f0ac51bb957e8d49e73" integrity sha512-UMgNAIJSeEPSMkzxiWCP8aFR8APsG21XczDnzwHdL/41F7g2C+KA6UeQc/3tzbe8XQo+PxbNLpReZeKSSnSPSQ== -"@backstage/cli-common@^0.1.14": - version "0.1.14" - resolved "https://registry.yarnpkg.com/@backstage/cli-common/-/cli-common-0.1.14.tgz#2291520acfbac860a05dd48fc3b876d5cd789b76" - integrity sha512-4kGWGrFuxoaCne2aHCOVW+vi8y2MLEMEj785SEApMG2J8jXJXUuIOzWw0MrN0pM1FqBXDb6aeQd+bmQMK/Ci+w== - "@backstage/cli-node@0.2.5", "@backstage/cli-node@^0.2.5": version "0.2.5" resolved "https://registry.yarnpkg.com/@backstage/cli-node/-/cli-node-0.2.5.tgz#553257a70cb7bc5c8097ed0c801eb87295164771" @@ -4786,28 +4695,6 @@ typescript-json-schema "^0.63.0" yaml "^2.0.0" -"@backstage/config-loader@^1.8.1": - version "1.8.1" - resolved "https://registry.yarnpkg.com/@backstage/config-loader/-/config-loader-1.8.1.tgz#4383309ffe0488fa6c9dac33f3bec96181750e42" - integrity sha512-oPT+TZK1ppBjQXgOJ+pfsfE/Lov596WlBc5po9wElgnbQ720OsyAmystLKecvZ1HAjC/IGLKrPZMh9OAy/k36Q== - dependencies: - "@backstage/cli-common" "^0.1.14" - "@backstage/config" "^1.2.0" - "@backstage/errors" "^1.2.4" - "@backstage/types" "^1.1.1" - "@types/json-schema" "^7.0.6" - ajv "^8.10.0" - chokidar "^3.5.2" - fs-extra "^11.2.0" - json-schema "^0.4.0" - json-schema-merge-allof "^0.8.1" - json-schema-traverse "^1.0.0" - lodash "^4.17.21" - minimist "^1.2.5" - node-fetch "^2.6.7" - typescript-json-schema "^0.63.0" - yaml "^2.0.0" - "@backstage/config@1.2.0", "@backstage/config@^1.1.1", "@backstage/config@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@backstage/config/-/config-1.2.0.tgz#6a4d93197d0586ee3a40f9e4877c5cfd76c128f3" @@ -5223,21 +5110,6 @@ lodash "^4.17.21" luxon "^3.0.0" -"@backstage/integration@^1.12.0": - version "1.12.0" - resolved "https://registry.yarnpkg.com/@backstage/integration/-/integration-1.12.0.tgz#3e65aae7984dfc85de5a42140b8a581d76656459" - integrity sha512-4MpRYuV+IkzZ+BzMIkmtxR1YyhidIq7+JccqXXhorI8BoAQLUmTZqlryTh9uiWIwY4u/GrIUIvZ81fPVxALjCQ== - dependencies: - "@azure/identity" "^4.0.0" - "@backstage/config" "^1.2.0" - "@backstage/errors" "^1.2.4" - "@octokit/auth-app" "^4.0.0" - "@octokit/rest" "^19.0.3" - cross-fetch "^4.0.0" - git-url-parse "^14.0.0" - lodash "^4.17.21" - luxon "^3.0.0" - "@backstage/integration@^1.7.0", "@backstage/integration@^1.8.0", "@backstage/integration@^1.9.0", "@backstage/integration@^1.9.1": version "1.9.1" resolved "https://registry.yarnpkg.com/@backstage/integration/-/integration-1.9.1.tgz#31d98720383792a2bfd633274da7d1b49f9f49c4" @@ -5641,29 +5513,6 @@ zod "^3.22.4" zod-to-json-schema "^3.21.4" -"@backstage/plugin-auth-node@^0.4.16": - version "0.4.16" - resolved "https://registry.yarnpkg.com/@backstage/plugin-auth-node/-/plugin-auth-node-0.4.16.tgz#06409aa6b132c4415eb4390b95edf8f671450175" - integrity sha512-U687eLZ2fjvweR7861OB5h4E8xZSEOdvaOZeRKAFQ/Evh+KdsqCkmxHdNvS006ghG0+K9dXwjSFDQqz35StgyQ== - dependencies: - "@backstage/backend-common" "^0.23.2" - "@backstage/backend-plugin-api" "^0.6.21" - "@backstage/catalog-client" "^1.6.5" - "@backstage/catalog-model" "^1.5.0" - "@backstage/config" "^1.2.0" - "@backstage/errors" "^1.2.4" - "@backstage/types" "^1.1.1" - "@types/express" "*" - "@types/passport" "^1.0.3" - express "^4.17.1" - jose "^5.0.0" - lodash "^4.17.21" - node-fetch "^2.6.7" - passport "^0.7.0" - winston "^3.2.1" - zod "^3.22.4" - zod-to-json-schema "^3.21.4" - "@backstage/plugin-auth-react@^0.1.0": version "0.1.1" resolved "https://registry.yarnpkg.com/@backstage/plugin-auth-react/-/plugin-auth-react-0.1.1.tgz#8307b83c6d1958c2a0c790bed5d9d9c3f6598670" @@ -5965,15 +5814,6 @@ "@backstage/plugin-permission-common" "^0.7.13" "@backstage/plugin-search-common" "^1.2.11" -"@backstage/plugin-catalog-common@^1.0.24": - version "1.0.24" - resolved "https://registry.yarnpkg.com/@backstage/plugin-catalog-common/-/plugin-catalog-common-1.0.24.tgz#022c408b0e8c6b55e89779c6f4fef5f09e9f8e89" - integrity sha512-LozPOa/HgDdobb4/p54W02+exZfuu0tIdKs3OCdvcd8xRh4Y30Qxqpi/kGwsSXCLCBNZv3ffNRuzmYe58VlX/w== - dependencies: - "@backstage/catalog-model" "^1.5.0" - "@backstage/plugin-permission-common" "^0.7.14" - "@backstage/plugin-search-common" "^1.2.12" - "@backstage/plugin-catalog-graph@0.4.4": version "0.4.4" resolved "https://registry.yarnpkg.com/@backstage/plugin-catalog-graph/-/plugin-catalog-graph-0.4.4.tgz#ff26dcec8ae437d07bbdc98093aa52503fe2a1b1" @@ -6068,20 +5908,6 @@ "@backstage/plugin-permission-node" "^0.7.29" "@backstage/types" "^1.1.1" -"@backstage/plugin-catalog-node@^1.12.3": - version "1.12.3" - resolved "https://registry.yarnpkg.com/@backstage/plugin-catalog-node/-/plugin-catalog-node-1.12.3.tgz#1a25c5f9ddf84d0d63881172a3edfdaae494c4e3" - integrity sha512-ovPF32JtyYzs53N8WLisH9nzYRZNOcSV3nIaql69BzfX8hyfnh7kPdSfxWsSYJANHIyL5z27kUHSAoFxq/tZnQ== - dependencies: - "@backstage/backend-plugin-api" "^0.6.21" - "@backstage/catalog-client" "^1.6.5" - "@backstage/catalog-model" "^1.5.0" - "@backstage/errors" "^1.2.4" - "@backstage/plugin-catalog-common" "^1.0.24" - "@backstage/plugin-permission-common" "^0.7.14" - "@backstage/plugin-permission-node" "^0.7.32" - "@backstage/types" "^1.1.1" - "@backstage/plugin-catalog-react@1.11.3", "@backstage/plugin-catalog-react@^1.11.3": version "1.11.3" resolved "https://registry.yarnpkg.com/@backstage/plugin-catalog-react/-/plugin-catalog-react-1.11.3.tgz#e83948f3c921791066499d30ef487a9f4ce5964b" @@ -6245,13 +6071,6 @@ dependencies: "@backstage/backend-plugin-api" "^0.6.18" -"@backstage/plugin-events-node@^0.3.7": - version "0.3.7" - resolved "https://registry.yarnpkg.com/@backstage/plugin-events-node/-/plugin-events-node-0.3.7.tgz#c97d3d5fa4dbd003d8db20de837729d70d0278e4" - integrity sha512-rjehJ8uBrU5oe1wXgLQ71CO34aNSqRTlbkc2SgSYLgrDLqk/tOjUo36M1HOHZODLokqndu20PSxXM3SfUQMEOg== - dependencies: - "@backstage/backend-plugin-api" "^0.6.21" - "@backstage/plugin-home-react@^0.1.12": version "0.1.12" resolved "https://registry.yarnpkg.com/@backstage/plugin-home-react/-/plugin-home-react-0.1.12.tgz#414997aa79e1c98e208233aab1e71eb5e8f81b55" @@ -6548,23 +6367,6 @@ zod "^3.22.4" zod-to-json-schema "^3.20.4" -"@backstage/plugin-permission-node@^0.7.32": - version "0.7.32" - resolved "https://registry.yarnpkg.com/@backstage/plugin-permission-node/-/plugin-permission-node-0.7.32.tgz#e462a4c8d6d8021ae5d8ff64bec84e176641fd77" - integrity sha512-jNKa2sNcQdbcQiGM8gdQa7SsX7SSAGmSUfLoD3F1BF9Hs18c90Mb1v1RFIcXfslHzzUVSLNFguRpZKZ+Mg0CPw== - dependencies: - "@backstage/backend-common" "^0.23.2" - "@backstage/backend-plugin-api" "^0.6.21" - "@backstage/config" "^1.2.0" - "@backstage/errors" "^1.2.4" - "@backstage/plugin-auth-node" "^0.4.16" - "@backstage/plugin-permission-common" "^0.7.14" - "@types/express" "^4.17.6" - express "^4.17.1" - express-promise-router "^4.1.0" - zod "^3.22.4" - zod-to-json-schema "^3.20.4" - "@backstage/plugin-permission-react@0.4.22", "@backstage/plugin-permission-react@^0.4.22": version "0.4.22" resolved "https://registry.yarnpkg.com/@backstage/plugin-permission-react/-/plugin-permission-react-0.4.22.tgz#7a6d60a7ada0748ca7c23ccba64b1afc7b33045c" @@ -7209,14 +7011,6 @@ "@backstage/plugin-permission-common" "^0.7.13" "@backstage/types" "^1.1.1" -"@backstage/plugin-search-common@^1.2.12": - version "1.2.12" - resolved "https://registry.yarnpkg.com/@backstage/plugin-search-common/-/plugin-search-common-1.2.12.tgz#0575788183ad7a66d6496e2ba765ee11bada4f2d" - integrity sha512-tjRhkgUYenK+dr+PHiS6pnXASGEVmxqjgoWfYoVNlKcwrXYHbddDoUJ1n51P/urhHqGGiz9zJyt8og+gN+TNaQ== - dependencies: - "@backstage/plugin-permission-common" "^0.7.14" - "@backstage/types" "^1.1.1" - "@backstage/plugin-search-react@1.7.10", "@backstage/plugin-search-react@^1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@backstage/plugin-search-react/-/plugin-search-react-1.7.10.tgz#bdbf7e4d60f0561d1bd794d7585e0cb1621caba6" @@ -14057,14 +13851,7 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb" integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== -"@types/react-dom@18.3.0": - version "18.3.0" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.0.tgz#0cbc818755d87066ab6ca74fbedb2547d74a82b0" - integrity sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg== - dependencies: - "@types/react" "*" - -"@types/react-dom@^18.0.0": +"@types/react-dom@18.2.18", "@types/react-dom@18.3.0", "@types/react-dom@^18.0.0": version "18.2.18" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.18.tgz#16946e6cd43971256d874bc3d0a72074bb8571dd" integrity sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw== @@ -14102,7 +13889,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^16.13.1 || ^17.0.0 || ^18.0.0": +"@types/react@*", "@types/react@18.2.48", "@types/react@18.3.3", "@types/react@^16.13.1 || ^17.0.0", "@types/react@^16.13.1 || ^17.0.0 || ^18.0.0": version "18.2.48" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.48.tgz#11df5664642d0bd879c1f58bc1d37205b064e8f1" integrity sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w== @@ -14111,23 +13898,6 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@18.3.3": - version "18.3.3" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f" - integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw== - dependencies: - "@types/prop-types" "*" - csstype "^3.0.2" - -"@types/react@^16.13.1 || ^17.0.0": - version "17.0.80" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.80.tgz#a5dfc351d6a41257eb592d73d3a85d3b7dbcbb41" - integrity sha512-LrgHIu2lEtIo8M7d1FcI3BdwXWoRQwMoXOZ7+dPTW0lYREjmlHl3P0U1VD0i/9tppOuv8/sam7sOjx34TxSFbA== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "^0.16" - csstype "^3.0.2" - "@types/request@^2.47.1", "@types/request@^2.48.8": version "2.48.12" resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.12.tgz#0f590f615a10f87da18e9790ac94c29ec4c5ef30" @@ -14165,7 +13935,7 @@ resolved "https://registry.yarnpkg.com/@types/sarif/-/sarif-2.1.7.tgz#dab4d16ba7568e9846c454a8764f33c5d98e5524" integrity sha512-kRz0VEkJqWLf1LLVN4pT1cg1Z9wAuvI6L97V3m2f5B76Tg8d413ddvLBPTEHAZJlnn4XSvu0FkZtViCQGVyrXQ== -"@types/scheduler@*", "@types/scheduler@^0.16": +"@types/scheduler@*": version "0.16.8" resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff" integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A== @@ -29405,7 +29175,7 @@ trim-right@^1.0.1: resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw== -triple-beam@^1.3.0, triple-beam@^1.4.1: +triple-beam@^1.3.0: version "1.4.1" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984" integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==