From dd395335bc252ff02c07e6457b519792fba917f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20MORI?= Date: Mon, 8 Aug 2022 15:06:01 +0200 Subject: [PATCH 01/28] Allow unknown typed location from being registered via the location service by configuration settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane MORI --- .changeset/flat-plums-shout.md | 5 + plugins/catalog-backend/config.d.ts | 17 +++ .../src/service/CatalogBuilder.ts | 2 +- .../service/DefaultLocationService.test.ts | 116 +++++++++++++++++- .../src/service/DefaultLocationService.ts | 10 +- 5 files changed, 146 insertions(+), 4 deletions(-) create mode 100644 .changeset/flat-plums-shout.md diff --git a/.changeset/flat-plums-shout.md b/.changeset/flat-plums-shout.md new file mode 100644 index 0000000000..578952c9c3 --- /dev/null +++ b/.changeset/flat-plums-shout.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-backend': patch +--- + +Allow unknown typed location from being registered via the location service by configuration settings diff --git a/plugins/catalog-backend/config.d.ts b/plugins/catalog-backend/config.d.ts index 950ed2f63c..473db9a35a 100644 --- a/plugins/catalog-backend/config.d.ts +++ b/plugins/catalog-backend/config.d.ts @@ -54,6 +54,23 @@ export interface Config { */ readonly?: boolean; + /** + * Allow unknown type when create location. + * + * Setting 'locationService.create.allowUnknownType=false' forbids to create + * location with unknown type through location service. + * This is the default value. + * + * Setting 'locationService.create.allowUnknownType=true' allows to create + * location with unknown type through location service. + * + */ + locationService?: { + create?: { + allowUnknownType: boolean; + }; + }; + /** * A set of static locations that the catalog shall always keep itself * up-to-date with. This is commonly used for large, permanent integrations diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.ts b/plugins/catalog-backend/src/service/CatalogBuilder.ts index e9e35301c3..57b5160a97 100644 --- a/plugins/catalog-backend/src/service/CatalogBuilder.ts +++ b/plugins/catalog-backend/src/service/CatalogBuilder.ts @@ -465,7 +465,7 @@ export class CatalogBuilder { const locationAnalyzer = this.locationAnalyzer ?? new RepoLocationAnalyzer(logger, integrations); const locationService = new AuthorizedLocationService( - new DefaultLocationService(locationStore, orchestrator), + new DefaultLocationService(locationStore, orchestrator, config), permissionEvaluator, ); const refreshService = new AuthorizedRefreshService( diff --git a/plugins/catalog-backend/src/service/DefaultLocationService.test.ts b/plugins/catalog-backend/src/service/DefaultLocationService.test.ts index 4399d48d69..e936d2de93 100644 --- a/plugins/catalog-backend/src/service/DefaultLocationService.test.ts +++ b/plugins/catalog-backend/src/service/DefaultLocationService.test.ts @@ -18,6 +18,7 @@ import { DefaultLocationService } from './DefaultLocationService'; import { CatalogProcessingOrchestrator } from '../processing/types'; import { LocationStore } from './types'; import { InputError } from '@backstage/errors'; +import { ConfigReader } from '@backstage/config'; describe('DefaultLocationServiceTest', () => { const orchestrator: jest.Mocked = { @@ -29,7 +30,17 @@ describe('DefaultLocationServiceTest', () => { listLocations: jest.fn(), getLocation: jest.fn(), }; - const locationService = new DefaultLocationService(store, orchestrator); + + const mockConfig = (allowUnknownType: boolean) => + new ConfigReader({ + catalog: { + locationService: { + create: { + allowUnknownType, + }, + }, + }, + }); beforeEach(() => { jest.resetAllMocks(); @@ -81,6 +92,11 @@ describe('DefaultLocationServiceTest', () => { errors: [], }); + const locationService = new DefaultLocationService( + store, + orchestrator, + mockConfig(false), + ); await locationService.createLocation( { type: 'url', target: 'https://backstage.io/catalog-info.yaml' }, true, @@ -144,6 +160,12 @@ describe('DefaultLocationServiceTest', () => { store.listLocations.mockResolvedValueOnce([ { id: '137', ...locationSpec }, ]); + + const locationService = new DefaultLocationService( + store, + orchestrator, + mockConfig(false), + ); const result = await locationService.createLocation( { type: 'url', target: 'https://backstage.io/catalog-info.yaml' }, true, @@ -197,6 +219,11 @@ describe('DefaultLocationServiceTest', () => { errors: [], }); + const locationService = new DefaultLocationService( + store, + orchestrator, + mockConfig(false), + ); await expect( locationService.createLocation( { type: 'url', target: 'https://backstage.io/catalog-info.yaml' }, @@ -225,6 +252,12 @@ describe('DefaultLocationServiceTest', () => { store.listLocations.mockResolvedValueOnce([ { id: '987', type: 'url', target: 'https://example.com' }, ]); + + const locationService = new DefaultLocationService( + store, + orchestrator, + mockConfig(false), + ); const result = await locationService.createLocation( { type: 'url', target: 'https://backstage.io/catalog-info.yaml' }, true, @@ -243,6 +276,11 @@ describe('DefaultLocationServiceTest', () => { id: '123', }); + const locationService = new DefaultLocationService( + store, + orchestrator, + mockConfig(false), + ); await expect( locationService.createLocation(locationSpec, false), ).resolves.toEqual({ @@ -259,7 +297,61 @@ describe('DefaultLocationServiceTest', () => { }); }); - it('should not allow locations of unknown types', async () => { + it('should create location with unknown type if configuration allows it', async () => { + const locationSpec = { + type: 'unknown', + target: 'https://backstage.io/catalog-info.yaml', + }; + + store.createLocation.mockResolvedValue({ + ...locationSpec, + id: '123', + }); + + const locationService = new DefaultLocationService( + store, + orchestrator, + mockConfig(true), + ); + await expect( + locationService.createLocation(locationSpec, false), + ).resolves.toEqual({ + entities: [], + location: { + id: '123', + target: 'https://backstage.io/catalog-info.yaml', + type: 'unknown', + }, + }); + expect(store.createLocation).toBeCalledWith({ + target: 'https://backstage.io/catalog-info.yaml', + type: 'unknown', + }); + }); + + it('should not allow locations of unknown types by default', async () => { + const locationService = new DefaultLocationService( + store, + orchestrator, + new ConfigReader({}), + ); + await expect( + locationService.createLocation( + { + type: 'unknown', + target: 'https://backstage.io/catalog-info.yaml', + }, + false, + ), + ).rejects.toThrow(InputError); + }); + + it('should not allow locations of unknown types if configuration forbids it', async () => { + const locationService = new DefaultLocationService( + store, + orchestrator, + mockConfig(false), + ); await expect( locationService.createLocation( { @@ -279,6 +371,11 @@ describe('DefaultLocationServiceTest', () => { errors: [new Error('Error: Unable to read url')], }); + const locationService = new DefaultLocationService( + store, + orchestrator, + mockConfig(false), + ); await expect( locationService.createLocation( { @@ -293,6 +390,11 @@ describe('DefaultLocationServiceTest', () => { describe('listLocations', () => { it('should call locationStore.deleteLocation', async () => { + const locationService = new DefaultLocationService( + store, + orchestrator, + mockConfig(false), + ); await locationService.listLocations(); expect(store.listLocations).toBeCalled(); }); @@ -300,6 +402,11 @@ describe('DefaultLocationServiceTest', () => { describe('deleteLocation', () => { it('should call locationStore.deleteLocation', async () => { + const locationService = new DefaultLocationService( + store, + orchestrator, + mockConfig(false), + ); await locationService.deleteLocation('123'); expect(store.deleteLocation).toBeCalledWith('123'); }); @@ -307,6 +414,11 @@ describe('DefaultLocationServiceTest', () => { describe('getLocation', () => { it('should call locationStore.getLocation', async () => { + const locationService = new DefaultLocationService( + store, + orchestrator, + mockConfig(false), + ); await locationService.getLocation('123'); expect(store.getLocation).toBeCalledWith('123'); }); diff --git a/plugins/catalog-backend/src/service/DefaultLocationService.ts b/plugins/catalog-backend/src/service/DefaultLocationService.ts index 819cead63d..e70d72a9ee 100644 --- a/plugins/catalog-backend/src/service/DefaultLocationService.ts +++ b/plugins/catalog-backend/src/service/DefaultLocationService.ts @@ -26,18 +26,26 @@ import { LocationInput, LocationService, LocationStore } from './types'; import { locationSpecToMetadataName } from '../util/conversion'; import { InputError } from '@backstage/errors'; import { DeferredEntity } from '@backstage/plugin-catalog-node'; +import { Config } from '@backstage/config'; export class DefaultLocationService implements LocationService { constructor( private readonly store: LocationStore, private readonly orchestrator: CatalogProcessingOrchestrator, + private readonly config: Config, ) {} async createLocation( input: LocationInput, dryRun: boolean, ): Promise<{ location: Location; entities: Entity[]; exists?: boolean }> { - if (input.type !== 'url') { + const allowUnknownTypeConfigName = + 'catalog.locationService.create.allowUnknownType'; + const allowUnknownType = + this.config.has(allowUnknownTypeConfigName) && + this.config.getBoolean(allowUnknownTypeConfigName); + + if (!allowUnknownType && input.type !== 'url') { throw new InputError(`Registered locations must be of type 'url'`); } if (dryRun) { From 679f7c5e95be93fc639b3aa9cd3677a29de6a7bb Mon Sep 17 00:00:00 2001 From: "TANGUY Antoine (SIB)" Date: Tue, 16 Aug 2022 16:51:29 +0200 Subject: [PATCH 02/28] fix(catalog-backend): add entity ref within errors Signed-off-by: TANGUY Antoine (SIB) --- .changeset/small-lemons-brake.md | 5 ++ ...faultCatalogProcessingOrchestrator.test.ts | 76 +++++++++++++++---- .../DefaultCatalogProcessingOrchestrator.ts | 11 ++- 3 files changed, 75 insertions(+), 17 deletions(-) create mode 100644 .changeset/small-lemons-brake.md diff --git a/.changeset/small-lemons-brake.md b/.changeset/small-lemons-brake.md new file mode 100644 index 0000000000..ac7906fc28 --- /dev/null +++ b/.changeset/small-lemons-brake.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-backend': patch +--- + +Include entity ref into error message when catalog policies fail diff --git a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.test.ts b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.test.ts index 30c668bb38..cbb130d138 100644 --- a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.test.ts +++ b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.test.ts @@ -20,6 +20,7 @@ import { ANNOTATION_ORIGIN_LOCATION, Entity, EntityPolicies, + EntityPolicy, LocationEntity, } from '@backstage/catalog-model'; import { ScmIntegrations } from '@backstage/integration'; @@ -35,6 +36,7 @@ import { CatalogRulesEnforcer } from '../ingestion/CatalogRules'; import { DefaultCatalogProcessingOrchestrator } from './DefaultCatalogProcessingOrchestrator'; import { defaultEntityDataParser } from '../modules/util/parse'; import { ConfigReader } from '@backstage/config'; +import { InputError } from '@backstage/errors'; class FooBarProcessor implements CatalogProcessor { getProcessorName = () => 'foo-bar'; @@ -191,23 +193,23 @@ describe('DefaultCatalogProcessingOrchestrator', () => { }); describe('rules', () => { - it('enforces catalog rules', async () => { - const entity: LocationEntity = { - apiVersion: 'backstage.io/v1beta1', - kind: 'Location', - metadata: { - name: 'l', - annotations: { - [ANNOTATION_ORIGIN_LOCATION]: 'url:https://example.com/origin.yaml', - [ANNOTATION_LOCATION]: 'url:https://example.com/origin.yaml', - }, + const entity: LocationEntity = { + apiVersion: 'backstage.io/v1beta1', + kind: 'Location', + metadata: { + name: 'l', + annotations: { + [ANNOTATION_ORIGIN_LOCATION]: 'url:https://example.com/origin.yaml', + [ANNOTATION_LOCATION]: 'url:https://example.com/origin.yaml', }, - spec: { - type: 'url', - target: 'http://example.com/entity.yaml', - }, - }; + }, + spec: { + type: 'url', + target: 'http://example.com/entity.yaml', + }, + }; + it('enforces catalog rules', async () => { const integrations = ScmIntegrations.fromConfig(new ConfigReader({})); const processor: jest.Mocked = { getProcessorName: jest.fn(), @@ -241,5 +243,49 @@ describe('DefaultCatalogProcessingOrchestrator', () => { orchestrator.process({ entity, state: {} }), ).resolves.toEqual(expect.objectContaining({ ok: false })); }); + + it('includes entity ref within error', async () => { + const integrations = ScmIntegrations.fromConfig(new ConfigReader({})); + const processor: jest.Mocked = { + getProcessorName: jest.fn(), + validateEntityKind: jest.fn(async () => true), + readLocation: jest.fn(async (_l, _o, emit) => { + emit(processingResult.entity({ type: 't', target: 't' }, entity)); + return true; + }), + }; + const parser: CatalogProcessorParser = jest.fn(); + const rulesEnforcer: jest.Mocked = { + isAllowed: jest.fn(), + }; + + class FailingEntityPolicy implements EntityPolicy { + async enforce(_entity: Entity): Promise { + // eslint-disable-next-line no-throw-literal + throw 'boom'; + } + } + const orchestrator = new DefaultCatalogProcessingOrchestrator({ + processors: [processor], + integrations, + logger: getVoidLogger(), + parser, + policy: EntityPolicies.allOf([new FailingEntityPolicy()]), + rulesEnforcer, + }); + + await expect( + orchestrator.process({ entity, state: {} }), + ).resolves.toEqual( + expect.objectContaining({ + ok: false, + errors: [ + new InputError( + "Policy check failed for location:default/l; caused by unknown error 'boom'", + ), + ], + }), + ); + }); }); }); diff --git a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.ts b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.ts index 9effaeb3d9..79876f70d8 100644 --- a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.ts +++ b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingOrchestrator.ts @@ -211,11 +211,18 @@ export class DefaultCatalogProcessingOrchestrator try { policyEnforcedEntity = await this.options.policy.enforce(entity); } catch (e) { - throw new InputError('Policy check failed', e); + throw new InputError( + `Policy check failed for ${stringifyEntityRef(entity)}`, + e, + ); } if (!policyEnforcedEntity) { - throw new Error('Policy unexpectedly returned no data'); + throw new Error( + `Policy unexpectedly returned no data for ${stringifyEntityRef( + entity, + )}`, + ); } return policyEnforcedEntity; From fdc6f0ad7dc27525ff29fae6eadedf6e39ce28a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20MORI?= Date: Fri, 19 Aug 2022 16:45:16 +0200 Subject: [PATCH 03/28] Use options instead of configuration for allowed location types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/backstage/backstage/pull/13013 Signed-off-by: Stéphane MORI --- .changeset/flat-plums-shout.md | 2 +- plugins/catalog-backend/config.d.ts | 17 ---- .../src/service/CatalogBuilder.ts | 18 +++- .../service/DefaultLocationService.test.ts | 97 +++---------------- .../src/service/DefaultLocationService.ts | 23 +++-- 5 files changed, 43 insertions(+), 114 deletions(-) diff --git a/.changeset/flat-plums-shout.md b/.changeset/flat-plums-shout.md index 578952c9c3..250d6a1b35 100644 --- a/.changeset/flat-plums-shout.md +++ b/.changeset/flat-plums-shout.md @@ -1,5 +1,5 @@ --- -'@backstage/plugin-catalog-backend': patch +'@backstage/plugin-catalog-backend': minor --- Allow unknown typed location from being registered via the location service by configuration settings diff --git a/plugins/catalog-backend/config.d.ts b/plugins/catalog-backend/config.d.ts index 473db9a35a..950ed2f63c 100644 --- a/plugins/catalog-backend/config.d.ts +++ b/plugins/catalog-backend/config.d.ts @@ -54,23 +54,6 @@ export interface Config { */ readonly?: boolean; - /** - * Allow unknown type when create location. - * - * Setting 'locationService.create.allowUnknownType=false' forbids to create - * location with unknown type through location service. - * This is the default value. - * - * Setting 'locationService.create.allowUnknownType=true' allows to create - * location with unknown type through location service. - * - */ - locationService?: { - create?: { - allowUnknownType: boolean; - }; - }; - /** * A set of static locations that the catalog shall always keep itself * up-to-date with. This is commonly used for large, permanent integrations diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.ts b/plugins/catalog-backend/src/service/CatalogBuilder.ts index 57b5160a97..9015bf4297 100644 --- a/plugins/catalog-backend/src/service/CatalogBuilder.ts +++ b/plugins/catalog-backend/src/service/CatalogBuilder.ts @@ -147,7 +147,8 @@ export class CatalogBuilder { maxSeconds: 150, }); private locationAnalyzer: LocationAnalyzer | undefined = undefined; - private permissionRules: CatalogPermissionRule[]; + private readonly permissionRules: CatalogPermissionRule[]; + private allowedLocationType: string[]; /** * Creates a catalog builder. @@ -167,6 +168,7 @@ export class CatalogBuilder { this.processorsReplace = false; this.parser = undefined; this.permissionRules = Object.values(catalogPermissionRules); + this.allowedLocationType = ['url']; } /** @@ -363,6 +365,16 @@ export class CatalogBuilder { this.permissionRules.push(...permissionRules.flat()); } + /** + * Sets up the allowed location types from being registered via the location service. + * + * @param allowedLocationTypes + */ + setAllowedLocationTypes(allowedLocationTypes: string[]) { + this.allowedLocationType = allowedLocationTypes; + return this; + } + /** * Wires up and returns all of the component parts of the catalog */ @@ -465,7 +477,9 @@ export class CatalogBuilder { const locationAnalyzer = this.locationAnalyzer ?? new RepoLocationAnalyzer(logger, integrations); const locationService = new AuthorizedLocationService( - new DefaultLocationService(locationStore, orchestrator, config), + new DefaultLocationService(locationStore, orchestrator, { + allowedLocationTypes: this.allowedLocationType, + }), permissionEvaluator, ); const refreshService = new AuthorizedRefreshService( diff --git a/plugins/catalog-backend/src/service/DefaultLocationService.test.ts b/plugins/catalog-backend/src/service/DefaultLocationService.test.ts index e936d2de93..d377ece202 100644 --- a/plugins/catalog-backend/src/service/DefaultLocationService.test.ts +++ b/plugins/catalog-backend/src/service/DefaultLocationService.test.ts @@ -18,7 +18,6 @@ import { DefaultLocationService } from './DefaultLocationService'; import { CatalogProcessingOrchestrator } from '../processing/types'; import { LocationStore } from './types'; import { InputError } from '@backstage/errors'; -import { ConfigReader } from '@backstage/config'; describe('DefaultLocationServiceTest', () => { const orchestrator: jest.Mocked = { @@ -31,17 +30,6 @@ describe('DefaultLocationServiceTest', () => { getLocation: jest.fn(), }; - const mockConfig = (allowUnknownType: boolean) => - new ConfigReader({ - catalog: { - locationService: { - create: { - allowUnknownType, - }, - }, - }, - }); - beforeEach(() => { jest.resetAllMocks(); }); @@ -92,11 +80,7 @@ describe('DefaultLocationServiceTest', () => { errors: [], }); - const locationService = new DefaultLocationService( - store, - orchestrator, - mockConfig(false), - ); + const locationService = new DefaultLocationService(store, orchestrator); await locationService.createLocation( { type: 'url', target: 'https://backstage.io/catalog-info.yaml' }, true, @@ -161,11 +145,7 @@ describe('DefaultLocationServiceTest', () => { { id: '137', ...locationSpec }, ]); - const locationService = new DefaultLocationService( - store, - orchestrator, - mockConfig(false), - ); + const locationService = new DefaultLocationService(store, orchestrator); const result = await locationService.createLocation( { type: 'url', target: 'https://backstage.io/catalog-info.yaml' }, true, @@ -219,11 +199,7 @@ describe('DefaultLocationServiceTest', () => { errors: [], }); - const locationService = new DefaultLocationService( - store, - orchestrator, - mockConfig(false), - ); + const locationService = new DefaultLocationService(store, orchestrator); await expect( locationService.createLocation( { type: 'url', target: 'https://backstage.io/catalog-info.yaml' }, @@ -253,11 +229,7 @@ describe('DefaultLocationServiceTest', () => { { id: '987', type: 'url', target: 'https://example.com' }, ]); - const locationService = new DefaultLocationService( - store, - orchestrator, - mockConfig(false), - ); + const locationService = new DefaultLocationService(store, orchestrator); const result = await locationService.createLocation( { type: 'url', target: 'https://backstage.io/catalog-info.yaml' }, true, @@ -276,11 +248,7 @@ describe('DefaultLocationServiceTest', () => { id: '123', }); - const locationService = new DefaultLocationService( - store, - orchestrator, - mockConfig(false), - ); + const locationService = new DefaultLocationService(store, orchestrator); await expect( locationService.createLocation(locationSpec, false), ).resolves.toEqual({ @@ -308,11 +276,9 @@ describe('DefaultLocationServiceTest', () => { id: '123', }); - const locationService = new DefaultLocationService( - store, - orchestrator, - mockConfig(true), - ); + const locationService = new DefaultLocationService(store, orchestrator, { + allowedLocationTypes: ['url', 'unknown'], + }); await expect( locationService.createLocation(locationSpec, false), ).resolves.toEqual({ @@ -330,28 +296,7 @@ describe('DefaultLocationServiceTest', () => { }); it('should not allow locations of unknown types by default', async () => { - const locationService = new DefaultLocationService( - store, - orchestrator, - new ConfigReader({}), - ); - await expect( - locationService.createLocation( - { - type: 'unknown', - target: 'https://backstage.io/catalog-info.yaml', - }, - false, - ), - ).rejects.toThrow(InputError); - }); - - it('should not allow locations of unknown types if configuration forbids it', async () => { - const locationService = new DefaultLocationService( - store, - orchestrator, - mockConfig(false), - ); + const locationService = new DefaultLocationService(store, orchestrator); await expect( locationService.createLocation( { @@ -371,11 +316,7 @@ describe('DefaultLocationServiceTest', () => { errors: [new Error('Error: Unable to read url')], }); - const locationService = new DefaultLocationService( - store, - orchestrator, - mockConfig(false), - ); + const locationService = new DefaultLocationService(store, orchestrator); await expect( locationService.createLocation( { @@ -390,11 +331,7 @@ describe('DefaultLocationServiceTest', () => { describe('listLocations', () => { it('should call locationStore.deleteLocation', async () => { - const locationService = new DefaultLocationService( - store, - orchestrator, - mockConfig(false), - ); + const locationService = new DefaultLocationService(store, orchestrator); await locationService.listLocations(); expect(store.listLocations).toBeCalled(); }); @@ -402,11 +339,7 @@ describe('DefaultLocationServiceTest', () => { describe('deleteLocation', () => { it('should call locationStore.deleteLocation', async () => { - const locationService = new DefaultLocationService( - store, - orchestrator, - mockConfig(false), - ); + const locationService = new DefaultLocationService(store, orchestrator); await locationService.deleteLocation('123'); expect(store.deleteLocation).toBeCalledWith('123'); }); @@ -414,11 +347,7 @@ describe('DefaultLocationServiceTest', () => { describe('getLocation', () => { it('should call locationStore.getLocation', async () => { - const locationService = new DefaultLocationService( - store, - orchestrator, - mockConfig(false), - ); + const locationService = new DefaultLocationService(store, orchestrator); await locationService.getLocation('123'); expect(store.getLocation).toBeCalledWith('123'); }); diff --git a/plugins/catalog-backend/src/service/DefaultLocationService.ts b/plugins/catalog-backend/src/service/DefaultLocationService.ts index e70d72a9ee..6603ebc08b 100644 --- a/plugins/catalog-backend/src/service/DefaultLocationService.ts +++ b/plugins/catalog-backend/src/service/DefaultLocationService.ts @@ -26,27 +26,30 @@ import { LocationInput, LocationService, LocationStore } from './types'; import { locationSpecToMetadataName } from '../util/conversion'; import { InputError } from '@backstage/errors'; import { DeferredEntity } from '@backstage/plugin-catalog-node'; -import { Config } from '@backstage/config'; + +export type DefaultLocationServiceOptions = { + allowedLocationTypes: string[]; +}; export class DefaultLocationService implements LocationService { constructor( private readonly store: LocationStore, private readonly orchestrator: CatalogProcessingOrchestrator, - private readonly config: Config, + private readonly options: DefaultLocationServiceOptions = { + allowedLocationTypes: ['url'], + }, ) {} async createLocation( input: LocationInput, dryRun: boolean, ): Promise<{ location: Location; entities: Entity[]; exists?: boolean }> { - const allowUnknownTypeConfigName = - 'catalog.locationService.create.allowUnknownType'; - const allowUnknownType = - this.config.has(allowUnknownTypeConfigName) && - this.config.getBoolean(allowUnknownTypeConfigName); - - if (!allowUnknownType && input.type !== 'url') { - throw new InputError(`Registered locations must be of type 'url'`); + if (!this.options.allowedLocationTypes.includes(input.type)) { + throw new InputError( + `Registered locations must be of an allowed type ${JSON.stringify( + this.options.allowedLocationTypes, + )}`, + ); } if (dryRun) { return this.dryRunCreateLocation(input); From 916369ae10242ded1ff4d57ba4cb5d93249b1491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20MORI?= Date: Mon, 22 Aug 2022 11:23:14 +0200 Subject: [PATCH 04/28] Refactor test to avoid multiple decalarations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane MORI --- .../service/DefaultLocationService.test.ts | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/plugins/catalog-backend/src/service/DefaultLocationService.test.ts b/plugins/catalog-backend/src/service/DefaultLocationService.test.ts index d377ece202..8169fc484d 100644 --- a/plugins/catalog-backend/src/service/DefaultLocationService.test.ts +++ b/plugins/catalog-backend/src/service/DefaultLocationService.test.ts @@ -29,6 +29,7 @@ describe('DefaultLocationServiceTest', () => { listLocations: jest.fn(), getLocation: jest.fn(), }; + const locationService = new DefaultLocationService(store, orchestrator); beforeEach(() => { jest.resetAllMocks(); @@ -80,7 +81,6 @@ describe('DefaultLocationServiceTest', () => { errors: [], }); - const locationService = new DefaultLocationService(store, orchestrator); await locationService.createLocation( { type: 'url', target: 'https://backstage.io/catalog-info.yaml' }, true, @@ -145,7 +145,6 @@ describe('DefaultLocationServiceTest', () => { { id: '137', ...locationSpec }, ]); - const locationService = new DefaultLocationService(store, orchestrator); const result = await locationService.createLocation( { type: 'url', target: 'https://backstage.io/catalog-info.yaml' }, true, @@ -199,7 +198,6 @@ describe('DefaultLocationServiceTest', () => { errors: [], }); - const locationService = new DefaultLocationService(store, orchestrator); await expect( locationService.createLocation( { type: 'url', target: 'https://backstage.io/catalog-info.yaml' }, @@ -229,7 +227,6 @@ describe('DefaultLocationServiceTest', () => { { id: '987', type: 'url', target: 'https://example.com' }, ]); - const locationService = new DefaultLocationService(store, orchestrator); const result = await locationService.createLocation( { type: 'url', target: 'https://backstage.io/catalog-info.yaml' }, true, @@ -248,7 +245,6 @@ describe('DefaultLocationServiceTest', () => { id: '123', }); - const locationService = new DefaultLocationService(store, orchestrator); await expect( locationService.createLocation(locationSpec, false), ).resolves.toEqual({ @@ -276,11 +272,15 @@ describe('DefaultLocationServiceTest', () => { id: '123', }); - const locationService = new DefaultLocationService(store, orchestrator, { - allowedLocationTypes: ['url', 'unknown'], - }); + const locationServiceAllowingUnknownType = new DefaultLocationService( + store, + orchestrator, + { + allowedLocationTypes: ['url', 'unknown'], + }, + ); await expect( - locationService.createLocation(locationSpec, false), + locationServiceAllowingUnknownType.createLocation(locationSpec, false), ).resolves.toEqual({ entities: [], location: { @@ -296,7 +296,6 @@ describe('DefaultLocationServiceTest', () => { }); it('should not allow locations of unknown types by default', async () => { - const locationService = new DefaultLocationService(store, orchestrator); await expect( locationService.createLocation( { @@ -316,7 +315,6 @@ describe('DefaultLocationServiceTest', () => { errors: [new Error('Error: Unable to read url')], }); - const locationService = new DefaultLocationService(store, orchestrator); await expect( locationService.createLocation( { @@ -331,7 +329,6 @@ describe('DefaultLocationServiceTest', () => { describe('listLocations', () => { it('should call locationStore.deleteLocation', async () => { - const locationService = new DefaultLocationService(store, orchestrator); await locationService.listLocations(); expect(store.listLocations).toBeCalled(); }); @@ -339,7 +336,6 @@ describe('DefaultLocationServiceTest', () => { describe('deleteLocation', () => { it('should call locationStore.deleteLocation', async () => { - const locationService = new DefaultLocationService(store, orchestrator); await locationService.deleteLocation('123'); expect(store.deleteLocation).toBeCalledWith('123'); }); @@ -347,7 +343,6 @@ describe('DefaultLocationServiceTest', () => { describe('getLocation', () => { it('should call locationStore.getLocation', async () => { - const locationService = new DefaultLocationService(store, orchestrator); await locationService.getLocation('123'); expect(store.getLocation).toBeCalledWith('123'); }); From 290ca43a2033c6c7f96d24f4e7a843712ac274ed Mon Sep 17 00:00:00 2001 From: Peter Macdonald Date: Wed, 24 Aug 2022 15:37:25 +0200 Subject: [PATCH 05/28] Add ProjectID to the output for #10907 Signed-off-by: Peter Macdonald --- .../src/scaffolder/actions/builtin/publish/gitlab.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts index 4fe55b77a2..9fc95b1b5e 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts @@ -112,6 +112,10 @@ export function createPublishGitlabAction(options: { title: 'A URL to the root of the repository', type: 'string', }, + projectId: { + title: 'The ID of the project', + type: 'string', + }, }, }, }, @@ -214,6 +218,7 @@ export function createPublishGitlabAction(options: { ctx.output('remoteUrl', remoteUrl); ctx.output('repoContentsUrl', repoContentsUrl); + ctx.output('projectId', projectId); }, }); } From 7db961367170d21b78642da7dbd3c3cb44fb0c3f Mon Sep 17 00:00:00 2001 From: Peter Macdonald Date: Wed, 24 Aug 2022 16:07:50 +0200 Subject: [PATCH 06/28] Added Changeset Signed-off-by: Peter Macdonald --- .changeset/good-papayas-dress.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/good-papayas-dress.md diff --git a/.changeset/good-papayas-dress.md b/.changeset/good-papayas-dress.md new file mode 100644 index 0000000000..09f60263c3 --- /dev/null +++ b/.changeset/good-papayas-dress.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder-backend': minor +--- + +added projectId for gitlab projects to be displayed in the output From f9ad79cedc2a395ded5fd7b5b259a12f45a4bfc5 Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 24 Aug 2022 21:40:09 +0200 Subject: [PATCH 07/28] chore: updating the api-report and fix the warning Signed-off-by: blam --- plugins/catalog-backend/api-report.md | 1 + plugins/catalog-backend/src/service/CatalogBuilder.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md index 22a7f8192c..d15c631e0c 100644 --- a/plugins/catalog-backend/api-report.md +++ b/plugins/catalog-backend/api-report.md @@ -150,6 +150,7 @@ export class CatalogBuilder { getDefaultProcessors(): CatalogProcessor[]; replaceEntityPolicies(policies: EntityPolicy[]): CatalogBuilder; replaceProcessors(processors: CatalogProcessor[]): CatalogBuilder; + setAllowedLocationTypes(allowedLocationTypes: string[]): this; setEntityDataParser(parser: CatalogProcessorParser): CatalogBuilder; setFieldFormatValidators(validators: Partial): CatalogBuilder; setLocationAnalyzer(locationAnalyzer: LocationAnalyzer): CatalogBuilder; diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.ts b/plugins/catalog-backend/src/service/CatalogBuilder.ts index 9015bf4297..a8ed0f492a 100644 --- a/plugins/catalog-backend/src/service/CatalogBuilder.ts +++ b/plugins/catalog-backend/src/service/CatalogBuilder.ts @@ -368,7 +368,7 @@ export class CatalogBuilder { /** * Sets up the allowed location types from being registered via the location service. * - * @param allowedLocationTypes + * @param allowedLocationTypes - the allowed location types */ setAllowedLocationTypes(allowedLocationTypes: string[]) { this.allowedLocationType = allowedLocationTypes; From 72d84f47c52eb5b31453d29af747e9ced141ccd6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 00:00:13 +0000 Subject: [PATCH 08/28] fix(deps): update dependency core-js to v3.25.0 Signed-off-by: Renovate Bot --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 84c39a4f96..74db1a874b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11214,9 +11214,9 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.10: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.4.1, core-js@^3.6.5: - version "3.22.8" - resolved "https://registry.npmjs.org/core-js/-/core-js-3.22.8.tgz#23f860b1fe60797cc4f704d76c93fea8a2f60631" - integrity sha512-UoGQ/cfzGYIuiq6Z7vWL1HfkE9U9IZ4Ub+0XSiJTCzvbZzgPA69oDF2f+lgJ6dFFLEdjW5O6svvoKzXX23xFkA== + version "3.25.0" + resolved "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz#be71d9e0dd648ffd70c44a7ec2319d039357eceb" + integrity sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" From 01b1ab30a9550e9672126ea1ed8c3d4982401b88 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 00:01:54 +0000 Subject: [PATCH 09/28] fix(deps): update dependency eslint-plugin-react to v7.31.0 Signed-off-by: Renovate Bot --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 84c39a4f96..542bed1ffb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13135,9 +13135,9 @@ eslint-plugin-react-hooks@^4.3.0: integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== eslint-plugin-react@^7.28.0: - version "7.30.1" - resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.30.1.tgz#2be4ab23ce09b5949c6631413ba64b2810fd3e22" - integrity sha512-NbEvI9jtqO46yJA3wcRF9Mo0lF9T/jhdHqhCHXiXtD+Zcb98812wvokjWpU7Q4QH5edo6dmqrukxVvWWXHlsUg== + version "7.31.0" + resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.0.tgz#fd3f81c9db5971095b3521ede22781afd37442b0" + integrity sha512-BWriBttYYCnfb4RO9SB91Og8uA9CPcBMl5UlCOCtuYW1UjhN3QypzEcEHky4ZIRZDKjbO2Blh9BjP8E7W/b1SA== dependencies: array-includes "^3.1.5" array.prototype.flatmap "^1.3.0" From adac38fbcd20d45f45e0515478f11ebc079cc36b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 00:02:57 +0000 Subject: [PATCH 10/28] fix(deps): update typescript-eslint monorepo to v5.35.1 Signed-off-by: Renovate Bot --- yarn.lock | 90 +++++++++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/yarn.lock b/yarn.lock index 84c39a4f96..955198e184 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8143,13 +8143,13 @@ integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw== "@typescript-eslint/eslint-plugin@^5.9.0": - version "5.34.0" - resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.34.0.tgz#d690f60e335596f38b01792e8f4b361d9bd0cb35" - integrity sha512-eRfPPcasO39iwjlUAMtjeueRGuIrW3TQ9WseIDl7i5UWuFbf83yYaU7YPs4j8+4CxUMIsj1k+4kV+E+G+6ypDQ== + version "5.35.1" + resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.35.1.tgz#0d822bfea7469904dfc1bb8f13cabd362b967c93" + integrity sha512-RBZZXZlI4XCY4Wzgy64vB+0slT9+yAPQRjj/HSaRwUot33xbDjF1oN9BLwOLTewoOI0jothIltZRe9uJCHf8gg== dependencies: - "@typescript-eslint/scope-manager" "5.34.0" - "@typescript-eslint/type-utils" "5.34.0" - "@typescript-eslint/utils" "5.34.0" + "@typescript-eslint/scope-manager" "5.35.1" + "@typescript-eslint/type-utils" "5.35.1" + "@typescript-eslint/utils" "5.35.1" debug "^4.3.4" functional-red-black-tree "^1.0.1" ignore "^5.2.0" @@ -8170,13 +8170,13 @@ eslint-utils "^3.0.0" "@typescript-eslint/parser@^5.9.0": - version "5.34.0" - resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.34.0.tgz#ca710858ea85dbfd30c9b416a335dc49e82dbc07" - integrity sha512-SZ3NEnK4usd2CXkoV3jPa/vo1mWX1fqRyIVUQZR4As1vyp4fneknBNJj+OFtV8WAVgGf+rOHMSqQbs2Qn3nFZQ== + version "5.35.1" + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.35.1.tgz#bf2ee2ebeaa0a0567213748243fb4eec2857f04f" + integrity sha512-XL2TBTSrh3yWAsMYpKseBYTVpvudNf69rPOWXWVBI08My2JVT5jR66eTt4IgQFHA/giiKJW5dUD4x/ZviCKyGg== dependencies: - "@typescript-eslint/scope-manager" "5.34.0" - "@typescript-eslint/types" "5.34.0" - "@typescript-eslint/typescript-estree" "5.34.0" + "@typescript-eslint/scope-manager" "5.35.1" + "@typescript-eslint/types" "5.35.1" + "@typescript-eslint/typescript-estree" "5.35.1" debug "^4.3.4" "@typescript-eslint/scope-manager@5.20.0": @@ -8187,13 +8187,13 @@ "@typescript-eslint/types" "5.20.0" "@typescript-eslint/visitor-keys" "5.20.0" -"@typescript-eslint/scope-manager@5.34.0": - version "5.34.0" - resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.34.0.tgz#14efd13dc57602937e25f188fd911f118781e527" - integrity sha512-HNvASMQlah5RsBW6L6c7IJ0vsm+8Sope/wu5sEAf7joJYWNb1LDbJipzmdhdUOnfrDFE6LR1j57x1EYVxrY4ow== +"@typescript-eslint/scope-manager@5.35.1": + version "5.35.1" + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.35.1.tgz#ccb69d54b7fd0f2d0226a11a75a8f311f525ff9e" + integrity sha512-kCYRSAzIW9ByEIzmzGHE50NGAvAP3wFTaZevgWva7GpquDyFPFcmvVkFJGWJJktg/hLwmys/FZwqM9EKr2u24Q== dependencies: - "@typescript-eslint/types" "5.34.0" - "@typescript-eslint/visitor-keys" "5.34.0" + "@typescript-eslint/types" "5.35.1" + "@typescript-eslint/visitor-keys" "5.35.1" "@typescript-eslint/scope-manager@5.9.0": version "5.9.0" @@ -8203,12 +8203,12 @@ "@typescript-eslint/types" "5.9.0" "@typescript-eslint/visitor-keys" "5.9.0" -"@typescript-eslint/type-utils@5.34.0": - version "5.34.0" - resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.34.0.tgz#7a324ab9ddd102cd5e1beefc94eea6f3eb32d32d" - integrity sha512-Pxlno9bjsQ7hs1pdWRUv9aJijGYPYsHpwMeCQ/Inavhym3/XaKt1ZKAA8FIw4odTBfowBdZJDMxf2aavyMDkLg== +"@typescript-eslint/type-utils@5.35.1": + version "5.35.1" + resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.35.1.tgz#d50903b56758c5c8fc3be52b3be40569f27f9c4a" + integrity sha512-8xT8ljvo43Mp7BiTn1vxLXkjpw8wS4oAc00hMSB4L1/jIiYbjjnc3Qp2GAUOG/v8zsNCd1qwcqfCQ0BuishHkw== dependencies: - "@typescript-eslint/utils" "5.34.0" + "@typescript-eslint/utils" "5.35.1" debug "^4.3.4" tsutils "^3.21.0" @@ -8217,10 +8217,10 @@ resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.20.0.tgz#fa39c3c2aa786568302318f1cb51fcf64258c20c" integrity sha512-+d8wprF9GyvPwtoB4CxBAR/s0rpP25XKgnOvMf/gMXYDvlUC3rPFHupdTQ/ow9vn7UDe5rX02ovGYQbv/IUCbg== -"@typescript-eslint/types@5.34.0": - version "5.34.0" - resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.34.0.tgz#217bf08049e9e7b86694d982e88a2c1566330c78" - integrity sha512-49fm3xbbUPuzBIOcy2CDpYWqy/X7VBkxVN+DC21e0zIm3+61Z0NZi6J9mqPmSW1BDVk9FIOvuCFyUPjXz93sjA== +"@typescript-eslint/types@5.35.1": + version "5.35.1" + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.35.1.tgz#af355fe52a0cc88301e889bc4ada72f279b63d61" + integrity sha512-FDaujtsH07VHzG0gQ6NDkVVhi1+rhq0qEvzHdJAQjysN+LHDCKDKCBRlZFFE0ec0jKxiv0hN63SNfExy0KrbQQ== "@typescript-eslint/types@5.9.0": version "5.9.0" @@ -8240,13 +8240,13 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@5.34.0": - version "5.34.0" - resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.34.0.tgz#ba7b83f4bf8ccbabf074bbf1baca7a58de3ccb9a" - integrity sha512-mXHAqapJJDVzxauEkfJI96j3D10sd567LlqroyCeJaHnu42sDbjxotGb3XFtGPYKPD9IyLjhsoULML1oI3M86A== +"@typescript-eslint/typescript-estree@5.35.1": + version "5.35.1" + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.35.1.tgz#db878a39a0dbdc9bb133f11cdad451770bfba211" + integrity sha512-JUqE1+VRTGyoXlDWWjm6MdfpBYVq+hixytrv1oyjYIBEOZhBCwtpp5ZSvBt4wIA1MKWlnaC2UXl2XmYGC3BoQA== dependencies: - "@typescript-eslint/types" "5.34.0" - "@typescript-eslint/visitor-keys" "5.34.0" + "@typescript-eslint/types" "5.35.1" + "@typescript-eslint/visitor-keys" "5.35.1" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -8266,15 +8266,15 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/utils@5.34.0": - version "5.34.0" - resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.34.0.tgz#0cae98f48d8f9e292e5caa9343611b6faf49e743" - integrity sha512-kWRYybU4Rn++7lm9yu8pbuydRyQsHRoBDIo11k7eqBWTldN4xUdVUMCsHBiE7aoEkFzrUEaZy3iH477vr4xHAQ== +"@typescript-eslint/utils@5.35.1": + version "5.35.1" + resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.35.1.tgz#ae1399afbfd6aa7d0ed1b7d941e9758d950250eb" + integrity sha512-v6F8JNXgeBWI4pzZn36hT2HXXzoBBBJuOYvoQiaQaEEjdi5STzux3Yj8v7ODIpx36i/5s8TdzuQ54TPc5AITQQ== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.34.0" - "@typescript-eslint/types" "5.34.0" - "@typescript-eslint/typescript-estree" "5.34.0" + "@typescript-eslint/scope-manager" "5.35.1" + "@typescript-eslint/types" "5.35.1" + "@typescript-eslint/typescript-estree" "5.35.1" eslint-scope "^5.1.1" eslint-utils "^3.0.0" @@ -8298,12 +8298,12 @@ "@typescript-eslint/types" "5.20.0" eslint-visitor-keys "^3.0.0" -"@typescript-eslint/visitor-keys@5.34.0": - version "5.34.0" - resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.34.0.tgz#d0fb3e31033e82ddd5de048371ad39eb342b2d40" - integrity sha512-O1moYjOSrab0a2fUvFpsJe0QHtvTC+cR+ovYpgKrAVXzqQyc74mv76TgY6z+aEtjQE2vgZux3CQVtGryqdcOAw== +"@typescript-eslint/visitor-keys@5.35.1": + version "5.35.1" + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.35.1.tgz#285e9e34aed7c876f16ff646a3984010035898e6" + integrity sha512-cEB1DvBVo1bxbW/S5axbGPE6b7FIMAbo3w+AGq6zNDA7+NYJOIkKj/sInfTv4edxd4PxJSgdN4t6/pbvgA+n5g== dependencies: - "@typescript-eslint/types" "5.34.0" + "@typescript-eslint/types" "5.35.1" eslint-visitor-keys "^3.3.0" "@typescript-eslint/visitor-keys@5.9.0": From c9ea7a5433bfc50823c86e3fadc037761bb1e51a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 02:37:03 +0000 Subject: [PATCH 11/28] fix(deps): update dependency @uiw/react-codemirror to v4.11.6 Signed-off-by: Renovate Bot --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7c42577aee..e27f44270c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8314,10 +8314,10 @@ "@typescript-eslint/types" "5.9.0" eslint-visitor-keys "^3.0.0" -"@uiw/codemirror-extensions-basic-setup@4.11.5": - version "4.11.5" - resolved "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.11.5.tgz#e66462bda16bb635948a6faa8ee354f5db22f0b5" - integrity sha512-aHtdF1JEzHmBVuWXemr8OH7SQP/LbXXZdiOo/4tcxjFpyTuVGzPteBdfQU0xPOk0m+5Oc1LPqM+HaNPXNzX6aA== +"@uiw/codemirror-extensions-basic-setup@4.11.6": + version "4.11.6" + resolved "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.11.6.tgz#a1fd89ac39a16ba750fff5e73e219ff32624aed7" + integrity sha512-VW9tmkHvdD5u3osksBrDU/DQYNGcifK3qJPmmMKmje106pZTgIhvxABVhNCEJlDIrG5zYV5cqLtwb9TPbkd5qQ== dependencies: "@codemirror/autocomplete" "^6.0.0" "@codemirror/commands" "^6.0.0" @@ -8328,13 +8328,13 @@ "@codemirror/view" "^6.0.0" "@uiw/react-codemirror@^4.9.3": - version "4.11.5" - resolved "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.11.5.tgz#9efead5e0f9496bda6eeb1118b67687b3b82861a" - integrity sha512-Bf8l3nVV4ekHbv4U0VrzUibl8+ucAY3UV0gk0xckbFnV1AlUxHcrYFiXSgy/rkyWBD7enHQENtM888B/3qBiwg== + version "4.11.6" + resolved "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.11.6.tgz#99267c5128912e7daf01c3bdcda70c1a7a7a9c68" + integrity sha512-xPBOHtWE1MqHp8H/hTnOTxnz1ZQiQ2CHi1neiTpnjUxQUNv5mm5vTSgw2POxPh1AJqAVFuS6L1p3EZZPiVyehQ== dependencies: "@babel/runtime" "^7.18.6" "@codemirror/theme-one-dark" "^6.0.0" - "@uiw/codemirror-extensions-basic-setup" "4.11.5" + "@uiw/codemirror-extensions-basic-setup" "4.11.6" codemirror "^6.0.0" "@webassemblyjs/ast@1.11.1": From 2b3f31b3f82da95f325799fd42f7d947c582709c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 06:51:23 +0000 Subject: [PATCH 12/28] fix(deps): update dependency @swc/helpers to v0.4.11 Signed-off-by: Renovate Bot --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index e27f44270c..e8f752145c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6540,9 +6540,9 @@ "@swc/core-win32-x64-msvc" "1.2.242" "@swc/helpers@^0.4.7": - version "0.4.9" - resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.9.tgz#09ab44feae456adaa1acb00f59254b9d0f89ba72" - integrity sha512-VQBBIInp9++WQaRsXbi05XwnH0qhNCJ99iMzdh5WmA9eXhXKNc4NnMB8GEOL1aaRju+E+vQA4rGYFM1jmb3BXA== + version "0.4.11" + resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.11.tgz#db23a376761b3d31c26502122f349a21b592c8de" + integrity sha512-rEUrBSGIoSFuYxwBYtlUFMlE2CwGhmW+w9355/5oduSw8e5h2+Tj4UrAGNNgP9915++wj5vkQo0UuOBqOAq4nw== dependencies: tslib "^2.4.0" From ac081c133d19ddf1f76a749a0b3c67906d0007eb Mon Sep 17 00:00:00 2001 From: Peter Macdonald <13601053+Parsifal-M@users.noreply.github.com> Date: Thu, 25 Aug 2022 11:14:19 +0200 Subject: [PATCH 13/28] Update .changeset/good-papayas-dress.md Anything for Vale :) Co-authored-by: Johan Haals Signed-off-by: Peter Macdonald <13601053+Parsifal-M@users.noreply.github.com> --- .changeset/good-papayas-dress.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/good-papayas-dress.md b/.changeset/good-papayas-dress.md index 09f60263c3..26062c8da8 100644 --- a/.changeset/good-papayas-dress.md +++ b/.changeset/good-papayas-dress.md @@ -2,4 +2,4 @@ '@backstage/plugin-scaffolder-backend': minor --- -added projectId for gitlab projects to be displayed in the output +Added `projectId` for gitlab projects to be displayed in the `gitlab:publish` output From 7b718aae29a3e6f07385902248b5b6dd25fd049d Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 25 Aug 2022 11:38:25 +0200 Subject: [PATCH 14/28] chore: use CatalogBuilder as return type Signed-off-by: blam --- plugins/catalog-backend/api-report.md | 2 +- plugins/catalog-backend/src/service/CatalogBuilder.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md index d15c631e0c..aa667b01d7 100644 --- a/plugins/catalog-backend/api-report.md +++ b/plugins/catalog-backend/api-report.md @@ -150,7 +150,7 @@ export class CatalogBuilder { getDefaultProcessors(): CatalogProcessor[]; replaceEntityPolicies(policies: EntityPolicy[]): CatalogBuilder; replaceProcessors(processors: CatalogProcessor[]): CatalogBuilder; - setAllowedLocationTypes(allowedLocationTypes: string[]): this; + setAllowedLocationTypes(allowedLocationTypes: string[]): CatalogBuilder; setEntityDataParser(parser: CatalogProcessorParser): CatalogBuilder; setFieldFormatValidators(validators: Partial): CatalogBuilder; setLocationAnalyzer(locationAnalyzer: LocationAnalyzer): CatalogBuilder; diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.ts b/plugins/catalog-backend/src/service/CatalogBuilder.ts index a8ed0f492a..25f9fde313 100644 --- a/plugins/catalog-backend/src/service/CatalogBuilder.ts +++ b/plugins/catalog-backend/src/service/CatalogBuilder.ts @@ -370,7 +370,7 @@ export class CatalogBuilder { * * @param allowedLocationTypes - the allowed location types */ - setAllowedLocationTypes(allowedLocationTypes: string[]) { + setAllowedLocationTypes(allowedLocationTypes: string[]): CatalogBuilder { this.allowedLocationType = allowedLocationTypes; return this; } From a6d551fad97f79c3b58a4cf89a81620b5fcab652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Thu, 25 Aug 2022 12:01:27 +0200 Subject: [PATCH 15/28] Properly handle free-text entity filtering in the case of empty tag arrays MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- .changeset/large-trainers-float.md | 5 ++++ plugins/catalog-react/src/filters.ts | 38 ++++++++++++++++++---------- 2 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 .changeset/large-trainers-float.md diff --git a/.changeset/large-trainers-float.md b/.changeset/large-trainers-float.md new file mode 100644 index 0000000000..b5d1d9be1d --- /dev/null +++ b/.changeset/large-trainers-float.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-react': patch +--- + +Properly handle free-text entity filtering in the case of empty tag arrays diff --git a/plugins/catalog-react/src/filters.ts b/plugins/catalog-react/src/filters.ts index a828015f0e..056b3b92c1 100644 --- a/plugins/catalog-react/src/filters.ts +++ b/plugins/catalog-react/src/filters.ts @@ -84,20 +84,32 @@ export class EntityTextFilter implements EntityFilter { constructor(readonly value: string) {} filterEntity(entity: Entity): boolean { - const upperCaseValue = this.value.toLocaleUpperCase('en-US'); + const words = this.toUpperArray(this.value.split(/\s/)); + const exactMatch = this.toUpperArray([entity.metadata.tags]); + const partialMatch = this.toUpperArray([ + entity.metadata.name, + entity.metadata.title, + ]); - return ( - entity.metadata.name - .toLocaleUpperCase('en-US') - .includes(upperCaseValue) || - `${entity.metadata.title}` - .toLocaleUpperCase('en-US') - .includes(upperCaseValue) || - entity.metadata.tags - ?.join('') - .toLocaleUpperCase('en-US') - .indexOf(upperCaseValue) !== -1 - ); + for (const word of words) { + if ( + exactMatch.every(m => m !== word) && + partialMatch.every(m => !m.includes(word)) + ) { + return false; + } + } + + return true; + } + + private toUpperArray( + value: Array, + ): Array { + return value + .flat() + .filter((m): m is string => Boolean(m)) + .map(m => m.toLocaleUpperCase('en-US')); } } From 651c9d6800e1f9036ae2485b8e67a982417cc6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Thu, 25 Aug 2022 14:38:50 +0200 Subject: [PATCH 16/28] index a null for large values as well MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- .changeset/gold-hounds-vanish.md | 5 +++++ .../src/stitching/buildEntitySearch.test.ts | 4 ++-- .../catalog-backend/src/stitching/buildEntitySearch.ts | 8 ++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 .changeset/gold-hounds-vanish.md diff --git a/.changeset/gold-hounds-vanish.md b/.changeset/gold-hounds-vanish.md new file mode 100644 index 0000000000..d221f0f5e9 --- /dev/null +++ b/.changeset/gold-hounds-vanish.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-backend': minor +--- + +The search index now does retain fields that have a very long value, but in the form of just a null. This makes it possible to at least filter for their existence. diff --git a/plugins/catalog-backend/src/stitching/buildEntitySearch.test.ts b/plugins/catalog-backend/src/stitching/buildEntitySearch.test.ts index e18f1c0c48..7364486f06 100644 --- a/plugins/catalog-backend/src/stitching/buildEntitySearch.test.ts +++ b/plugins/catalog-backend/src/stitching/buildEntitySearch.test.ts @@ -109,10 +109,10 @@ describe('buildEntitySearch', () => { expect(output).toEqual([]); }); - it('skips very large values', () => { + it('replaces very large values with null', () => { const input = [{ key: 'foo', value: 'a'.repeat(10000) }]; const output = mapToRows(input, 'eid'); - expect(output).toEqual([]); + expect(output).toEqual([{ entity_id: 'eid', key: 'foo', value: null }]); }); }); diff --git a/plugins/catalog-backend/src/stitching/buildEntitySearch.ts b/plugins/catalog-backend/src/stitching/buildEntitySearch.ts index 54e5ffa738..88a87df134 100644 --- a/plugins/catalog-backend/src/stitching/buildEntitySearch.ts +++ b/plugins/catalog-backend/src/stitching/buildEntitySearch.ts @@ -137,8 +137,12 @@ export function mapToRows(input: Kv[], entityId: string): DbSearchRow[] { result.push({ entity_id: entityId, key, value: null }); } else { const value = String(rawValue).toLocaleLowerCase('en-US'); - if (key.length <= MAX_KEY_LENGTH && value.length <= MAX_VALUE_LENGTH) { - result.push({ entity_id: entityId, key, value }); + if (key.length <= MAX_KEY_LENGTH) { + result.push({ + entity_id: entityId, + key, + value: value.length <= MAX_VALUE_LENGTH ? value : null, + }); } } } From 18ee24197e5644704fe0117bf56b7d8f318ae1bc Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 25 Aug 2022 14:53:28 +0200 Subject: [PATCH 17/28] chore: fix autoselect of the workspace when there are a list provided Signed-off-by: blam --- .../fields/RepoUrlPicker/BitbucketRepoPicker.tsx | 9 ++++++++- .../components/fields/RepoUrlPicker/RepoUrlPicker.tsx | 6 +++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx index 38d615078d..5bc1380553 100644 --- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx +++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import React from 'react'; +import React, { useEffect } from 'react'; import FormControl from '@material-ui/core/FormControl'; import FormHelperText from '@material-ui/core/FormHelperText'; import Input from '@material-ui/core/Input'; @@ -32,6 +32,13 @@ export const BitbucketRepoPicker = (props: { const ownerItems: SelectItem[] = allowedOwners ? allowedOwners?.map(i => ({ label: i, value: i })) : []; + + useEffect(() => { + if (host === 'bitbucket.org' && allowedOwners.length) { + onChange({ workspace: allowedOwners[0] }); + } + }, [allowedOwners, host, onChange]); + return ( <> {host === 'bitbucket.org' && ( diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx index f6fa37109d..2214997560 100644 --- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx +++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx @@ -90,9 +90,13 @@ export const RepoUrlPicker = ( /* we deal with calling the repo setting here instead of in each components for ease */ useEffect(() => { if (allowedOwners.length > 0) { - setState(prevState => ({ ...prevState, owner: allowedOwners[0] })); + setState(prevState => ({ + ...prevState, + owner: allowedOwners[0], + })); } }, [setState, allowedOwners]); + useEffect(() => { if (allowedRepos.length > 0) { setState(prevState => ({ ...prevState, repoName: allowedRepos[0] })); From a66d44b72b760e69696a0e84ffea20a64d8d385d Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 25 Aug 2022 14:54:43 +0200 Subject: [PATCH 18/28] chore: add changeset Signed-off-by: blam --- .changeset/funny-hounds-obey.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/funny-hounds-obey.md diff --git a/.changeset/funny-hounds-obey.md b/.changeset/funny-hounds-obey.md new file mode 100644 index 0000000000..065af245c7 --- /dev/null +++ b/.changeset/funny-hounds-obey.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder': patch +--- + +Fixing bug when the workspace would not be automatically saved when using `allowedOwners` From 04f3374d45460e770428a9dc7fee07d7b33db6ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 13:16:53 +0000 Subject: [PATCH 19/28] chore(deps): update dependency @graphql-codegen/cli to v2.11.7 Signed-off-by: Renovate Bot --- yarn.lock | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index e8f752145c..8877b58474 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2842,9 +2842,9 @@ meros "^1.1.4" "@graphql-codegen/cli@^2.3.1": - version "2.11.6" - resolved "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-2.11.6.tgz#3acfd7cd3bac40999ba1262063d84ca7c96172dc" - integrity sha512-0R2Bhgjt3XZTSdsn8MGGuJjDEN2z+KCo7920zLZz9boy6bQ0EyuxS9AUATePS9aC3djy2POAIPCHz8iHK68IlQ== + version "2.11.7" + resolved "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-2.11.7.tgz#ee08dde48bac3b54ee30542f6bc6ed0a7acc3631" + integrity sha512-Ldh9gRfmRL2ulMfEOGr3nuIv3s0YMnmJZ52Q1Z/eQoiW+x8KLwNIJNCS/O++YyoEO975WA5GLjfBoNzJ5qUQYw== dependencies: "@graphql-codegen/core" "2.6.2" "@graphql-codegen/plugin-helpers" "^2.6.2" @@ -2858,7 +2858,7 @@ "@graphql-tools/prisma-loader" "^7.2.7" "@graphql-tools/url-loader" "^7.13.2" "@graphql-tools/utils" "^8.9.0" - "@whatwg-node/fetch" "^0.2.3" + "@whatwg-node/fetch" "^0.3.0" ansi-escapes "^4.3.1" chalk "^4.1.0" chokidar "^3.5.2" @@ -8458,7 +8458,7 @@ "@webassemblyjs/ast" "1.11.1" "@xtuc/long" "4.2.2" -"@whatwg-node/fetch@^0.2.3", "@whatwg-node/fetch@^0.2.4": +"@whatwg-node/fetch@^0.2.4": version "0.2.6" resolved "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.2.6.tgz#eb8e68624c55aecfa4c6d7ea36b3ce3ad5d5f79e" integrity sha512-NhHiqeGcKjgqUZvJTZSou9qsFEPBBG1LPm2Npz0cmcPvukhhQfjX+p3quRx6b9AyjNPp1f73VB1z4ApHy9FcNg== @@ -8473,6 +8473,21 @@ undici "^5.8.0" web-streams-polyfill "^3.2.0" +"@whatwg-node/fetch@^0.3.0": + version "0.3.2" + resolved "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.3.2.tgz#da4323795c26c135563ba01d49dc16037bec4287" + integrity sha512-Bs5zAWQs0tXsLa4mRmLw7Psps1EN78vPtgcLpw3qPY8s6UYPUM67zFZ9cy+7tZ64PXhfwzxJn+m7RH2Lq48RNQ== + dependencies: + "@peculiar/webcrypto" "^1.4.0" + abort-controller "^3.0.0" + busboy "^1.6.0" + event-target-polyfill "^0.0.3" + form-data-encoder "^1.7.1" + formdata-node "^4.3.1" + node-fetch "^2.6.7" + undici "^5.8.0" + web-streams-polyfill "^3.2.0" + "@xmldom/xmldom@^0.7.0", "@xmldom/xmldom@^0.7.5": version "0.7.5" resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz#09fa51e356d07d0be200642b0e4f91d8e6dd408d" From 0adb6cfcd73359ef8271247e632750a850795824 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 13:17:48 +0000 Subject: [PATCH 20/28] fix(deps): update dependency @codemirror/view to v6.2.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 e8f752145c..313f27e5e0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2530,9 +2530,9 @@ "@lezer/highlight" "^1.0.0" "@codemirror/view@^6.0.0": - version "6.2.0" - resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.2.0.tgz#bae4c486a84174bd9656af9c9d2bd709d5b26c9f" - integrity sha512-3emW1symh+GoteFMBPsltjmF790U/trouLILATh3JodbF/z98HvcQh2g3+H6dfNIHx16uNonsAF4mNzVr1TJNA== + version "6.2.1" + resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.2.1.tgz#299698639c658c738f10021c5ea78a513c63977b" + integrity sha512-r1svbtAj2Lp/86F3yy1TfDAOAtJRGLINLSEqByETyUaGo1EnLS+P+bbGCVHV62z46BzZYm16noDid69+4bzn0g== dependencies: "@codemirror/state" "^6.0.0" style-mod "^4.0.0" From 6017734ec8e8e8a637222e17a490eb11ecc188ef Mon Sep 17 00:00:00 2001 From: Peter Macdonald Date: Thu, 25 Aug 2022 19:18:52 +0200 Subject: [PATCH 21/28] Added projectId test scenario under the outputs section Signed-off-by: Peter Macdonald --- .../src/scaffolder/actions/builtin/publish/gitlab.test.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts index 27261ecd49..dc1d26d416 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts @@ -313,11 +313,12 @@ describe('publish:gitlab', () => { }); }); - it('should call output with the remoteUrl and repoContentsUrl', async () => { + it('should call output with the remoteUrl and repoContentsUrl and projectId', async () => { mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 }); mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 }); mockGitlabClient.Projects.create.mockResolvedValue({ http_url_to_repo: 'http://mockurl.git', + id: 1234, }); await action.handler(mockContext); @@ -330,6 +331,7 @@ describe('publish:gitlab', () => { 'repoContentsUrl', 'http://mockurl/-/blob/master', ); + expect(mockContext.output).toHaveBeenCalledWith('projectId', 1234); }); it('should call the correct Gitlab APIs when setUserAsOwner option is true and integration config has a token', async () => { From 4fac72246023fed1ed072c6105cd06b89bd915be Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 21:24:53 +0000 Subject: [PATCH 22/28] fix(deps): update dependency npm-packlist to v5.1.3 Signed-off-by: Renovate Bot --- yarn.lock | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8d7a027fad..354ef9c984 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19878,13 +19878,20 @@ normalize-url@^6.0.1, normalize-url@^6.1.0: resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== -npm-bundled@^1.1.1, npm-bundled@^1.1.2: +npm-bundled@^1.1.1: version "1.1.2" resolved "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1" integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ== dependencies: npm-normalize-package-bin "^1.0.1" +npm-bundled@^2.0.0: + version "2.0.1" + resolved "https://registry.npmjs.org/npm-bundled/-/npm-bundled-2.0.1.tgz#94113f7eb342cd7a67de1e789f896b04d2c600f4" + integrity sha512-gZLxXdjEzE/+mOstGDqR6b0EkhJ+kM6fxM6vUuckuctuVPh80Q6pw/rSZj9s4Gex9GxWtIicO1pc8DB9KZWudw== + dependencies: + npm-normalize-package-bin "^2.0.0" + npm-install-checks@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4" @@ -19948,13 +19955,13 @@ npm-packlist@^3.0.0: npm-normalize-package-bin "^1.0.1" npm-packlist@^5.0.0, npm-packlist@^5.1.0: - version "5.1.2" - resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.2.tgz#bbca5715020696953fd2862cbc89cbf2d7ee4875" - integrity sha512-rQiBDNmt1H1jNhFEo9ilTD7ZJXd6cvHSmBK+waIBu886v6OyLWjZqb1RD9viR7rgG0AAe29FYnOXcO26TRxT/Q== + version "5.1.3" + resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.3.tgz#69d253e6fd664b9058b85005905012e00e69274b" + integrity sha512-263/0NGrn32YFYi4J533qzrQ/krmmrWwhKkzwTuM4f/07ug51odoaNjUexxO4vxlzURHcmYMH1QjvHjsNDKLVg== dependencies: glob "^8.0.1" ignore-walk "^5.0.1" - npm-bundled "^1.1.2" + npm-bundled "^2.0.0" npm-normalize-package-bin "^2.0.0" npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pick-manifest@^6.1.1: From 69143d392ea28f39875165cb49ef374e7085532c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 21:25:59 +0000 Subject: [PATCH 23/28] fix(deps): update dependency aws-sdk to v2.1203.0 Signed-off-by: Renovate Bot --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8d7a027fad..955e1d0d5f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9290,9 +9290,9 @@ aws-sdk-mock@^5.2.1: traverse "^0.6.6" aws-sdk@^2.1122.0, aws-sdk@^2.814.0, aws-sdk@^2.840.0, aws-sdk@^2.948.0: - version "2.1202.0" - resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1202.0.tgz#5a8349d02d2092477e2a9b621c00e96eaf49cbf3" - integrity sha512-fFoEX+Id8/h/RIHw/gTZl3GnFF+RaXRmXueF7qCOqHm4g7mFOOgUUbc4BLbZ4gCDYRiyxNlGgija/je8EhLNRw== + version "2.1203.0" + resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1203.0.tgz#03289662a1d05084b7f8db602136cbac963ff061" + integrity sha512-6HeVddh4HfsH6uXkadergui6cQW5BN2gxVFoxhGytD6lv15xrYgWALQ3iOfcmPg0OLafgnC5RAdFmyPnb7McVw== dependencies: buffer "4.9.2" events "1.1.1" From 6b743cdd74b68906cc07f4a7d1d920c2aa921026 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Aug 2022 01:42:13 +0000 Subject: [PATCH 24/28] fix(deps): update dependency typescript to v4.8.2 Signed-off-by: Renovate Bot --- cypress/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cypress/yarn.lock b/cypress/yarn.lock index 2f1e0f0775..646342b0a2 100644 --- a/cypress/yarn.lock +++ b/cypress/yarn.lock @@ -1059,9 +1059,9 @@ type-fest@^0.21.3: integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== typescript@^4.1.3: - version "4.7.4" - resolved "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" - integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== + version "4.8.2" + resolved "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790" + integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw== universalify@^2.0.0: version "2.0.0" From d55fbc97817b9f34e26df886e229669eeee8ef22 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Aug 2022 05:56:12 +0000 Subject: [PATCH 25/28] fix(deps): update apollo graphql packages to v3.10.2 Signed-off-by: Renovate Bot --- yarn.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7ea38d03bf..2c223af395 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8822,10 +8822,10 @@ apollo-reporting-protobuf@^3.3.2: dependencies: "@apollo/protobufjs" "1.2.4" -apollo-server-core@^3.10.1: - version "3.10.1" - resolved "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.10.1.tgz#01f9ffc57c7d15c27bd7f89d65f45522aa3f3c3d" - integrity sha512-UFFziv6h15QbKRZOA6wLyr1Sle9kns3JuQ5DEB7OYe5AIoOJNjZkWXX/tmLFUrSmlnDDryi6Sf5pDzpYmUC/UA== +apollo-server-core@^3.10.2: + version "3.10.2" + resolved "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.10.2.tgz#04c5c3fc96b6c7d7f84fdc7356cf9830de4db561" + integrity sha512-/1o9KPoAMgcjJJ9Y0IH1665wf9d02L/m/mcfBOHiFmRgeGkNgrhTy59BxQTBK241USAWMhwMpp171cv/hM5Dng== dependencies: "@apollo/utils.keyvaluecache" "^1.0.1" "@apollo/utils.logger" "^1.0.0" @@ -8862,10 +8862,10 @@ apollo-server-errors@^3.3.1: resolved "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz#ba5c00cdaa33d4cbd09779f8cb6f47475d1cd655" integrity sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA== -apollo-server-express@^3.0.0, apollo-server-express@^3.10.1: - version "3.10.1" - resolved "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.10.1.tgz#b0262d3c4919b554cff5872639bb13b694b5a217" - integrity sha512-r0esst3YGNdlphYiOrflfBqJ15VAZAhYhWSFo2kPF4knsIGK5HUkeqwjMr+fFDBn4DEfYzC+I1+LnsF/hFN8VQ== +apollo-server-express@^3.0.0, apollo-server-express@^3.10.2: + version "3.10.2" + resolved "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.10.2.tgz#df7cb81eab10d84db55297a2820cf3bd8814eb80" + integrity sha512-TUpnh23qAP3NqMp3/2TxcCpOxhvT64H6teOM5W+t5ncdHZ85aEMDrbfIhNwqkdsya+UyMn9IoBmn25h5TW93ZQ== dependencies: "@types/accepts" "^1.3.5" "@types/body-parser" "1.19.2" @@ -8873,7 +8873,7 @@ apollo-server-express@^3.0.0, apollo-server-express@^3.10.1: "@types/express" "4.17.13" "@types/express-serve-static-core" "4.17.30" accepts "^1.3.5" - apollo-server-core "^3.10.1" + apollo-server-core "^3.10.2" apollo-server-types "^3.6.2" body-parser "^1.19.0" cors "^2.8.5" @@ -8897,13 +8897,13 @@ apollo-server-types@^3.6.2: apollo-server-env "^4.2.1" apollo-server@^3.0.0: - version "3.10.1" - resolved "https://registry.npmjs.org/apollo-server/-/apollo-server-3.10.1.tgz#ed0c39d706a6a232885680c001df3b90c5cb0902" - integrity sha512-2e7EN7Pw+vV7vP236zozuFVMLjeY6Q8lF1VzT+j32pZ2oYuTrDv+9lFjMjTBPK2yV5kzuOwJU4dWkWx5OKDEiQ== + version "3.10.2" + resolved "https://registry.npmjs.org/apollo-server/-/apollo-server-3.10.2.tgz#8d7859ba27f3d94c57a0a7065ae776f32dfc697a" + integrity sha512-iKYcbCGl32TxmV2YShiBbQqU8uJrwTopNi82KphKXcwgPyaZnMlNbVQOqiZSHVH4DtANAR4bB1cx8ORG+29NhQ== dependencies: "@types/express" "4.17.13" - apollo-server-core "^3.10.1" - apollo-server-express "^3.10.1" + apollo-server-core "^3.10.2" + apollo-server-express "^3.10.2" express "^4.17.1" aproba@^1.0.3: From 8942e9390217ad55dcf9bbdec3934b579d416434 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Aug 2022 06:01:22 +0000 Subject: [PATCH 26/28] fix(deps): update dependency @swc/core to v1.2.244 Signed-off-by: Renovate Bot --- storybook/yarn.lock | 136 ++++++++++++++++++++++---------------------- yarn.lock | 136 ++++++++++++++++++++++---------------------- 2 files changed, 136 insertions(+), 136 deletions(-) diff --git a/storybook/yarn.lock b/storybook/yarn.lock index 27209371c2..44e983b917 100644 --- a/storybook/yarn.lock +++ b/storybook/yarn.lock @@ -2094,101 +2094,101 @@ regenerator-runtime "^0.13.7" resolve-from "^5.0.0" -"@swc/core-android-arm-eabi@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.242.tgz#3ae5d8b178a0835ae0878094175d943f2d894bec" - integrity sha512-Ukx1LQAUbPRJdREF9FMgeUwIuRtWJNpPyPF7BWl4hIkw024q75mohMbp3S2wgrF1TsSsEGW37q0DkFxPJ2uJbQ== +"@swc/core-android-arm-eabi@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.244.tgz#f45c5560a471b867f780ed9bd0799620ff8afd04" + integrity sha512-bQN6SY78bFIm6lz46ss4+ZDU9owevVjF95Cm+3KB/13ZOPF+m5Pdm8WQLoBYTLgJ0r4/XukEe9XXjba/6Kf8kw== dependencies: "@swc/wasm" "1.2.122" -"@swc/core-android-arm64@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-android-arm64/-/core-android-arm64-1.2.242.tgz#2c1885c08dd5720991a6fa7585d39a93df98e773" - integrity sha512-4E/y+reQWHVCV/0Sn174gsLQyqIKlBWKnwUfPa7MA53VBacp8HTYoPY+iwKPrngsH16gEOC7iByiTJHR/4kirg== +"@swc/core-android-arm64@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-android-arm64/-/core-android-arm64-1.2.244.tgz#92d6cc1829d621fa1aa88d84d30a85112a82d148" + integrity sha512-CJeL/EeOIzrH+77otNT6wfGF8uadOHo4rEaBN/xvmtnpdADjYJ8Wt85X4nRK0G929bMke/QdJm5ilPNJdmgCTg== dependencies: "@swc/wasm" "1.2.130" -"@swc/core-darwin-arm64@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.242.tgz#1b8b16a132cc354ea3b31d26c46908dae2fe41ed" - integrity sha512-nIqtjxdbz0Fe0gFZwCygBwUrGEXj3c4mjHjNeveidVX/6U0HE/EAj+0iXuw8zjJLof8HCMnxq8CzzvhA6gd3ZA== +"@swc/core-darwin-arm64@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.244.tgz#7e068d14c357771f7ca23d7e1941e8bd577d2b5f" + integrity sha512-ZhRK8L/lpPCerUxtrW48cRJtpsUG5xVTUXu3N0TrYuxRzzapHgK+61g1JdtcwdNvEV7l00X4vfCBRYO0S2nsmw== -"@swc/core-darwin-x64@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.2.242.tgz#cde041d520fcfb0865f49b395bb2c76af8ec3f3a" - integrity sha512-iZKzI76vYYHD/t8wkQ/uIVuIyxN1eift2nLvUU7/jtmoa6b8DH/45ykB/C3vkuvYVNMiGA8HIjJIzw7RJz5XIQ== +"@swc/core-darwin-x64@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.2.244.tgz#bdf3c8150a3e18c392f3d30749a24f71bbd381cd" + integrity sha512-4mY8Gkq2ZMUpXYCLceGp7w0Jnxp75N1gQswNFhMBU4k90ElDuBtPoUSnB1v8MwlQtK7WA25MdvwFnBaEJnfxOg== -"@swc/core-freebsd-x64@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.242.tgz#a95827311424dd86190fdb73bec996d24188c6d3" - integrity sha512-6JNi5/6JDvcTQzBkndELiIlJufWowoI2ZEmXlGIJpiGoj28PEDPwy5LO7KkXa4DnY5L4CSh15idFO/DxV0rGAQ== +"@swc/core-freebsd-x64@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.244.tgz#0941dd18745cc19ed35bc8b5f4c06f62fe91240d" + integrity sha512-k/NEZfkgtZ4S96woYArZ89jwJ/L1zyxihTgFFu7SxDt+WRE1EPmY42Gt4y874zi1JiSEFSRHiiueDUfRPu7C0Q== dependencies: "@swc/wasm" "1.2.130" -"@swc/core-linux-arm-gnueabihf@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.242.tgz#1b0bd0ba96c59a9c4b87668521ce8ba55c8c7f55" - integrity sha512-NGL9A3cv8PCbeQ1SvPfApNlHvFbf7Jn305sCAy3iZYsmwm+EU4JNlOWXGgRioP7ABhz2kwLhfYs8UMYCDIVq8Q== +"@swc/core-linux-arm-gnueabihf@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.244.tgz#e60536c2c7e858940138366d9438d33c80a119e3" + integrity sha512-tE9b/oZWhMXwoXHkgHFckMrLrlczvG7HgQAdtDuA6g30Xd/3XmdVzC4NbXR+1HoaGVDh7cf0EFE3aKdfPvPQwA== dependencies: "@swc/wasm" "1.2.130" -"@swc/core-linux-arm64-gnu@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.242.tgz#f97c1b655779788fff9a035f6a80180b1545423b" - integrity sha512-OJ0kAjgeoRDJlo6Rvd2GnJ92tiIndmC/8krD9gfnQEyAgpR+jajOxbKhyBN/QZPyD2q/TG2LPqxhGYZ79q5mWQ== +"@swc/core-linux-arm64-gnu@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.244.tgz#daa61051c971c30dd3bb5414be98ca7392b08c06" + integrity sha512-zrpVKUeQxZnzorOp3aXhjK1X2/6xuVZcdyxAUDzItP6G4nLbgPBEQLUi6aUjOjquFiihokXoKWaMPQjF/LqH+g== -"@swc/core-linux-arm64-musl@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.242.tgz#ad77a5c7fc79d42d64970ca1886eb9d626388ca2" - integrity sha512-VqnHSYb1a6xW5ARUx9kq88s1S3XvCw9TvQXsPcN4e5qsugrLzxWLnqIM6VnWW06prxN7pYlWo9QtrtdPfbppmA== +"@swc/core-linux-arm64-musl@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.244.tgz#177ea7e8ba74309c2a08e165f147e63b7420a5d8" + integrity sha512-gI6bntk+HDe2witOsQgBDyDDpRmF5dfxbygvVsEdCI+Ko9yj5S9aCsc8WhhbtdcEG1Fo3v/sM/F/9pGatCAwzQ== -"@swc/core-linux-x64-gnu@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.242.tgz#4c7f2c483876a4b0755a263133c25413fa69df88" - integrity sha512-DDqVJh0KpgHb+E0563+6PqAYDzYTSwgZXF/fOULwlHC7Yt50a9+ecisTFSHkWc74zPMtq27kMTuZyyLeD3gu7A== +"@swc/core-linux-x64-gnu@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.244.tgz#c4f00359567fdb25ab5616bf000168f4fcf30534" + integrity sha512-hwJ5HrDj7asmVGjzaT6SFdhPVxVUIYm9LCuE3yu89+6C5aR9YrCXvpgIjGcHJvEO2PLAtff72FsX7sbXbzzYGQ== -"@swc/core-linux-x64-musl@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.242.tgz#48f8769094cfde9d78dc32936666575470583b2a" - integrity sha512-P+9sWgd5eZ6kS1WxOJbCeSgWY7mLP742PhwAzpFrJqCq5nx8Q4FYo4L5mOVNAheYDWldsxR1nKXR1RIMK3S2Lw== +"@swc/core-linux-x64-musl@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.244.tgz#f4d07fbd6c73f54dfa351caf8263a81245882a1f" + integrity sha512-P8d4AIVN63xaS3t5WhOo0Ejy/X7XaDxXe9sJpEbGQP7CGofhURvgXwe8Q6uhPeWC9AwEPu35ArFQ0ZUmOCY0rg== -"@swc/core-win32-arm64-msvc@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.242.tgz#e421a5a7a49d1effa71a22fea22a65256b447108" - integrity sha512-W5cevrf5aDJzdE++XeQi1BJKuigC3dlG2NaBUyt3inmep7nli6eoBJdj9Vyg5EPfFOdeI6wQiwOpFvQRoAle8Q== +"@swc/core-win32-arm64-msvc@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.244.tgz#38167a47c1cd8c73d0621a14d46b7982d1d314ff" + integrity sha512-PZUhgooqPDo+NUo+tIxWI1jKnYVV2ACs8eUkSE++Qf7E4/9Igy79XHbG4/G5ERlCudhdcw4XkYiRN8GJQg6P5w== dependencies: "@swc/wasm" "1.2.130" -"@swc/core-win32-ia32-msvc@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.242.tgz#1b836f5872195fef506a094eae7734b5fd28a1b5" - integrity sha512-XRQcgChvY9333hBre9F53EbiVfVu5MkSH4+XIiNMK14Jg8EqQ1nOcd+jvv2sEdEVbufCmBbWNjofUrCoQey60w== +"@swc/core-win32-ia32-msvc@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.244.tgz#7d6cb0ab95358dc56bd92ca85ac06687a732fa51" + integrity sha512-w7v8fND4E8wOHoVVNJIDjOh8EQiedI9HCsCTEDM/z/dVPsk/rxi6iHYnZG6gv+X/d0aCLeZQOkW9khfyy128cg== dependencies: "@swc/wasm" "1.2.130" -"@swc/core-win32-x64-msvc@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.242.tgz#61a6c7d4da1dec1188b912785bd8e0bb16ff8440" - integrity sha512-Cz1hZOxcfEVgzEr2sYIW9MxT+wEEbYz7aB87ZDmTUpr7vuvBiLMwsYItm8qG847wZeJfa+J7CC+tty5GJOBOOQ== +"@swc/core-win32-x64-msvc@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.244.tgz#fed9dd48b3ac1269c7dc62e23fa875ec3f2356b4" + integrity sha512-/A9ssLtqXEQrdHnJ9SvZSBF7zQM/0ydz8B3p5BT9kUbAhmNqbfE4/Wy3d2zd7nrF16n6tRm4giCzcIdzd/7mvw== "@swc/core@^1.2.239": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core/-/core-1.2.242.tgz#4392ef0012fe9667440c6eb5a419b6cc86a0a786" - integrity sha512-JQqSYVoLtHtztCNBgeCKyxmqw6AksHsC4WvVSSErLXJx6JXKaog1HFVuzd6rwx2lLCV+zBnbqJFug5OX0g2knw== + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core/-/core-1.2.244.tgz#d8ba46113c35f2e33dad6663ba8ce178542e24a3" + integrity sha512-/UguNMvKgVeR8wGFb53h+Y9hFSiEpeUhC4Cr1neN15wvWZD3lfvN4qAdqNifZiiPKXrCwYy8NTKlHVtHMYzpXw== optionalDependencies: - "@swc/core-android-arm-eabi" "1.2.242" - "@swc/core-android-arm64" "1.2.242" - "@swc/core-darwin-arm64" "1.2.242" - "@swc/core-darwin-x64" "1.2.242" - "@swc/core-freebsd-x64" "1.2.242" - "@swc/core-linux-arm-gnueabihf" "1.2.242" - "@swc/core-linux-arm64-gnu" "1.2.242" - "@swc/core-linux-arm64-musl" "1.2.242" - "@swc/core-linux-x64-gnu" "1.2.242" - "@swc/core-linux-x64-musl" "1.2.242" - "@swc/core-win32-arm64-msvc" "1.2.242" - "@swc/core-win32-ia32-msvc" "1.2.242" - "@swc/core-win32-x64-msvc" "1.2.242" + "@swc/core-android-arm-eabi" "1.2.244" + "@swc/core-android-arm64" "1.2.244" + "@swc/core-darwin-arm64" "1.2.244" + "@swc/core-darwin-x64" "1.2.244" + "@swc/core-freebsd-x64" "1.2.244" + "@swc/core-linux-arm-gnueabihf" "1.2.244" + "@swc/core-linux-arm64-gnu" "1.2.244" + "@swc/core-linux-arm64-musl" "1.2.244" + "@swc/core-linux-x64-gnu" "1.2.244" + "@swc/core-linux-x64-musl" "1.2.244" + "@swc/core-win32-arm64-msvc" "1.2.244" + "@swc/core-win32-ia32-msvc" "1.2.244" + "@swc/core-win32-x64-msvc" "1.2.244" "@swc/wasm@1.2.122": version "1.2.122" diff --git a/yarn.lock b/yarn.lock index 7ea38d03bf..f6614fd138 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6443,101 +6443,101 @@ "@svgr/plugin-jsx" "^6.3.1" "@svgr/plugin-svgo" "^6.3.1" -"@swc/core-android-arm-eabi@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.242.tgz#3ae5d8b178a0835ae0878094175d943f2d894bec" - integrity sha512-Ukx1LQAUbPRJdREF9FMgeUwIuRtWJNpPyPF7BWl4hIkw024q75mohMbp3S2wgrF1TsSsEGW37q0DkFxPJ2uJbQ== +"@swc/core-android-arm-eabi@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.244.tgz#f45c5560a471b867f780ed9bd0799620ff8afd04" + integrity sha512-bQN6SY78bFIm6lz46ss4+ZDU9owevVjF95Cm+3KB/13ZOPF+m5Pdm8WQLoBYTLgJ0r4/XukEe9XXjba/6Kf8kw== dependencies: "@swc/wasm" "1.2.122" -"@swc/core-android-arm64@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-android-arm64/-/core-android-arm64-1.2.242.tgz#2c1885c08dd5720991a6fa7585d39a93df98e773" - integrity sha512-4E/y+reQWHVCV/0Sn174gsLQyqIKlBWKnwUfPa7MA53VBacp8HTYoPY+iwKPrngsH16gEOC7iByiTJHR/4kirg== +"@swc/core-android-arm64@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-android-arm64/-/core-android-arm64-1.2.244.tgz#92d6cc1829d621fa1aa88d84d30a85112a82d148" + integrity sha512-CJeL/EeOIzrH+77otNT6wfGF8uadOHo4rEaBN/xvmtnpdADjYJ8Wt85X4nRK0G929bMke/QdJm5ilPNJdmgCTg== dependencies: "@swc/wasm" "1.2.130" -"@swc/core-darwin-arm64@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.242.tgz#1b8b16a132cc354ea3b31d26c46908dae2fe41ed" - integrity sha512-nIqtjxdbz0Fe0gFZwCygBwUrGEXj3c4mjHjNeveidVX/6U0HE/EAj+0iXuw8zjJLof8HCMnxq8CzzvhA6gd3ZA== +"@swc/core-darwin-arm64@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.244.tgz#7e068d14c357771f7ca23d7e1941e8bd577d2b5f" + integrity sha512-ZhRK8L/lpPCerUxtrW48cRJtpsUG5xVTUXu3N0TrYuxRzzapHgK+61g1JdtcwdNvEV7l00X4vfCBRYO0S2nsmw== -"@swc/core-darwin-x64@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.2.242.tgz#cde041d520fcfb0865f49b395bb2c76af8ec3f3a" - integrity sha512-iZKzI76vYYHD/t8wkQ/uIVuIyxN1eift2nLvUU7/jtmoa6b8DH/45ykB/C3vkuvYVNMiGA8HIjJIzw7RJz5XIQ== +"@swc/core-darwin-x64@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.2.244.tgz#bdf3c8150a3e18c392f3d30749a24f71bbd381cd" + integrity sha512-4mY8Gkq2ZMUpXYCLceGp7w0Jnxp75N1gQswNFhMBU4k90ElDuBtPoUSnB1v8MwlQtK7WA25MdvwFnBaEJnfxOg== -"@swc/core-freebsd-x64@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.242.tgz#a95827311424dd86190fdb73bec996d24188c6d3" - integrity sha512-6JNi5/6JDvcTQzBkndELiIlJufWowoI2ZEmXlGIJpiGoj28PEDPwy5LO7KkXa4DnY5L4CSh15idFO/DxV0rGAQ== +"@swc/core-freebsd-x64@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.244.tgz#0941dd18745cc19ed35bc8b5f4c06f62fe91240d" + integrity sha512-k/NEZfkgtZ4S96woYArZ89jwJ/L1zyxihTgFFu7SxDt+WRE1EPmY42Gt4y874zi1JiSEFSRHiiueDUfRPu7C0Q== dependencies: "@swc/wasm" "1.2.130" -"@swc/core-linux-arm-gnueabihf@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.242.tgz#1b0bd0ba96c59a9c4b87668521ce8ba55c8c7f55" - integrity sha512-NGL9A3cv8PCbeQ1SvPfApNlHvFbf7Jn305sCAy3iZYsmwm+EU4JNlOWXGgRioP7ABhz2kwLhfYs8UMYCDIVq8Q== +"@swc/core-linux-arm-gnueabihf@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.244.tgz#e60536c2c7e858940138366d9438d33c80a119e3" + integrity sha512-tE9b/oZWhMXwoXHkgHFckMrLrlczvG7HgQAdtDuA6g30Xd/3XmdVzC4NbXR+1HoaGVDh7cf0EFE3aKdfPvPQwA== dependencies: "@swc/wasm" "1.2.130" -"@swc/core-linux-arm64-gnu@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.242.tgz#f97c1b655779788fff9a035f6a80180b1545423b" - integrity sha512-OJ0kAjgeoRDJlo6Rvd2GnJ92tiIndmC/8krD9gfnQEyAgpR+jajOxbKhyBN/QZPyD2q/TG2LPqxhGYZ79q5mWQ== +"@swc/core-linux-arm64-gnu@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.244.tgz#daa61051c971c30dd3bb5414be98ca7392b08c06" + integrity sha512-zrpVKUeQxZnzorOp3aXhjK1X2/6xuVZcdyxAUDzItP6G4nLbgPBEQLUi6aUjOjquFiihokXoKWaMPQjF/LqH+g== -"@swc/core-linux-arm64-musl@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.242.tgz#ad77a5c7fc79d42d64970ca1886eb9d626388ca2" - integrity sha512-VqnHSYb1a6xW5ARUx9kq88s1S3XvCw9TvQXsPcN4e5qsugrLzxWLnqIM6VnWW06prxN7pYlWo9QtrtdPfbppmA== +"@swc/core-linux-arm64-musl@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.244.tgz#177ea7e8ba74309c2a08e165f147e63b7420a5d8" + integrity sha512-gI6bntk+HDe2witOsQgBDyDDpRmF5dfxbygvVsEdCI+Ko9yj5S9aCsc8WhhbtdcEG1Fo3v/sM/F/9pGatCAwzQ== -"@swc/core-linux-x64-gnu@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.242.tgz#4c7f2c483876a4b0755a263133c25413fa69df88" - integrity sha512-DDqVJh0KpgHb+E0563+6PqAYDzYTSwgZXF/fOULwlHC7Yt50a9+ecisTFSHkWc74zPMtq27kMTuZyyLeD3gu7A== +"@swc/core-linux-x64-gnu@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.244.tgz#c4f00359567fdb25ab5616bf000168f4fcf30534" + integrity sha512-hwJ5HrDj7asmVGjzaT6SFdhPVxVUIYm9LCuE3yu89+6C5aR9YrCXvpgIjGcHJvEO2PLAtff72FsX7sbXbzzYGQ== -"@swc/core-linux-x64-musl@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.242.tgz#48f8769094cfde9d78dc32936666575470583b2a" - integrity sha512-P+9sWgd5eZ6kS1WxOJbCeSgWY7mLP742PhwAzpFrJqCq5nx8Q4FYo4L5mOVNAheYDWldsxR1nKXR1RIMK3S2Lw== +"@swc/core-linux-x64-musl@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.244.tgz#f4d07fbd6c73f54dfa351caf8263a81245882a1f" + integrity sha512-P8d4AIVN63xaS3t5WhOo0Ejy/X7XaDxXe9sJpEbGQP7CGofhURvgXwe8Q6uhPeWC9AwEPu35ArFQ0ZUmOCY0rg== -"@swc/core-win32-arm64-msvc@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.242.tgz#e421a5a7a49d1effa71a22fea22a65256b447108" - integrity sha512-W5cevrf5aDJzdE++XeQi1BJKuigC3dlG2NaBUyt3inmep7nli6eoBJdj9Vyg5EPfFOdeI6wQiwOpFvQRoAle8Q== +"@swc/core-win32-arm64-msvc@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.244.tgz#38167a47c1cd8c73d0621a14d46b7982d1d314ff" + integrity sha512-PZUhgooqPDo+NUo+tIxWI1jKnYVV2ACs8eUkSE++Qf7E4/9Igy79XHbG4/G5ERlCudhdcw4XkYiRN8GJQg6P5w== dependencies: "@swc/wasm" "1.2.130" -"@swc/core-win32-ia32-msvc@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.242.tgz#1b836f5872195fef506a094eae7734b5fd28a1b5" - integrity sha512-XRQcgChvY9333hBre9F53EbiVfVu5MkSH4+XIiNMK14Jg8EqQ1nOcd+jvv2sEdEVbufCmBbWNjofUrCoQey60w== +"@swc/core-win32-ia32-msvc@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.244.tgz#7d6cb0ab95358dc56bd92ca85ac06687a732fa51" + integrity sha512-w7v8fND4E8wOHoVVNJIDjOh8EQiedI9HCsCTEDM/z/dVPsk/rxi6iHYnZG6gv+X/d0aCLeZQOkW9khfyy128cg== dependencies: "@swc/wasm" "1.2.130" -"@swc/core-win32-x64-msvc@1.2.242": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.242.tgz#61a6c7d4da1dec1188b912785bd8e0bb16ff8440" - integrity sha512-Cz1hZOxcfEVgzEr2sYIW9MxT+wEEbYz7aB87ZDmTUpr7vuvBiLMwsYItm8qG847wZeJfa+J7CC+tty5GJOBOOQ== +"@swc/core-win32-x64-msvc@1.2.244": + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.244.tgz#fed9dd48b3ac1269c7dc62e23fa875ec3f2356b4" + integrity sha512-/A9ssLtqXEQrdHnJ9SvZSBF7zQM/0ydz8B3p5BT9kUbAhmNqbfE4/Wy3d2zd7nrF16n6tRm4giCzcIdzd/7mvw== "@swc/core@^1.2.239": - version "1.2.242" - resolved "https://registry.npmjs.org/@swc/core/-/core-1.2.242.tgz#4392ef0012fe9667440c6eb5a419b6cc86a0a786" - integrity sha512-JQqSYVoLtHtztCNBgeCKyxmqw6AksHsC4WvVSSErLXJx6JXKaog1HFVuzd6rwx2lLCV+zBnbqJFug5OX0g2knw== + version "1.2.244" + resolved "https://registry.npmjs.org/@swc/core/-/core-1.2.244.tgz#d8ba46113c35f2e33dad6663ba8ce178542e24a3" + integrity sha512-/UguNMvKgVeR8wGFb53h+Y9hFSiEpeUhC4Cr1neN15wvWZD3lfvN4qAdqNifZiiPKXrCwYy8NTKlHVtHMYzpXw== optionalDependencies: - "@swc/core-android-arm-eabi" "1.2.242" - "@swc/core-android-arm64" "1.2.242" - "@swc/core-darwin-arm64" "1.2.242" - "@swc/core-darwin-x64" "1.2.242" - "@swc/core-freebsd-x64" "1.2.242" - "@swc/core-linux-arm-gnueabihf" "1.2.242" - "@swc/core-linux-arm64-gnu" "1.2.242" - "@swc/core-linux-arm64-musl" "1.2.242" - "@swc/core-linux-x64-gnu" "1.2.242" - "@swc/core-linux-x64-musl" "1.2.242" - "@swc/core-win32-arm64-msvc" "1.2.242" - "@swc/core-win32-ia32-msvc" "1.2.242" - "@swc/core-win32-x64-msvc" "1.2.242" + "@swc/core-android-arm-eabi" "1.2.244" + "@swc/core-android-arm64" "1.2.244" + "@swc/core-darwin-arm64" "1.2.244" + "@swc/core-darwin-x64" "1.2.244" + "@swc/core-freebsd-x64" "1.2.244" + "@swc/core-linux-arm-gnueabihf" "1.2.244" + "@swc/core-linux-arm64-gnu" "1.2.244" + "@swc/core-linux-arm64-musl" "1.2.244" + "@swc/core-linux-x64-gnu" "1.2.244" + "@swc/core-linux-x64-musl" "1.2.244" + "@swc/core-win32-arm64-msvc" "1.2.244" + "@swc/core-win32-ia32-msvc" "1.2.244" + "@swc/core-win32-x64-msvc" "1.2.244" "@swc/helpers@^0.4.7": version "0.4.11" From cb5fba650859559abca1f570ff876f684ff5c695 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Aug 2022 06:55:30 +0000 Subject: [PATCH 27/28] fix(deps): update dependency rollup-plugin-esbuild to v4.10.0 Signed-off-by: Renovate Bot --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2c223af395..d26d2c03f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23343,9 +23343,9 @@ rollup-plugin-dts@^4.0.1: "@babel/code-frame" "^7.16.7" rollup-plugin-esbuild@^4.7.2: - version "4.9.3" - resolved "https://registry.npmjs.org/rollup-plugin-esbuild/-/rollup-plugin-esbuild-4.9.3.tgz#8c62042bdda9f33d18b1c280914394e5a842dd53" - integrity sha512-bxfUNYTa9Tw/4kdFfT9gtidDtqXyRdCW11ctZM7D8houCCVqp5qHzQF7hhIr31rqMA0APbG47fgVbbCGXgM49Q== + version "4.10.0" + resolved "https://registry.npmjs.org/rollup-plugin-esbuild/-/rollup-plugin-esbuild-4.10.0.tgz#37036a28ab5637b9dec6cd30285ee18c52b44652" + integrity sha512-wXsooS93cmD5+1NlOrPQaoacdcoqo65q5UJLKQ/lhS6BorNSD+arh/CDRQFdFZvbPCC4kYruZ292OfHXhi/XFw== dependencies: "@rollup/pluginutils" "^4.1.1" debug "^4.3.3" From 4371374bf1f3954a6dc7fda8575beec5f52634a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Aug 2022 08:14:28 +0000 Subject: [PATCH 28/28] chore(deps): update dependency @graphql-codegen/cli to v2.11.8 Signed-off-by: Renovate Bot --- yarn.lock | 57 ++++++++++++++++++++----------------------------------- 1 file changed, 21 insertions(+), 36 deletions(-) diff --git a/yarn.lock b/yarn.lock index 33604bb142..cc711f146b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2671,16 +2671,6 @@ resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== -"@endemolshinegroup/cosmiconfig-typescript-loader@3.0.2": - version "3.0.2" - resolved "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.0.2.tgz#eea4635828dde372838b0909693ebd9aafeec22d" - integrity sha512-QRVtqJuS1mcT56oHpVegkKBlgtWjXw/gHNWO3eL9oyB5Sc7HBoc2OLG/nYpVfT/Jejvo3NUrD0Udk7XgoyDKkA== - dependencies: - lodash.get "^4" - make-error "^1" - ts-node "^9" - tslib "^2" - "@esbuild/linux-loong64@0.14.54": version "0.14.54" resolved "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028" @@ -2842,9 +2832,9 @@ meros "^1.1.4" "@graphql-codegen/cli@^2.3.1": - version "2.11.7" - resolved "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-2.11.7.tgz#ee08dde48bac3b54ee30542f6bc6ed0a7acc3631" - integrity sha512-Ldh9gRfmRL2ulMfEOGr3nuIv3s0YMnmJZ52Q1Z/eQoiW+x8KLwNIJNCS/O++YyoEO975WA5GLjfBoNzJ5qUQYw== + version "2.11.8" + resolved "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-2.11.8.tgz#6dfe2efe701f6f35eba8a817f13aa79d64fc5af7" + integrity sha512-LFEgDk+ShNsuy8GVR8bkLcfvvq6ugq3NmDsHYzCtJO/NW/8InQeqoH2X4e+7YhS/4M9iA2vdzSk0hSsv610Oww== dependencies: "@graphql-codegen/core" "2.6.2" "@graphql-codegen/plugin-helpers" "^2.6.2" @@ -2865,7 +2855,7 @@ cosmiconfig "^7.0.0" debounce "^1.2.0" detect-indent "^6.0.0" - graphql-config "^4.3.1" + graphql-config "^4.3.4" inquirer "^8.0.0" is-glob "^4.0.1" json-to-pretty-yaml "^1.2.2" @@ -11253,6 +11243,11 @@ cosmiconfig-toml-loader@1.0.0: dependencies: "@iarna/toml" "^2.2.5" +cosmiconfig-typescript-loader@^3.1.0: + version "3.1.1" + resolved "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.1.1.tgz#9cdc2ae1a219cf52b0bc0647596c6691b9ab56a3" + integrity sha512-SR5/NciF0vyYqcGsmB9WJ4QOKkcSSSzcBPLrnT6094BYahMy0eImWvlH3zoEOYqpF2zgiyAKHtWTXTo+fqgxPg== + cosmiconfig@7.0.1, cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: version "7.0.1" resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" @@ -14848,12 +14843,11 @@ graphlib@^2.1.8: dependencies: lodash "^4.17.15" -graphql-config@^4.3.1: - version "4.3.1" - resolved "https://registry.npmjs.org/graphql-config/-/graphql-config-4.3.1.tgz#636b539b1acc06fb48012d0e0f228014ccb0325f" - integrity sha512-czBWzJSGaLJfOHBLuUTZVRTjfgohPfvlaeN1B5nXBVptFARpiFuS7iI4FnRhCGwm6qt1h2j1g05nkg0OIGA6bg== +graphql-config@^4.3.4: + version "4.3.4" + resolved "https://registry.npmjs.org/graphql-config/-/graphql-config-4.3.4.tgz#6d2df477bb83bf05b800fe4d80214e2ccae0cd11" + integrity sha512-TAUEs+NOrECotpQM89bDyg2laTCDtGjH7zv6CAdLG0l8NhybqChVQszvSpHIKJJbJdmrLkYbLmyA1WdxDaz3wA== dependencies: - "@endemolshinegroup/cosmiconfig-typescript-loader" "3.0.2" "@graphql-tools/graphql-file-loader" "^7.3.7" "@graphql-tools/json-file-loader" "^7.3.7" "@graphql-tools/load" "^7.5.5" @@ -14862,8 +14856,11 @@ graphql-config@^4.3.1: "@graphql-tools/utils" "^8.6.5" cosmiconfig "7.0.1" cosmiconfig-toml-loader "1.0.0" + cosmiconfig-typescript-loader "^3.1.0" minimatch "4.2.1" string-env-interpolation "1.0.1" + ts-node "^10.8.1" + tslib "^2.4.0" graphql-executor@0.0.23: version "0.0.23" @@ -18100,7 +18097,7 @@ lodash.flattendeep@^4.0.0: resolved "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= -lodash.get@^4, lodash.get@^4.4.2: +lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= @@ -18419,7 +18416,7 @@ make-dir@^3.0.0, make-dir@^3.1.0: dependencies: semver "^6.0.0" -make-error@^1, make-error@^1.1.1: +make-error@^1.1.1: version "1.3.6" resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== @@ -24144,7 +24141,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.10, source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.20: +source-map-support@^0.5.10, source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.20: version "0.5.21" resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -25486,7 +25483,7 @@ ts-morph@^15.0.0: "@ts-morph/common" "~0.16.0" code-block-writer "^11.0.0" -ts-node@^10.0.0, ts-node@^10.2.1, ts-node@^10.4.0: +ts-node@^10.0.0, ts-node@^10.2.1, ts-node@^10.4.0, ts-node@^10.8.1: version "10.9.1" resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw== @@ -25505,18 +25502,6 @@ ts-node@^10.0.0, ts-node@^10.2.1, ts-node@^10.4.0: v8-compile-cache-lib "^3.0.1" yn "3.1.1" -ts-node@^9: - version "9.1.1" - resolved "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d" - integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg== - dependencies: - arg "^4.1.0" - create-require "^1.1.0" - diff "^4.0.1" - make-error "^1.1.1" - source-map-support "^0.5.17" - yn "3.1.1" - tsconfig-paths@^3.14.1: version "3.14.1" resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" @@ -25532,7 +25517,7 @@ tslib@2.0.3: resolved "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== -tslib@2.3.1, tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.2.0, tslib@^2.3.1, tslib@~2.3.0: +tslib@2.3.1, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.2.0, tslib@^2.3.1, tslib@~2.3.0: version "2.3.1" resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==