feat(batch): add Firelens configuration support for AWS Batch Job Definition

Author: badmintoncryer

packages/aws-cdk-lib/aws-apigateway/lib/integration.ts

@@ -132,24 +132,24 @@ export interface IntegrationOptions {
    * The VpcLink used for the integration.
    * Required if connectionType is VPC_LINK
    *
-   * @deprecated Use `vpcLinkV2` for VPC Link V2 integrations with ALB/NLB
+   * Use this for NLB integrations. For ALB integrations, use `vpcLinkV2` instead.
    */
   readonly vpcLink?: IVpcLink;
 
   /**
    * The VPC Link V2 used for the integration.
    *
-   * VPC Links V2 enable private integrations that connect your REST API directly to Application Load Balancers or Network Load Balancers.
+   * VPC Links V2 enable private integrations that connect your REST API directly to Application Load Balancers.
    *
-   * When using `vpcLinkV2`, you must also specify `integrationTarget` with the ARN of the ALB or NLB.
+   * When using `vpcLinkV2`, you must also specify `integrationTarget` with the ARN of the ALB.
    *
    * @see https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-vpc-links-v2.html
    * @default - No VPC Link V2
    */
   readonly vpcLinkV2?: apigwv2.IVpcLink;
 
   /**
-   * The ALB or NLB ARN to send the request to.
+   * The ALB ARN to send the request to.
    *
    * Only supported for private integrations that use VPC links V2.
    * When using this property, you must also specify `vpcLinkV2`.
@@ -233,11 +233,12 @@ export interface IntegrationConfig {
   readonly integrationHttpMethod?: string;
 
   /**
-   * This value is included in computing the Deployment's fingerprint. When the fingerprint
-   * changes, a new deployment is triggered.
+   * This value is included in computing the Deployment's fingerprint.
+   * When the fingerprint changes, a new deployment is triggered.
    * This property should contain values associated with the Integration that upon changing
    * should trigger a fresh the Deployment needs to be refreshed.
-   * @default undefined deployments are not triggered for any change to this integration.
+   *
+   * @default undefined - deployments are not triggered for any change to this integration.
    */
   readonly deploymentToken?: string;
 }

packages/aws-cdk-lib/aws-apigateway/lib/integrations/alb.ts

@@ -1,7 +1,7 @@
 import * as apigwv2 from '../../../aws-apigatewayv2';
 import * as ec2 from '../../../aws-ec2';
 import * as elbv2 from '../../../aws-elasticloadbalancingv2';
-import { Names, Token } from '../../../core';
+import { Token } from '../../../core';
 import { ValidationError } from '../../../core/lib/errors';
 import { ConnectionType, Integration, IntegrationConfig, IntegrationOptions, IntegrationType } from '../integration';
 import { Method } from '../method';
@@ -39,8 +39,7 @@ export interface AlbIntegrationProps {
   /**
    * Integration options, such as request/response mapping, content handling, etc.
    *
-   * Note: `vpcLinkV2` and `integrationTarget` options are automatically configured
-   * and should not be specified here.
+   * `vpcLinkV2` and `integrationTarget` options are automatically configured and should not be specified here.
    *
    * @default - No additional options
    */
@@ -70,9 +69,9 @@ export class AlbIntegration extends Integration {
 
     super({
       type: proxy ? IntegrationType.HTTP_PROXY : IntegrationType.HTTP,
-      // integrationHttpMethod will be set in bind() if not provided
+      // integrationHttpMethod will be updated in bind() if not provided
       integrationHttpMethod: props.httpMethod ?? 'ANY',
-      // uri is required for HTTP integrations, will be set in bind()
+      // uri is required for HTTP integrations, will be updated in bind()
       uri: 'http://placeholder.internal',
       options: props.options,
     });
@@ -131,12 +130,14 @@ export class AlbIntegration extends Integration {
   }
 
   /**
-   * Creates a new VPC Link for the ALB's VPC.
+   * Creates a new VPC Link for the VPC, or returns an existing one if already created.
+   *
+   * VPC Links are shared per VPC, similar to the API Gateway V2 implementation.
    */
   private createVpcLink(method: Method, vpc: ec2.IVpc): apigwv2.VpcLink {
-    const id = `VpcLink-${Names.nodeUniqueId(this.alb.node)}`;
+    const id = `VpcLink-${vpc.node.id}`;
 
-    // Check if a VPC link already exists in the API's scope
+    // Check if a VPC link already exists in the API's scope for this VPC
     const existingVpcLink = method.api.node.tryFindChild(id) as apigwv2.VpcLink | undefined;
     if (existingVpcLink) {
       return existingVpcLink;