From 6968b65ba1b710e21f98f41c8652a56d8bd75654 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 16 May 2022 12:45:24 +0000 Subject: [PATCH 01/16] fix(deps): update dependency @react-hookz/web to v14 Signed-off-by: Renovate Bot --- .changeset/renovate-ad175cc.md | 7 +++++++ packages/core-components/package.json | 2 +- plugins/gcp-projects/package.json | 2 +- .../techdocs-module-addons-contrib/package.json | 2 +- yarn.lock | 14 +++++++++++++- 5 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 .changeset/renovate-ad175cc.md diff --git a/.changeset/renovate-ad175cc.md b/.changeset/renovate-ad175cc.md new file mode 100644 index 0000000000..72e278146e --- /dev/null +++ b/.changeset/renovate-ad175cc.md @@ -0,0 +1,7 @@ +--- +'@backstage/core-components': patch +'@backstage/plugin-gcp-projects': patch +'@backstage/plugin-techdocs-module-addons-contrib': patch +--- + +Updated dependency `@react-hookz/web` to `^14.0.0`. diff --git a/packages/core-components/package.json b/packages/core-components/package.json index e2f05aff2d..04690bdc0e 100644 --- a/packages/core-components/package.json +++ b/packages/core-components/package.json @@ -65,7 +65,7 @@ "react-syntax-highlighter": "^15.4.5", "react-text-truncate": "^0.18.0", "react-use": "^17.3.2", - "@react-hookz/web": "^13.0.0", + "@react-hookz/web": "^14.0.0", "react-virtualized-auto-sizer": "^1.0.6", "react-window": "^1.8.6", "remark-gfm": "^3.0.1", diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json index aff29d7e07..8adbb389ea 100644 --- a/plugins/gcp-projects/package.json +++ b/plugins/gcp-projects/package.json @@ -40,7 +40,7 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", - "@react-hookz/web": "^13.0.0", + "@react-hookz/web": "^14.0.0", "react-router-dom": "6.0.0-beta.0" }, "peerDependencies": { diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json index 074d12a505..41f6366a97 100644 --- a/plugins/techdocs-module-addons-contrib/package.json +++ b/plugins/techdocs-module-addons-contrib/package.json @@ -43,7 +43,7 @@ "@material-ui/core": "^4.9.13", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", - "@react-hookz/web": "^13.0.0", + "@react-hookz/web": "^14.0.0", "git-url-parse": "^11.6.0", "react-use": "^17.2.4" }, diff --git a/yarn.lock b/yarn.lock index 6ec8648cac..871d204840 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4906,6 +4906,11 @@ resolved "https://registry.npmjs.org/@react-hookz/deep-equal/-/deep-equal-1.0.1.tgz#1e9aad97b964879b54a3909f36f0727befa13e1f" integrity sha512-6k/pU2jNlgYvKOy84vpCAZ8MGVwybvAdjzrh4UicCVOCPxz0LSBws1OE6O5TO4sPHaSw+yLfNzNK8RicGFc1Kw== +"@react-hookz/deep-equal@^1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/@react-hookz/deep-equal/-/deep-equal-1.0.2.tgz#4e8bdeda027379dcf8b62a42e5f75f0351b11b35" + integrity sha512-cM5kPFb6EFH5q52WzRxfRX9+8g5kq78McWOYs6e1seo+nK6NpfLupT5uOCIJp37jU8ayd4Su8ni3HRFTN2C2kg== + "@react-hookz/web@^13.0.0": version "13.3.0" resolved "https://registry.npmjs.org/@react-hookz/web/-/web-13.3.0.tgz#257e31049e92a121912fe1e67bdd01dbec5a203b" @@ -4913,6 +4918,13 @@ dependencies: "@react-hookz/deep-equal" "^1.0.1" +"@react-hookz/web@^14.0.0": + version "14.2.2" + resolved "https://registry.npmjs.org/@react-hookz/web/-/web-14.2.2.tgz#eee0085f954e5b62d0a6c5b20d8786c28abfb9ad" + integrity sha512-6FeZHKV3FFOYnbSJMkkqXDoMuIX0HEFJlDF4LpHR7RsA3zrH2xzhtF8nSYZ+pG6fDIqYKID9yQuILFmbAWaqCQ== + dependencies: + "@react-hookz/deep-equal" "^1.0.2" + "@repeaterjs/repeater@^3.0.4": version "3.0.4" resolved "https://registry.npmjs.org/@repeaterjs/repeater/-/repeater-3.0.4.tgz#a04d63f4d1bf5540a41b01a921c9a7fddc3bd1ca" @@ -13485,7 +13497,7 @@ graphql-type-json@^0.3.2: resolved "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.2.tgz#f53a851dbfe07bd1c8157d24150064baab41e115" integrity sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg== -graphql-ws@5.5.5, graphql-ws@^5.4.1: +graphql-ws@^5.4.1: version "5.5.5" resolved "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.5.5.tgz#f375486d3f196e2a2527b503644693ae3a8670a9" integrity sha512-hvyIS71vs4Tu/yUYHPvGXsTgo0t3arU820+lT5VjZS2go0ewp2LqyCgxEN56CzOG7Iys52eRhHBiD1gGRdiQtw== From b594679ae321db708cc01175a7031e74f9c5d192 Mon Sep 17 00:00:00 2001 From: Patrick Jungermann Date: Mon, 16 May 2022 18:27:29 +0200 Subject: [PATCH 02/16] feat: support array as arg for `CatalogBuilder.addEntityProvider` and others Allows to use e.g. ``` builder.addEntityProvider(getArrayOfProviders()); ``` instead of ``` builder.addEntityProvider(...getArrayOfProviders()); ``` Signed-off-by: Patrick Jungermann --- .changeset/slimy-elephants-attend.md | 15 +++++++++++ docs/integrations/aws-s3/discovery.md | 2 +- docs/integrations/gerrit/discovery.md | 2 +- plugins/catalog-backend/api-report.md | 18 ++++++++++--- .../src/service/CatalogBuilder.ts | 26 +++++++++++++------ 5 files changed, 49 insertions(+), 14 deletions(-) create mode 100644 .changeset/slimy-elephants-attend.md diff --git a/.changeset/slimy-elephants-attend.md b/.changeset/slimy-elephants-attend.md new file mode 100644 index 0000000000..4add8f18a3 --- /dev/null +++ b/.changeset/slimy-elephants-attend.md @@ -0,0 +1,15 @@ +--- +'@backstage/plugin-catalog-backend': minor +--- + +Allow array as non-spread arguments at the `CatalogBuilder`. + +```typescript +builder.addEntityProvider(...getArrayOfProviders()); +``` + +can be simplified to + +```typescript +builder.addEntityProvider(getArrayOfProviders()); +``` diff --git a/docs/integrations/aws-s3/discovery.md b/docs/integrations/aws-s3/discovery.md index 5091b4057b..40739937a4 100644 --- a/docs/integrations/aws-s3/discovery.md +++ b/docs/integrations/aws-s3/discovery.md @@ -67,7 +67,7 @@ import { AwsS3EntityProvider } from '@backstage/plugin-catalog-backend-module-aw const builder = await CatalogBuilder.create(env); /** ... other processors and/or providers ... */ builder.addEntityProvider( - ...AwsS3EntityProvider.fromConfig(env.config, { + AwsS3EntityProvider.fromConfig(env.config, { logger: env.logger, schedule: env.scheduler.createScheduledTaskRunner({ frequency: { minutes: 30 }, diff --git a/docs/integrations/gerrit/discovery.md b/docs/integrations/gerrit/discovery.md index b801f7b77a..04fa3dac2a 100644 --- a/docs/integrations/gerrit/discovery.md +++ b/docs/integrations/gerrit/discovery.md @@ -30,7 +30,7 @@ import { Duration } from 'luxon'; const builder = await CatalogBuilder.create(env); /** ... other processors and/or providers ... */ builder.addEntityProvider( - ...GerritEntityProvider.fromConfig(env.config, { + GerritEntityProvider.fromConfig(env.config, { logger: env.logger, schedule: env.scheduler.createScheduledTaskRunner({ frequency: { minutes: 30 }, diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md index a770d6289e..cb8a5abb8a 100644 --- a/plugins/catalog-backend/api-report.md +++ b/plugins/catalog-backend/api-report.md @@ -110,11 +110,21 @@ export class BuiltinKindsEntityProcessor implements CatalogProcessor { // @public export class CatalogBuilder { - addEntityPolicy(...policies: EntityPolicy[]): CatalogBuilder; - addEntityProvider(...providers: EntityProvider[]): CatalogBuilder; + addEntityPolicy( + ...policies: Array> + ): CatalogBuilder; + addEntityProvider( + ...providers: Array> + ): CatalogBuilder; // @alpha - addPermissionRules(...permissionRules: CatalogPermissionRule[]): void; - addProcessor(...processors: CatalogProcessor[]): CatalogBuilder; + addPermissionRules( + ...permissionRules: Array< + CatalogPermissionRule | Array + > + ): void; + addProcessor( + ...processors: Array> + ): CatalogBuilder; build(): Promise<{ processingEngine: CatalogProcessingEngine; router: Router; diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.ts b/plugins/catalog-backend/src/service/CatalogBuilder.ts index 57508615ac..0d4ddc8e71 100644 --- a/plugins/catalog-backend/src/service/CatalogBuilder.ts +++ b/plugins/catalog-backend/src/service/CatalogBuilder.ts @@ -172,8 +172,10 @@ export class CatalogBuilder { * * @param policies - One or more policies */ - addEntityPolicy(...policies: EntityPolicy[]): CatalogBuilder { - this.entityPolicies.push(...policies); + addEntityPolicy( + ...policies: Array> + ): CatalogBuilder { + this.entityPolicies.push(...policies.flat()); return this; } @@ -268,8 +270,10 @@ export class CatalogBuilder { * * @param providers - One or more entity providers */ - addEntityProvider(...providers: EntityProvider[]): CatalogBuilder { - this.entityProviders.push(...providers); + addEntityProvider( + ...providers: Array> + ): CatalogBuilder { + this.entityProviders.push(...providers.flat()); return this; } @@ -279,8 +283,10 @@ export class CatalogBuilder { * * @param processors - One or more processors */ - addProcessor(...processors: CatalogProcessor[]): CatalogBuilder { - this.processors.push(...processors); + addProcessor( + ...processors: Array> + ): CatalogBuilder { + this.processors.push(...processors.flat()); return this; } @@ -341,8 +347,12 @@ export class CatalogBuilder { * @param permissionRules - Additional permission rules * @alpha */ - addPermissionRules(...permissionRules: CatalogPermissionRule[]) { - this.permissionRules.push(...permissionRules); + addPermissionRules( + ...permissionRules: Array< + CatalogPermissionRule | Array + > + ) { + this.permissionRules.push(...permissionRules.flat()); } /** From 6387b7a98a1873b21e91330bbcb7b10650f98e24 Mon Sep 17 00:00:00 2001 From: Sergey Shevchenko Date: Tue, 10 May 2022 16:57:13 +0300 Subject: [PATCH 03/16] feat: Export annotation helpers from allure plugin Signed-off-by: Sergey Shevchenko --- .changeset/loud-jars-kick.md | 5 +++++ plugins/allure/api-report.md | 11 +++++++++++ plugins/allure/src/index.ts | 4 ++++ 3 files changed, 20 insertions(+) create mode 100644 .changeset/loud-jars-kick.md diff --git a/.changeset/loud-jars-kick.md b/.changeset/loud-jars-kick.md new file mode 100644 index 0000000000..b53006f7f9 --- /dev/null +++ b/.changeset/loud-jars-kick.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-allure': patch +--- + +Add export for `isAllureReportAvailable` and `ALLURE_PROJECT_ID_ANNOTATION` so it can be used outside of plugin diff --git a/plugins/allure/api-report.md b/plugins/allure/api-report.md index 5489ba4f26..c5c4253cd4 100644 --- a/plugins/allure/api-report.md +++ b/plugins/allure/api-report.md @@ -6,8 +6,14 @@ /// import { BackstagePlugin } from '@backstage/core-plugin-api'; +import { Entity } from '@backstage/catalog-model'; import { RouteRef } from '@backstage/core-plugin-api'; +// Warning: (ae-missing-release-tag) "ALLURE_PROJECT_ID_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const ALLURE_PROJECT_ID_ANNOTATION = 'qameta.io/allure-project'; + // Warning: (ae-missing-release-tag) "allurePlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // // @public (undocumented) @@ -22,4 +28,9 @@ export const allurePlugin: BackstagePlugin< // // @public (undocumented) export const EntityAllureReportContent: () => JSX.Element; + +// Warning: (ae-missing-release-tag) "isAllureReportAvailable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const isAllureReportAvailable: (entity: Entity) => boolean; ``` diff --git a/plugins/allure/src/index.ts b/plugins/allure/src/index.ts index d9dbfab056..4fae28258d 100644 --- a/plugins/allure/src/index.ts +++ b/plugins/allure/src/index.ts @@ -21,3 +21,7 @@ */ export { allurePlugin, EntityAllureReportContent } from './plugin'; +export { + isAllureReportAvailable, + ALLURE_PROJECT_ID_ANNOTATION, +} from './components/annotationHelpers'; From 449dcef98e6a8c3282f17cbc050965f9784840bc Mon Sep 17 00:00:00 2001 From: Juan Pablo Garcia Ripa Date: Tue, 17 May 2022 10:48:18 +0200 Subject: [PATCH 04/16] allow multiple component types Signed-off-by: Juan Pablo Garcia Ripa --- .changeset/fluffy-candles-learn.md | 5 ++ plugins/catalog/api-report.md | 4 +- .../EntitySwitch/conditions.test.ts | 59 +++++++++++++++++++ .../src/components/EntitySwitch/conditions.ts | 6 +- 4 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 .changeset/fluffy-candles-learn.md create mode 100644 plugins/catalog/src/components/EntitySwitch/conditions.test.ts diff --git a/.changeset/fluffy-candles-learn.md b/.changeset/fluffy-candles-learn.md new file mode 100644 index 0000000000..f3ed109071 --- /dev/null +++ b/.changeset/fluffy-candles-learn.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog': patch +--- + +Updates the `ìsComponentType` to allow an array of possible types diff --git a/plugins/catalog/api-report.md b/plugins/catalog/api-report.md index 556016941a..e95a8a638c 100644 --- a/plugins/catalog/api-report.md +++ b/plugins/catalog/api-report.md @@ -371,7 +371,9 @@ export interface HasSystemsCardProps { } // @public -export function isComponentType(type: string): (entity: Entity) => boolean; +export function isComponentType( + types: string | string[], +): (entity: Entity) => boolean; // @public export function isKind(kind: string): (entity: Entity) => boolean; diff --git a/plugins/catalog/src/components/EntitySwitch/conditions.test.ts b/plugins/catalog/src/components/EntitySwitch/conditions.test.ts new file mode 100644 index 0000000000..05df2d6bc5 --- /dev/null +++ b/plugins/catalog/src/components/EntitySwitch/conditions.test.ts @@ -0,0 +1,59 @@ +/* + * Copyright 2022 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Entity } from '@backstage/catalog-model'; +import { isComponentType } from '.'; + +const serviceComponent: Entity = { + apiVersion: '', + kind: 'component', + metadata: { name: 'aService' }, + spec: { type: 'service' }, +}; + +const websiteComponent: Entity = { + apiVersion: '', + kind: 'component', + metadata: { name: 'aService' }, + spec: { type: 'website' }, +}; + +const notComponent: Entity = { + apiVersion: '', + kind: 'not-component', + metadata: { name: 'aService' }, + spec: { type: 'service' }, +}; + +describe('isComponentType', () => { + it('should false on non component kinds', () => { + const checkEntity = isComponentType('service'); + + expect(checkEntity(notComponent)).not.toBeTruthy(); + }); + it('should check for the intended type', () => { + const checkEntity = isComponentType('service'); + + expect(checkEntity(websiteComponent)).not.toBeTruthy(); + expect(checkEntity(serviceComponent)).toBeTruthy(); + }); + it('should check for multiple types', () => { + const checkEntity = isComponentType(['service', 'website']); + + expect(checkEntity(serviceComponent)).toBeTruthy(); + expect(checkEntity(websiteComponent)).toBeTruthy(); + }); +}); diff --git a/plugins/catalog/src/components/EntitySwitch/conditions.ts b/plugins/catalog/src/components/EntitySwitch/conditions.ts index 907aa45afe..314c05d14b 100644 --- a/plugins/catalog/src/components/EntitySwitch/conditions.ts +++ b/plugins/catalog/src/components/EntitySwitch/conditions.ts @@ -34,13 +34,15 @@ export function isKind(kind: string) { * For use in EntitySwitch.Case. Matches if the entity is a Component of a given spec.type. * @public */ -export function isComponentType(type: string) { +export function isComponentType(types: string | string[]) { return (entity: Entity) => { if (!strCmp(entity.kind, 'component')) { return false; } const componentEntity = entity as ComponentEntity; - return strCmp(componentEntity.spec.type, type); + return typeof types === 'string' + ? strCmp(componentEntity.spec.type, types) + : types.some(type => strCmp(componentEntity.spec.type, type)); }; } From 7b62bbc83e2466ba10bfe7b5c2debc054445b81e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 17 May 2022 13:26:52 +0000 Subject: [PATCH 05/16] chore(deps): update dependency @types/yup to v0.29.14 Signed-off-by: Renovate Bot --- yarn.lock | 88 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 27 deletions(-) diff --git a/yarn.lock b/yarn.lock index 82dc6a601a..ebab374af2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6620,9 +6620,9 @@ "@types/node" "*" "@types/yup@^0.29.13": - version "0.29.13" - resolved "https://registry.npmjs.org/@types/yup/-/yup-0.29.13.tgz#21b137ba60841307a3c8a1050d3bf4e63ad561e9" - integrity sha512-qRyuv+P/1t1JK1rA+elmK1MmCL1BapEzKKfbEhDBV/LMMse4lmhZ/XbgETI39JveDJRpLjmToOI6uFtMW/WR2g== + version "0.29.14" + resolved "https://registry.npmjs.org/@types/yup/-/yup-0.29.14.tgz#754f1dccedcc66fc2bbe290c27f5323b407ceb00" + integrity sha512-Ynb/CjHhE/Xp/4bhHmQC4U1Ox+I2OpfRYF3dnNgQqn1cHa6LK3H1wJMNPT02tSVZA6FYuXE2ITORfbnb6zBCSA== "@types/zen-observable@^0.8.0", "@types/zen-observable@^0.8.2": version "0.8.3" @@ -6630,18 +6630,18 @@ integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw== "@typescript-eslint/eslint-plugin@^5.9.0": - version "5.23.0" - resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.23.0.tgz#bc4cbcf91fbbcc2e47e534774781b82ae25cc3d8" - integrity sha512-hEcSmG4XodSLiAp1uxv/OQSGsDY6QN3TcRU32gANp+19wGE1QQZLRS8/GV58VRUoXhnkuJ3ZxNQ3T6Z6zM59DA== + version "5.24.0" + resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.24.0.tgz#59f9ed21fc4490444b75b250e4ce81e4b7bba18f" + integrity sha512-6bqFGk6wa9+6RrU++eLknKyDqXU1Oc8nyoLu5a1fU17PNRJd9UBr56rMF7c4DRaRtnarlkQ4jwxUbvBo8cNlpw== dependencies: - "@typescript-eslint/scope-manager" "5.23.0" - "@typescript-eslint/type-utils" "5.23.0" - "@typescript-eslint/utils" "5.23.0" - debug "^4.3.2" + "@typescript-eslint/scope-manager" "5.24.0" + "@typescript-eslint/type-utils" "5.24.0" + "@typescript-eslint/utils" "5.24.0" + debug "^4.3.4" functional-red-black-tree "^1.0.1" - ignore "^5.1.8" + ignore "^5.2.0" regexpp "^3.2.0" - semver "^7.3.5" + semver "^7.3.7" tsutils "^3.21.0" "@typescript-eslint/experimental-utils@^5.0.0": @@ -6682,6 +6682,14 @@ "@typescript-eslint/types" "5.23.0" "@typescript-eslint/visitor-keys" "5.23.0" +"@typescript-eslint/scope-manager@5.24.0": + version "5.24.0" + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.24.0.tgz#ac8c4d65064204b596909c204fe9b7e30c3f51b2" + integrity sha512-WpMWipcDzGmMzdT7NtTjRXFabx10WleLUGrJpuJLGaxSqpcyq5ACpKSD5VE40h2nz3melQ91aP4Du7lh9FliCA== + dependencies: + "@typescript-eslint/types" "5.24.0" + "@typescript-eslint/visitor-keys" "5.24.0" + "@typescript-eslint/scope-manager@5.9.0": version "5.9.0" resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.9.0.tgz#02dfef920290c1dcd7b1999455a3eaae7a1a3117" @@ -6690,13 +6698,13 @@ "@typescript-eslint/types" "5.9.0" "@typescript-eslint/visitor-keys" "5.9.0" -"@typescript-eslint/type-utils@5.23.0": - version "5.23.0" - resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.23.0.tgz#f852252f2fc27620d5bb279d8fed2a13d2e3685e" - integrity sha512-iuI05JsJl/SUnOTXA9f4oI+/4qS/Zcgk+s2ir+lRmXI+80D8GaGwoUqs4p+X+4AxDolPpEpVUdlEH4ADxFy4gw== +"@typescript-eslint/type-utils@5.24.0": + version "5.24.0" + resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.24.0.tgz#aad47227e89cceec9175b1a67df69ebcd79f9421" + integrity sha512-uGi+sQiM6E5CeCZYBXiaIvIChBXru4LZ1tMoeKbh1Lze+8BO9syUG07594C4lvN2YPT4KVeIupOJkVI+9/DAmQ== dependencies: - "@typescript-eslint/utils" "5.23.0" - debug "^4.3.2" + "@typescript-eslint/utils" "5.24.0" + debug "^4.3.4" tsutils "^3.21.0" "@typescript-eslint/types@5.20.0": @@ -6709,6 +6717,11 @@ resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz#8733de0f58ae0ed318dbdd8f09868cdbf9f9ad09" integrity sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw== +"@typescript-eslint/types@5.24.0": + version "5.24.0" + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.24.0.tgz#565ff94a4b89073265e27514dc65225d18aabe6c" + integrity sha512-Tpg1c3shTDgTmZd3qdUyd+16r/pGmVaVEbLs+ufuWP0EruVbUiEOmpBBQxBb9a8iPRxi8Rb2oiwOxuZJzSq11A== + "@typescript-eslint/types@5.9.0": version "5.9.0" resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.9.0.tgz#e5619803e39d24a03b3369506df196355736e1a3" @@ -6740,6 +6753,19 @@ semver "^7.3.5" tsutils "^3.21.0" +"@typescript-eslint/typescript-estree@5.24.0": + version "5.24.0" + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.24.0.tgz#30b9cbc1af475b9e02aca34cfe9ba9e1bb820143" + integrity sha512-zcor6vQkQmZAQfebSPVwUk/FD+CvnsnlfKXYeQDsWXRF+t7SBPmIfNia/wQxCSeu1h1JIjwV2i9f5/DdSp/uDw== + dependencies: + "@typescript-eslint/types" "5.24.0" + "@typescript-eslint/visitor-keys" "5.24.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + semver "^7.3.7" + tsutils "^3.21.0" + "@typescript-eslint/typescript-estree@5.9.0": version "5.9.0" resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.9.0.tgz#0e5c6f03f982931abbfbc3c1b9df5fbf92a3490f" @@ -6753,15 +6779,15 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/utils@5.23.0": - version "5.23.0" - resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.23.0.tgz#4691c3d1b414da2c53d8943310df36ab1c50648a" - integrity sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA== +"@typescript-eslint/utils@5.24.0": + version "5.24.0" + resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.24.0.tgz#7a854028040a305ddea129328e45cfb2c6406e75" + integrity sha512-K05sbWoeCBJH8KXu6hetBJ+ukG0k2u2KlgD3bN+v+oBKm8adJqVHpSSLHNzqyuv0Lh4GVSAUgZ5lB4icmPmWLw== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.23.0" - "@typescript-eslint/types" "5.23.0" - "@typescript-eslint/typescript-estree" "5.23.0" + "@typescript-eslint/scope-manager" "5.24.0" + "@typescript-eslint/types" "5.24.0" + "@typescript-eslint/typescript-estree" "5.24.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" @@ -6793,6 +6819,14 @@ "@typescript-eslint/types" "5.23.0" eslint-visitor-keys "^3.0.0" +"@typescript-eslint/visitor-keys@5.24.0": + version "5.24.0" + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.24.0.tgz#bb3e9a788ccd50c53e03557e4e203599880c3123" + integrity sha512-qzGwSXMyMnogcAo+/2fU+jhlPPVMXlIH2PeAonIKjJSoDKl1+lJVvG5Z5Oud36yU0TWK2cs1p/FaSN5J2OUFYA== + dependencies: + "@typescript-eslint/types" "5.24.0" + eslint-visitor-keys "^3.3.0" + "@typescript-eslint/visitor-keys@5.9.0": version "5.9.0" resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.9.0.tgz#7585677732365e9d27f1878150fab3922784a1a6" @@ -13059,7 +13093,7 @@ globalthis@^1.0.1: dependencies: define-properties "^1.1.3" -globby@^11.0.0, globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4: +globby@^11.0.0, globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4, globby@^11.1.0: version "11.1.0" resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -13866,7 +13900,7 @@ ignore@^3.3.5: resolved "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug== -ignore@^5.1.4, ignore@^5.1.8, ignore@^5.2.0: +ignore@^5.1.4, ignore@^5.2.0: version "5.2.0" resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== From 0b19d6454be79e15a6e3cdcf4f2502e1adad07a2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 18 May 2022 00:34:12 +0000 Subject: [PATCH 06/16] fix(deps): update dependency glob to v7.2.3 Signed-off-by: Renovate Bot --- yarn.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index ebab374af2..c696fcaf6a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13008,14 +13008,14 @@ glob@7.1.6: path-is-absolute "^1.0.0" glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@^7.2.0: - version "7.2.0" - resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + version "7.2.3" + resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "^3.1.1" once "^1.3.0" path-is-absolute "^1.0.0" @@ -17648,7 +17648,7 @@ minimatch@5.0.1, minimatch@^5.0.0, minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.2: +minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== From 2a20ce27bc939394f24a2fc493e7a30569a425fb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 18 May 2022 01:39:58 +0000 Subject: [PATCH 07/16] fix(deps): update dependency graphiql to v1.8.10 Signed-off-by: Renovate Bot --- yarn.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index c696fcaf6a..bce53454e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2016,7 +2016,7 @@ teeny-request "^7.1.3" xdg-basedir "^4.0.0" -"@graphiql/toolkit@^0.4.4": +"@graphiql/toolkit@^0.4.5": version "0.4.5" resolved "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.4.5.tgz#9fb5020444712562eae9581724695c235f610836" integrity sha512-QXuuMSSK/0GfBS7tltrGZdyhIvm6oe9TK4VW9pfa8dALYttpzyJ64Q4Sx9I1Ng++yOMJWziM/ksa043zkNHsjQ== @@ -13208,11 +13208,11 @@ grapheme-splitter@^1.0.4: integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== graphiql@^1.5.12, graphiql@^1.8.8: - version "1.8.9" - resolved "https://registry.npmjs.org/graphiql/-/graphiql-1.8.9.tgz#96063ace9379699e873da078bf0f2ae7062f370e" - integrity sha512-X+olqol3VfOrFrsAfYzgNbvHoEE0lDUtg52+f3yLeNY4Ens+rAH4RSdH4wVtoRdh3CafmhVsfLQvn04hHkgftQ== + version "1.8.10" + resolved "https://registry.npmjs.org/graphiql/-/graphiql-1.8.10.tgz#a45e80a896b802f9591a89aa9af90fdafe44d5d8" + integrity sha512-ZYGsBzJz3OWh30eRr5D07ETHLqUEgfOddKdMLHgivLRmWVG6paRNOPzgwFyXy49JwL6gTzVmZoHabml7yySCnA== dependencies: - "@graphiql/toolkit" "^0.4.4" + "@graphiql/toolkit" "^0.4.5" codemirror "^5.65.3" codemirror-graphql "^1.3.0" copy-to-clipboard "^3.2.0" From e97e11c40b5b2c90b75baa7c6202a5496bd23db2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 18 May 2022 02:28:38 +0000 Subject: [PATCH 08/16] fix(deps): update dependency jsonschema to v1.4.1 Signed-off-by: Renovate Bot --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index bce53454e6..7a1a5b8ae9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15771,9 +15771,9 @@ jsonpointer@^5.0.0: integrity sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg== jsonschema@^1.2.6: - version "1.4.0" - resolved "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.0.tgz#1afa34c4bc22190d8e42271ec17ac8b3404f87b2" - integrity sha512-/YgW6pRMr6M7C+4o8kS+B/2myEpHCrxO4PEWnqJNBFMjn7EWXqlQ4tGwL6xTHeRplwuZmcAncdvfOad1nT2yMw== + version "1.4.1" + resolved "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab" + integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ== jsonwebtoken@^8.5.1: version "8.5.1" From 9496fdb51b7dc0c86658b32a8cc324ce5cc3d487 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 18 May 2022 03:47:57 +0000 Subject: [PATCH 09/16] fix(deps): update dependency keyv to v4.2.8 Signed-off-by: Renovate Bot --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7a1a5b8ae9..e73a5d4b1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15983,9 +15983,9 @@ keyv@^3.0.0: json-buffer "3.0.0" keyv@^4.0.0, keyv@^4.0.3: - version "4.2.7" - resolved "https://registry.npmjs.org/keyv/-/keyv-4.2.7.tgz#00b8994d46098e8eb8c933cb29aaaf18be5effea" - integrity sha512-HeOstD8SXvtWoQhMMBCelcUuZsiV7T7MwsADtOXT0KuwYP9nCxrSoMDeLXNDTLN3VFSuRp38JzoGbbTboq3QQw== + version "4.2.8" + resolved "https://registry.npmjs.org/keyv/-/keyv-4.2.8.tgz#6c91189fe6134d8a526cb360566693c095fcfb60" + integrity sha512-IZZo6krhHWPhgsP5mBkEdPopVPN/stgCnBVuqi6dda/Nm5mDTOSVTrFMkWqlJsDum+B0YSe887tNxdjDWkO7aQ== dependencies: compress-brotli "^1.3.8" json-buffer "3.0.1" From e51f978d466ad4bf8bca324bc6d83094a5d0c945 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 18 May 2022 04:44:09 +0000 Subject: [PATCH 10/16] fix(deps): update dependency marked to v4.0.16 Signed-off-by: Renovate Bot --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index e73a5d4b1c..79addcf323 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16929,9 +16929,9 @@ markdown-table@^3.0.0: integrity sha512-CBbaYXKSGnE1uLRpKA1SWgIRb2PQrpkllNWpZtZe6VojOJ4ysqiq7/2glYcmKsOYN09QgH/HEBX5hIshAeiK6A== marked@^4.0.14: - version "4.0.15" - resolved "https://registry.npmjs.org/marked/-/marked-4.0.15.tgz#0216b7c9d5fcf6ac5042343c41d81a8b1b5e1b4a" - integrity sha512-esX5lPdTfG4p8LDkv+obbRCyOKzB+820ZZyMOXJZygZBHrH9b3xXR64X4kT3sPe9Nx8qQXbmcz6kFSMt4Nfk6Q== + version "4.0.16" + resolved "https://registry.npmjs.org/marked/-/marked-4.0.16.tgz#9ec18fc1a723032eb28666100344d9428cf7a264" + integrity sha512-wahonIQ5Jnyatt2fn8KqF/nIqZM8mh3oRu2+l5EANGMhu6RFjiSG52QNE2eWzFMI94HqYSgN184NurgNG6CztA== match-sorter@^6.0.2: version "6.3.1" From 33d88c2b2a28389de6ae49a13aaa4ee1e535d59a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 18 May 2022 05:34:46 +0000 Subject: [PATCH 11/16] fix(deps): update dependency passport to v0.5.3 Signed-off-by: Renovate Bot --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 79addcf323..9e39b56e83 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19363,9 +19363,9 @@ passport-strategy@1.x.x, passport-strategy@^1.0.0: integrity sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ= passport@^0.5.2: - version "0.5.2" - resolved "https://registry.npmjs.org/passport/-/passport-0.5.2.tgz#0cb38dd8a71552c8390dfa6a9a6f7f3909954bcf" - integrity sha512-w9n/Ot5I7orGD4y+7V3EFJCQEznE5RxHamUxcqLT2QoJY0f2JdN8GyHonYFvN0Vz+L6lUJfVhrk2aZz2LbuREw== + version "0.5.3" + resolved "https://registry.npmjs.org/passport/-/passport-0.5.3.tgz#e69b46c9bb3290660bc2b3299330d78710b198cc" + integrity sha512-gGc+70h4gGdBWNsR3FuV3byLDY6KBTJAIExGFXTpQaYfbbcHCBlRRKx7RBQSpqEqc5Hh2qVzRs7ssvSfOpkUEA== dependencies: passport-strategy "1.x.x" pause "0.0.1" From 66a8730ab163c32b17b8f228ea8295ebceba952e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 18 May 2022 06:35:13 +0000 Subject: [PATCH 12/16] fix(deps): update dependency swagger-ui-react to v4.11.1 Signed-off-by: Renovate Bot --- yarn.lock | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9e39b56e83..2fea2bd1ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8379,11 +8379,6 @@ btoa-lite@^1.0.0: resolved "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337" integrity sha1-M3dm2hWAEhD92VbCLpxokaudAzc= -btoa@^1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73" - integrity sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g== - buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" @@ -9582,7 +9577,7 @@ cookie@0.4.2, cookie@^0.4.1, cookie@^0.4.2, cookie@~0.4.1: resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== -cookie@0.5.0: +cookie@0.5.0, cookie@~0.5.0: version "0.5.0" resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== @@ -23291,14 +23286,13 @@ svgo@^2.5.0, svgo@^2.7.0: picocolors "^1.0.0" stable "^0.1.8" -swagger-client@^3.18.4: - version "3.18.4" - resolved "https://registry.npmjs.org/swagger-client/-/swagger-client-3.18.4.tgz#71be9df585157a3335a542c407733d2134fa75e9" - integrity sha512-Wj26oEctONq/u0uM+eSj18675YM5e2vFnx7Kr4neLeXEHKUsfceVQ/OdtrBXdrT3VbtdBbZfMTfl1JOBpix2MA== +swagger-client@^3.18.5: + version "3.18.5" + resolved "https://registry.npmjs.org/swagger-client/-/swagger-client-3.18.5.tgz#8034df561452f4bbd36871a8072394b7ca883106" + integrity sha512-c0txGDtfQTJnaIBaEKCwtRNcUaaAfj+RXI4QVV9p3WW+AUCQqp4naCjaDNNsOfMkE4ySyhnblbL+jGqAVC7snw== dependencies: "@babel/runtime-corejs3" "^7.11.2" - btoa "^1.2.1" - cookie "~0.4.1" + cookie "~0.5.0" cross-fetch "^3.1.5" deepmerge "~4.2.2" fast-json-patch "^3.0.0-1" @@ -23312,9 +23306,9 @@ swagger-client@^3.18.4: url "~0.11.0" swagger-ui-react@^4.1.3: - version "4.11.0" - resolved "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-4.11.0.tgz#995597c050c2c63fafdfd1874661fa3b329008e4" - integrity sha512-QAQVoT7a9CfhyxTmy9MrXCL9l4Y2B60QMAthdTsZdHAH3mGsZF0KH18a+gFncGTN4sotuyIDiOgoPRP5idiz6g== + version "4.11.1" + resolved "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-4.11.1.tgz#1de7feea2f99aa292d52cfa3d31edf665eaa6181" + integrity sha512-w7WkrEL7uw1EofILX9hNKQXqy5EQhxTU3u+Ob8YcLqeAEUjECewtyTvsQ+79Xypj9yXbqSvgdPkpho1n5Bo2NQ== dependencies: "@babel/runtime-corejs3" "^7.16.8" "@braintree/sanitize-url" "=6.0.0" @@ -23344,7 +23338,7 @@ swagger-ui-react@^4.1.3: reselect "^4.1.5" serialize-error "^8.1.0" sha.js "^2.4.11" - swagger-client "^3.18.4" + swagger-client "^3.18.5" url-parse "^1.5.8" xml "=1.0.1" xml-but-prettier "^1.0.1" From b745553812e282ebec260e01077ccb33d74a24ad Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 18 May 2022 07:19:18 +0000 Subject: [PATCH 13/16] fix(deps): update dependency testcontainers to v8.10.1 Signed-off-by: Renovate Bot --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2fea2bd1ca..3ee0cb4e4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23555,9 +23555,9 @@ test-exclude@^6.0.0: minimatch "^3.0.4" testcontainers@^8.1.2: - version "8.10.0" - resolved "https://registry.npmjs.org/testcontainers/-/testcontainers-8.10.0.tgz#fae18c4b2016eb4b0d8cc992c47738e26d1d0717" - integrity sha512-7Kwcw9JFav2H+J9/0JF9ZYaxn4nvboLHyh0xpKHw8Imtoc8H2w/HgKJGgpn+hi6X1y1I0F24Z+jYkARYBgbdHQ== + version "8.10.1" + resolved "https://registry.npmjs.org/testcontainers/-/testcontainers-8.10.1.tgz#2b3d1d25932f437ba4c46a1f32380ce7987629f8" + integrity sha512-MQFoWe6sJrbcZqXb+fM7uN2w9WnV2KZnNyI7Qc9pbxQZS6oLa/or5kgL4DADAuzYFxXJvL3f8inIGI+/1S+rvA== dependencies: "@balena/dockerignore" "^1.0.2" "@types/archiver" "^5.3.1" From b08947bd5d384e196af3120f9cfdfd22e1167640 Mon Sep 17 00:00:00 2001 From: Juan Pablo Garcia Ripa Date: Wed, 18 May 2022 10:04:09 +0200 Subject: [PATCH 14/16] allow multiple kinds and namespaces Signed-off-by: Juan Pablo Garcia Ripa --- .changeset/fluffy-candles-learn.md | 2 +- plugins/catalog/api-report.md | 6 ++- .../EntitySwitch/conditions.test.ts | 53 ++++++++++++++++++- .../src/components/EntitySwitch/conditions.ts | 18 ++++--- 4 files changed, 68 insertions(+), 11 deletions(-) diff --git a/.changeset/fluffy-candles-learn.md b/.changeset/fluffy-candles-learn.md index f3ed109071..6fe3f1e09b 100644 --- a/.changeset/fluffy-candles-learn.md +++ b/.changeset/fluffy-candles-learn.md @@ -2,4 +2,4 @@ '@backstage/plugin-catalog': patch --- -Updates the `ìsComponentType` to allow an array of possible types +Updates the `isKind`, `ìsComponentType`, and `isNamespace` to allow an array of possible values diff --git a/plugins/catalog/api-report.md b/plugins/catalog/api-report.md index e95a8a638c..3d426a0c8b 100644 --- a/plugins/catalog/api-report.md +++ b/plugins/catalog/api-report.md @@ -376,10 +376,12 @@ export function isComponentType( ): (entity: Entity) => boolean; // @public -export function isKind(kind: string): (entity: Entity) => boolean; +export function isKind(kinds: string | string[]): (entity: Entity) => boolean; // @public -export function isNamespace(namespace: string): (entity: Entity) => boolean; +export function isNamespace( + namespaces: string | string[], +): (entity: Entity) => boolean; // @public export function isOrphan(entity: Entity): boolean; diff --git a/plugins/catalog/src/components/EntitySwitch/conditions.test.ts b/plugins/catalog/src/components/EntitySwitch/conditions.test.ts index 05df2d6bc5..dfed546fd8 100644 --- a/plugins/catalog/src/components/EntitySwitch/conditions.test.ts +++ b/plugins/catalog/src/components/EntitySwitch/conditions.test.ts @@ -15,7 +15,7 @@ */ import { Entity } from '@backstage/catalog-model'; -import { isComponentType } from '.'; +import { isComponentType, isKind, isNamespace } from './conditions'; const serviceComponent: Entity = { apiVersion: '', @@ -38,6 +38,27 @@ const notComponent: Entity = { spec: { type: 'service' }, }; +const apiKind: Entity = { + apiVersion: '', + kind: 'api', + metadata: { name: 'api' }, + spec: { type: 'api' }, +}; + +const aNamespace: Entity = { + apiVersion: '', + kind: 'component', + metadata: { name: 'aService', namespace: 'a' }, + spec: { type: 'service' }, +}; + +const bNamespace: Entity = { + apiVersion: '', + kind: 'component', + metadata: { name: 'aService', namespace: 'b' }, + spec: { type: 'service' }, +}; + describe('isComponentType', () => { it('should false on non component kinds', () => { const checkEntity = isComponentType('service'); @@ -57,3 +78,33 @@ describe('isComponentType', () => { expect(checkEntity(websiteComponent)).toBeTruthy(); }); }); + +describe('isKind', () => { + it('should check for the intended kind', () => { + const checkEntity = isKind('component'); + + expect(checkEntity(notComponent)).not.toBeTruthy(); + expect(checkEntity(serviceComponent)).toBeTruthy(); + }); + it('should check for multiple types', () => { + const checkEntity = isKind(['component', 'api']); + + expect(checkEntity(serviceComponent)).toBeTruthy(); + expect(checkEntity(apiKind)).toBeTruthy(); + }); +}); + +describe('isNamespace', () => { + it('should check for the intended type', () => { + const checkEntity = isNamespace('a'); + + expect(checkEntity(aNamespace)).toBeTruthy(); + expect(checkEntity(bNamespace)).not.toBeTruthy(); + }); + it('should check for multiple types', () => { + const checkEntity = isNamespace(['a', 'b']); + + expect(checkEntity(aNamespace)).toBeTruthy(); + expect(checkEntity(bNamespace)).toBeTruthy(); + }); +}); diff --git a/plugins/catalog/src/components/EntitySwitch/conditions.ts b/plugins/catalog/src/components/EntitySwitch/conditions.ts index 314c05d14b..5f50fde5c9 100644 --- a/plugins/catalog/src/components/EntitySwitch/conditions.ts +++ b/plugins/catalog/src/components/EntitySwitch/conditions.ts @@ -22,12 +22,18 @@ function strCmp(a: string | undefined, b: string | undefined): boolean { ); } +function strCmpAll(value: string | undefined, cmpValues: string | string[]) { + return typeof cmpValues === 'string' + ? strCmp(value, cmpValues) + : cmpValues.some(cmpVal => strCmp(value, cmpVal)); +} + /** * For use in EntitySwitch.Case. Matches if the entity is of a given kind. * @public */ -export function isKind(kind: string) { - return (entity: Entity) => strCmp(entity.kind, kind); +export function isKind(kinds: string | string[]) { + return (entity: Entity) => strCmpAll(entity.kind, kinds); } /** @@ -40,9 +46,7 @@ export function isComponentType(types: string | string[]) { return false; } const componentEntity = entity as ComponentEntity; - return typeof types === 'string' - ? strCmp(componentEntity.spec.type, types) - : types.some(type => strCmp(componentEntity.spec.type, type)); + return strCmpAll(componentEntity.spec.type, types); }; } @@ -50,6 +54,6 @@ export function isComponentType(types: string | string[]) { * For use in EntitySwitch.Case. Matches if the entity is in a given namespace. * @public */ -export function isNamespace(namespace: string) { - return (entity: Entity) => strCmp(entity.metadata?.namespace, namespace); +export function isNamespace(namespaces: string | string[]) { + return (entity: Entity) => strCmpAll(entity.metadata?.namespace, namespaces); } From bc0f4219bc94618d712fe5d566b28b4d0169fb22 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 18 May 2022 10:23:06 +0200 Subject: [PATCH 15/16] pre Signed-off-by: Patrik Oldsberg --- .changeset/pre.json | 158 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 .changeset/pre.json diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 0000000000..aff34f172d --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,158 @@ +{ + "mode": "pre", + "tag": "next", + "initialVersions": { + "example-app": "0.2.71", + "@backstage/app-defaults": "1.0.2", + "example-backend": "0.2.71", + "@backstage/backend-common": "0.13.3", + "@backstage/backend-tasks": "0.3.1", + "@backstage/backend-test-utils": "0.1.24", + "@backstage/catalog-client": "1.0.2", + "@backstage/catalog-model": "1.0.2", + "@backstage/cli": "0.17.1", + "@backstage/cli-common": "0.1.9", + "@backstage/codemods": "0.1.38", + "@backstage/config": "1.0.1", + "@backstage/config-loader": "1.1.1", + "@backstage/core-app-api": "1.0.2", + "@backstage/core-components": "0.9.4", + "@backstage/core-plugin-api": "1.0.2", + "@backstage/create-app": "0.4.27", + "@backstage/dev-utils": "1.0.2", + "e2e-test": "0.2.0", + "@backstage/errors": "1.0.0", + "@backstage/integration": "1.2.0", + "@backstage/integration-react": "1.1.0", + "@backstage/release-manifests": "0.0.3", + "@backstage/search-common": "0.3.4", + "@techdocs/cli": "1.1.1", + "techdocs-cli-embedded-app": "0.2.70", + "@backstage/techdocs-common": "0.11.15", + "@backstage/test-utils": "1.1.0", + "@backstage/theme": "0.2.15", + "@backstage/types": "1.0.0", + "@backstage/version-bridge": "1.0.1", + "@backstage/plugin-adr": "0.1.0", + "@backstage/plugin-adr-backend": "0.1.0", + "@backstage/plugin-adr-common": "0.1.0", + "@backstage/plugin-airbrake": "0.3.5", + "@backstage/plugin-airbrake-backend": "0.2.5", + "@backstage/plugin-allure": "0.1.21", + "@backstage/plugin-analytics-module-ga": "0.1.16", + "@backstage/plugin-apache-airflow": "0.1.13", + "@backstage/plugin-api-docs": "0.8.5", + "@backstage/plugin-app-backend": "0.3.32", + "@backstage/plugin-auth-backend": "0.14.0", + "@backstage/plugin-auth-node": "0.2.1", + "@backstage/plugin-azure-devops": "0.1.21", + "@backstage/plugin-azure-devops-backend": "0.3.11", + "@backstage/plugin-azure-devops-common": "0.2.3", + "@backstage/plugin-badges": "0.2.29", + "@backstage/plugin-badges-backend": "0.1.26", + "@backstage/plugin-bazaar": "0.1.20", + "@backstage/plugin-bazaar-backend": "0.1.16", + "@backstage/plugin-bitrise": "0.1.32", + "@backstage/plugin-catalog": "1.2.0", + "@backstage/plugin-catalog-backend": "1.1.2", + "@backstage/plugin-catalog-backend-module-aws": "0.1.5", + "@backstage/plugin-catalog-backend-module-azure": "0.1.3", + "@backstage/plugin-catalog-backend-module-bitbucket": "0.1.3", + "@backstage/plugin-catalog-backend-module-gerrit": "0.1.0", + "@backstage/plugin-catalog-backend-module-github": "0.1.3", + "@backstage/plugin-catalog-backend-module-gitlab": "0.1.3", + "@backstage/plugin-catalog-backend-module-ldap": "0.4.3", + "@backstage/plugin-catalog-backend-module-msgraph": "0.3.2", + "@backstage/plugin-catalog-common": "1.0.2", + "@backstage/plugin-catalog-graph": "0.2.17", + "@backstage/plugin-catalog-graphql": "0.3.9", + "@backstage/plugin-catalog-import": "0.8.8", + "@backstage/plugin-catalog-react": "1.1.0", + "@backstage/plugin-cicd-statistics": "0.1.7", + "@backstage/plugin-cicd-statistics-module-gitlab": "0.1.1", + "@backstage/plugin-circleci": "0.3.5", + "@backstage/plugin-cloudbuild": "0.3.5", + "@backstage/plugin-code-climate": "0.1.5", + "@backstage/plugin-code-coverage": "0.1.32", + "@backstage/plugin-code-coverage-backend": "0.1.30", + "@backstage/plugin-codescene": "0.1.0", + "@backstage/plugin-config-schema": "0.1.28", + "@backstage/plugin-cost-insights": "0.11.27", + "@internal/plugin-todo-list": "1.0.1", + "@internal/plugin-todo-list-backend": "1.0.1", + "@internal/plugin-todo-list-common": "1.0.1", + "@backstage/plugin-explore": "0.3.36", + "@backstage/plugin-explore-react": "0.0.17", + "@backstage/plugin-firehydrant": "0.1.22", + "@backstage/plugin-fossa": "0.2.37", + "@backstage/plugin-gcalendar": "0.3.1", + "@backstage/plugin-gcp-projects": "0.3.24", + "@backstage/plugin-git-release-manager": "0.3.18", + "@backstage/plugin-github-actions": "0.5.5", + "@backstage/plugin-github-deployments": "0.1.36", + "@backstage/plugin-gitops-profiles": "0.3.23", + "@backstage/plugin-gocd": "0.1.11", + "@backstage/plugin-graphiql": "0.2.37", + "@backstage/plugin-graphql-backend": "0.1.22", + "@backstage/plugin-home": "0.4.21", + "@backstage/plugin-ilert": "0.1.31", + "@backstage/plugin-jenkins": "0.7.4", + "@backstage/plugin-jenkins-backend": "0.1.22", + "@backstage/plugin-jenkins-common": "0.1.4", + "@backstage/plugin-kafka": "0.3.5", + "@backstage/plugin-kafka-backend": "0.2.25", + "@backstage/plugin-kubernetes": "0.6.5", + "@backstage/plugin-kubernetes-backend": "0.5.1", + "@backstage/plugin-kubernetes-common": "0.2.10", + "@backstage/plugin-lighthouse": "0.3.5", + "@backstage/plugin-newrelic": "0.3.23", + "@backstage/plugin-newrelic-dashboard": "0.1.13", + "@backstage/plugin-org": "0.5.5", + "@backstage/plugin-pagerduty": "0.3.32", + "@backstage/plugin-periskop": "0.1.3", + "@backstage/plugin-periskop-backend": "0.1.3", + "@backstage/plugin-permission-backend": "0.5.7", + "@backstage/plugin-permission-common": "0.6.1", + "@backstage/plugin-permission-node": "0.6.1", + "@backstage/plugin-permission-react": "0.4.1", + "@backstage/plugin-proxy-backend": "0.2.26", + "@backstage/plugin-rollbar": "0.4.5", + "@backstage/plugin-rollbar-backend": "0.1.29", + "@backstage/plugin-scaffolder": "1.2.0", + "@backstage/plugin-scaffolder-backend": "1.2.0", + "@backstage/plugin-scaffolder-backend-module-cookiecutter": "0.2.7", + "@backstage/plugin-scaffolder-backend-module-rails": "0.4.0", + "@backstage/plugin-scaffolder-backend-module-yeoman": "0.2.5", + "@backstage/plugin-scaffolder-common": "1.1.0", + "@backstage/plugin-search": "0.8.1", + "@backstage/plugin-search-backend": "0.5.2", + "@backstage/plugin-search-backend-module-elasticsearch": "0.1.4", + "@backstage/plugin-search-backend-module-pg": "0.3.3", + "@backstage/plugin-search-backend-node": "0.6.1", + "@backstage/plugin-search-common": "0.3.4", + "@backstage/plugin-search-react": "0.2.0", + "@backstage/plugin-sentry": "0.3.43", + "@backstage/plugin-shortcuts": "0.2.6", + "@backstage/plugin-sonarqube": "0.3.5", + "@backstage/plugin-splunk-on-call": "0.3.29", + "@backstage/plugin-stack-overflow": "0.1.1", + "@backstage/plugin-stack-overflow-backend": "0.1.1", + "@backstage/plugin-tech-insights": "0.2.1", + "@backstage/plugin-tech-insights-backend": "0.4.0", + "@backstage/plugin-tech-insights-backend-module-jsonfc": "0.1.16", + "@backstage/plugin-tech-insights-common": "0.2.4", + "@backstage/plugin-tech-insights-node": "0.3.0", + "@backstage/plugin-tech-radar": "0.5.12", + "@backstage/plugin-techdocs": "1.1.1", + "@backstage/plugin-techdocs-addons-test-utils": "1.0.0", + "@backstage/plugin-techdocs-backend": "1.1.1", + "@backstage/plugin-techdocs-module-addons-contrib": "1.0.0", + "@backstage/plugin-techdocs-node": "1.1.1", + "@backstage/plugin-techdocs-react": "1.0.0", + "@backstage/plugin-todo": "0.2.7", + "@backstage/plugin-todo-backend": "0.1.29", + "@backstage/plugin-user-settings": "0.4.4", + "@backstage/plugin-xcmetrics": "0.2.25" + }, + "changesets": [] +} From eb2544b21b219209fe05818b22d72594dd66532f Mon Sep 17 00:00:00 2001 From: Patrick Jungermann Date: Tue, 17 May 2022 23:53:08 +0200 Subject: [PATCH 16/16] fix: inline config interfaces Signed-off-by: Patrick Jungermann --- .changeset/beige-deers-remember.md | 5 ++ .changeset/nervous-gorillas-approve.md | 6 ++ .../catalog-backend-module-aws/config.d.ts | 66 ++++++++++++------- .../catalog-backend-module-gerrit/config.d.ts | 43 ++++++------ plugins/cost-insights/config.d.ts | 2 +- 5 files changed, 78 insertions(+), 44 deletions(-) create mode 100644 .changeset/beige-deers-remember.md create mode 100644 .changeset/nervous-gorillas-approve.md diff --git a/.changeset/beige-deers-remember.md b/.changeset/beige-deers-remember.md new file mode 100644 index 0000000000..4fcba4f0c6 --- /dev/null +++ b/.changeset/beige-deers-remember.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-cost-insights': patch +--- + +Add missing `export` in configuration schema. diff --git a/.changeset/nervous-gorillas-approve.md b/.changeset/nervous-gorillas-approve.md new file mode 100644 index 0000000000..8c0d742b7b --- /dev/null +++ b/.changeset/nervous-gorillas-approve.md @@ -0,0 +1,6 @@ +--- +'@backstage/plugin-catalog-backend-module-aws': patch +'@backstage/plugin-catalog-backend-module-gerrit': patch +--- + +Inline config interfaces diff --git a/plugins/catalog-backend-module-aws/config.d.ts b/plugins/catalog-backend-module-aws/config.d.ts index 2e41d60aac..6f84ca6daf 100644 --- a/plugins/catalog-backend-module-aws/config.d.ts +++ b/plugins/catalog-backend-module-aws/config.d.ts @@ -14,27 +14,6 @@ * limitations under the License. */ -interface AwsS3Config { - /** - * (Required) AWS S3 Bucket Name - * @visibility backend - */ - bucketName: string; - /** - * (Optional) AWS S3 Object key prefix - * If not set, all keys will be accepted, no filtering will be applied. - * @visibility backend - */ - prefix?: string; - /** - * (Optional) AWS Region. - * If not set, AWS_REGION environment variable or aws config file will be used. - * @see https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/setting-region.html - * @visibility backend - */ - region?: string; -} - export interface Config { catalog?: { /** @@ -62,7 +41,50 @@ export interface Config { * * Uses "default" as default id for the single config variant. */ - awsS3?: AwsS3Config | Record; + awsS3?: + | { + /** + * (Required) AWS S3 Bucket Name + * @visibility backend + */ + bucketName: string; + /** + * (Optional) AWS S3 Object key prefix + * If not set, all keys will be accepted, no filtering will be applied. + * @visibility backend + */ + prefix?: string; + /** + * (Optional) AWS Region. + * If not set, AWS_REGION environment variable or aws config file will be used. + * @see https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/setting-region.html + * @visibility backend + */ + region?: string; + } + | Record< + string, + { + /** + * (Required) AWS S3 Bucket Name + * @visibility backend + */ + bucketName: string; + /** + * (Optional) AWS S3 Object key prefix + * If not set, all keys will be accepted, no filtering will be applied. + * @visibility backend + */ + prefix?: string; + /** + * (Optional) AWS Region. + * If not set, AWS_REGION environment variable or aws config file will be used. + * @see https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/setting-region.html + * @visibility backend + */ + region?: string; + } + >; }; }; } diff --git a/plugins/catalog-backend-module-gerrit/config.d.ts b/plugins/catalog-backend-module-gerrit/config.d.ts index 14e8f58d8f..744917a198 100644 --- a/plugins/catalog-backend-module-gerrit/config.d.ts +++ b/plugins/catalog-backend-module-gerrit/config.d.ts @@ -14,26 +14,6 @@ * limitations under the License. */ -interface GerritConfig { - /** - * (Required) The host of the Gerrit integration to use. - * @visibility backend - */ - host: string; - /** - * (Required) The query to use for the "List Projects" API call. Used to limit the - * scope of the projects that the provider tries to ingest. - * @visibility backend - */ - query: string; - /** - * (Optional) Branch. - * The branch where the provider will try to find entities. Defaults to "master". - * @visibility backend - */ - branch?: string; -} - export interface Config { catalog?: { /** @@ -45,7 +25,28 @@ export interface Config { * * Maps provider id with configuration. */ - gerrit?: Record; + gerrit?: Record< + string, + { + /** + * (Required) The host of the Gerrit integration to use. + * @visibility backend + */ + host: string; + /** + * (Required) The query to use for the "List Projects" API call. Used to limit the + * scope of the projects that the provider tries to ingest. + * @visibility backend + */ + query: string; + /** + * (Optional) Branch. + * The branch where the provider will try to find entities. Defaults to "master". + * @visibility backend + */ + branch?: string; + } + >; }; }; } diff --git a/plugins/cost-insights/config.d.ts b/plugins/cost-insights/config.d.ts index 3d4e649b67..8438ca6561 100644 --- a/plugins/cost-insights/config.d.ts +++ b/plugins/cost-insights/config.d.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -interface Config { +export interface Config { costInsights: { /** * @visibility frontend