From 7db5c8cdafe7b9b22b6b40cb25ed8bd1946301f4 Mon Sep 17 00:00:00 2001
From: Julian Michel <mail@julianmichel.de>
Date: Thu, 14 Oct 2021 20:11:44 +0200
Subject: [PATCH] feat(msk): add Kafka version 2.8.1 (#16881)

Add support for Apache Kafka version 2.8.1 in Amazon MSK.

Announcement: https://aws.amazon.com/about-aws/whats-new/2021/10/amazon-msk-support-apache-kafka-version-2-8-1/

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/@aws-cdk/aws-msk/README.md           |  2 +-
 .../@aws-cdk/aws-msk/lib/cluster-version.ts   |  5 +++
 .../aws-msk/test/integ.cluster.expected.json  | 32 +++++++++----------
 .../@aws-cdk/aws-msk/test/integ.cluster.ts    |  2 +-
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/packages/@aws-cdk/aws-msk/README.md b/packages/@aws-cdk/aws-msk/README.md
index ce86c6a477c45..664ec4f66c973 100644
--- a/packages/@aws-cdk/aws-msk/README.md
+++ b/packages/@aws-cdk/aws-msk/README.md
@@ -29,7 +29,7 @@ The following example creates an MSK Cluster.
 import * as msk from '@aws-cdk/aws-msk';
 
 const cluster = new Cluster(this, 'Cluster', {
-  kafkaVersion: msk.KafkaVersion.V2_6_1,
+  kafkaVersion: msk.KafkaVersion.V2_8_1,
   vpc,
 });
 ```
diff --git a/packages/@aws-cdk/aws-msk/lib/cluster-version.ts b/packages/@aws-cdk/aws-msk/lib/cluster-version.ts
index 0d3b511aae59e..b04c154b76054 100644
--- a/packages/@aws-cdk/aws-msk/lib/cluster-version.ts
+++ b/packages/@aws-cdk/aws-msk/lib/cluster-version.ts
@@ -47,6 +47,11 @@ export class KafkaVersion {
    */
   public static readonly V2_8_0 = KafkaVersion.of('2.8.0');
 
+  /**
+   * Kafka version 2.8.1
+   */
+  public static readonly V2_8_1 = KafkaVersion.of('2.8.1');
+
   /**
    * Custom cluster version
    * @param version custom version number
diff --git a/packages/@aws-cdk/aws-msk/test/integ.cluster.expected.json b/packages/@aws-cdk/aws-msk/test/integ.cluster.expected.json
index 9a0d0db6e2325..2b523706bd3e2 100644
--- a/packages/@aws-cdk/aws-msk/test/integ.cluster.expected.json
+++ b/packages/@aws-cdk/aws-msk/test/integ.cluster.expected.json
@@ -95,15 +95,15 @@
     "VPCPublicSubnet1NATGatewayE0556630": {
       "Type": "AWS::EC2::NatGateway",
       "Properties": {
+        "SubnetId": {
+          "Ref": "VPCPublicSubnet1SubnetB4246D30"
+        },
         "AllocationId": {
           "Fn::GetAtt": [
             "VPCPublicSubnet1EIP6AD938E8",
             "AllocationId"
           ]
         },
-        "SubnetId": {
-          "Ref": "VPCPublicSubnet1SubnetB4246D30"
-        },
         "Tags": [
           {
             "Key": "Name",
@@ -192,15 +192,15 @@
     "VPCPublicSubnet2NATGateway3C070193": {
       "Type": "AWS::EC2::NatGateway",
       "Properties": {
+        "SubnetId": {
+          "Ref": "VPCPublicSubnet2Subnet74179F39"
+        },
         "AllocationId": {
           "Fn::GetAtt": [
             "VPCPublicSubnet2EIP4947BC00",
             "AllocationId"
           ]
         },
-        "SubnetId": {
-          "Ref": "VPCPublicSubnet2Subnet74179F39"
-        },
         "Tags": [
           {
             "Key": "Name",
@@ -399,7 +399,7 @@
           }
         },
         "ClusterName": "integ-test",
-        "KafkaVersion": "2.6.1",
+        "KafkaVersion": "2.8.1",
         "NumberOfBrokerNodes": 2,
         "EncryptionInfo": {
           "EncryptionInTransit": {
@@ -524,7 +524,7 @@
       "Properties": {
         "Code": {
           "S3Bucket": {
-            "Ref": "AssetParameters5c61041c12314e1ad8e67a0107fa3733382a206a78cdc1576fffa7e93caca5b4S3BucketB17E5ABD"
+            "Ref": "AssetParameters1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2dS3Bucket4C71F166"
           },
           "S3Key": {
             "Fn::Join": [
@@ -537,7 +537,7 @@
                       "Fn::Split": [
                         "||",
                         {
-                          "Ref": "AssetParameters5c61041c12314e1ad8e67a0107fa3733382a206a78cdc1576fffa7e93caca5b4S3VersionKey77778F6A"
+                          "Ref": "AssetParameters1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2dS3VersionKey0124EFC4"
                         }
                       ]
                     }
@@ -550,7 +550,7 @@
                       "Fn::Split": [
                         "||",
                         {
-                          "Ref": "AssetParameters5c61041c12314e1ad8e67a0107fa3733382a206a78cdc1576fffa7e93caca5b4S3VersionKey77778F6A"
+                          "Ref": "AssetParameters1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2dS3VersionKey0124EFC4"
                         }
                       ]
                     }
@@ -576,17 +576,17 @@
     }
   },
   "Parameters": {
-    "AssetParameters5c61041c12314e1ad8e67a0107fa3733382a206a78cdc1576fffa7e93caca5b4S3BucketB17E5ABD": {
+    "AssetParameters1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2dS3Bucket4C71F166": {
       "Type": "String",
-      "Description": "S3 bucket for asset \"5c61041c12314e1ad8e67a0107fa3733382a206a78cdc1576fffa7e93caca5b4\""
+      "Description": "S3 bucket for asset \"1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2d\""
     },
-    "AssetParameters5c61041c12314e1ad8e67a0107fa3733382a206a78cdc1576fffa7e93caca5b4S3VersionKey77778F6A": {
+    "AssetParameters1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2dS3VersionKey0124EFC4": {
       "Type": "String",
-      "Description": "S3 key for asset version \"5c61041c12314e1ad8e67a0107fa3733382a206a78cdc1576fffa7e93caca5b4\""
+      "Description": "S3 key for asset version \"1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2d\""
     },
-    "AssetParameters5c61041c12314e1ad8e67a0107fa3733382a206a78cdc1576fffa7e93caca5b4ArtifactHash580E429C": {
+    "AssetParameters1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2dArtifactHash6350D824": {
       "Type": "String",
-      "Description": "Artifact hash for asset \"5c61041c12314e1ad8e67a0107fa3733382a206a78cdc1576fffa7e93caca5b4\""
+      "Description": "Artifact hash for asset \"1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2d\""
     }
   },
   "Outputs": {
diff --git a/packages/@aws-cdk/aws-msk/test/integ.cluster.ts b/packages/@aws-cdk/aws-msk/test/integ.cluster.ts
index c05fa496d7210..06ad0893d20d7 100644
--- a/packages/@aws-cdk/aws-msk/test/integ.cluster.ts
+++ b/packages/@aws-cdk/aws-msk/test/integ.cluster.ts
@@ -10,7 +10,7 @@ const vpc = new ec2.Vpc(stack, 'VPC', { maxAzs: 2 });
 
 const cluster = new msk.Cluster(stack, 'Cluster', {
   clusterName: 'integ-test',
-  kafkaVersion: msk.KafkaVersion.V2_6_1,
+  kafkaVersion: msk.KafkaVersion.V2_8_1,
   vpc,
   removalPolicy: cdk.RemovalPolicy.DESTROY,
 });