Merge branch 'master' into lambda-nodejs-tsc-detection

aws · Mar 7, 2022 · 9dd37ec · 9dd37ec
2 parents 79e509d + b3c5fe8
commit 9dd37ec
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 15 deletions.
diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts
@@ -235,10 +235,6 @@ if (!process.stdout.isTTY) {
 }
 
 async function initCommandLine() {
-  void refreshNotices()
-    .then(_ => debug('Notices refreshed'))
-    .catch(e => debug(`Notices refresh failed: ${e}`));
-
   const argv = await parseCommandLineArguments();
   if (argv.verbose) {
     setLogLevel(argv.verbose);
@@ -254,6 +250,12 @@ async function initCommandLine() {
   });
   await configuration.load();
 
+  if (shouldDisplayNotices()) {
+    void refreshNotices()
+      .then(_ => debug('Notices refreshed'))
+      .catch(e => debug(`Notices refresh failed: ${e}`));
+  }
+
   const sdkProvider = await SdkProvider.withAwsCliCompatibleDefaults({
     profile: configuration.settings.get(['profile']),
     ec2creds: argv.ec2creds,
@@ -326,10 +328,10 @@ async function initCommandLine() {
         });
       }
     }
+  }
 
-    function shouldDisplayNotices(): boolean {
-      return configuration.settings.get(['notices']) ?? true;
-    }
+  function shouldDisplayNotices(): boolean {
+    return configuration.settings.get(['notices']) ?? true;
   }
 
   async function main(command: string, args: any): Promise<number | void> {

diff --git a/packages/aws-cdk/lib/notices.ts b/packages/aws-cdk/lib/notices.ts
@@ -43,13 +43,14 @@ export async function displayNotices(props: DisplayNoticesProps) {
 
 export async function generateMessage(dataSource: NoticeDataSource, props: DisplayNoticesProps) {
   const data = await dataSource.fetch();
-  const individualMessages = formatNotices(filterNotices(data, {
+  const filteredNotices = filterNotices(data, {
     outdir: props.outdir,
     acknowledgedIssueNumbers: new Set(props.acknowledgedIssueNumbers),
-  }));
+  });
 
-  if (individualMessages.length > 0) {
-    return finalMessage(individualMessages, data[0].issueNumber);
+  if (filteredNotices.length > 0) {
+    const individualMessages = formatNotices(filteredNotices);
+    return finalMessage(individualMessages, filteredNotices[0].issueNumber);
   }
   return '';
 }
@@ -108,18 +109,15 @@ export class WebsiteNoticeDataSource implements NoticeDataSource {
     const timeout = 3000;
 
     return new Promise((resolve) => {
+      setTimeout(() => resolve([]), timeout);
       try {
         const req = https.get('https://cli.cdk.dev-tools.aws.dev/notices.json',
           { timeout },
           res => {
-            const startTime = Date.now();
             if (res.statusCode === 200) {
               res.setEncoding('utf8');
               let rawData = '';
               res.on('data', (chunk) => {
-                if (Date.now() - startTime > timeout) {
-                  resolve([]);
-                }
                 rawData += chunk;
               });
               res.on('end', () => {

diff --git a/packages/aws-cdk/test/integ/cli/cli.integtest.ts b/packages/aws-cdk/test/integ/cli/cli.integtest.ts
@@ -757,6 +757,20 @@ integTest('templates on disk contain metadata resource, also in nested assemblie
   expect(JSON.parse(nestedTemplateContents).Resources.CDKMetadata).toBeTruthy();
 }));
 
+integTest('skips notice refresh', withDefaultFixture(async (fixture) => {
+  const output = await fixture.cdkSynth({
+    options: ['--no-notices'],
+    modEnv: {
+      INTEG_STACK_SET: 'stage-using-context',
+    },
+    allowErrExit: true,
+  });
+
+  // Neither succeeds nor fails, but skips the refresh
+  await expect(output).not.toContain('Notices refreshed');
+  await expect(output).not.toContain('Notices refresh failed');
+}));
+
 async function listChildren(parent: string, pred: (x: string) => Promise<boolean>) {
   const ret = new Array<string>();
   for (const child of await fs.readdir(parent, { encoding: 'utf-8' })) {