fix(cli): notices don't work behind a proxy

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts

@@ -2828,7 +2828,7 @@ integTest('requests go through a proxy when configured',
     });
 
     // We don't need to modify any request, so the proxy
-    // passes through all requests to the host.
+    // passes through all requests to the target host.
     const endpoint = await proxyServer
       .forAnyRequest()
       .thenPassThrough();
@@ -2845,13 +2845,21 @@ integTest('requests go through a proxy when configured',
           '--proxy', proxyServer.url,
           '--ca-bundle-path', certPath,
         ],
+        modEnv: {
+          CDK_HOME: fixture.integTestDir,
+        },
       });
     } finally {
       await fs.rm(certDir, { recursive: true, force: true });
       await proxyServer.stop();
     }
 
-    const actionsUsed = actions(await endpoint.getSeenRequests());
+    const requests = await endpoint.getSeenRequests();
+
+    expect(requests.map(req => req.url))
+      .toContain('https://cli.cdk.dev-tools.aws.dev/notices.json');
+
+    const actionsUsed = actions(requests);
     expect(actionsUsed).toContain('AssumeRole');
     expect(actionsUsed).toContain('CreateChangeSet');
   }),

packages/aws-cdk/lib/api/aws-auth/awscli-compatible.ts

@@ -109,23 +109,27 @@ export class AwsCliCompatible {
   }
 
   public static requestHandlerBuilder(options: SdkHttpOptions = {}): NodeHttpHandlerOptions {
+    const agent = this.proxyAgent(options);
+
+    return {
+      connectionTimeout: DEFAULT_CONNECTION_TIMEOUT,
+      requestTimeout: DEFAULT_TIMEOUT,
+      httpsAgent: agent,
+      httpAgent: agent,
+    };
+  }
+
+  public static proxyAgent(options: SdkHttpOptions) {
     // Force it to use the proxy provided through the command line.
     // Otherwise, let the ProxyAgent auto-detect the proxy using environment variables.
     const getProxyForUrl = options.proxyAddress != null
       ? () => Promise.resolve(options.proxyAddress!)
       : undefined;
 
-    const agent = new ProxyAgent({
+    return new ProxyAgent({
       ca: tryGetCACert(options.caBundlePath),
-      getProxyForUrl: getProxyForUrl,
+      getProxyForUrl,
     });
-
-    return {
-      connectionTimeout: DEFAULT_CONNECTION_TIMEOUT,
-      requestTimeout: DEFAULT_TIMEOUT,
-      httpsAgent: agent,
-      httpAgent: agent,
-    };
   }
 
   /**

packages/aws-cdk/lib/cli.ts

@@ -89,6 +89,10 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise<n
     output: configuration.settings.get(['outdir']),
     shouldDisplay: configuration.settings.get(['notices']),
     includeAcknowledged: cmd === 'notices' ? !argv.unacknowledged : false,
+    httpOptions: {
+      proxyAddress: configuration.settings.get(['proxy']),
+      caBundlePath: configuration.settings.get(['caBundlePath']),
+    },
   });
   await notices.refresh();
 

packages/aws-cdk/lib/notices.ts

@@ -1,10 +1,13 @@
 import { ClientRequest } from 'http';
-import * as https from 'https';
+import { RequestOptions } from 'https';
+import * as https from 'node:https';
 import * as path from 'path';
 import type { Environment } from '@aws-cdk/cx-api';
 import * as fs from 'fs-extra';
 import * as semver from 'semver';
-import { debug, print, warning, error } from './logging';
+import { SdkHttpOptions } from './api';
+import { AwsCliCompatible } from './api/aws-auth/awscli-compatible';
+import { debug, error, print, warning } from './logging';
 import { Context } from './settings';
 import { loadTreeFromDir, some } from './tree';
 import { flatMap } from './util';
@@ -39,6 +42,11 @@ export interface NoticesProps {
    * @default true
    */
   readonly shouldDisplay?: boolean;
+
+  /**
+   * Options for the HTTP request
+   */
+  readonly httpOptions?: SdkHttpOptions;
 }
 
 export interface NoticesPrintOptions {
@@ -189,7 +197,7 @@ export class NoticesFilter {
 }
 
 /**
- * Infomration about a bootstrapped environment.
+ * Information about a bootstrapped environment.
  */
 export interface BootstrappedEnvironment {
   readonly bootstrapStackVersion: number;
@@ -222,6 +230,7 @@ export class Notices {
   private readonly shouldDisplay: boolean;
   private readonly acknowledgedIssueNumbers: Set<Number>;
   private readonly includeAcknowlegded: boolean;
+  private readonly httpOptions: SdkHttpOptions;
 
   private data: Set<Notice> = new Set();
 
@@ -234,6 +243,7 @@ export class Notices {
     this.includeAcknowlegded = props.includeAcknowledged ?? false;
     this.output = props.output ?? 'cdk.out';
     this.shouldDisplay = props.shouldDisplay ?? true;
+    this.httpOptions = props.httpOptions ?? {};
   }
 
   /**
@@ -263,7 +273,8 @@ export class Notices {
     }
 
     try {
-      const dataSource = new CachedDataSource(CACHE_FILE_PATH, options.dataSource ?? new WebsiteNoticeDataSource(), options.force ?? false);
+      const underlyingDataSource = options.dataSource ?? new WebsiteNoticeDataSource(this.httpOptions);
+      const dataSource = new CachedDataSource(CACHE_FILE_PATH, underlyingDataSource, options.force ?? false);
       const notices = await dataSource.fetch();
       this.data = new Set(this.includeAcknowlegded ? notices : notices.filter(n => !this.acknowledgedIssueNumbers.has(n.issueNumber)));
     } catch (e: any) {
@@ -375,6 +386,12 @@ export interface NoticeDataSource {
 }
 
 export class WebsiteNoticeDataSource implements NoticeDataSource {
+  private readonly options: SdkHttpOptions;
+
+  constructor(options: SdkHttpOptions = {}) {
+    this.options = options;
+  }
+
   fetch(): Promise<Notice[]> {
     const timeout = 3000;
     return new Promise((resolve, reject) => {
@@ -388,8 +405,13 @@ export class WebsiteNoticeDataSource implements NoticeDataSource {
 
       timer.unref();
 
+      const options: RequestOptions = {
+        agent: AwsCliCompatible.proxyAgent(this.options),
+      };
+
       try {
         req = https.get('https://cli.cdk.dev-tools.aws.dev/notices.json',
+          options,
           res => {
             if (res.statusCode === 200) {
               res.setEncoding('utf8');

packages/aws-cdk/lib/settings.ts

@@ -266,6 +266,7 @@ export class Settings {
       app: argv.app,
       browser: argv.browser,
       build: argv.build,
+      caBundlePath: argv.caBundlePath,
       context,
       debug: argv.debug,
       tags,
@@ -285,6 +286,7 @@ export class Settings {
       output: argv.output,
       outputsFile: argv.outputsFile,
       progress: argv.progress,
+      proxy: argv.proxy,
       bundlingStacks,
       lookups: argv.lookups,
       rollback: argv.rollback,