-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(s3-deployment): add security groups
support passing security groups to the underlying lambda function to enforce connectivity constraints expose securityGroups attribute of lambda underlying s3 bucket deployment to provide more control over connectivity rules
- Loading branch information
Showing
1 changed file
with
71 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
diff --git a/packages/aws-cdk-lib/aws-s3-deployment/lib/bucket-deployment.ts b/packages/aws-cdk-lib/aws-s3-deployment/lib/bucket-deployment.ts | ||
index 5d782dfb6b..f4d8ec7d2f 100644 | ||
--- a/packages/aws-cdk-lib/aws-s3-deployment/lib/bucket-deployment.ts | ||
+++ b/packages/aws-cdk-lib/aws-s3-deployment/lib/bucket-deployment.ts | ||
@@ -258,6 +258,13 @@ export interface BucketDeploymentProps { | ||
*/ | ||
readonly vpcSubnets?: ec2.SubnetSelection; | ||
|
||
+ /** | ||
+ * Security group to use with the vpc and subnet. | ||
+ * | ||
+ * @default - the Vpc default strategy if not specified | ||
+ */ | ||
+ readonly securityGroups?: ec2.SecurityGroup[]; | ||
+ | ||
/** | ||
* If set to true, uploads will precompute the value of `x-amz-content-sha256` | ||
* and include it in the signed S3 request headers. | ||
@@ -345,6 +352,7 @@ export class BucketDeployment extends Construct { | ||
ephemeralStorageSize: props.ephemeralStorageSize, | ||
vpc: props.vpc, | ||
vpcSubnets: props.vpcSubnets, | ||
+ securityGroups: props.securityGroups, | ||
filesystem: accessPoint ? lambda.FileSystem.fromEfsAccessPoint( | ||
accessPoint, | ||
mountPath, | ||
diff --git a/packages/aws-cdk-lib/aws-s3-deployment/test/bucket-deployment.test.ts b/packages/aws-cdk-lib/aws-s3-deployment/test/bucket-deployment.test.ts | ||
index 34801b97bb..fa0457eca0 100644 | ||
--- a/packages/aws-cdk-lib/aws-s3-deployment/test/bucket-deployment.test.ts | ||
+++ b/packages/aws-cdk-lib/aws-s3-deployment/test/bucket-deployment.test.ts | ||
@@ -1090,7 +1090,7 @@ test('deployment allows vpc to be implicitly supplied to lambda', () => { | ||
}); | ||
}); | ||
|
||
-test('deployment allows vpc and subnets to be implicitly supplied to lambda', () => { | ||
+test('deployment allows vpc, subnets and security groups to be explicitly supplied to lambda', () => { | ||
|
||
// GIVEN | ||
const stack = new cdk.Stack(); | ||
@@ -1101,6 +1101,14 @@ test('deployment allows vpc and subnets to be implicitly supplied to lambda', () | ||
availabilityZone: vpc.availabilityZones[0], | ||
cidrBlock: vpc.vpcCidrBlock, | ||
}); | ||
+ const sg: ec2.SecurityGroup[] = [ | ||
+ new ec2.SecurityGroup(stack, 'sg1', { | ||
+ vpc, | ||
+ allowAllOutbound: false, | ||
+ description: 'custom security group', | ||
+ securityGroupName: 'controlled egress', | ||
+ }), | ||
+ ]; | ||
|
||
// WHEN | ||
new s3deploy.BucketDeployment(stack, 'DeployWithVpc2', { | ||
@@ -1110,6 +1118,7 @@ test('deployment allows vpc and subnets to be implicitly supplied to lambda', () | ||
vpcSubnets: { | ||
availabilityZones: [vpc.availabilityZones[0]], | ||
}, | ||
+ securityGroups: sg, | ||
}); | ||
|
||
// THEN | ||
@@ -1118,7 +1127,7 @@ test('deployment allows vpc and subnets to be implicitly supplied to lambda', () | ||
SecurityGroupIds: [ | ||
{ | ||
'Fn::GetAtt': [ | ||
- 'CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756Cc8a39596cb8641929fcf6a288bc9db5ab7b0f656adSecurityGroup11274779', | ||
+ 'sg15CEFF4E3', | ||
'GroupId', | ||
], | ||
}, |