Merge branch 'main' into automation/yarn-upgrade

mergify[bot] · web-flow · commit 16a63300ca19 · 2024-03-15T18:38:04.000Z
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-event-sources/test/integ.s3.imported-bucket.js.snapshot/tester.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-event-sources/test/integ.s3.imported-bucket.js.snapshot/tester.template.json
@@ -178,7 +178,7 @@
       "Arn"
      ]
     },
-    "Runtime": "python3.9",
+    "Runtime": "python3.11",
     "Timeout": 300
    },
    "DependsOn": [
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-event-sources/test/integ.s3.js.snapshot/lambda-event-source-s3.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-event-sources/test/integ.s3.js.snapshot/lambda-event-source-s3.template.json
@@ -323,7 +323,7 @@
       "Arn"
      ]
     },
-    "Runtime": "python3.9",
+    "Runtime": "python3.11",
     "Timeout": 300
    },
    "DependsOn": [
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-notifications/test/integ.notifications.js.snapshot/test-3.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-notifications/test/integ.notifications.js.snapshot/test-3.template.json
@@ -254,7 +254,7 @@
       "Arn"
      ]
     },
-    "Runtime": "python3.9",
+    "Runtime": "python3.11",
     "Timeout": 300
    },
    "DependsOn": [
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-notifications/test/lambda/integ.bucket-notifications.js.snapshot/cdk-integ-lambda-bucket-notifications.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-notifications/test/lambda/integ.bucket-notifications.js.snapshot/cdk-integ-lambda-bucket-notifications.template.json
@@ -246,7 +246,7 @@
       "Arn"
      ]
     },
-    "Runtime": "python3.9",
+    "Runtime": "python3.11",
     "Timeout": 300
    },
    "DependsOn": [
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-notifications/test/sns/integ.sns-bucket-notifications.js.snapshot/sns-bucket-notifications.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-notifications/test/sns/integ.sns-bucket-notifications.js.snapshot/sns-bucket-notifications.template.json
@@ -204,7 +204,7 @@
       "Arn"
      ]
     },
-    "Runtime": "python3.9",
+    "Runtime": "python3.11",
     "Timeout": 300
    },
    "DependsOn": [
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-notifications/test/sqs/integ.bucket-notifications-unmanaged.js.snapshot/integ-sqs-bucket-notifications.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-notifications/test/sqs/integ.bucket-notifications-unmanaged.js.snapshot/integ-sqs-bucket-notifications.template.json
@@ -412,7 +412,7 @@
       "Arn"
      ]
     },
-    "Runtime": "python3.9",
+    "Runtime": "python3.11",
     "Timeout": 300
    },
    "DependsOn": [
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-notifications/test/sqs/integ.bucket-notifications.js.snapshot/sqs-bucket-notifications.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-notifications/test/sqs/integ.bucket-notifications.js.snapshot/sqs-bucket-notifications.template.json
@@ -193,7 +193,7 @@
       "Arn"
      ]
     },
-    "Runtime": "python3.9",
+    "Runtime": "python3.11",
     "Timeout": 300
    },
    "DependsOn": [
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket.notifications.js.snapshot/aws-cdk-s3-notifications.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket.notifications.js.snapshot/aws-cdk-s3-notifications.template.json
@@ -89,7 +89,7 @@
       "Arn"
      ]
     },
-    "Runtime": "python3.9",
+    "Runtime": "python3.11",
     "Timeout": 300
    },
    "DependsOn": [
diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/private/statistic.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/private/statistic.ts
@@ -34,6 +34,10 @@ export interface PercentileStatistic extends SingleStatistic {
   statName: 'percentile';
 }
 
+export interface PercentileRankStatistic extends PairStatistic {
+  statName: 'percentileRank';
+}
+
 export interface TrimmedMeanStatistic extends PairStatistic {
   statName: 'trimmedMean';
 }
@@ -154,6 +158,7 @@ export function parseStatistic(
 ):
   | SimpleStatistic
   | PercentileStatistic
+  | PercentileRankStatistic
   | TrimmedMeanStatistic
   | WinsorizedMeanStatistic
   | TrimmedCountStatistic
@@ -188,6 +193,10 @@ export function parseStatistic(
   m = parseSingleStatistic(stat, 'p');
   if (m) return { ...m, statName: 'percentile' } as PercentileStatistic;
 
+  // Percentile Rank statistics
+  m = parsePairStatistic(stat, 'pr');
+  if (m) return { ...m, statName: 'percentileRank' } as PercentileRankStatistic;
+
   // Trimmed mean statistics
   m = parseSingleStatistic(stat, 'tm') || parsePairStatistic(stat, 'tm');
   if (m) return { ...m, statName: 'trimmedMean' } as TrimmedMeanStatistic;
diff --git a/packages/aws-cdk-lib/aws-cloudwatch/test/stats.test.ts b/packages/aws-cdk-lib/aws-cloudwatch/test/stats.test.ts
@@ -1,5 +1,20 @@
+import { Metric, Stats } from '../../aws-cloudwatch';
 import * as cloudwatch from '../lib';
 
+it.each([
+  Stats.percentileRank(0),
+  Stats.percentileRank(0, 1),
+  Stats.percentileRank(0, undefined),
+])('Stats can create valid statistics %s without causing warnings', (statistic) => {
+  const metric = new Metric({
+    namespace: 'example',
+    metricName: 'example',
+    statistic,
+  });
+
+  expect(metric.warningsV2).toEqual(undefined);
+});
+
 test('spot check some constants', () => {
   expect(cloudwatch.Stats.AVERAGE).toEqual('Average');
   expect(cloudwatch.Stats.IQM).toEqual('IQM');
diff --git a/packages/aws-cdk-lib/aws-s3/lib/notifications-resource/notifications-resource-handler.ts b/packages/aws-cdk-lib/aws-s3/lib/notifications-resource/notifications-resource-handler.ts
@@ -98,7 +98,7 @@ export class NotificationsResourceHandler extends Construct {
         Code: { ZipFile: handlerSourceWithoutComments },
         Handler: 'index.handler',
         Role: this.role.roleArn,
-        Runtime: 'python3.9',
+        Runtime: 'python3.11',
         Timeout: 300,
       },
     });
diff --git a/packages/aws-cdk-lib/aws-s3/test/notification.test.ts b/packages/aws-cdk-lib/aws-s3/test/notification.test.ts
@@ -182,7 +182,7 @@ describe('notification', () => {
     });
 
     Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {
-      Runtime: 'python3.9',
+      Runtime: 'python3.11',
     });
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@`
`178`	`178`	`"Arn"`
`179`	`179`	`]`
`180`	`180`	`},`
`181`		`- "Runtime": "python3.9",`
	`181`	`+ "Runtime": "python3.11",`
`182`	`182`	`"Timeout": 300`
`183`	`183`	`},`
`184`	`184`	`"DependsOn": [`
Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@`
`323`	`323`	`"Arn"`
`324`	`324`	`]`
`325`	`325`	`},`
`326`		`- "Runtime": "python3.9",`
	`326`	`+ "Runtime": "python3.11",`
`327`	`327`	`"Timeout": 300`
`328`	`328`	`},`
`329`	`329`	`"DependsOn": [`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@`
`254`	`254`	`"Arn"`
`255`	`255`	`]`
`256`	`256`	`},`
`257`		`- "Runtime": "python3.9",`
	`257`	`+ "Runtime": "python3.11",`
`258`	`258`	`"Timeout": 300`
`259`	`259`	`},`
`260`	`260`	`"DependsOn": [`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@`
`246`	`246`	`"Arn"`
`247`	`247`	`]`
`248`	`248`	`},`
`249`		`- "Runtime": "python3.9",`
	`249`	`+ "Runtime": "python3.11",`
`250`	`250`	`"Timeout": 300`
`251`	`251`	`},`
`252`	`252`	`"DependsOn": [`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@`
`204`	`204`	`"Arn"`
`205`	`205`	`]`
`206`	`206`	`},`
`207`		`- "Runtime": "python3.9",`
	`207`	`+ "Runtime": "python3.11",`
`208`	`208`	`"Timeout": 300`
`209`	`209`	`},`
`210`	`210`	`"DependsOn": [`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@`
`412`	`412`	`"Arn"`
`413`	`413`	`]`
`414`	`414`	`},`
`415`		`- "Runtime": "python3.9",`
	`415`	`+ "Runtime": "python3.11",`
`416`	`416`	`"Timeout": 300`
`417`	`417`	`},`
`418`	`418`	`"DependsOn": [`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@`
`193`	`193`	`"Arn"`
`194`	`194`	`]`
`195`	`195`	`},`
`196`		`- "Runtime": "python3.9",`
	`196`	`+ "Runtime": "python3.11",`
`197`	`197`	`"Timeout": 300`
`198`	`198`	`},`
`199`	`199`	`"DependsOn": [`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@`
`89`	`89`	`"Arn"`
`90`	`90`	`]`
`91`	`91`	`},`
`92`		`- "Runtime": "python3.9",`
	`92`	`+ "Runtime": "python3.11",`
`93`	`93`	`"Timeout": 300`
`94`	`94`	`},`
`95`	`95`	`"DependsOn": [`