add default patcher for registry schema importers

cdklabs · Oct 25, 2023 · 1576fee · 1576fee
1 parent f27a6aa
commit 1576fee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/@aws-cdk/service-spec-importers/src/loaders/load-cloudformation-registry.ts b/packages/@aws-cdk/service-spec-importers/src/loaders/load-cloudformation-registry.ts
@@ -3,6 +3,7 @@ import * as util from 'util';
 import { isSuccess, Result } from '@cdklabs/tskb';
 import * as _glob from 'glob';
 import { Loader, LoadResult, LoadSourceOptions } from './loader';
+import { patchCloudFormationRegistry } from '../patches';
 import { JsonLensPatcher } from '../patching';
 import { ProblemReport, ReportAudience } from '../report';
 import { CloudFormationRegistryResource } from '../types';
@@ -23,7 +24,7 @@ export function loadCloudFormationRegistryDirectory(
       'CloudFormationRegistryResource.schema.json',
       {
         mustValidate: options.validate,
-        patcher: options.patcher,
+        patcher: options.patcher ?? patchCloudFormationRegistry,
         errorRootDirectory: baseDir,
       },
     );

diff --git a/packages/@aws-cdk/service-spec-importers/src/loaders/load-sam-schema.ts b/packages/@aws-cdk/service-spec-importers/src/loaders/load-sam-schema.ts
@@ -1,6 +1,6 @@
 import { assertSuccess } from '@cdklabs/tskb';
 import { Loader, LoadResult, LoadSourceOptions } from './loader';
-// import { patchSamTemplateSpec } from '../../../aws-service-spec/build/patches/sam-patches';
+import { normalizeJsonSchema } from '../patches';
 import { JsonLensPatcher } from '../patching';
 import { SamTemplateSchema } from '../types';
 
@@ -17,7 +17,7 @@ export async function loadSamSchema(
 ): Promise<LoadResult<SamTemplateSchema>> {
   const loader = await Loader.fromSchemaFile<SamTemplateSchema>('SamTemplateSchema.schema.json', {
     mustValidate: options.validate,
-    patcher: options.patcher,
+    patcher: options.patcher ?? normalizeJsonSchema,
   });
 
   const result = await loader.loadFile(filePath);