diff --git a/packages/catalog-model/src/kinds/LocationEntityV1alpha1.ts b/packages/catalog-model/src/kinds/LocationEntityV1alpha1.ts index 20f99f15b3..fb452b6ac7 100644 --- a/packages/catalog-model/src/kinds/LocationEntityV1alpha1.ts +++ b/packages/catalog-model/src/kinds/LocationEntityV1alpha1.ts @@ -31,7 +31,6 @@ export interface LocationEntityV1alpha1 extends Entity { type?: string; target?: string; targets?: string[]; - optional?: boolean; }; } diff --git a/plugins/catalog-backend/src/next/CatalogProcessingOrchestratorImpl.ts b/plugins/catalog-backend/src/next/CatalogProcessingOrchestratorImpl.ts index 0107c5cd8d..a8e9b924d0 100644 --- a/plugins/catalog-backend/src/next/CatalogProcessingOrchestratorImpl.ts +++ b/plugins/catalog-backend/src/next/CatalogProcessingOrchestratorImpl.ts @@ -181,7 +181,7 @@ export class CatalogProcessingOrchestratorImpl // Backwards compatible processing of location entites if (isLocationEntity(entity)) { - const { type = location.type, optional = false } = entity.spec; + const { type = location.type } = entity.spec; const targets = new Array(); if (entity.spec.target) { targets.push(entity.spec.target); @@ -214,9 +214,9 @@ export class CatalogProcessingOrchestratorImpl { type, target, - presence: optional ? 'optional' : 'required', + presence: 'required', }, - Boolean(entity.spec?.optional), + false, emitter.emit, this.options.parser, ); diff --git a/plugins/catalog-backend/src/next/util.ts b/plugins/catalog-backend/src/next/util.ts index 6ff1cde2f0..f8e6f1f978 100644 --- a/plugins/catalog-backend/src/next/util.ts +++ b/plugins/catalog-backend/src/next/util.ts @@ -82,7 +82,6 @@ export function locationSpecToLocationEntity( spec: { type: location.type, target: location.target, - optional: location.presence === 'optional' ? true : undefined, }, };