chore: fix up v2 from inaccurate merge commits

The forward merge #13414 was erroneously squash-merged, resulting in some
defects in the future forward merges. In particular, #13426 was dropped,
un-reverting the commit and causing issues. There were also some test changes
from #13462 that appeared to be dropped.

This PR fixes the issue by just directly applying a patch to v2-main that solves
the difference between the current v2-main and what we'd have if we un-squashed
the squashed merge-commit and replayed all commits after that.

This is an effective duplicate of #13742, except that this is a clean patch that
can be applied, whereas the other is a rebased branch that will need to be
force-pushed to be applied.

Author: njlynch

packages/@aws-cdk/assets/lib/fs/options.ts

@@ -10,7 +10,6 @@ export interface CopyOptions {
    * A strategy for how to handle symlinks.
    *
    * @default Never
-   * @deprecated use `followSymlinks` instead
    */
   readonly follow?: FollowMode;
 

packages/@aws-cdk/aws-appmesh/lib/route-spec.ts

@@ -1,4 +1,4 @@
-import { Duration } from '@aws-cdk/core';
+import * as cdk from '@aws-cdk/core';
 import { Construct } from 'constructs';
 import { CfnRoute } from './appmesh.generated';
 import { Protocol, HttpTimeout, GrpcTimeout, TcpTimeout } from './shared-interfaces';
@@ -357,7 +357,7 @@ export interface HttpRetryPolicy {
   /**
    * The timeout for each retry attempt
    */
-  readonly retryTimeout: Duration;
+  readonly retryTimeout: cdk.Duration;
 
   /**
    * TCP events on which to retry. The event occurs before any processing of a

packages/@aws-cdk/aws-ecr-assets/lib/image-asset.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as assets from '@aws-cdk/assets';
 import * as ecr from '@aws-cdk/aws-ecr';
-import { Annotations, AssetStaging, FeatureFlags, FileFingerprintOptions, IgnoreMode, Stack, SymlinkFollowMode, Token } from '@aws-cdk/core';
+import { Annotations, FeatureFlags, IgnoreMode, Stack, Token } from '@aws-cdk/core';
 import * as cxapi from '@aws-cdk/cx-api';
 
 // keep this import separate from other imports to reduce chance for merge conflicts with v2-main
@@ -12,7 +12,7 @@ import { Construct } from 'constructs';
 /**
  * Options for DockerImageAsset
  */
-export interface DockerImageAssetOptions extends assets.FingerprintOptions, FileFingerprintOptions {
+export interface DockerImageAssetOptions extends assets.FingerprintOptions {
   /**
    * ECR repository name
    *
@@ -140,9 +140,8 @@ export class DockerImageAsset extends Construct implements assets.IAsset {
     // deletion of the ECR repository the app used).
     extraHash.version = '1.21.0';
 
-    const staging = new AssetStaging(this, 'Staging', {
+    const staging = new assets.Staging(this, 'Staging', {
       ...props,
-      follow: props.followSymlinks ?? toSymlinkFollow(props.follow),
       exclude,
       ignoreMode,
       sourcePath: dir,
@@ -185,13 +184,3 @@ function validateBuildArgs(buildArgs?: { [key: string]: string }) {
     }
   }
 }
-
-function toSymlinkFollow(follow?: assets.FollowMode): SymlinkFollowMode | undefined {
-  switch (follow) {
-    case undefined: return undefined;
-    case assets.FollowMode.NEVER: return SymlinkFollowMode.NEVER;
-    case assets.FollowMode.ALWAYS: return SymlinkFollowMode.ALWAYS;
-    case assets.FollowMode.BLOCK_EXTERNAL: return SymlinkFollowMode.BLOCK_EXTERNAL;
-    case assets.FollowMode.EXTERNAL: return SymlinkFollowMode.EXTERNAL;
-  }
-}

packages/@aws-cdk/aws-neptune/README.md

@@ -31,7 +31,7 @@ import * as neptune from '@aws-cdk/aws-neptune';
 
 ## Starting a Neptune Database
 
-To set up a Neptune database, define a `DatabaseCluster`. You must always launch a database in a VPC.
+To set up a Neptune database, define a `DatabaseCluster`. You must always launch a database in a VPC. 
 
 ```ts
 const cluster = new neptune.DatabaseCluster(this, 'Database', {

packages/@aws-cdk/aws-neptune/test/cluster.test.ts

@@ -1,4 +1,5 @@
-import { ABSENT, expect as expectCDK, haveResource, ResourcePart } from '@aws-cdk/assert';
+import '@aws-cdk/assert/jest';
+import { ABSENT, ResourcePart } from '@aws-cdk/assert';
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as iam from '@aws-cdk/aws-iam';
 import * as kms from '@aws-cdk/aws-kms';
@@ -20,28 +21,28 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBCluster', {
+    expect(stack).toHaveResource('AWS::Neptune::DBCluster', {
       Properties: {
         DBSubnetGroupName: { Ref: 'DatabaseSubnets3C9252C9' },
         VpcSecurityGroupIds: [{ 'Fn::GetAtt': ['DatabaseSecurityGroup5C91FDCB', 'GroupId'] }],
         StorageEncrypted: true,
       },
       DeletionPolicy: 'Retain',
       UpdateReplacePolicy: 'Retain',
-    }, ResourcePart.CompleteDefinition));
+    }, ResourcePart.CompleteDefinition);
 
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBInstance', {
+    expect(stack).toHaveResource('AWS::Neptune::DBInstance', {
       DeletionPolicy: 'Retain',
       UpdateReplacePolicy: 'Retain',
-    }, ResourcePart.CompleteDefinition));
+    }, ResourcePart.CompleteDefinition);
 
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBSubnetGroup', {
+    expect(stack).toHaveResource('AWS::Neptune::DBSubnetGroup', {
       SubnetIds: [
         { Ref: 'VPCPrivateSubnet1Subnet8BCA10E0' },
         { Ref: 'VPCPrivateSubnet2SubnetCFCDAA7A' },
         { Ref: 'VPCPrivateSubnet3Subnet3EDCD457' },
       ],
-    }));
+    });
   });
 
   test('can create a cluster with a single instance', () => {
@@ -57,10 +58,10 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBCluster', {
+    expect(stack).toHaveResource('AWS::Neptune::DBCluster', {
       DBSubnetGroupName: { Ref: 'DatabaseSubnets3C9252C9' },
       VpcSecurityGroupIds: [{ 'Fn::GetAtt': ['DatabaseSecurityGroup5C91FDCB', 'GroupId'] }],
-    }));
+    });
   });
 
   test('errors when less than one instance is specified', () => {
@@ -111,11 +112,11 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBCluster', {
+    expect(stack).toHaveResource('AWS::Neptune::DBCluster', {
       EngineVersion: '1.0.4.1',
       DBSubnetGroupName: { Ref: 'DatabaseSubnets3C9252C9' },
       VpcSecurityGroupIds: [{ 'Fn::GetAtt': ['DatabaseSecurityGroup5C91FDCB', 'GroupId'] }],
-    }));
+    });
   });
 
   test('can create a cluster with imported vpc and security group', () => {
@@ -135,10 +136,10 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBCluster', {
+    expect(stack).toHaveResource('AWS::Neptune::DBCluster', {
       DBSubnetGroupName: { Ref: 'DatabaseSubnets3C9252C9' },
       VpcSecurityGroupIds: ['SecurityGroupId12345'],
-    }));
+    });
   });
 
   test('cluster with parameter group', () => {
@@ -160,9 +161,9 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBCluster', {
+    expect(stack).toHaveResource('AWS::Neptune::DBCluster', {
       DBClusterParameterGroupName: { Ref: 'ParamsA8366201' },
-    }));
+    });
   });
 
   test('cluster with associated role', () => {
@@ -183,7 +184,7 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBCluster', {
+    expect(stack).toHaveResource('AWS::Neptune::DBCluster', {
       AssociatedRoles: [
         {
           RoleArn: {
@@ -194,7 +195,7 @@ describe('DatabaseCluster', () => {
           },
         },
       ],
-    }));
+    });
   });
 
   test('cluster with imported parameter group', () => {
@@ -212,9 +213,9 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBCluster', {
+    expect(stack).toHaveResource('AWS::Neptune::DBCluster', {
       DBClusterParameterGroupName: 'ParamGroupName',
-    }));
+    });
   });
 
   test('create an encrypted cluster with custom KMS key', () => {
@@ -230,15 +231,15 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBCluster', {
+    expect(stack).toHaveResource('AWS::Neptune::DBCluster', {
       KmsKeyId: {
         'Fn::GetAtt': [
           'Key961B73FD',
           'Arn',
         ],
       },
       StorageEncrypted: true,
-    }));
+    });
   });
 
   test('creating a cluster defaults to using encryption', () => {
@@ -253,9 +254,9 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBCluster', {
+    expect(stack).toHaveResource('AWS::Neptune::DBCluster', {
       StorageEncrypted: true,
-    }));
+    });
   });
 
   test('supplying a KMS key with storageEncryption false throws an error', () => {
@@ -306,9 +307,9 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBInstance', {
+    expect(stack).toHaveResource('AWS::Neptune::DBInstance', {
       DBInstanceIdentifier: `${instanceIdentifierBase}1`,
-    }));
+    });
   });
 
   test('cluster identifier used', () => {
@@ -325,9 +326,9 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBInstance', {
+    expect(stack).toHaveResource('AWS::Neptune::DBInstance', {
       DBInstanceIdentifier: `${clusterIdentifier}instance1`,
-    }));
+    });
   });
 
   test('imported cluster has supplied attributes', () => {
@@ -372,9 +373,9 @@ describe('DatabaseCluster', () => {
     cluster.connections.allowToAnyIpv4(ec2.Port.tcp(443));
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::EC2::SecurityGroupEgress', {
+    expect(stack).toHaveResource('AWS::EC2::SecurityGroupEgress', {
       GroupId: 'sg-123456789',
-    }));
+    });
   });
 
   test('backup retention period respected', () => {
@@ -390,9 +391,9 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBCluster', {
+    expect(stack).toHaveResource('AWS::Neptune::DBCluster', {
       BackupRetentionPeriod: 20,
-    }));
+    });
   });
 
   test('backup maintenance window respected', () => {
@@ -409,10 +410,10 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBCluster', {
+    expect(stack).toHaveResource('AWS::Neptune::DBCluster', {
       BackupRetentionPeriod: 20,
       PreferredBackupWindow: '07:34-08:04',
-    }));
+    });
   });
 
   test('regular maintenance window respected', () => {
@@ -428,9 +429,9 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBCluster', {
+    expect(stack).toHaveResource('AWS::Neptune::DBCluster', {
       PreferredMaintenanceWindow: '07:34-08:04',
-    }));
+    });
   });
 
   test('iam authentication - off by default', () => {
@@ -445,9 +446,9 @@ describe('DatabaseCluster', () => {
     });
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBCluster', {
+    expect(stack).toHaveResourceLike('AWS::Neptune::DBCluster', {
       IamAuthEnabled: ABSENT,
-    }));
+    });
   });
 
   test('createGrant - creates IAM policy and enables IAM auth', () => {
@@ -466,10 +467,10 @@ describe('DatabaseCluster', () => {
     cluster.grantConnect(role);
 
     // THEN
-    expectCDK(stack).to(haveResource('AWS::Neptune::DBCluster', {
+    expect(stack).toHaveResourceLike('AWS::Neptune::DBCluster', {
       IamAuthEnabled: true,
-    }));
-    expectCDK(stack).to(haveResource('AWS::IAM::Policy', {
+    });
+    expect(stack).toHaveResource('AWS::IAM::Policy', {
       PolicyDocument: {
         Statement: [{
           Effect: 'Allow',
@@ -502,7 +503,7 @@ describe('DatabaseCluster', () => {
         }],
         Version: '2012-10-17',
       },
-    }));
+    });
   });
 
   test('createGrant - throws if IAM auth disabled', () => {

packages/@aws-cdk/aws-s3-assets/lib/asset.ts

@@ -8,7 +8,7 @@ import * as cxapi from '@aws-cdk/cx-api';
 import { Construct } from 'constructs';
 import { toSymlinkFollow } from './compat';
 
-export interface AssetOptions extends assets.CopyOptions, cdk.FileCopyOptions, cdk.AssetOptions {
+export interface AssetOptions extends assets.CopyOptions, cdk.AssetOptions {
   /**
    * A list of principals that should be able to read this asset from S3.
    * You can use `asset.grantRead(principal)` to grant read permissions later.
@@ -121,7 +121,7 @@ export class Asset extends Construct implements cdk.IAsset {
     const staging = new cdk.AssetStaging(this, 'Stage', {
       ...props,
       sourcePath: path.resolve(props.path),
-      follow: props.followSymlinks ?? toSymlinkFollow(props.follow),
+      follow: toSymlinkFollow(props.follow),
       assetHash: props.assetHash ?? props.sourceHash,
     });