Merge branch 'main' into automation/yarn-upgrade

aws · Mar 15, 2024 · 16a6330 · 16a6330
2 parents bb5b100 + 3d14b3b
commit 16a6330
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 10 deletions.
diff --git a/...t/aws-lambda-event-sources/test/integ.s3.imported-bucket.js.snapshot/tester.template.json b/...t/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/...t/aws-lambda-event-sources/test/integ.s3.js.snapshot/lambda-event-source-s3.template.json b/...t/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/...integ/test/aws-s3-notifications/test/integ.notifications.js.snapshot/test-3.template.json b/...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/...nteg.bucket-notifications.js.snapshot/cdk-integ-lambda-bucket-notifications.template.json b/...nteg.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/...est/sns/integ.sns-bucket-notifications.js.snapshot/sns-bucket-notifications.template.json b/...est/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/...g.bucket-notifications-unmanaged.js.snapshot/integ-sqs-bucket-notifications.template.json b/...g.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/...ns/test/sqs/integ.bucket-notifications.js.snapshot/sqs-bucket-notifications.template.json b/...ns/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/...aws-s3/test/integ.bucket.notifications.js.snapshot/aws-cdk-s3-notifications.template.json b/...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',
     });
   });
 });