Added catch to refreshNotices call;

Type of main updated; Refresh doesn't force a cache update
aws · Feb 22, 2022 · bf55bb2 · bf55bb2
1 parent 6b89ea1
commit bf55bb2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/packages/aws-cdk/lib/cdk-toolkit.ts b/packages/aws-cdk/lib/cdk-toolkit.ts
@@ -391,7 +391,7 @@ export class CdkToolkit {
     }
   }
 
-  public async list(selectors: string[], options: { long?: boolean } = { }) {
+  public async list(selectors: string[], options: { long?: boolean, json?: boolean } = { }): Promise<number> {
     const stacks = await this.selectStacksForList(selectors);
 
     // if we are in "long" mode, emit the array as-is (JSON/YAML)
@@ -404,7 +404,8 @@ export class CdkToolkit {
           environment: stack.environment,
         });
       }
-      return long; // will be YAML formatted output
+      data(serializeStructure(long, options.json ?? false));
+      return 0;
     }
 
     // just print stack IDs

diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts
@@ -230,7 +230,9 @@ if (!process.stdout.isTTY) {
 }
 
 async function initCommandLine() {
-  void refreshNotices().then(_ => debug('Notices refreshed'));
+  void refreshNotices()
+    .then(_ => debug('Notices refreshed'))
+    .catch(e => debug(`Notices refresh failed: ${e}`));
 
   const argv = await parseCommandLineArguments();
   if (argv.verbose) {
@@ -325,7 +327,7 @@ async function initCommandLine() {
     }
   }
 
-  async function main(command: string, args: any): Promise<number | string | {} | void> {
+  async function main(command: string, args: any): Promise<number | void> {
     const toolkitStackName: string = ToolkitInfo.determineName(configuration.settings.get(['toolkitStackName']));
     debug(`Toolkit stack: ${chalk.bold(toolkitStackName)}`);
 
@@ -363,7 +365,7 @@ async function initCommandLine() {
 
       case 'ls':
       case 'list':
-        return cli.list(args.STACKS, { long: args.long });
+        return cli.list(args.STACKS, { long: args.long, json: argv.json });
 
       case 'diff':
         const enableDiffNoFail = isFeatureEnabled(configuration, cxapi.ENABLE_DIFF_NO_FAIL);

diff --git a/packages/aws-cdk/lib/notices.ts b/packages/aws-cdk/lib/notices.ts
@@ -30,7 +30,7 @@ export interface DisplayNoticesProps {
 }
 
 export async function refreshNotices() {
-  const dataSource = dataSourceReference(true);
+  const dataSource = dataSourceReference(false);
   return dataSource.fetch();
 }