fix the actual bug

aws · Nov 8, 2023 · b5efde9 · b5efde9
1 parent 0fd9f17
commit b5efde9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/tools/@aws-cdk/spec2cdk/README.md b/tools/@aws-cdk/spec2cdk/README.md
@@ -59,7 +59,7 @@ Options:
     --pattern                           [string] [default: %moduleName%/%serviceShortName%.generated.ts]
       File and path pattern for generated files
     --service                           [string]
-      Generate files only for a specific service, e.g. aws-lambda
+      Generate files only for a specific service, e.g. AWS::S3
 
 Path patterns can use the following variables:
 

diff --git a/tools/@aws-cdk/spec2cdk/lib/cli/index.ts b/tools/@aws-cdk/spec2cdk/lib/cli/index.ts
@@ -37,7 +37,7 @@ const config = {
   },
   'service': {
     type: 'string',
-    description: 'Generate files only for a specific service, e.g. aws-lambda',
+    description: 'Generate files only for a specific service, e.g. AWS::S3',
   },
   'clear-output': {
     type: 'boolean',
@@ -83,7 +83,7 @@ async function main(argv: string[]) {
 
   const outputDir = positionals[0];
   if (!outputDir) {
-    throw new Error('Please specify the output-path');
+    throw new EvalError('Please specify the output-path');
   }
 
   const pss: Record<PatternKeys, true> = { moduleName: true, serviceName: true, serviceShortName: true };
@@ -117,7 +117,10 @@ async function main(argv: string[]) {
   };
 
   if (options.service && typeof options.service === 'string') {
-    const moduleMap = { [options.service]: { services: [options.service] } };
+    if (!options.service.includes('::')) {
+      throw new EvalError('Service must be in the form `<Partition>::<Service>, e.g. AWS::S3');
+    }
+    const moduleMap = { [options.service.toLocaleLowerCase().split('::').join('-')]: { services: [options.service] } };
     await generate(moduleMap, generatorOptions);
     return;
   }
@@ -126,9 +129,15 @@ async function main(argv: string[]) {
 }
 
 main(process.argv.splice(2)).catch((e) => {
-  log.error(`Error: ${e.message}\n`);
-  showHelp(command, args);
   process.exitCode = 1;
+
+  if (e instanceof EvalError) {
+    log.error(`Error: ${e.message}\n`);
+    showHelp(command, args);
+  } else {
+    log.error(e);
+  }
+
 });
 
 function stringOr(pat: unknown, def: string) {

diff --git a/tools/@aws-cdk/spec2cdk/lib/generate.ts b/tools/@aws-cdk/spec2cdk/lib/generate.ts
@@ -225,7 +225,7 @@ async function generator(
 
   const result = {
     modules: moduleMap,
-    resources: Object.values(moduleMap).flat().map(pick('resources')).reduce(mergeObjects),
+    resources: Object.values(moduleMap).flat().map(pick('resources')).reduce(mergeObjects, {}),
     outputFiles: Object.values(moduleMap).flat().flatMap(pick('outputFiles')),
   };