Merge branch 'neptune-alpha/33807-add-engine-versions' of https://github.com/masterhugo/aws-cdk into neptune-alpha/33807-add-engine-versions

masterhugo · masterhugo · commit 67d3d78df93f · 2025-04-09T20:50:15.000Z
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-tags.js.snapshot/asset.a5110b475e7a506b8a1282cdfb3c2f7ae59bcf00ba96273a702339b8819dd17f.zip b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-tags.js.snapshot/asset.a5110b475e7a506b8a1282cdfb3c2f7ae59bcf00ba96273a702339b8819dd17f.zip
diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/distribution.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/distribution.ts
@@ -905,6 +905,7 @@ export enum OriginProtocolPolicy {
 export enum SSLMethod {
   SNI = 'sni-only',
   VIP = 'vip',
+  STATIC_IP = 'static-ip',
 }
 
 /**
diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/web-distribution.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/web-distribution.ts
@@ -819,6 +819,10 @@ export class CloudFrontWebDistribution extends cdk.Resource implements IDistribu
       SecurityPolicyProtocol.TLS_V1_2_2019, SecurityPolicyProtocol.TLS_V1_2_2021,
     ],
     [SSLMethod.VIP]: [SecurityPolicyProtocol.SSL_V3, SecurityPolicyProtocol.TLS_V1],
+    [SSLMethod.STATIC_IP]: [
+      SecurityPolicyProtocol.TLS_V1_2_2018, SecurityPolicyProtocol.TLS_V1_2_2019,
+      SecurityPolicyProtocol.TLS_V1_2_2021,
+    ],
   };
 
   constructor(scope: Construct, id: string, props: CloudFrontWebDistributionProps) {

Original file line number	Diff line number	Diff line change
`@@ -905,6 +905,7 @@ export enum OriginProtocolPolicy {`
`905`	`905`	`export enum SSLMethod {`
`906`	`906`	`SNI = 'sni-only',`
`907`	`907`	`VIP = 'vip',`
	`908`	`+ STATIC_IP = 'static-ip',`
`908`	`909`	`}`
`909`	`910`
`910`	`911`	`/**`