From 29ba225c0bd581d0d65a36f574c75cb5c0978570 Mon Sep 17 00:00:00 2001 From: maz Date: Sat, 8 Mar 2025 18:18:59 +0900 Subject: [PATCH] fix(efs): cannot run an integ test when `transitionToArchivePolicy` is specified and `throughputMode` is `undefined` --- .../integ.efs-transition.js.snapshot/cdk.out | 2 +- .../integ.json | 2 +- .../manifest.json | 154 ++++++++++++- .../test-efs-transition-integ.assets.json | 6 +- .../test-efs-transition-integ.template.json | 3 +- ...efaultTestDeployAssert7E1529D5.assets.json | 2 +- .../tree.json | 206 ++++++++++++++---- .../test/aws-efs/test/integ.efs-transition.ts | 3 +- .../aws-efs/test/efs-file-system.test.ts | 2 + 9 files changed, 322 insertions(+), 58 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/cdk.out index 1f0068d32659a..1e02a2deb191b 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"36.0.0"} \ No newline at end of file +{"version":"40.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/integ.json index fe3b37643d4db..384caea04322b 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "36.0.0", + "version": "40.0.0", "testCases": { "test-efs-integ-test/DefaultTest": { "stacks": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/manifest.json index 50775457be791..ba72388d7dbf1 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "36.0.0", + "version": "40.0.0", "artifacts": { "test-efs-transition-integ.assets": { "type": "cdk:asset-manifest", @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a0ff3a279e15d0e57140ef487ec06c6930bcfe16dc844df0f8a06688bc719b54.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/85d9300d4ebe9c71f0d30c1d8d5ac6ceb9c2a01a2fef18719c6b2c25a70d80fc.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -34,12 +34,58 @@ "test-efs-transition-integ.assets" ], "metadata": { + "/test-efs-transition-integ/Vpc": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "maxAzs": "*", + "natGateways": "*", + "restrictDefaultSecurityGroup": false + } + } + ], "/test-efs-transition-integ/Vpc/Resource": [ { "type": "aws:cdk:logicalId", "data": "Vpc8378EB38" } ], + "/test-efs-transition-integ/Vpc/PublicSubnet1": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:method", + "data": {} + }, + { + "type": "aws:cdk:analytics:method", + "data": { + "addNatGateway": [ + "*" + ] + } + } + ], "/test-efs-transition-integ/Vpc/PublicSubnet1/Subnet": [ { "type": "aws:cdk:logicalId", @@ -76,6 +122,34 @@ "data": "VpcPublicSubnet1NATGateway4D7517AA" } ], + "/test-efs-transition-integ/Vpc/PublicSubnet2": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:method", + "data": {} + } + ], "/test-efs-transition-integ/Vpc/PublicSubnet2/Subnet": [ { "type": "aws:cdk:logicalId", @@ -100,6 +174,34 @@ "data": "VpcPublicSubnet2DefaultRoute97F91067" } ], + "/test-efs-transition-integ/Vpc/PrivateSubnet1": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:method", + "data": {} + } + ], "/test-efs-transition-integ/Vpc/PrivateSubnet1/Subnet": [ { "type": "aws:cdk:logicalId", @@ -124,6 +226,34 @@ "data": "VpcPrivateSubnet1DefaultRouteBE02A9ED" } ], + "/test-efs-transition-integ/Vpc/PrivateSubnet2": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:method", + "data": {} + } + ], "/test-efs-transition-integ/Vpc/PrivateSubnet2/Subnet": [ { "type": "aws:cdk:logicalId", @@ -160,12 +290,32 @@ "data": "VpcVPCGWBF912B6E" } ], + "/test-efs-transition-integ/FileSystem": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "vpc": "*", + "lifecyclePolicy": "AFTER_14_DAYS", + "throughputMode": "elastic", + "transitionToArchivePolicy": "AFTER_90_DAYS", + "outOfInfrequentAccessPolicy": "AFTER_1_ACCESS" + } + } + ], "/test-efs-transition-integ/FileSystem/Resource": [ { "type": "aws:cdk:logicalId", "data": "FileSystem8A8E25C0" } ], + "/test-efs-transition-integ/FileSystem/EfsSecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "vpc": "*" + } + } + ], "/test-efs-transition-integ/FileSystem/EfsSecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/test-efs-transition-integ.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/test-efs-transition-integ.assets.json index 082e82cf0b792..7fe1fdc42d5ed 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/test-efs-transition-integ.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/test-efs-transition-integ.assets.json @@ -1,7 +1,7 @@ { - "version": "36.0.0", + "version": "40.0.0", "files": { - "a0ff3a279e15d0e57140ef487ec06c6930bcfe16dc844df0f8a06688bc719b54": { + "85d9300d4ebe9c71f0d30c1d8d5ac6ceb9c2a01a2fef18719c6b2c25a70d80fc": { "source": { "path": "test-efs-transition-integ.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "a0ff3a279e15d0e57140ef487ec06c6930bcfe16dc844df0f8a06688bc719b54.json", + "objectKey": "85d9300d4ebe9c71f0d30c1d8d5ac6ceb9c2a01a2fef18719c6b2c25a70d80fc.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/test-efs-transition-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/test-efs-transition-integ.template.json index 17afd24beda12..816f67857f396 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/test-efs-transition-integ.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/test-efs-transition-integ.template.json @@ -395,7 +395,8 @@ { "TransitionToArchive": "AFTER_90_DAYS" } - ] + ], + "ThroughputMode": "elastic" }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/testefsintegtestDefaultTestDeployAssert7E1529D5.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/testefsintegtestDefaultTestDeployAssert7E1529D5.assets.json index 5808bd55fd3ee..3c6e7f3ac48d8 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/testefsintegtestDefaultTestDeployAssert7E1529D5.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/testefsintegtestDefaultTestDeployAssert7E1529D5.assets.json @@ -1,5 +1,5 @@ { - "version": "36.0.0", + "version": "40.0.0", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/tree.json index d71614338e5a7..132c5835efd96 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.js.snapshot/tree.json @@ -32,7 +32,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnVPC", - "version": "2.118.0" + "version": "0.0.0" } }, "PublicSubnet1": { @@ -76,7 +76,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", - "version": "2.118.0" + "version": "0.0.0" } }, "Acl": { @@ -84,7 +84,8 @@ "path": "test-efs-transition-integ/Vpc/PublicSubnet1/Acl", "constructInfo": { "fqn": "aws-cdk-lib.Resource", - "version": "2.118.0" + "version": "0.0.0", + "metadata": [] } }, "RouteTable": { @@ -106,7 +107,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", - "version": "2.118.0" + "version": "0.0.0" } }, "RouteTableAssociation": { @@ -125,7 +126,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", - "version": "2.118.0" + "version": "0.0.0" } }, "DefaultRoute": { @@ -145,7 +146,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", - "version": "2.118.0" + "version": "0.0.0" } }, "EIP": { @@ -165,7 +166,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", - "version": "2.118.0" + "version": "0.0.0" } }, "NATGateway": { @@ -193,13 +194,37 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", - "version": "2.118.0" + "version": "0.0.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", - "version": "2.118.0" + "version": "0.0.0", + "metadata": [ + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + {}, + { + "addNatGateway": [ + "*" + ] + } + ] } }, "PublicSubnet2": { @@ -243,7 +268,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", - "version": "2.118.0" + "version": "0.0.0" } }, "Acl": { @@ -251,7 +276,8 @@ "path": "test-efs-transition-integ/Vpc/PublicSubnet2/Acl", "constructInfo": { "fqn": "aws-cdk-lib.Resource", - "version": "2.118.0" + "version": "0.0.0", + "metadata": [] } }, "RouteTable": { @@ -273,7 +299,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", - "version": "2.118.0" + "version": "0.0.0" } }, "RouteTableAssociation": { @@ -292,7 +318,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", - "version": "2.118.0" + "version": "0.0.0" } }, "DefaultRoute": { @@ -312,13 +338,32 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", - "version": "2.118.0" + "version": "0.0.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", - "version": "2.118.0" + "version": "0.0.0", + "metadata": [ + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + {} + ] } }, "PrivateSubnet1": { @@ -362,7 +407,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", - "version": "2.118.0" + "version": "0.0.0" } }, "Acl": { @@ -370,7 +415,8 @@ "path": "test-efs-transition-integ/Vpc/PrivateSubnet1/Acl", "constructInfo": { "fqn": "aws-cdk-lib.Resource", - "version": "2.118.0" + "version": "0.0.0", + "metadata": [] } }, "RouteTable": { @@ -392,7 +438,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", - "version": "2.118.0" + "version": "0.0.0" } }, "RouteTableAssociation": { @@ -411,7 +457,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", - "version": "2.118.0" + "version": "0.0.0" } }, "DefaultRoute": { @@ -431,13 +477,32 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", - "version": "2.118.0" + "version": "0.0.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", - "version": "2.118.0" + "version": "0.0.0", + "metadata": [ + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + {} + ] } }, "PrivateSubnet2": { @@ -481,7 +546,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", - "version": "2.118.0" + "version": "0.0.0" } }, "Acl": { @@ -489,7 +554,8 @@ "path": "test-efs-transition-integ/Vpc/PrivateSubnet2/Acl", "constructInfo": { "fqn": "aws-cdk-lib.Resource", - "version": "2.118.0" + "version": "0.0.0", + "metadata": [] } }, "RouteTable": { @@ -511,7 +577,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", - "version": "2.118.0" + "version": "0.0.0" } }, "RouteTableAssociation": { @@ -530,7 +596,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", - "version": "2.118.0" + "version": "0.0.0" } }, "DefaultRoute": { @@ -550,13 +616,32 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", - "version": "2.118.0" + "version": "0.0.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", - "version": "2.118.0" + "version": "0.0.0", + "metadata": [ + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + {} + ] } }, "IGW": { @@ -575,7 +660,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnInternetGateway", - "version": "2.118.0" + "version": "0.0.0" } }, "VPCGW": { @@ -594,13 +679,20 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnVPCGatewayAttachment", - "version": "2.118.0" + "version": "0.0.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.Vpc", - "version": "2.118.0" + "version": "0.0.0", + "metadata": [ + { + "maxAzs": "*", + "natGateways": "*", + "restrictDefaultSecurityGroup": false + } + ] } }, "FileSystem": { @@ -640,6 +732,9 @@ }, { "transitionToPrimaryStorageClass": "AFTER_1_ACCESS" + }, + { + "transitionToArchive": "AFTER_90_DAYS" } ], "fileSystemTags": [ @@ -647,12 +742,13 @@ "key": "Name", "value": "test-efs-transition-integ/FileSystem" } - ] + ], + "throughputMode": "elastic" } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_efs.CfnFileSystem", - "version": "2.118.0" + "version": "0.0.0" } }, "EfsSecurityGroup": { @@ -686,13 +782,18 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.CfnSecurityGroup", - "version": "2.118.0" + "version": "0.0.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "2.118.0" + "version": "0.0.0", + "metadata": [ + { + "vpc": "*" + } + ] } }, "EfsMountTarget-PrivateSubnet1": { @@ -719,7 +820,7 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_efs.CfnMountTarget", - "version": "2.118.0" + "version": "0.0.0" } }, "EfsMountTarget-PrivateSubnet2": { @@ -746,13 +847,22 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_efs.CfnMountTarget", - "version": "2.118.0" + "version": "0.0.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.aws_efs.FileSystem", - "version": "2.118.0" + "version": "0.0.0", + "metadata": [ + { + "vpc": "*", + "lifecyclePolicy": "AFTER_14_DAYS", + "throughputMode": "elastic", + "transitionToArchivePolicy": "AFTER_90_DAYS", + "outOfInfrequentAccessPolicy": "AFTER_1_ACCESS" + } + ] } }, "BootstrapVersion": { @@ -760,7 +870,7 @@ "path": "test-efs-transition-integ/BootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", - "version": "2.118.0" + "version": "0.0.0" } }, "CheckBootstrapVersion": { @@ -768,13 +878,13 @@ "path": "test-efs-transition-integ/CheckBootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnRule", - "version": "2.118.0" + "version": "0.0.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.Stack", - "version": "2.118.0" + "version": "0.0.0" } }, "test-efs-integ-test": { @@ -790,7 +900,7 @@ "path": "test-efs-integ-test/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.3.0" + "version": "10.4.2" } }, "DeployAssert": { @@ -802,7 +912,7 @@ "path": "test-efs-integ-test/DefaultTest/DeployAssert/BootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", - "version": "2.118.0" + "version": "0.0.0" } }, "CheckBootstrapVersion": { @@ -810,25 +920,25 @@ "path": "test-efs-integ-test/DefaultTest/DeployAssert/CheckBootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnRule", - "version": "2.118.0" + "version": "0.0.0" } } }, "constructInfo": { "fqn": "aws-cdk-lib.Stack", - "version": "2.118.0" + "version": "0.0.0" } } }, "constructInfo": { "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", - "version": "2.118.0-alpha.0" + "version": "0.0.0" } } }, "constructInfo": { "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", - "version": "2.118.0-alpha.0" + "version": "0.0.0" } }, "Tree": { @@ -836,13 +946,13 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.3.0" + "version": "10.4.2" } } }, "constructInfo": { "fqn": "aws-cdk-lib.App", - "version": "2.118.0" + "version": "0.0.0" } } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.ts index b17898ccbdda6..16a7a83960394 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-transition.ts @@ -1,6 +1,6 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as cdk from 'aws-cdk-lib'; -import { FileSystem, LifecyclePolicy, OutOfInfrequentAccessPolicy } from 'aws-cdk-lib/aws-efs'; +import { FileSystem, LifecyclePolicy, OutOfInfrequentAccessPolicy, ThroughputMode } from 'aws-cdk-lib/aws-efs'; import * as integ from '@aws-cdk/integ-tests-alpha'; const app = new cdk.App(); @@ -11,6 +11,7 @@ const vpc = new ec2.Vpc(stack, 'Vpc', { maxAzs: 3, natGateways: 1, restrictDefau new FileSystem(stack, 'FileSystem', { vpc, lifecyclePolicy: LifecyclePolicy.AFTER_14_DAYS, + throughputMode: ThroughputMode.ELASTIC, transitionToArchivePolicy: LifecyclePolicy.AFTER_90_DAYS, outOfInfrequentAccessPolicy: OutOfInfrequentAccessPolicy.AFTER_1_ACCESS, }); diff --git a/packages/aws-cdk-lib/aws-efs/test/efs-file-system.test.ts b/packages/aws-cdk-lib/aws-efs/test/efs-file-system.test.ts index 58df6c997f62b..55fbca40933cf 100644 --- a/packages/aws-cdk-lib/aws-efs/test/efs-file-system.test.ts +++ b/packages/aws-cdk-lib/aws-efs/test/efs-file-system.test.ts @@ -113,12 +113,14 @@ test('file system LifecyclePolicies is created correctly', () => { // WHEN new FileSystem(stack, 'EfsFileSystem', { vpc, + throughputMode: ThroughputMode.ELASTIC, lifecyclePolicy: LifecyclePolicy.AFTER_7_DAYS, outOfInfrequentAccessPolicy: OutOfInfrequentAccessPolicy.AFTER_1_ACCESS, transitionToArchivePolicy: LifecyclePolicy.AFTER_14_DAYS, }); // THEN Template.fromStack(stack).hasResourceProperties('AWS::EFS::FileSystem', { + ThroughputMode: 'elastic', LifecyclePolicies: [ { TransitionToIA: 'AFTER_7_DAYS',