Merge branch 'main' into otaviom/temp-custom-resource-provider

packages/aws-cdk/lib/notices.ts

@@ -1,3 +1,4 @@
+import { ClientRequest } from 'http';
 import * as https from 'https';
 import * as path from 'path';
 import * as fs from 'fs-extra';
@@ -108,9 +109,18 @@ export class WebsiteNoticeDataSource implements NoticeDataSource {
   fetch(): Promise<Notice[]> {
     const timeout = 3000;
     return new Promise((resolve, reject) => {
+      let req: ClientRequest | undefined;
+
+      let timer = setTimeout(() => {
+        if (req) {
+          req.destroy(new Error('Request timed out'));
+        }
+      }, timeout);
+
+      timer.unref();
+
       try {
-        const req = https.get('https://cli.cdk.dev-tools.aws.dev/notices.json',
-          { timeout },
+        req = https.get('https://cli.cdk.dev-tools.aws.dev/notices.json',
           res => {
             if (res.statusCode === 200) {
               res.setEncoding('utf8');
@@ -138,20 +148,6 @@ export class WebsiteNoticeDataSource implements NoticeDataSource {
             }
           });
         req.on('error', reject);
-        req.on('timeout', () => {
-          // The 'timeout' event doesn't stop anything by itself, it just
-          // notifies that it has been long time since we saw bytes.
-          // In our case, we want to give up.
-          req.destroy(new Error('Request timed out'));
-        });
-
-        // It's not like I don't *trust* the 'timeout' event... but I don't trust it.
-        // Add a backup timer that will destroy the request after all.
-        // (This is at least necessary to make the tests pass, but that's probably because of 'nock'.
-        // It's not clear whether users will hit this).
-        setTimeout(() => {
-          req.destroy(new Error('Request timed out. You should never see this message; if you do, please let us know at https://github.com/aws/aws-cdk/issues'));
-        }, timeout + 200);
       } catch (e) {
         reject(new Error(`HTTPS 'get' call threw an error: ${e.message}`));
       }