From cbacf4d9adde9a06fc78387b37ba1f97b2de2493 Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Thu, 19 Dec 2024 23:16:50 +0100 Subject: [PATCH] feat(msk-alpha): new KafkaVersions `3_7_X` and `3_7_X_KRAFT` (#32515) ### Issue # (if applicable) None ### Reason for this change Update the CDK listed Kafka versions to match the current availability, as well as add missing deprecated versions ### Description of changes Even though there is a Metadata mode input in the web console (see [announcement](https://aws.amazon.com/blogs/big-data/introducing-support-for-apache-kafka-on-raft-mode-kraft-with-amazon-msk-clusters/)), there doesn't seem to be any associated fields, and the metadata mode is only dictated by the selected version according to the [docs](https://docs.aws.amazon.com/msk/latest/developerguide/metadata-management.html#kraft-intro): > To create a cluster in KRaft mode using the MSK API CreateCluster or CreateClusterV2 operations, you should use 3.7.x.kraft as the version. Use 3.7.x as the version to create a cluster in ZooKeeper mode. Given this, I don't see a reason to add a field to the `KafkaVersion` class to differentiate between the ZooKeeper and KRaft mode. This may easily be added in the future if needed. I've also refactored the tiered array to increase maintainability and align it with other version classes, such as the RDS `EngineVersion`s. See [docs](https://docs.aws.amazon.com/msk/latest/developerguide/msk-tiered-storage.html#msk-tiered-storage-requirements) for supported versions: > The Amazon MSK cluster with tiered storage enabled must use version 3.6.0 or higher, or 2.8.2.tiered. I don't think it's worth parsing the version to automatically determine the tiered storage support, as we already have non-semver versions and support may be dropped for future versions. ### Description of how you validated changes I compared the current CDK versions to live SDK data, using the `kafka:ListKafkaVersions` API results, and updated the cluster version integration ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../aws-msk-alpha/lib/cluster-version.ts | 60 ++- .../@aws-cdk/aws-msk-alpha/lib/cluster.ts | 4 +- .../aws-msk-alpha/test/cluster.test.ts | 5 + ...efaultTestDeployAssertD6628743.assets.json | 2 +- .../KafkaVersionTestStack.assets.json | 6 +- .../KafkaVersionTestStack.template.json | 259 ++++------ .../integ.cluster-version.js.snapshot/cdk.out | 2 +- .../integ.json | 2 +- .../manifest.json | 160 +++++-- .../tree.json | 449 +++++++----------- .../test/integ.cluster-version.ts | 7 +- 11 files changed, 437 insertions(+), 519 deletions(-) diff --git a/packages/@aws-cdk/aws-msk-alpha/lib/cluster-version.ts b/packages/@aws-cdk/aws-msk-alpha/lib/cluster-version.ts index b3c5277018b1c..6fd9367f3d811 100644 --- a/packages/@aws-cdk/aws-msk-alpha/lib/cluster-version.ts +++ b/packages/@aws-cdk/aws-msk-alpha/lib/cluster-version.ts @@ -1,3 +1,16 @@ +/** + * Available features for a given Kafka version + */ +export interface KafkaVersionFeatures { + /** + * Whether the Kafka version supports tiered storage mode. + * + * @see https://docs.aws.amazon.com/msk/latest/developerguide/msk-tiered-storage.html#msk-tiered-storage-requirements + * @default false + */ + readonly tieredStorage?: boolean; +} + /** * Kafka cluster version */ @@ -22,11 +35,15 @@ export class KafkaVersion { /** * Kafka version 2.2.1 + * + * @deprecated use the latest runtime instead */ public static readonly V2_2_1 = KafkaVersion.of('2.2.1'); /** * Kafka version 2.3.1 + * + * @deprecated use the latest runtime instead */ public static readonly V2_3_1 = KafkaVersion.of('2.3.1'); @@ -40,12 +57,16 @@ export class KafkaVersion { public static readonly V2_4_1 = KafkaVersion.of('2.4.1'); /** - * Kafka version 2.4.1 + * Kafka version 2.4.1.1 + * + * @deprecated use the latest runtime instead */ public static readonly V2_4_1_1 = KafkaVersion.of('2.4.1.1'); /** * Kafka version 2.5.1 + * + * @deprecated use the latest runtime instead */ public static readonly V2_5_1 = KafkaVersion.of('2.5.1'); @@ -97,7 +118,7 @@ export class KafkaVersion { /** * AWS MSK Kafka version 2.8.2.tiered */ - public static readonly V2_8_2_TIERED = KafkaVersion.of('2.8.2.tiered'); + public static readonly V2_8_2_TIERED = KafkaVersion.of('2.8.2.tiered', { tieredStorage: true }); /** * Kafka version 3.1.1 @@ -132,36 +153,41 @@ export class KafkaVersion { /** * Kafka version 3.6.0 */ - public static readonly V3_6_0 = KafkaVersion.of('3.6.0'); + public static readonly V3_6_0 = KafkaVersion.of('3.6.0', { tieredStorage: true }); /** - * Custom cluster version - * @param version custom version number + * Kafka version 3.7.x with ZooKeeper metadata mode support + * + * @see https://docs.aws.amazon.com/msk/latest/developerguide/metadata-management.html#msk-get-connection-string */ - public static of(version: string) { - return new KafkaVersion(version); - } + public static readonly V3_7_X = KafkaVersion.of('3.7.x', { tieredStorage: true }); /** - * List of Kafka versions that support tiered storage + * Kafka version 3.7.x with KRaft (Apache Kafka Raft) metadata mode support * - * @see https://docs.aws.amazon.com/msk/latest/developerguide/msk-tiered-storage.html#msk-tiered-storage-requirements + * @see https://docs.aws.amazon.com/msk/latest/developerguide/metadata-management.html#kraft-intro */ - private static readonly TIERED_STORAGE_COMPATIBLE_VERSIONS = [ - KafkaVersion.V2_8_2_TIERED, - KafkaVersion.V3_6_0, - ].map(({ version }) => version); + public static readonly V3_7_X_KRAFT = KafkaVersion.of('3.7.x.kraft', { tieredStorage: true }); + + /** + * Custom cluster version + * @param version custom version number + */ + public static of(version: string, features?: KafkaVersionFeatures) { + return new KafkaVersion(version, features); + } /** * * @param version cluster version number + * @param features features for the cluster version */ - private constructor(public readonly version: string) {} + private constructor(public readonly version: string, public readonly features?: KafkaVersionFeatures) {} /** * Checks if the cluster version supports tiered storage mode. */ - public isTieredStorageCompatible() { - return KafkaVersion.TIERED_STORAGE_COMPATIBLE_VERSIONS.includes(this.version); + public isTieredStorageCompatible(): boolean { + return this.features?.tieredStorage ?? false; }; } diff --git a/packages/@aws-cdk/aws-msk-alpha/lib/cluster.ts b/packages/@aws-cdk/aws-msk-alpha/lib/cluster.ts index ed8041e6751a2..f83da19627a0e 100644 --- a/packages/@aws-cdk/aws-msk-alpha/lib/cluster.ts +++ b/packages/@aws-cdk/aws-msk-alpha/lib/cluster.ts @@ -685,7 +685,7 @@ export class Cluster extends ClusterBase { ); } - let clientAuthentication; + let clientAuthentication: CfnCluster.ClientAuthenticationProperty | undefined; if (props.clientAuthentication?.saslProps?.iam) { clientAuthentication = { sasl: { iam: { enabled: props.clientAuthentication.saslProps.iam } }, @@ -747,7 +747,7 @@ export class Cluster extends ClusterBase { openMonitoring: openMonitoring, storageMode: props.storageMode, loggingInfo: loggingInfo, - clientAuthentication: clientAuthentication, + clientAuthentication, }); this.clusterName = this.getResourceNameAttribute( diff --git a/packages/@aws-cdk/aws-msk-alpha/test/cluster.test.ts b/packages/@aws-cdk/aws-msk-alpha/test/cluster.test.ts index 7c4bd6a10f4ec..af79eabee06af 100644 --- a/packages/@aws-cdk/aws-msk-alpha/test/cluster.test.ts +++ b/packages/@aws-cdk/aws-msk-alpha/test/cluster.test.ts @@ -44,6 +44,9 @@ describe('MSK Cluster', () => { [msk.KafkaVersion.V3_3_2, '3.3.2'], [msk.KafkaVersion.V3_4_0, '3.4.0'], [msk.KafkaVersion.V3_5_1, '3.5.1'], + [msk.KafkaVersion.V3_6_0, '3.6.0'], + [msk.KafkaVersion.V3_7_X, '3.7.x'], + [msk.KafkaVersion.V3_7_X_KRAFT, '3.7.x.kraft'], ], )('created with expected Kafka version %j', (parameter, result) => { new msk.Cluster(stack, 'Cluster', { @@ -794,6 +797,8 @@ describe('MSK Cluster', () => { expect(msk.KafkaVersion.V2_8_2_TIERED.isTieredStorageCompatible()).toBeTruthy(); expect(msk.KafkaVersion.V3_5_1.isTieredStorageCompatible()).toBeFalsy(); expect(msk.KafkaVersion.V3_6_0.isTieredStorageCompatible()).toBeTruthy(); + expect(msk.KafkaVersion.V3_7_X.isTieredStorageCompatible()).toBeTruthy(); + expect(msk.KafkaVersion.V3_7_X_KRAFT.isTieredStorageCompatible()).toBeTruthy(); }); test('create a cluster with tiered storage mode', () => { diff --git a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/KafkaVersionIntegTestDefaultTestDeployAssertD6628743.assets.json b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/KafkaVersionIntegTestDefaultTestDeployAssertD6628743.assets.json index 869ba604ac597..3a1821b106f8c 100644 --- a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/KafkaVersionIntegTestDefaultTestDeployAssertD6628743.assets.json +++ b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/KafkaVersionIntegTestDefaultTestDeployAssertD6628743.assets.json @@ -1,5 +1,5 @@ { - "version": "34.0.0", + "version": "38.0.1", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { diff --git a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/KafkaVersionTestStack.assets.json b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/KafkaVersionTestStack.assets.json index 8288650493764..f3ba089e1b206 100644 --- a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/KafkaVersionTestStack.assets.json +++ b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/KafkaVersionTestStack.assets.json @@ -1,7 +1,7 @@ { - "version": "34.0.0", + "version": "38.0.1", "files": { - "17094a380561572466f9dbcbbbcaca7ec3ca262d3308a1c0a1eae6529f016ac0": { + "4d392c9811fa038d040e6ec26693ad7b938112bf1c1d090019f4fdb0b32d4c49": { "source": { "path": "KafkaVersionTestStack.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "17094a380561572466f9dbcbbbcaca7ec3ca262d3308a1c0a1eae6529f016ac0.json", + "objectKey": "4d392c9811fa038d040e6ec26693ad7b938112bf1c1d090019f4fdb0b32d4c49.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/KafkaVersionTestStack.template.json b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/KafkaVersionTestStack.template.json index 7643cd0b0e028..c8e18283d3ec4 100644 --- a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/KafkaVersionTestStack.template.json +++ b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/KafkaVersionTestStack.template.json @@ -363,76 +363,7 @@ } } }, - "ClusterVersion221SecurityGroup7D79A634": { - "Type": "AWS::EC2::SecurityGroup", - "Properties": { - "GroupDescription": "MSK security group", - "SecurityGroupEgress": [ - { - "CidrIp": "0.0.0.0/0", - "Description": "Allow all outbound traffic by default", - "IpProtocol": "-1" - } - ], - "VpcId": { - "Ref": "Vpc8378EB38" - } - } - }, - "ClusterVersion2216E958BDB": { - "Type": "AWS::MSK::Cluster", - "Properties": { - "BrokerNodeGroupInfo": { - "ClientSubnets": [ - { - "Ref": "VpcPrivateSubnet1Subnet536B997A" - }, - { - "Ref": "VpcPrivateSubnet2Subnet3788AAA1" - } - ], - "InstanceType": "kafka.m5.large", - "SecurityGroups": [ - { - "Fn::GetAtt": [ - "ClusterVersion221SecurityGroup7D79A634", - "GroupId" - ] - } - ], - "StorageInfo": { - "EBSStorageInfo": { - "VolumeSize": 1000 - } - } - }, - "ClusterName": "cluster-v2-2-1", - "EncryptionInfo": { - "EncryptionInTransit": { - "ClientBroker": "TLS", - "InCluster": true - } - }, - "KafkaVersion": "2.2.1", - "LoggingInfo": { - "BrokerLogs": { - "CloudWatchLogs": { - "Enabled": false - }, - "Firehose": { - "Enabled": false - }, - "S3": { - "Enabled": false - } - } - }, - "NumberOfBrokerNodes": 2 - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, - "ClusterVersion231SecurityGroup9CC906F6": { + "ClusterVersion260SecurityGroup7EE4C4B9": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -448,7 +379,7 @@ } } }, - "ClusterVersion231ECA150B0": { + "ClusterVersion260FB26AA6A": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -464,7 +395,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion231SecurityGroup9CC906F6", + "ClusterVersion260SecurityGroup7EE4C4B9", "GroupId" ] } @@ -475,14 +406,14 @@ } } }, - "ClusterName": "cluster-v2-3-1", + "ClusterName": "cluster-v2-6-0", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "2.3.1", + "KafkaVersion": "2.6.0", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -501,7 +432,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion2411SecurityGroup1C6605A8": { + "ClusterVersion261SecurityGroupA9CF6B0F": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -517,7 +448,7 @@ } } }, - "ClusterVersion2411B601F534": { + "ClusterVersion261D43B824F": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -533,7 +464,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion2411SecurityGroup1C6605A8", + "ClusterVersion261SecurityGroupA9CF6B0F", "GroupId" ] } @@ -544,14 +475,14 @@ } } }, - "ClusterName": "cluster-v2-4-1-1", + "ClusterName": "cluster-v2-6-1", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "2.4.1.1", + "KafkaVersion": "2.6.1", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -570,7 +501,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion251SecurityGroup54D25418": { + "ClusterVersion262SecurityGroup1F74C57D": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -586,7 +517,7 @@ } } }, - "ClusterVersion251B0616FDE": { + "ClusterVersion2622894BF48": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -602,7 +533,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion251SecurityGroup54D25418", + "ClusterVersion262SecurityGroup1F74C57D", "GroupId" ] } @@ -613,14 +544,14 @@ } } }, - "ClusterName": "cluster-v2-5-1", + "ClusterName": "cluster-v2-6-2", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "2.5.1", + "KafkaVersion": "2.6.2", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -639,7 +570,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion260SecurityGroup7EE4C4B9": { + "ClusterVersion263SecurityGroupE3FAA85B": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -655,7 +586,7 @@ } } }, - "ClusterVersion260FB26AA6A": { + "ClusterVersion263DC77D2ED": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -671,7 +602,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion260SecurityGroup7EE4C4B9", + "ClusterVersion263SecurityGroupE3FAA85B", "GroupId" ] } @@ -682,14 +613,14 @@ } } }, - "ClusterName": "cluster-v2-6-0", + "ClusterName": "cluster-v2-6-3", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "2.6.0", + "KafkaVersion": "2.6.3", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -708,7 +639,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion261SecurityGroupA9CF6B0F": { + "ClusterVersion270SecurityGroupC310BF35": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -724,7 +655,7 @@ } } }, - "ClusterVersion261D43B824F": { + "ClusterVersion27010CB5FBF": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -740,7 +671,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion261SecurityGroupA9CF6B0F", + "ClusterVersion270SecurityGroupC310BF35", "GroupId" ] } @@ -751,14 +682,14 @@ } } }, - "ClusterName": "cluster-v2-6-1", + "ClusterName": "cluster-v2-7-0", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "2.6.1", + "KafkaVersion": "2.7.0", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -777,7 +708,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion262SecurityGroup1F74C57D": { + "ClusterVersion271SecurityGroup1487C17C": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -793,7 +724,7 @@ } } }, - "ClusterVersion2622894BF48": { + "ClusterVersion271AA1304B7": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -809,7 +740,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion262SecurityGroup1F74C57D", + "ClusterVersion271SecurityGroup1487C17C", "GroupId" ] } @@ -820,14 +751,14 @@ } } }, - "ClusterName": "cluster-v2-6-2", + "ClusterName": "cluster-v2-7-1", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "2.6.2", + "KafkaVersion": "2.7.1", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -846,7 +777,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion263SecurityGroupE3FAA85B": { + "ClusterVersion272SecurityGroupB8AE57F0": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -862,7 +793,7 @@ } } }, - "ClusterVersion263DC77D2ED": { + "ClusterVersion272BEE37AA9": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -878,7 +809,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion263SecurityGroupE3FAA85B", + "ClusterVersion272SecurityGroupB8AE57F0", "GroupId" ] } @@ -889,14 +820,14 @@ } } }, - "ClusterName": "cluster-v2-6-3", + "ClusterName": "cluster-v2-7-2", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "2.6.3", + "KafkaVersion": "2.7.2", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -915,7 +846,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion270SecurityGroupC310BF35": { + "ClusterVersion280SecurityGroup7A071E33": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -931,7 +862,7 @@ } } }, - "ClusterVersion27010CB5FBF": { + "ClusterVersion280A292F8BA": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -947,7 +878,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion270SecurityGroupC310BF35", + "ClusterVersion280SecurityGroup7A071E33", "GroupId" ] } @@ -958,14 +889,14 @@ } } }, - "ClusterName": "cluster-v2-7-0", + "ClusterName": "cluster-v2-8-0", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "2.7.0", + "KafkaVersion": "2.8.0", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -984,7 +915,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion271SecurityGroup1487C17C": { + "ClusterVersion281SecurityGroup58456B77": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -1000,7 +931,7 @@ } } }, - "ClusterVersion271AA1304B7": { + "ClusterVersion281E912F3B9": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -1016,7 +947,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion271SecurityGroup1487C17C", + "ClusterVersion281SecurityGroup58456B77", "GroupId" ] } @@ -1027,14 +958,14 @@ } } }, - "ClusterName": "cluster-v2-7-1", + "ClusterName": "cluster-v2-8-1", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "2.7.1", + "KafkaVersion": "2.8.1", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -1053,7 +984,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion272SecurityGroupB8AE57F0": { + "ClusterVersion282tieredSecurityGroup3FA6200D": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -1069,7 +1000,7 @@ } } }, - "ClusterVersion272BEE37AA9": { + "ClusterVersion282tiered485A19BE": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -1085,7 +1016,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion272SecurityGroupB8AE57F0", + "ClusterVersion282tieredSecurityGroup3FA6200D", "GroupId" ] } @@ -1096,14 +1027,14 @@ } } }, - "ClusterName": "cluster-v2-7-2", + "ClusterName": "cluster-v2-8-2-tiered", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "2.7.2", + "KafkaVersion": "2.8.2.tiered", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -1122,7 +1053,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion280SecurityGroup7A071E33": { + "ClusterVersion311SecurityGroupFFD16098": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -1138,7 +1069,7 @@ } } }, - "ClusterVersion280A292F8BA": { + "ClusterVersion311273A2535": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -1154,7 +1085,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion280SecurityGroup7A071E33", + "ClusterVersion311SecurityGroupFFD16098", "GroupId" ] } @@ -1165,14 +1096,14 @@ } } }, - "ClusterName": "cluster-v2-8-0", + "ClusterName": "cluster-v3-1-1", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "2.8.0", + "KafkaVersion": "3.1.1", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -1191,7 +1122,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion281SecurityGroup58456B77": { + "ClusterVersion320SecurityGroupF51F054B": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -1207,7 +1138,7 @@ } } }, - "ClusterVersion281E912F3B9": { + "ClusterVersion3202AA95F49": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -1223,7 +1154,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion281SecurityGroup58456B77", + "ClusterVersion320SecurityGroupF51F054B", "GroupId" ] } @@ -1234,14 +1165,14 @@ } } }, - "ClusterName": "cluster-v2-8-1", + "ClusterName": "cluster-v3-2-0", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "2.8.1", + "KafkaVersion": "3.2.0", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -1260,7 +1191,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion282tieredSecurityGroup3FA6200D": { + "ClusterVersion331SecurityGroupE349B3D7": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -1276,7 +1207,7 @@ } } }, - "ClusterVersion282tiered485A19BE": { + "ClusterVersion331008AC95F": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -1292,7 +1223,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion282tieredSecurityGroup3FA6200D", + "ClusterVersion331SecurityGroupE349B3D7", "GroupId" ] } @@ -1303,14 +1234,14 @@ } } }, - "ClusterName": "cluster-v2-8-2-tiered", + "ClusterName": "cluster-v3-3-1", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "2.8.2.tiered", + "KafkaVersion": "3.3.1", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -1329,7 +1260,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion311SecurityGroupFFD16098": { + "ClusterVersion332SecurityGroup75E967C6": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -1345,7 +1276,7 @@ } } }, - "ClusterVersion311273A2535": { + "ClusterVersion332A4AB4092": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -1361,7 +1292,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion311SecurityGroupFFD16098", + "ClusterVersion332SecurityGroup75E967C6", "GroupId" ] } @@ -1372,14 +1303,14 @@ } } }, - "ClusterName": "cluster-v3-1-1", + "ClusterName": "cluster-v3-3-2", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "3.1.1", + "KafkaVersion": "3.3.2", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -1398,7 +1329,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion320SecurityGroupF51F054B": { + "ClusterVersion340SecurityGroupBCDEC51B": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -1414,7 +1345,7 @@ } } }, - "ClusterVersion3202AA95F49": { + "ClusterVersion340D193688A": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -1430,7 +1361,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion320SecurityGroupF51F054B", + "ClusterVersion340SecurityGroupBCDEC51B", "GroupId" ] } @@ -1441,14 +1372,14 @@ } } }, - "ClusterName": "cluster-v3-2-0", + "ClusterName": "cluster-v3-4-0", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "3.2.0", + "KafkaVersion": "3.4.0", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -1467,7 +1398,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion331SecurityGroupE349B3D7": { + "ClusterVersion351SecurityGroup866E7223": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -1483,7 +1414,7 @@ } } }, - "ClusterVersion331008AC95F": { + "ClusterVersion3515E181C3E": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -1499,7 +1430,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion331SecurityGroupE349B3D7", + "ClusterVersion351SecurityGroup866E7223", "GroupId" ] } @@ -1510,14 +1441,14 @@ } } }, - "ClusterName": "cluster-v3-3-1", + "ClusterName": "cluster-v3-5-1", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "3.3.1", + "KafkaVersion": "3.5.1", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -1536,7 +1467,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion332SecurityGroup75E967C6": { + "ClusterVersion360SecurityGroupDE3FDA4D": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -1552,7 +1483,7 @@ } } }, - "ClusterVersion332A4AB4092": { + "ClusterVersion360A3C740F1": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -1568,7 +1499,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion332SecurityGroup75E967C6", + "ClusterVersion360SecurityGroupDE3FDA4D", "GroupId" ] } @@ -1579,14 +1510,14 @@ } } }, - "ClusterName": "cluster-v3-3-2", + "ClusterName": "cluster-v3-6-0", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "3.3.2", + "KafkaVersion": "3.6.0", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -1605,7 +1536,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion340SecurityGroupBCDEC51B": { + "ClusterVersion37xSecurityGroup907921C2": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -1621,7 +1552,7 @@ } } }, - "ClusterVersion340D193688A": { + "ClusterVersion37xF25198B0": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -1637,7 +1568,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion340SecurityGroupBCDEC51B", + "ClusterVersion37xSecurityGroup907921C2", "GroupId" ] } @@ -1648,14 +1579,14 @@ } } }, - "ClusterName": "cluster-v3-4-0", + "ClusterName": "cluster-v3-7-x", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "3.4.0", + "KafkaVersion": "3.7.x", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { @@ -1674,7 +1605,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "ClusterVersion351SecurityGroup866E7223": { + "ClusterVersion37xkraftSecurityGroupD9C2010F": { "Type": "AWS::EC2::SecurityGroup", "Properties": { "GroupDescription": "MSK security group", @@ -1690,7 +1621,7 @@ } } }, - "ClusterVersion3515E181C3E": { + "ClusterVersion37xkraft42DC71DF": { "Type": "AWS::MSK::Cluster", "Properties": { "BrokerNodeGroupInfo": { @@ -1706,7 +1637,7 @@ "SecurityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion351SecurityGroup866E7223", + "ClusterVersion37xkraftSecurityGroupD9C2010F", "GroupId" ] } @@ -1717,14 +1648,14 @@ } } }, - "ClusterName": "cluster-v3-5-1", + "ClusterName": "cluster-v3-7-x-kraft", "EncryptionInfo": { "EncryptionInTransit": { "ClientBroker": "TLS", "InCluster": true } }, - "KafkaVersion": "3.5.1", + "KafkaVersion": "3.7.x.kraft", "LoggingInfo": { "BrokerLogs": { "CloudWatchLogs": { diff --git a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/cdk.out b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/cdk.out index 2313ab5436501..c6e612584e352 100644 --- a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/cdk.out +++ b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"34.0.0"} \ No newline at end of file +{"version":"38.0.1"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/integ.json b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/integ.json index 97e7cd88f3932..9d4d8f3628891 100644 --- a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/integ.json +++ b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/integ.json @@ -1,6 +1,6 @@ { "enableLookups": true, - "version": "34.0.0", + "version": "38.0.1", "testCases": { "KafkaVersionIntegTest/DefaultTest": { "stacks": [ diff --git a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/manifest.json b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/manifest.json index 6017a3953ca81..bcdf2a7ee818a 100644 --- a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "34.0.0", + "version": "38.0.1", "artifacts": { "KafkaVersionTestStack.assets": { "type": "cdk:asset-manifest", @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/17094a380561572466f9dbcbbbcaca7ec3ca262d3308a1c0a1eae6529f016ac0.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4d392c9811fa038d040e6ec26693ad7b938112bf1c1d090019f4fdb0b32d4c49.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -172,54 +172,6 @@ "data": "VpcVPCGWBF912B6E" } ], - "/KafkaVersionTestStack/ClusterVersion2-2-1/SecurityGroup/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterVersion221SecurityGroup7D79A634" - } - ], - "/KafkaVersionTestStack/ClusterVersion2-2-1/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterVersion2216E958BDB" - } - ], - "/KafkaVersionTestStack/ClusterVersion2-3-1/SecurityGroup/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterVersion231SecurityGroup9CC906F6" - } - ], - "/KafkaVersionTestStack/ClusterVersion2-3-1/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterVersion231ECA150B0" - } - ], - "/KafkaVersionTestStack/ClusterVersion2-4-1-1/SecurityGroup/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterVersion2411SecurityGroup1C6605A8" - } - ], - "/KafkaVersionTestStack/ClusterVersion2-4-1-1/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterVersion2411B601F534" - } - ], - "/KafkaVersionTestStack/ClusterVersion2-5-1/SecurityGroup/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterVersion251SecurityGroup54D25418" - } - ], - "/KafkaVersionTestStack/ClusterVersion2-5-1/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterVersion251B0616FDE" - } - ], "/KafkaVersionTestStack/ClusterVersion2-6-0/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -412,6 +364,42 @@ "data": "ClusterVersion3515E181C3E" } ], + "/KafkaVersionTestStack/ClusterVersion3-6-0/SecurityGroup/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "ClusterVersion360SecurityGroupDE3FDA4D" + } + ], + "/KafkaVersionTestStack/ClusterVersion3-6-0/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "ClusterVersion360A3C740F1" + } + ], + "/KafkaVersionTestStack/ClusterVersion3-7-x/SecurityGroup/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "ClusterVersion37xSecurityGroup907921C2" + } + ], + "/KafkaVersionTestStack/ClusterVersion3-7-x/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "ClusterVersion37xF25198B0" + } + ], + "/KafkaVersionTestStack/ClusterVersion3-7-x-kraft/SecurityGroup/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "ClusterVersion37xkraftSecurityGroupD9C2010F" + } + ], + "/KafkaVersionTestStack/ClusterVersion3-7-x-kraft/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "ClusterVersion37xkraft42DC71DF" + } + ], "/KafkaVersionTestStack/BootstrapVersion": [ { "type": "aws:cdk:logicalId", @@ -423,6 +411,78 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } + ], + "ClusterVersion221SecurityGroup7D79A634": [ + { + "type": "aws:cdk:logicalId", + "data": "ClusterVersion221SecurityGroup7D79A634", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "ClusterVersion2216E958BDB": [ + { + "type": "aws:cdk:logicalId", + "data": "ClusterVersion2216E958BDB", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "ClusterVersion231SecurityGroup9CC906F6": [ + { + "type": "aws:cdk:logicalId", + "data": "ClusterVersion231SecurityGroup9CC906F6", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "ClusterVersion231ECA150B0": [ + { + "type": "aws:cdk:logicalId", + "data": "ClusterVersion231ECA150B0", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "ClusterVersion2411SecurityGroup1C6605A8": [ + { + "type": "aws:cdk:logicalId", + "data": "ClusterVersion2411SecurityGroup1C6605A8", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "ClusterVersion2411B601F534": [ + { + "type": "aws:cdk:logicalId", + "data": "ClusterVersion2411B601F534", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "ClusterVersion251SecurityGroup54D25418": [ + { + "type": "aws:cdk:logicalId", + "data": "ClusterVersion251SecurityGroup54D25418", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "ClusterVersion251B0616FDE": [ + { + "type": "aws:cdk:logicalId", + "data": "ClusterVersion251B0616FDE", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } ] }, "displayName": "KafkaVersionTestStack" diff --git a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/tree.json b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/tree.json index 8c0dc74a6cb89..75ba28ae32a77 100644 --- a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/tree.json +++ b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/tree.json @@ -623,120 +623,17 @@ "version": "0.0.0" } }, - "ClusterVersion2-2-1": { - "id": "ClusterVersion2-2-1", - "path": "KafkaVersionTestStack/ClusterVersion2-2-1", - "children": { - "SecurityGroup": { - "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion2-2-1/SecurityGroup", - "children": { - "Resource": { - "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-2-1/SecurityGroup/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", - "aws:cdk:cloudformation:props": { - "groupDescription": "MSK security group", - "securityGroupEgress": [ - { - "cidrIp": "0.0.0.0/0", - "description": "Allow all outbound traffic by default", - "ipProtocol": "-1" - } - ], - "vpcId": { - "Ref": "Vpc8378EB38" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnSecurityGroup", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" - } - }, - "Resource": { - "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-2-1/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", - "aws:cdk:cloudformation:props": { - "brokerNodeGroupInfo": { - "instanceType": "kafka.m5.large", - "clientSubnets": [ - { - "Ref": "VpcPrivateSubnet1Subnet536B997A" - }, - { - "Ref": "VpcPrivateSubnet2Subnet3788AAA1" - } - ], - "securityGroups": [ - { - "Fn::GetAtt": [ - "ClusterVersion221SecurityGroup7D79A634", - "GroupId" - ] - } - ], - "storageInfo": { - "ebsStorageInfo": { - "volumeSize": 1000 - } - } - }, - "clusterName": "cluster-v2-2-1", - "encryptionInfo": { - "encryptionInTransit": { - "clientBroker": "TLS", - "inCluster": true - } - }, - "kafkaVersion": "2.2.1", - "loggingInfo": { - "brokerLogs": { - "cloudWatchLogs": { - "enabled": false - }, - "firehose": { - "enabled": false - }, - "s3": { - "enabled": false - } - } - }, - "numberOfBrokerNodes": 2 - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_msk.CfnCluster", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" - } - }, - "ClusterVersion2-3-1": { - "id": "ClusterVersion2-3-1", - "path": "KafkaVersionTestStack/ClusterVersion2-3-1", + "ClusterVersion2-6-0": { + "id": "ClusterVersion2-6-0", + "path": "KafkaVersionTestStack/ClusterVersion2-6-0", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion2-3-1/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion2-6-0/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-3-1/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-6-0/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -766,7 +663,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-3-1/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-6-0/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -783,7 +680,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion231SecurityGroup9CC906F6", + "ClusterVersion260SecurityGroup7EE4C4B9", "GroupId" ] } @@ -794,14 +691,14 @@ } } }, - "clusterName": "cluster-v2-3-1", + "clusterName": "cluster-v2-6-0", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "2.3.1", + "kafkaVersion": "2.6.0", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -829,17 +726,17 @@ "version": "0.0.0" } }, - "ClusterVersion2-4-1-1": { - "id": "ClusterVersion2-4-1-1", - "path": "KafkaVersionTestStack/ClusterVersion2-4-1-1", + "ClusterVersion2-6-1": { + "id": "ClusterVersion2-6-1", + "path": "KafkaVersionTestStack/ClusterVersion2-6-1", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion2-4-1-1/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion2-6-1/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-4-1-1/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-6-1/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -869,7 +766,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-4-1-1/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-6-1/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -886,7 +783,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion2411SecurityGroup1C6605A8", + "ClusterVersion261SecurityGroupA9CF6B0F", "GroupId" ] } @@ -897,14 +794,14 @@ } } }, - "clusterName": "cluster-v2-4-1-1", + "clusterName": "cluster-v2-6-1", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "2.4.1.1", + "kafkaVersion": "2.6.1", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -932,17 +829,17 @@ "version": "0.0.0" } }, - "ClusterVersion2-5-1": { - "id": "ClusterVersion2-5-1", - "path": "KafkaVersionTestStack/ClusterVersion2-5-1", + "ClusterVersion2-6-2": { + "id": "ClusterVersion2-6-2", + "path": "KafkaVersionTestStack/ClusterVersion2-6-2", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion2-5-1/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion2-6-2/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-5-1/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-6-2/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -972,7 +869,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-5-1/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-6-2/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -989,7 +886,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion251SecurityGroup54D25418", + "ClusterVersion262SecurityGroup1F74C57D", "GroupId" ] } @@ -1000,14 +897,14 @@ } } }, - "clusterName": "cluster-v2-5-1", + "clusterName": "cluster-v2-6-2", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "2.5.1", + "kafkaVersion": "2.6.2", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -1035,17 +932,17 @@ "version": "0.0.0" } }, - "ClusterVersion2-6-0": { - "id": "ClusterVersion2-6-0", - "path": "KafkaVersionTestStack/ClusterVersion2-6-0", + "ClusterVersion2-6-3": { + "id": "ClusterVersion2-6-3", + "path": "KafkaVersionTestStack/ClusterVersion2-6-3", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion2-6-0/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion2-6-3/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-6-0/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-6-3/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -1075,7 +972,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-6-0/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-6-3/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -1092,7 +989,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion260SecurityGroup7EE4C4B9", + "ClusterVersion263SecurityGroupE3FAA85B", "GroupId" ] } @@ -1103,14 +1000,14 @@ } } }, - "clusterName": "cluster-v2-6-0", + "clusterName": "cluster-v2-6-3", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "2.6.0", + "kafkaVersion": "2.6.3", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -1138,17 +1035,17 @@ "version": "0.0.0" } }, - "ClusterVersion2-6-1": { - "id": "ClusterVersion2-6-1", - "path": "KafkaVersionTestStack/ClusterVersion2-6-1", + "ClusterVersion2-7-0": { + "id": "ClusterVersion2-7-0", + "path": "KafkaVersionTestStack/ClusterVersion2-7-0", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion2-6-1/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion2-7-0/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-6-1/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-7-0/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -1178,7 +1075,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-6-1/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-7-0/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -1195,7 +1092,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion261SecurityGroupA9CF6B0F", + "ClusterVersion270SecurityGroupC310BF35", "GroupId" ] } @@ -1206,14 +1103,14 @@ } } }, - "clusterName": "cluster-v2-6-1", + "clusterName": "cluster-v2-7-0", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "2.6.1", + "kafkaVersion": "2.7.0", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -1241,17 +1138,17 @@ "version": "0.0.0" } }, - "ClusterVersion2-6-2": { - "id": "ClusterVersion2-6-2", - "path": "KafkaVersionTestStack/ClusterVersion2-6-2", + "ClusterVersion2-7-1": { + "id": "ClusterVersion2-7-1", + "path": "KafkaVersionTestStack/ClusterVersion2-7-1", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion2-6-2/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion2-7-1/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-6-2/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-7-1/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -1281,7 +1178,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-6-2/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-7-1/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -1298,7 +1195,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion262SecurityGroup1F74C57D", + "ClusterVersion271SecurityGroup1487C17C", "GroupId" ] } @@ -1309,14 +1206,14 @@ } } }, - "clusterName": "cluster-v2-6-2", + "clusterName": "cluster-v2-7-1", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "2.6.2", + "kafkaVersion": "2.7.1", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -1344,17 +1241,17 @@ "version": "0.0.0" } }, - "ClusterVersion2-6-3": { - "id": "ClusterVersion2-6-3", - "path": "KafkaVersionTestStack/ClusterVersion2-6-3", + "ClusterVersion2-7-2": { + "id": "ClusterVersion2-7-2", + "path": "KafkaVersionTestStack/ClusterVersion2-7-2", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion2-6-3/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion2-7-2/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-6-3/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-7-2/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -1384,7 +1281,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-6-3/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-7-2/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -1401,7 +1298,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion263SecurityGroupE3FAA85B", + "ClusterVersion272SecurityGroupB8AE57F0", "GroupId" ] } @@ -1412,14 +1309,14 @@ } } }, - "clusterName": "cluster-v2-6-3", + "clusterName": "cluster-v2-7-2", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "2.6.3", + "kafkaVersion": "2.7.2", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -1447,17 +1344,17 @@ "version": "0.0.0" } }, - "ClusterVersion2-7-0": { - "id": "ClusterVersion2-7-0", - "path": "KafkaVersionTestStack/ClusterVersion2-7-0", + "ClusterVersion2-8-0": { + "id": "ClusterVersion2-8-0", + "path": "KafkaVersionTestStack/ClusterVersion2-8-0", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion2-7-0/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion2-8-0/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-7-0/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-8-0/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -1487,7 +1384,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-7-0/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-8-0/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -1504,7 +1401,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion270SecurityGroupC310BF35", + "ClusterVersion280SecurityGroup7A071E33", "GroupId" ] } @@ -1515,14 +1412,14 @@ } } }, - "clusterName": "cluster-v2-7-0", + "clusterName": "cluster-v2-8-0", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "2.7.0", + "kafkaVersion": "2.8.0", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -1550,17 +1447,17 @@ "version": "0.0.0" } }, - "ClusterVersion2-7-1": { - "id": "ClusterVersion2-7-1", - "path": "KafkaVersionTestStack/ClusterVersion2-7-1", + "ClusterVersion2-8-1": { + "id": "ClusterVersion2-8-1", + "path": "KafkaVersionTestStack/ClusterVersion2-8-1", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion2-7-1/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion2-8-1/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-7-1/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-8-1/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -1590,7 +1487,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-7-1/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-8-1/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -1607,7 +1504,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion271SecurityGroup1487C17C", + "ClusterVersion281SecurityGroup58456B77", "GroupId" ] } @@ -1618,14 +1515,14 @@ } } }, - "clusterName": "cluster-v2-7-1", + "clusterName": "cluster-v2-8-1", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "2.7.1", + "kafkaVersion": "2.8.1", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -1653,17 +1550,17 @@ "version": "0.0.0" } }, - "ClusterVersion2-7-2": { - "id": "ClusterVersion2-7-2", - "path": "KafkaVersionTestStack/ClusterVersion2-7-2", + "ClusterVersion2-8-2-tiered": { + "id": "ClusterVersion2-8-2-tiered", + "path": "KafkaVersionTestStack/ClusterVersion2-8-2-tiered", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion2-7-2/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion2-8-2-tiered/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-7-2/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-8-2-tiered/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -1693,7 +1590,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-7-2/Resource", + "path": "KafkaVersionTestStack/ClusterVersion2-8-2-tiered/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -1710,7 +1607,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion272SecurityGroupB8AE57F0", + "ClusterVersion282tieredSecurityGroup3FA6200D", "GroupId" ] } @@ -1721,14 +1618,14 @@ } } }, - "clusterName": "cluster-v2-7-2", + "clusterName": "cluster-v2-8-2-tiered", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "2.7.2", + "kafkaVersion": "2.8.2.tiered", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -1756,17 +1653,17 @@ "version": "0.0.0" } }, - "ClusterVersion2-8-0": { - "id": "ClusterVersion2-8-0", - "path": "KafkaVersionTestStack/ClusterVersion2-8-0", + "ClusterVersion3-1-1": { + "id": "ClusterVersion3-1-1", + "path": "KafkaVersionTestStack/ClusterVersion3-1-1", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion2-8-0/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion3-1-1/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-8-0/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-1-1/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -1796,7 +1693,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-8-0/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-1-1/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -1813,7 +1710,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion280SecurityGroup7A071E33", + "ClusterVersion311SecurityGroupFFD16098", "GroupId" ] } @@ -1824,14 +1721,14 @@ } } }, - "clusterName": "cluster-v2-8-0", + "clusterName": "cluster-v3-1-1", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "2.8.0", + "kafkaVersion": "3.1.1", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -1859,17 +1756,17 @@ "version": "0.0.0" } }, - "ClusterVersion2-8-1": { - "id": "ClusterVersion2-8-1", - "path": "KafkaVersionTestStack/ClusterVersion2-8-1", + "ClusterVersion3-2-0": { + "id": "ClusterVersion3-2-0", + "path": "KafkaVersionTestStack/ClusterVersion3-2-0", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion2-8-1/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion3-2-0/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-8-1/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-2-0/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -1899,7 +1796,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-8-1/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-2-0/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -1916,7 +1813,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion281SecurityGroup58456B77", + "ClusterVersion320SecurityGroupF51F054B", "GroupId" ] } @@ -1927,14 +1824,14 @@ } } }, - "clusterName": "cluster-v2-8-1", + "clusterName": "cluster-v3-2-0", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "2.8.1", + "kafkaVersion": "3.2.0", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -1962,17 +1859,17 @@ "version": "0.0.0" } }, - "ClusterVersion2-8-2-tiered": { - "id": "ClusterVersion2-8-2-tiered", - "path": "KafkaVersionTestStack/ClusterVersion2-8-2-tiered", + "ClusterVersion3-3-1": { + "id": "ClusterVersion3-3-1", + "path": "KafkaVersionTestStack/ClusterVersion3-3-1", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion2-8-2-tiered/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion3-3-1/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-8-2-tiered/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-3-1/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -2002,7 +1899,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion2-8-2-tiered/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-3-1/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -2019,7 +1916,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion282tieredSecurityGroup3FA6200D", + "ClusterVersion331SecurityGroupE349B3D7", "GroupId" ] } @@ -2030,14 +1927,14 @@ } } }, - "clusterName": "cluster-v2-8-2-tiered", + "clusterName": "cluster-v3-3-1", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "2.8.2.tiered", + "kafkaVersion": "3.3.1", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -2065,17 +1962,17 @@ "version": "0.0.0" } }, - "ClusterVersion3-1-1": { - "id": "ClusterVersion3-1-1", - "path": "KafkaVersionTestStack/ClusterVersion3-1-1", + "ClusterVersion3-3-2": { + "id": "ClusterVersion3-3-2", + "path": "KafkaVersionTestStack/ClusterVersion3-3-2", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion3-1-1/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion3-3-2/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion3-1-1/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-3-2/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -2105,7 +2002,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion3-1-1/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-3-2/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -2122,7 +2019,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion311SecurityGroupFFD16098", + "ClusterVersion332SecurityGroup75E967C6", "GroupId" ] } @@ -2133,14 +2030,14 @@ } } }, - "clusterName": "cluster-v3-1-1", + "clusterName": "cluster-v3-3-2", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "3.1.1", + "kafkaVersion": "3.3.2", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -2168,17 +2065,17 @@ "version": "0.0.0" } }, - "ClusterVersion3-2-0": { - "id": "ClusterVersion3-2-0", - "path": "KafkaVersionTestStack/ClusterVersion3-2-0", + "ClusterVersion3-4-0": { + "id": "ClusterVersion3-4-0", + "path": "KafkaVersionTestStack/ClusterVersion3-4-0", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion3-2-0/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion3-4-0/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion3-2-0/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-4-0/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -2208,7 +2105,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion3-2-0/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-4-0/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -2225,7 +2122,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion320SecurityGroupF51F054B", + "ClusterVersion340SecurityGroupBCDEC51B", "GroupId" ] } @@ -2236,14 +2133,14 @@ } } }, - "clusterName": "cluster-v3-2-0", + "clusterName": "cluster-v3-4-0", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "3.2.0", + "kafkaVersion": "3.4.0", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -2271,17 +2168,17 @@ "version": "0.0.0" } }, - "ClusterVersion3-3-1": { - "id": "ClusterVersion3-3-1", - "path": "KafkaVersionTestStack/ClusterVersion3-3-1", + "ClusterVersion3-5-1": { + "id": "ClusterVersion3-5-1", + "path": "KafkaVersionTestStack/ClusterVersion3-5-1", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion3-3-1/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion3-5-1/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion3-3-1/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-5-1/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -2311,7 +2208,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion3-3-1/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-5-1/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -2328,7 +2225,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion331SecurityGroupE349B3D7", + "ClusterVersion351SecurityGroup866E7223", "GroupId" ] } @@ -2339,14 +2236,14 @@ } } }, - "clusterName": "cluster-v3-3-1", + "clusterName": "cluster-v3-5-1", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "3.3.1", + "kafkaVersion": "3.5.1", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -2374,17 +2271,17 @@ "version": "0.0.0" } }, - "ClusterVersion3-3-2": { - "id": "ClusterVersion3-3-2", - "path": "KafkaVersionTestStack/ClusterVersion3-3-2", + "ClusterVersion3-6-0": { + "id": "ClusterVersion3-6-0", + "path": "KafkaVersionTestStack/ClusterVersion3-6-0", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion3-3-2/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion3-6-0/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion3-3-2/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-6-0/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -2414,7 +2311,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion3-3-2/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-6-0/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -2431,7 +2328,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion332SecurityGroup75E967C6", + "ClusterVersion360SecurityGroupDE3FDA4D", "GroupId" ] } @@ -2442,14 +2339,14 @@ } } }, - "clusterName": "cluster-v3-3-2", + "clusterName": "cluster-v3-6-0", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "3.3.2", + "kafkaVersion": "3.6.0", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -2477,17 +2374,17 @@ "version": "0.0.0" } }, - "ClusterVersion3-4-0": { - "id": "ClusterVersion3-4-0", - "path": "KafkaVersionTestStack/ClusterVersion3-4-0", + "ClusterVersion3-7-x": { + "id": "ClusterVersion3-7-x", + "path": "KafkaVersionTestStack/ClusterVersion3-7-x", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion3-4-0/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion3-7-x/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion3-4-0/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-7-x/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -2517,7 +2414,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion3-4-0/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-7-x/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -2534,7 +2431,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion340SecurityGroupBCDEC51B", + "ClusterVersion37xSecurityGroup907921C2", "GroupId" ] } @@ -2545,14 +2442,14 @@ } } }, - "clusterName": "cluster-v3-4-0", + "clusterName": "cluster-v3-7-x", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "3.4.0", + "kafkaVersion": "3.7.x", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -2580,17 +2477,17 @@ "version": "0.0.0" } }, - "ClusterVersion3-5-1": { - "id": "ClusterVersion3-5-1", - "path": "KafkaVersionTestStack/ClusterVersion3-5-1", + "ClusterVersion3-7-x-kraft": { + "id": "ClusterVersion3-7-x-kraft", + "path": "KafkaVersionTestStack/ClusterVersion3-7-x-kraft", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "KafkaVersionTestStack/ClusterVersion3-5-1/SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion3-7-x-kraft/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion3-5-1/SecurityGroup/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-7-x-kraft/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -2620,7 +2517,7 @@ }, "Resource": { "id": "Resource", - "path": "KafkaVersionTestStack/ClusterVersion3-5-1/Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-7-x-kraft/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::MSK::Cluster", "aws:cdk:cloudformation:props": { @@ -2637,7 +2534,7 @@ "securityGroups": [ { "Fn::GetAtt": [ - "ClusterVersion351SecurityGroup866E7223", + "ClusterVersion37xkraftSecurityGroupD9C2010F", "GroupId" ] } @@ -2648,14 +2545,14 @@ } } }, - "clusterName": "cluster-v3-5-1", + "clusterName": "cluster-v3-7-x-kraft", "encryptionInfo": { "encryptionInTransit": { "clientBroker": "TLS", "inCluster": true } }, - "kafkaVersion": "3.5.1", + "kafkaVersion": "3.7.x.kraft", "loggingInfo": { "brokerLogs": { "cloudWatchLogs": { @@ -2718,7 +2615,7 @@ "path": "KafkaVersionIntegTest/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.4.2" } }, "DeployAssert": { @@ -2764,7 +2661,7 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.4.2" } } }, diff --git a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.ts b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.ts index cf22c87996e34..926f05f8998dc 100644 --- a/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.ts +++ b/packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.ts @@ -6,10 +6,6 @@ import { IntegTest } from '@aws-cdk/integ-tests-alpha'; import { Vpc } from 'aws-cdk-lib/aws-ec2'; const versions: KafkaVersion[] = [ - KafkaVersion.V2_2_1, - KafkaVersion.V2_3_1, - KafkaVersion.V2_4_1_1, - KafkaVersion.V2_5_1, KafkaVersion.V2_6_0, KafkaVersion.V2_6_1, KafkaVersion.V2_6_2, @@ -26,6 +22,9 @@ const versions: KafkaVersion[] = [ KafkaVersion.V3_3_2, KafkaVersion.V3_4_0, KafkaVersion.V3_5_1, + KafkaVersion.V3_6_0, + KafkaVersion.V3_7_X, + KafkaVersion.V3_7_X_KRAFT, ]; class KafkaVersionTest extends Stack {