diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index a978cee..5aaed20 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/package.json b/package.json index 07b6029..9b2f30d 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@backstage/catalog-model": "^1.7.5", "@backstage/config": "^1.3.4", "@backstage/plugin-catalog-common": "^1.1.5", - "@backstage/plugin-catalog-node": "^1.19.0", + "@backstage/plugin-catalog-node": "^2.2.3", "@rootly/backstage-plugin-common": "^1.4.0", "winston": "^3.18.3", "yn": "^5.1.0" diff --git a/yarn.lock b/yarn.lock index 4b7b4cd..b3dd94d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -552,15 +552,24 @@ __metadata: languageName: node linkType: hard -"@backstage/catalog-client@npm:^1.12.0": - version: 1.12.0 - resolution: "@backstage/catalog-client@npm:1.12.0" +"@backstage/backend-plugin-api@npm:^1.9.3": + version: 1.9.3 + resolution: "@backstage/backend-plugin-api@npm:1.9.3" dependencies: - "@backstage/catalog-model": "npm:^1.7.5" - "@backstage/errors": "npm:^1.2.7" - cross-fetch: "npm:^4.0.0" - uri-template: "npm:^2.0.0" - checksum: 10/fe771e73a690cbacb7dbfbbd3fa425736225556ee79c8e3644a4393d3c2711855ed891a077c68fa03a12caec1df05a64c749f01783e938b1149f74929626ccb9 + "@backstage/cli-common": "npm:^0.3.0" + "@backstage/config": "npm:^1.3.8" + "@backstage/errors": "npm:^1.3.1" + "@backstage/plugin-auth-node": "npm:^0.7.3" + "@backstage/plugin-permission-common": "npm:^0.9.9" + "@backstage/plugin-permission-node": "npm:^0.11.2" + "@backstage/types": "npm:^1.2.2" + "@types/express": "npm:^4.17.6" + "@types/json-schema": "npm:^7.0.6" + "@types/luxon": "npm:^3.0.0" + knex: "npm:^3.0.0" + luxon: "npm:^3.0.0" + zod: "npm:^3.25.76 || ^4.0.0" + checksum: 10/578530991f9ec6c35bc34ba5cb8037fe986d991717c2f62e18de2e17afc24e8355dbf370be18c8756e8067ca57b8a88849d6348e302bbccc749d594f451e777b languageName: node linkType: hard @@ -578,6 +587,21 @@ __metadata: languageName: node linkType: hard +"@backstage/catalog-client@npm:^1.16.1": + version: 1.16.1 + resolution: "@backstage/catalog-client@npm:1.16.1" + dependencies: + "@backstage/catalog-model": "npm:^1.9.0" + "@backstage/errors": "npm:^1.3.1" + "@backstage/filter-predicates": "npm:^0.1.4" + "@backstage/plugin-catalog-common": "npm:^1.1.10" + cross-fetch: "npm:^4.0.0" + lodash: "npm:^4.17.21" + uri-template: "npm:^2.0.0" + checksum: 10/7ecd7b38e71db7afbcde34ce7397a7e58681f28df78a1012a0200b73a381d99881f9a9a561f971b3fe4dc1a2e1075918ae3f292314e3ce94f3b3fe4afcf67d6a + languageName: node + linkType: hard + "@backstage/catalog-model@npm:^1.7.5, @backstage/catalog-model@npm:^1.9.0": version: 1.9.0 resolution: "@backstage/catalog-model@npm:1.9.0" @@ -1045,7 +1069,7 @@ __metadata: languageName: node linkType: hard -"@backstage/config@npm:^1.3.3, @backstage/config@npm:^1.3.4, @backstage/config@npm:^1.3.8": +"@backstage/config@npm:^1.3.4, @backstage/config@npm:^1.3.8": version: 1.3.8 resolution: "@backstage/config@npm:1.3.8" dependencies: @@ -1056,16 +1080,6 @@ __metadata: languageName: node linkType: hard -"@backstage/errors@npm:^1.2.7": - version: 1.2.7 - resolution: "@backstage/errors@npm:1.2.7" - dependencies: - "@backstage/types": "npm:^1.2.1" - serialize-error: "npm:^8.0.1" - checksum: 10/99bbe2cbb9f6672afe30bab02ab1cf48daa8e994fb0c5b9390075ebf9357d5f7d450b9ea889e908e2823ee47cbf5405432e32171d338653bebf1b5914b735c35 - languageName: node - linkType: hard - "@backstage/errors@npm:^1.3.1": version: 1.3.1 resolution: "@backstage/errors@npm:1.3.1" @@ -1099,6 +1113,19 @@ __metadata: languageName: node linkType: hard +"@backstage/filter-predicates@npm:^0.1.4": + version: 0.1.4 + resolution: "@backstage/filter-predicates@npm:0.1.4" + dependencies: + "@backstage/config": "npm:^1.3.8" + "@backstage/errors": "npm:^1.3.1" + "@backstage/types": "npm:^1.2.2" + zod: "npm:^3.25.76 || ^4.0.0" + zod-validation-error: "npm:^5.0.0" + checksum: 10/42445bd8cfdf8e329c34019d159058d6d0c38b5a58ba010287499f87aac3fd84c4fd43e7afd29b0fcfd6822cf8a7dbf6fc307a42e99057bb350a1d2b9b3db1d3 + languageName: node + linkType: hard + "@backstage/module-federation-common@npm:^0.1.4": version: 0.1.4 resolution: "@backstage/module-federation-common@npm:0.1.4" @@ -1124,35 +1151,35 @@ __metadata: languageName: node linkType: hard -"@backstage/plugin-auth-node@npm:^0.6.7": - version: 0.6.7 - resolution: "@backstage/plugin-auth-node@npm:0.6.7" +"@backstage/plugin-auth-node@npm:^0.7.1": + version: 0.7.1 + resolution: "@backstage/plugin-auth-node@npm:0.7.1" dependencies: - "@backstage/backend-plugin-api": "npm:^1.4.3" - "@backstage/catalog-client": "npm:^1.12.0" - "@backstage/catalog-model": "npm:^1.7.5" - "@backstage/config": "npm:^1.3.3" - "@backstage/errors": "npm:^1.2.7" + "@backstage/backend-plugin-api": "npm:^1.9.1" + "@backstage/catalog-client": "npm:^1.15.1" + "@backstage/catalog-model": "npm:^1.9.0" + "@backstage/config": "npm:^1.3.8" + "@backstage/errors": "npm:^1.3.1" "@backstage/types": "npm:^1.2.2" "@types/express": "npm:^4.17.6" "@types/passport": "npm:^1.0.3" - express: "npm:^4.17.1" + express: "npm:^4.22.0" jose: "npm:^5.0.0" lodash: "npm:^4.17.21" passport: "npm:^0.7.0" - zod: "npm:^3.22.4" - zod-to-json-schema: "npm:^3.21.4" - zod-validation-error: "npm:^3.4.0" - checksum: 10/f25ada64c900b7fd00f2088edb94f9fd35b306b9c754936a81b8c3c9d6f80e842e1f224648b7b8d39d84d75340a6c51afa2d9ec1bab8c0fac11cb84416177a1a + zod: "npm:^3.25.76 || ^4.0.0" + zod-to-json-schema: "npm:^3.25.1" + zod-validation-error: "npm:^4.0.2" + checksum: 10/e799d61a7b213d76a69d1214f26cfa36e7cbb528a65fbdc25b638a09cf411a9a2bee97ea7bd9665a2ca2ff124d7edec71780a5b1be8f0b8e6a4de492a5f88584 languageName: node linkType: hard -"@backstage/plugin-auth-node@npm:^0.7.1": - version: 0.7.1 - resolution: "@backstage/plugin-auth-node@npm:0.7.1" +"@backstage/plugin-auth-node@npm:^0.7.3": + version: 0.7.3 + resolution: "@backstage/plugin-auth-node@npm:0.7.3" dependencies: - "@backstage/backend-plugin-api": "npm:^1.9.1" - "@backstage/catalog-client": "npm:^1.15.1" + "@backstage/backend-plugin-api": "npm:^1.9.3" + "@backstage/catalog-client": "npm:^1.16.1" "@backstage/catalog-model": "npm:^1.9.0" "@backstage/config": "npm:^1.3.8" "@backstage/errors": "npm:^1.3.1" @@ -1165,12 +1192,12 @@ __metadata: passport: "npm:^0.7.0" zod: "npm:^3.25.76 || ^4.0.0" zod-to-json-schema: "npm:^3.25.1" - zod-validation-error: "npm:^4.0.2" - checksum: 10/e799d61a7b213d76a69d1214f26cfa36e7cbb528a65fbdc25b638a09cf411a9a2bee97ea7bd9665a2ca2ff124d7edec71780a5b1be8f0b8e6a4de492a5f88584 + zod-validation-error: "npm:^5.0.0" + checksum: 10/729d71af478d2da5e8254ee2cb2116df19f58be316776505b37707b7a490faff83f3fd4792779c1422ed59ccf159cb0ebb32f307d1064d0bd09d8d1d8e033474 languageName: node linkType: hard -"@backstage/plugin-catalog-common@npm:^1.1.5": +"@backstage/plugin-catalog-common@npm:^1.1.10, @backstage/plugin-catalog-common@npm:^1.1.5": version: 1.1.10 resolution: "@backstage/plugin-catalog-common@npm:1.1.10" dependencies: @@ -1181,36 +1208,27 @@ __metadata: languageName: node linkType: hard -"@backstage/plugin-catalog-node@npm:^1.19.0": - version: 1.19.0 - resolution: "@backstage/plugin-catalog-node@npm:1.19.0" +"@backstage/plugin-catalog-node@npm:^2.2.3": + version: 2.2.3 + resolution: "@backstage/plugin-catalog-node@npm:2.2.3" dependencies: - "@backstage/backend-plugin-api": "npm:^1.4.3" - "@backstage/catalog-client": "npm:^1.12.0" - "@backstage/catalog-model": "npm:^1.7.5" - "@backstage/errors": "npm:^1.2.7" - "@backstage/plugin-catalog-common": "npm:^1.1.5" - "@backstage/plugin-permission-common": "npm:^0.9.1" - "@backstage/plugin-permission-node": "npm:^0.10.4" + "@backstage/backend-plugin-api": "npm:^1.9.3" + "@backstage/catalog-client": "npm:^1.16.1" + "@backstage/catalog-model": "npm:^1.9.0" + "@backstage/errors": "npm:^1.3.1" + "@backstage/plugin-catalog-common": "npm:^1.1.10" + "@backstage/plugin-permission-common": "npm:^0.9.9" + "@backstage/plugin-permission-node": "npm:^0.11.2" "@backstage/types": "npm:^1.2.2" + "@opentelemetry/api": "npm:^1.9.0" lodash: "npm:^4.17.21" yaml: "npm:^2.0.0" - checksum: 10/4220ae095d3ad93f5df1d94aa1fed13bc2553a9f6c6747990910061f48a775f54c58e8c28a74e06dae0a40a15f3e9f3fa33259f825bf00a2cef45136750e9ac4 - languageName: node - linkType: hard - -"@backstage/plugin-permission-common@npm:^0.9.1": - version: 0.9.1 - resolution: "@backstage/plugin-permission-common@npm:0.9.1" - dependencies: - "@backstage/config": "npm:^1.3.3" - "@backstage/errors": "npm:^1.2.7" - "@backstage/types": "npm:^1.2.1" - cross-fetch: "npm:^4.0.0" - uuid: "npm:^11.0.0" - zod: "npm:^3.22.4" - zod-to-json-schema: "npm:^3.20.4" - checksum: 10/6ccd0ddab703ae65b73b91f345b6b60a7b87792328e5b38fcf626062f5cd5c12ab40fa405684a19066bd5107db95ca44d1884e757c67554fe0d98b0f43389f3b + peerDependencies: + "@backstage/backend-test-utils": ^1.11.5 + peerDependenciesMeta: + "@backstage/backend-test-utils": + optional: true + checksum: 10/e213a3a9c190cdd0f10b4abec7cebe3bc9dbf45c3e2ad3fd7c0379b07c92039dc56a377defc37a3a39720df23eed7c22f6e10d7e6b82e17d17c22df11ea47c76 languageName: node linkType: hard @@ -1228,29 +1246,28 @@ __metadata: languageName: node linkType: hard -"@backstage/plugin-permission-node@npm:^0.10.4": - version: 0.10.4 - resolution: "@backstage/plugin-permission-node@npm:0.10.4" +"@backstage/plugin-permission-node@npm:^0.11.0": + version: 0.11.0 + resolution: "@backstage/plugin-permission-node@npm:0.11.0" dependencies: - "@backstage/backend-plugin-api": "npm:^1.4.3" - "@backstage/config": "npm:^1.3.3" - "@backstage/errors": "npm:^1.2.7" - "@backstage/plugin-auth-node": "npm:^0.6.7" - "@backstage/plugin-permission-common": "npm:^0.9.1" + "@backstage/backend-plugin-api": "npm:^1.9.1" + "@backstage/config": "npm:^1.3.8" + "@backstage/errors": "npm:^1.3.1" + "@backstage/plugin-permission-common": "npm:^0.9.9" "@types/express": "npm:^4.17.6" - express: "npm:^4.17.1" + express: "npm:^4.22.0" express-promise-router: "npm:^4.1.0" - zod: "npm:^3.22.4" - zod-to-json-schema: "npm:^3.20.4" - checksum: 10/227ae0c7fa8c8cc94ce7c61d1a754bfdbba7563d94ea7cfc516b51f6ce771a45b3ec4fab48911813b54119055e6a62852370098d0257d44bce935f6a450b667c + zod: "npm:^3.25.76 || ^4.0.0" + zod-to-json-schema: "npm:^3.25.1" + checksum: 10/4376f5f41c31739e85ff4285fee6c361f04649a68eadadaa8e556a698909e48ad7f8c8eb6606a6ba4d721114bb217762c8dcc6ee95071021998f668a5bb30224 languageName: node linkType: hard -"@backstage/plugin-permission-node@npm:^0.11.0": - version: 0.11.0 - resolution: "@backstage/plugin-permission-node@npm:0.11.0" +"@backstage/plugin-permission-node@npm:^0.11.2": + version: 0.11.2 + resolution: "@backstage/plugin-permission-node@npm:0.11.2" dependencies: - "@backstage/backend-plugin-api": "npm:^1.9.1" + "@backstage/backend-plugin-api": "npm:^1.9.3" "@backstage/config": "npm:^1.3.8" "@backstage/errors": "npm:^1.3.1" "@backstage/plugin-permission-common": "npm:^0.9.9" @@ -1259,7 +1276,7 @@ __metadata: express-promise-router: "npm:^4.1.0" zod: "npm:^3.25.76 || ^4.0.0" zod-to-json-schema: "npm:^3.25.1" - checksum: 10/4376f5f41c31739e85ff4285fee6c361f04649a68eadadaa8e556a698909e48ad7f8c8eb6606a6ba4d721114bb217762c8dcc6ee95071021998f668a5bb30224 + checksum: 10/976668176dd9df5e423c4f9f24450b7e7e36ccea548aac7199788869e773adf06eb9974263df231410da9f91d9f276888bd8c54c1bfb50edb8912fa1ccec6769 languageName: node linkType: hard @@ -1280,13 +1297,6 @@ __metadata: languageName: node linkType: hard -"@backstage/types@npm:^1.2.1": - version: 1.2.1 - resolution: "@backstage/types@npm:1.2.1" - checksum: 10/e3e65835b9db31d3f697e2d62fbcf52a3a6373e9f75fa8429e61f0a455880d4c32cdf996b22e85165e1a5b108604267281624befebcf9ae692c8844675925f14 - languageName: node - linkType: hard - "@backstage/types@npm:^1.2.2": version: 1.2.2 resolution: "@backstage/types@npm:1.2.2" @@ -2716,6 +2726,13 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/api@npm:^1.9.0": + version: 1.9.1 + resolution: "@opentelemetry/api@npm:1.9.1" + checksum: 10/b26032739d3c54ca99b5a2920844a1fbd4c3ee383cacbb0915e8c706a2626fe91e96feaa6e893397abe0545dc8d0a765b220aa18a31b1773176eeaf3a225e10e + languageName: node + linkType: hard + "@peculiar/asn1-cms@npm:^2.6.0, @peculiar/asn1-cms@npm:^2.6.1": version: 2.6.1 resolution: "@peculiar/asn1-cms@npm:2.6.1" @@ -3206,7 +3223,7 @@ __metadata: "@backstage/cli-defaults": "npm:^0.1.4" "@backstage/config": "npm:^1.3.4" "@backstage/plugin-catalog-common": "npm:^1.1.5" - "@backstage/plugin-catalog-node": "npm:^1.19.0" + "@backstage/plugin-catalog-node": "npm:^2.2.3" "@jest/environment-jsdom-abstract": "npm:^30.4.1" "@rootly/backstage-plugin-common": "npm:^1.4.0" "@types/jest": "npm:^30.0.0" @@ -16952,15 +16969,6 @@ __metadata: languageName: node linkType: hard -"zod-to-json-schema@npm:^3.20.4, zod-to-json-schema@npm:^3.21.4": - version: 3.22.0 - resolution: "zod-to-json-schema@npm:3.22.0" - peerDependencies: - zod: ^3.22.4 - checksum: 10/d82c9457fd83cb6e6bf22b5bb7dfc1a5f289f1cf600c97788c34898bec3b749a53ef05cd6be828cf84fc6933139233d0f86b7d6cf5d8a0c9568c8fb2869a18ca - languageName: node - linkType: hard - "zod-to-json-schema@npm:^3.25.1": version: 3.25.2 resolution: "zod-to-json-schema@npm:3.25.2" @@ -16970,15 +16978,6 @@ __metadata: languageName: node linkType: hard -"zod-validation-error@npm:^3.4.0": - version: 3.4.0 - resolution: "zod-validation-error@npm:3.4.0" - peerDependencies: - zod: ^3.18.0 - checksum: 10/b98b1bbba14a3bb31649a1566c8c5a5213ec70dcaa2cbb1e89db00d56648a446225b35a8f6768471730d7013f4f141cd70c2b9740d69e6433ebfa148aecdac2f - languageName: node - linkType: hard - "zod-validation-error@npm:^4.0.2": version: 4.0.2 resolution: "zod-validation-error@npm:4.0.2" @@ -16997,13 +16996,6 @@ __metadata: languageName: node linkType: hard -"zod@npm:^3.22.4": - version: 3.22.4 - resolution: "zod@npm:3.22.4" - checksum: 10/73622ca36a916f785cf528fe612a884b3e0f183dbe6b33365a7d0fc92abdbedf7804c5e2bd8df0a278e1472106d46674281397a3dd800fa9031dc3429758c6ac - languageName: node - linkType: hard - "zod@npm:^3.25.76": version: 3.25.76 resolution: "zod@npm:3.25.76"