Merge branch 'main' into update-integ-test-waiter-log-group

Author: sugardon

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.js.snapshot/aws-cdk-codepipeline-cloudformation.assets.json

@@ -795,6 +795,7 @@
       {
        "Action": [
         "cloudformation:DescribeChangeSet",
+        "cloudformation:DescribeStackEvents",
         "cloudformation:DescribeStacks",
         "cloudformation:ExecuteChangeSet"
        ],

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.js.snapshot/aws-cdk-codepipeline-cloudformation.template.json

@@ -46,7 +46,7 @@ const flinkApp = new flink.Application(this, 'Application', {
     },
   },
   // ...
-  runtime: flink.Runtime.FLINK_1_15,
+  runtime: flink.Runtime.FLINK_1_18,
   code: flink.ApplicationCode.fromBucket(bucket, 'my-app.jar'),
 });
 ```
@@ -59,7 +59,7 @@ snapshotting, monitoring, and parallelism.
 declare const bucket: s3.Bucket;
 const flinkApp = new flink.Application(this, 'Application', {
   code: flink.ApplicationCode.fromBucket(bucket, 'my-app.jar'),
-  runtime: flink.Runtime.FLINK_1_15,
+  runtime: flink.Runtime.FLINK_1_18,
   checkpointingEnabled: true, // default is true
   checkpointInterval: Duration.seconds(30), // default is 1 minute
   minPauseBetweenCheckpoints: Duration.seconds(10), // default is 5 seconds
@@ -80,7 +80,7 @@ declare const bucket: s3.Bucket;
 declare const vpc: ec2.Vpc;
 const flinkApp = new flink.Application(this, 'Application', {
   code: flink.ApplicationCode.fromBucket(bucket, 'my-app.jar'),
-  runtime: flink.Runtime.FLINK_1_15,
+  runtime: flink.Runtime.FLINK_1_18,
   vpc,
 });
 ```

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.js.snapshot/cdk.out

@@ -66,6 +66,9 @@ export class Runtime {
   /** Flink Version 1.15 */
   public static readonly FLINK_1_15 = Runtime.of('FLINK-1_15');
 
+  /** Flink Version 1.18 */
+  public static readonly FLINK_1_18 = Runtime.of('FLINK-1_18');
+
   /** Create a new Runtime with with an arbitrary Flink version string */
   public static of(value: string) {
     return new Runtime(value);

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.js.snapshot/integ.json

@@ -147,13 +147,6 @@
   "AppF1B96344": {
    "Type": "AWS::KinesisAnalyticsV2::Application",
    "Properties": {
-    "RuntimeEnvironment": "FLINK-1_11",
-    "ServiceExecutionRole": {
-     "Fn::GetAtt": [
-      "AppRole1AF9B530",
-      "Arn"
-     ]
-    },
     "ApplicationConfiguration": {
      "ApplicationCodeConfiguration": {
       "CodeContent": {
@@ -181,6 +174,13 @@
      "ApplicationSnapshotConfiguration": {
       "SnapshotsEnabled": true
      }
+    },
+    "RuntimeEnvironment": "FLINK-1_18",
+    "ServiceExecutionRole": {
+     "Fn::GetAtt": [
+      "AppRole1AF9B530",
+      "Arn"
+     ]
     }
    },
    "DependsOn": [