feat(toolkit-lib)!: allow custom https.Agent for SDK requests

Author: mrgrain

.projenrc.ts

@@ -751,7 +751,6 @@ const toolkitLib = configureProject(
       'glob',
       'minimatch',
       'p-limit@^3',
-      'proxy-agent',
       'semver',
       'split2',
       'uuid',

packages/@aws-cdk/toolkit-lib/.projen/deps.json

@@ -6,9 +6,7 @@ import { MetadataService } from '@aws-sdk/ec2-metadata-service';
 import type { NodeHttpHandlerOptions } from '@smithy/node-http-handler';
 import { loadSharedConfigFiles } from '@smithy/shared-ini-file-loader';
 import { makeCachingProvider } from './provider-caching';
-import { ProxyAgentProvider } from './proxy-agent';
 import type { ISdkLogger } from './sdk-logger';
-import type { SdkHttpOptions } from './types';
 import { AuthenticationError } from '../../toolkit/toolkit-error';
 import { IO, type IoHelper } from '../io/private';
 
@@ -279,8 +277,3 @@ export function sdkRequestHandler(agent?: Agent): NodeHttpHandlerOptions {
     httpAgent: agent,
   };
 }
-
-export async function makeRequestHandler(ioHelper: IoHelper, options: SdkHttpOptions = {}): Promise<NodeHttpHandlerOptions> {
-  const agent = await new ProxyAgentProvider(ioHelper).create(options);
-  return sdkRequestHandler(agent);
-}

packages/@aws-cdk/toolkit-lib/.projen/tasks.json

@@ -1,4 +1,3 @@
-export * from '../proxy-agent';
 export * from '../sdk';
 export * from '../sdk-provider';
 export * from '../sdk-logger';

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

@@ -1,3 +1,4 @@
+import type { Agent } from 'node:https';
 import type { SDKv3CompatibleCredentialProvider } from '@aws-cdk/cli-plugin-contract';
 import { AwsCliCompatible } from './awscli-compatible';
 import type { SdkProviderServices } from './sdk-provider';
@@ -32,18 +33,13 @@ export interface SdkConfig {
  */
 export interface SdkHttpOptions {
   /**
-   * Proxy address to use
+   * The agent responsible for making the network requests.
    *
-   * @default No proxy
-   */
-  readonly proxyAddress?: string;
-
-  /**
-   * A path to a certificate bundle that contains a cert to be trusted.
+   * Use this so set up a proxy connection.
    *
-   * @default No certificate bundle
+   * @default - uses the shared global node agent
    */
-  readonly caBundlePath?: string;
+  readonly agent?: Agent;
 }
 
 export abstract class BaseCredentials {

packages/@aws-cdk/toolkit-lib/lib/api/aws-auth/private/index.ts

@@ -33,7 +33,7 @@ import { type SynthOptions } from '../actions/synth';
 import type { WatchOptions } from '../actions/watch';
 import { patternsArrayForWatch } from '../actions/watch/private';
 import { BaseCredentials, type SdkConfig } from '../api/aws-auth';
-import { makeRequestHandler } from '../api/aws-auth/awscli-compatible';
+import { sdkRequestHandler } from '../api/aws-auth/awscli-compatible';
 import type { SdkProviderServices } from '../api/aws-auth/private';
 import { SdkProvider, IoHostSdkLogger } from '../api/aws-auth/private';
 import { Bootstrapper } from '../api/bootstrap';
@@ -184,7 +184,7 @@ export class Toolkit extends CloudAssemblySourceBuilder {
       const ioHelper = asIoHelper(this.ioHost, action);
       const services: SdkProviderServices = {
         ioHelper,
-        requestHandler: await makeRequestHandler(ioHelper, this.props.sdkConfig?.httpOptions),
+        requestHandler: sdkRequestHandler(this.props.sdkConfig?.httpOptions?.agent),
         logger: new IoHostSdkLogger(ioHelper),
         pluginHost: this.pluginHost,
       };