Merge branch 'main' into merge-back/2.189.0

mergify[bot] · web-flow · commit d751b1fa1c12 · 2025-04-09T23:20:13.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-bedrock/lib/foundation-model.ts b/packages/aws-cdk-lib/aws-bedrock/lib/foundation-model.ts
@@ -392,6 +392,9 @@ export class FoundationModelIdentifier {
   /** Base model "mistral.mistral-large-2407-v1:0". */
   public static readonly MISTRAL_LARGE_2_V0_1 = new FoundationModelIdentifier('mistral.mistral-large-2407-v1:0');
 
+  /** Base model "mistral.pixtral-large-2502-v1:0". */
+  public static readonly MISTRAL_PIXTRAL_LARGE_2502_V1_0 = new FoundationModelIdentifier('mistral.pixtral-large-2502-v1:0');
+
   /**
    * Base model "stability.stable-diffusion-xl".
    * @deprecated use latest version of the model
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) {
diff --git a/packages/aws-cdk-lib/custom-resources/lib/custom-resource-config/custom-resource-config.ts b/packages/aws-cdk-lib/custom-resources/lib/custom-resource-config/custom-resource-config.ts
@@ -31,8 +31,10 @@ export class CustomResourceConfig {
    *
    * This feature is currently experimental.
    */
-  public addLogRetentionLifetime(rentention: logs.RetentionDays) {
-    Aspects.of(this.scope).add(new CustomResourceLogRetention(rentention), { priority: AspectPriority.MUTATING });
+  public addLogRetentionLifetime(retention: logs.RetentionDays) {
+    Aspects.of(this.scope).add(new CustomResourceLogRetention(retention), {
+      priority: AspectPriority.MUTATING,
+    });
   }
 
   /**

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`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,10 @@ export class CustomResourceConfig {`
`31`	`31`	`*`
`32`	`32`	`* This feature is currently experimental.`
`33`	`33`	`*/`
`34`		`- public addLogRetentionLifetime(rentention: logs.RetentionDays) {`
`35`		`- Aspects.of(this.scope).add(new CustomResourceLogRetention(rentention), { priority: AspectPriority.MUTATING });`
	`34`	`+ public addLogRetentionLifetime(retention: logs.RetentionDays) {`
	`35`	`+ Aspects.of(this.scope).add(new CustomResourceLogRetention(retention), {`
	`36`	`+ priority: AspectPriority.MUTATING,`
	`37`	`+ });`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`/**`