From 4fcf9ecd34c8b12294ba2bcc89afff24512336f5 Mon Sep 17 00:00:00 2001 From: maz Date: Sat, 22 Feb 2025 11:40:36 +0900 Subject: [PATCH 1/2] feat(msk): add support for Kafka version 3.8.x and KRaft --- .../@aws-cdk/aws-msk-alpha/lib/cluster-version.ts | 13 +++++++++++++ .../@aws-cdk/aws-msk-alpha/test/cluster.test.ts | 2 ++ .../aws-msk-alpha/test/integ.cluster-version.ts | 2 ++ 3 files changed, 17 insertions(+) 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 82a0a7247988e..1534163e1fe8f 100644 --- a/packages/@aws-cdk/aws-msk-alpha/lib/cluster-version.ts +++ b/packages/@aws-cdk/aws-msk-alpha/lib/cluster-version.ts @@ -169,6 +169,19 @@ export class KafkaVersion { */ public static readonly V3_7_X_KRAFT = KafkaVersion.of('3.7.x.kraft', { tieredStorage: true }); + /** + * Kafka version 3.8.x with ZooKeeper metadata mode support + * + * @see https://docs.aws.amazon.com/msk/latest/developerguide/metadata-management.html#msk-get-connection-string + */ + public static readonly V3_8_X = KafkaVersion.of('3.8.x', { tieredStorage: true }); + + /** + * Kafka version 3.8.x with KRaft (Apache Kafka Raft) metadata mode support + * + * @see https://docs.aws.amazon.com/msk/latest/developerguide/metadata-management.html#kraft-intro + */ + public static readonly V3_8_X_KRAFT = KafkaVersion.of('3.8.x.kraft', { tieredStorage: true }); /** * Custom cluster version * @param version custom version number 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 50ed3af98f67f..17ddc3d713f12 100644 --- a/packages/@aws-cdk/aws-msk-alpha/test/cluster.test.ts +++ b/packages/@aws-cdk/aws-msk-alpha/test/cluster.test.ts @@ -47,6 +47,8 @@ describe('MSK Cluster', () => { [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'], + [msk.KafkaVersion.V3_8_X, '3.8.x'], + [msk.KafkaVersion.V3_8_X_KRAFT, '3.8.x.kraft'], ], )('created with expected Kafka version %j', (parameter, result) => { new msk.Cluster(stack, 'Cluster', { 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 926f05f8998dc..6cdf2e1f05904 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 @@ -25,6 +25,8 @@ const versions: KafkaVersion[] = [ KafkaVersion.V3_6_0, KafkaVersion.V3_7_X, KafkaVersion.V3_7_X_KRAFT, + KafkaVersion.V3_8_X, + KafkaVersion.V3_8_X_KRAFT, ]; class KafkaVersionTest extends Stack { From e143d09219dbb2c678fd6403e59ceac33bab90e2 Mon Sep 17 00:00:00 2001 From: maz Date: Sat, 22 Feb 2025 13:15:02 +0900 Subject: [PATCH 2/2] update --- packages/@aws-cdk/aws-msk-alpha/README.md | 14 +- .../aws-msk-alpha/lib/cluster-version.ts | 30 +- ...efaultTestDeployAssertD6628743.assets.json | 2 +- .../KafkaVersionTestStack.assets.json | 6 +- .../KafkaVersionTestStack.template.json | 174 ++++- .../integ.cluster-version.js.snapshot/cdk.out | 2 +- .../integ.json | 3 +- .../manifest.json | 504 ++++++++++++-- .../tree.json | 659 ++++++++++++++++-- .../test/integ.cluster-version.ts | 2 - 10 files changed, 1255 insertions(+), 141 deletions(-) diff --git a/packages/@aws-cdk/aws-msk-alpha/README.md b/packages/@aws-cdk/aws-msk-alpha/README.md index a162ed16ddbc8..b4e35b0826793 100644 --- a/packages/@aws-cdk/aws-msk-alpha/README.md +++ b/packages/@aws-cdk/aws-msk-alpha/README.md @@ -23,7 +23,7 @@ The following example creates an MSK Cluster. declare const vpc: ec2.Vpc; const cluster = new msk.Cluster(this, 'Cluster', { clusterName: 'myCluster', - kafkaVersion: msk.KafkaVersion.V2_8_1, + kafkaVersion: msk.KafkaVersion.V3_8_X, vpc, }); ``` @@ -36,7 +36,7 @@ To control who can access the Cluster, use the `.connections` attribute. For a l declare const vpc: ec2.Vpc; const cluster = new msk.Cluster(this, 'Cluster', { clusterName: 'myCluster', - kafkaVersion: msk.KafkaVersion.V2_8_1, + kafkaVersion: msk.KafkaVersion.V3_8_X, vpc, }); @@ -88,7 +88,7 @@ import * as acmpca from 'aws-cdk-lib/aws-acmpca'; declare const vpc: ec2.Vpc; const cluster = new msk.Cluster(this, 'Cluster', { clusterName: 'myCluster', - kafkaVersion: msk.KafkaVersion.V2_8_1, + kafkaVersion: msk.KafkaVersion.V3_8_X, vpc, encryptionInTransit: { clientBroker: msk.ClientBrokerEncryption.TLS, @@ -113,7 +113,7 @@ Enable client authentication with [SASL/SCRAM](https://docs.aws.amazon.com/msk/l declare const vpc: ec2.Vpc; const cluster = new msk.Cluster(this, 'cluster', { clusterName: 'myCluster', - kafkaVersion: msk.KafkaVersion.V2_8_1, + kafkaVersion: msk.KafkaVersion.V3_8_X, vpc, encryptionInTransit: { clientBroker: msk.ClientBrokerEncryption.TLS, @@ -132,7 +132,7 @@ Enable client authentication with [IAM](https://docs.aws.amazon.com/msk/latest/d declare const vpc: ec2.Vpc; const cluster = new msk.Cluster(this, 'cluster', { clusterName: 'myCluster', - kafkaVersion: msk.KafkaVersion.V2_8_1, + kafkaVersion: msk.KafkaVersion.V3_8_X, vpc, encryptionInTransit: { clientBroker: msk.ClientBrokerEncryption.TLS, @@ -155,7 +155,7 @@ import * as acmpca from 'aws-cdk-lib/aws-acmpca'; declare const vpc: ec2.Vpc; const cluster = new msk.Cluster(this, 'Cluster', { clusterName: 'myCluster', - kafkaVersion: msk.KafkaVersion.V2_8_1, + kafkaVersion: msk.KafkaVersion.V3_8_X, vpc, encryptionInTransit: { clientBroker: msk.ClientBrokerEncryption.TLS, @@ -186,7 +186,7 @@ declare const vpc: ec2.Vpc; declare const bucket: s3.IBucket; const cluster = new msk.Cluster(this, 'cluster', { clusterName: 'myCluster', - kafkaVersion: msk.KafkaVersion.V2_8_1, + kafkaVersion: msk.KafkaVersion.V3_8_X, vpc, logging: { s3: { 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 1534163e1fe8f..640a951d26429 100644 --- a/packages/@aws-cdk/aws-msk-alpha/lib/cluster-version.ts +++ b/packages/@aws-cdk/aws-msk-alpha/lib/cluster-version.ts @@ -72,71 +72,99 @@ export class KafkaVersion { /** * Kafka version 2.6.0 + * + * @deprecated use the latest runtime instead */ public static readonly V2_6_0 = KafkaVersion.of('2.6.0'); /** * Kafka version 2.6.1 + * + * @deprecated use the latest runtime instead */ public static readonly V2_6_1 = KafkaVersion.of('2.6.1'); /** * Kafka version 2.6.2 + * + * @deprecated use the latest runtime instead */ public static readonly V2_6_2 = KafkaVersion.of('2.6.2'); /** * Kafka version 2.6.3 + * + * @deprecated use the latest runtime instead */ public static readonly V2_6_3 = KafkaVersion.of('2.6.3'); /** * Kafka version 2.7.0 + * + * @deprecated use the latest runtime instead */ public static readonly V2_7_0 = KafkaVersion.of('2.7.0'); /** * Kafka version 2.7.1 + * + * @deprecated use the latest runtime instead */ public static readonly V2_7_1 = KafkaVersion.of('2.7.1'); /** * Kafka version 2.7.2 + * + * @deprecated use the latest runtime instead */ public static readonly V2_7_2 = KafkaVersion.of('2.7.2'); /** * Kafka version 2.8.0 + * + * @deprecated use the latest runtime instead */ public static readonly V2_8_0 = KafkaVersion.of('2.8.0'); /** * Kafka version 2.8.1 + * + * @deprecated use the latest runtime instead */ public static readonly V2_8_1 = KafkaVersion.of('2.8.1'); /** * AWS MSK Kafka version 2.8.2.tiered + * + * @deprecated use the latest runtime instead */ public static readonly V2_8_2_TIERED = KafkaVersion.of('2.8.2.tiered', { tieredStorage: true }); /** * Kafka version 3.1.1 + * + * @deprecated use the latest runtime instead */ public static readonly V3_1_1 = KafkaVersion.of('3.1.1'); /** * Kafka version 3.2.0 + * + * @deprecated use the latest runtime instead */ public static readonly V3_2_0 = KafkaVersion.of('3.2.0'); /** * Kafka version 3.3.1 + * + * @deprecated use the latest runtime instead */ public static readonly V3_3_1 = KafkaVersion.of('3.3.1'); /** * Kafka version 3.3.2 + * + * @deprecated use the latest runtime instead */ public static readonly V3_3_2 = KafkaVersion.of('3.3.2'); @@ -174,7 +202,7 @@ export class KafkaVersion { * * @see https://docs.aws.amazon.com/msk/latest/developerguide/metadata-management.html#msk-get-connection-string */ - public static readonly V3_8_X = KafkaVersion.of('3.8.x', { tieredStorage: true }); + public static readonly V3_8_X = KafkaVersion.of('3.8.x', { tieredStorage: true }); /** * Kafka version 3.8.x with KRaft (Apache Kafka Raft) metadata mode support 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 3a1821b106f8c..1882b9cea2cfe 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": "38.0.1", + "version": "39.0.0", "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 f3ba089e1b206..e2bdb3f3c09a3 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": "38.0.1", + "version": "39.0.0", "files": { - "4d392c9811fa038d040e6ec26693ad7b938112bf1c1d090019f4fdb0b32d4c49": { + "3bcdf360a48a080b50477a549d18f1bbe06f7e854d3e0ac6a0b4d7f0e1d5a930": { "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": "4d392c9811fa038d040e6ec26693ad7b938112bf1c1d090019f4fdb0b32d4c49.json", + "objectKey": "3bcdf360a48a080b50477a549d18f1bbe06f7e854d3e0ac6a0b4d7f0e1d5a930.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 c8e18283d3ec4..2fa80ffe39eee 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 @@ -18,7 +18,14 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "AvailabilityZone": "test-region-1a", + "AvailabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": true, "Tags": [ @@ -119,7 +126,14 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "AvailabilityZone": "test-region-1b", + "AvailabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": true, "Tags": [ @@ -220,7 +234,14 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "AvailabilityZone": "test-region-1a", + "AvailabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, "Tags": [ @@ -282,7 +303,14 @@ "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "AvailabilityZone": "test-region-1b", + "AvailabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, "CidrBlock": "10.0.192.0/18", "MapPublicIpOnLaunch": false, "Tags": [ @@ -1673,6 +1701,144 @@ }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" + }, + "ClusterVersion38xSecurityGroupF2DB8982": { + "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" + } + } + }, + "ClusterVersion38x7A89E888": { + "Type": "AWS::MSK::Cluster", + "Properties": { + "BrokerNodeGroupInfo": { + "ClientSubnets": [ + { + "Ref": "VpcPrivateSubnet1Subnet536B997A" + }, + { + "Ref": "VpcPrivateSubnet2Subnet3788AAA1" + } + ], + "InstanceType": "kafka.m5.large", + "SecurityGroups": [ + { + "Fn::GetAtt": [ + "ClusterVersion38xSecurityGroupF2DB8982", + "GroupId" + ] + } + ], + "StorageInfo": { + "EBSStorageInfo": { + "VolumeSize": 1000 + } + } + }, + "ClusterName": "cluster-v3-8-x", + "EncryptionInfo": { + "EncryptionInTransit": { + "ClientBroker": "TLS", + "InCluster": true + } + }, + "KafkaVersion": "3.8.x", + "LoggingInfo": { + "BrokerLogs": { + "CloudWatchLogs": { + "Enabled": false + }, + "Firehose": { + "Enabled": false + }, + "S3": { + "Enabled": false + } + } + }, + "NumberOfBrokerNodes": 2 + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "ClusterVersion38xkraftSecurityGroup0FA5642D": { + "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" + } + } + }, + "ClusterVersion38xkraft98AC7604": { + "Type": "AWS::MSK::Cluster", + "Properties": { + "BrokerNodeGroupInfo": { + "ClientSubnets": [ + { + "Ref": "VpcPrivateSubnet1Subnet536B997A" + }, + { + "Ref": "VpcPrivateSubnet2Subnet3788AAA1" + } + ], + "InstanceType": "kafka.m5.large", + "SecurityGroups": [ + { + "Fn::GetAtt": [ + "ClusterVersion38xkraftSecurityGroup0FA5642D", + "GroupId" + ] + } + ], + "StorageInfo": { + "EBSStorageInfo": { + "VolumeSize": 1000 + } + } + }, + "ClusterName": "cluster-v3-8-x-kraft", + "EncryptionInfo": { + "EncryptionInTransit": { + "ClientBroker": "TLS", + "InCluster": true + } + }, + "KafkaVersion": "3.8.x.kraft", + "LoggingInfo": { + "BrokerLogs": { + "CloudWatchLogs": { + "Enabled": false + }, + "Firehose": { + "Enabled": false + }, + "S3": { + "Enabled": false + } + } + }, + "NumberOfBrokerNodes": 2 + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" } }, "Parameters": { 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 c6e612584e352..91e1a8b9901d5 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":"38.0.1"} \ No newline at end of file +{"version":"39.0.0"} \ 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 9d4d8f3628891..f9b4c30dbfac6 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,5 @@ { - "enableLookups": true, - "version": "38.0.1", + "version": "39.0.0", "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 bcdf2a7ee818a..d291d931593dc 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": "38.0.1", + "version": "39.0.0", "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}/4d392c9811fa038d040e6ec26693ad7b938112bf1c1d090019f4fdb0b32d4c49.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/3bcdf360a48a080b50477a549d18f1bbe06f7e854d3e0ac6a0b4d7f0e1d5a930.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -34,12 +34,57 @@ "KafkaVersionTestStack.assets" ], "metadata": { + "/KafkaVersionTestStack/Vpc": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "maxAzs": "*", + "restrictDefaultSecurityGroup": false + } + } + ], "/KafkaVersionTestStack/Vpc/Resource": [ { "type": "aws:cdk:logicalId", "data": "Vpc8378EB38" } ], + "/KafkaVersionTestStack/Vpc/PublicSubnet1": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:method", + "data": {} + }, + { + "type": "aws:cdk:analytics:method", + "data": { + "addNatGateway": [ + "*" + ] + } + } + ], "/KafkaVersionTestStack/Vpc/PublicSubnet1/Subnet": [ { "type": "aws:cdk:logicalId", @@ -76,6 +121,42 @@ "data": "VpcPublicSubnet1NATGateway4D7517AA" } ], + "/KafkaVersionTestStack/Vpc/PublicSubnet2": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:method", + "data": {} + }, + { + "type": "aws:cdk:analytics:method", + "data": { + "addNatGateway": [ + "*" + ] + } + } + ], "/KafkaVersionTestStack/Vpc/PublicSubnet2/Subnet": [ { "type": "aws:cdk:logicalId", @@ -112,6 +193,34 @@ "data": "VpcPublicSubnet2NATGateway9182C01D" } ], + "/KafkaVersionTestStack/Vpc/PrivateSubnet1": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:method", + "data": {} + } + ], "/KafkaVersionTestStack/Vpc/PrivateSubnet1/Subnet": [ { "type": "aws:cdk:logicalId", @@ -136,6 +245,34 @@ "data": "VpcPrivateSubnet1DefaultRouteBE02A9ED" } ], + "/KafkaVersionTestStack/Vpc/PrivateSubnet2": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:construct", + "data": { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + } + }, + { + "type": "aws:cdk:analytics:method", + "data": {} + } + ], "/KafkaVersionTestStack/Vpc/PrivateSubnet2/Subnet": [ { "type": "aws:cdk:logicalId", @@ -172,6 +309,21 @@ "data": "VpcVPCGWBF912B6E" } ], + "/KafkaVersionTestStack/ClusterVersion2-6-0": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion2-6-0/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion2-6-0/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -184,6 +336,21 @@ "data": "ClusterVersion260FB26AA6A" } ], + "/KafkaVersionTestStack/ClusterVersion2-6-1": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion2-6-1/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion2-6-1/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -196,6 +363,21 @@ "data": "ClusterVersion261D43B824F" } ], + "/KafkaVersionTestStack/ClusterVersion2-6-2": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion2-6-2/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion2-6-2/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -208,6 +390,21 @@ "data": "ClusterVersion2622894BF48" } ], + "/KafkaVersionTestStack/ClusterVersion2-6-3": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion2-6-3/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion2-6-3/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -220,6 +417,21 @@ "data": "ClusterVersion263DC77D2ED" } ], + "/KafkaVersionTestStack/ClusterVersion2-7-0": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion2-7-0/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion2-7-0/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -232,6 +444,21 @@ "data": "ClusterVersion27010CB5FBF" } ], + "/KafkaVersionTestStack/ClusterVersion2-7-1": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion2-7-1/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion2-7-1/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -244,6 +471,21 @@ "data": "ClusterVersion271AA1304B7" } ], + "/KafkaVersionTestStack/ClusterVersion2-7-2": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion2-7-2/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion2-7-2/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -256,6 +498,21 @@ "data": "ClusterVersion272BEE37AA9" } ], + "/KafkaVersionTestStack/ClusterVersion2-8-0": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion2-8-0/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion2-8-0/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -268,6 +525,21 @@ "data": "ClusterVersion280A292F8BA" } ], + "/KafkaVersionTestStack/ClusterVersion2-8-1": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion2-8-1/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion2-8-1/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -280,6 +552,21 @@ "data": "ClusterVersion281E912F3B9" } ], + "/KafkaVersionTestStack/ClusterVersion2-8-2-tiered": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion2-8-2-tiered/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion2-8-2-tiered/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -292,6 +579,21 @@ "data": "ClusterVersion282tiered485A19BE" } ], + "/KafkaVersionTestStack/ClusterVersion3-1-1": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion3-1-1/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion3-1-1/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -304,6 +606,21 @@ "data": "ClusterVersion311273A2535" } ], + "/KafkaVersionTestStack/ClusterVersion3-2-0": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion3-2-0/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion3-2-0/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -316,6 +633,21 @@ "data": "ClusterVersion3202AA95F49" } ], + "/KafkaVersionTestStack/ClusterVersion3-3-1": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion3-3-1/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion3-3-1/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -328,6 +660,21 @@ "data": "ClusterVersion331008AC95F" } ], + "/KafkaVersionTestStack/ClusterVersion3-3-2": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion3-3-2/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion3-3-2/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -340,6 +687,21 @@ "data": "ClusterVersion332A4AB4092" } ], + "/KafkaVersionTestStack/ClusterVersion3-4-0": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion3-4-0/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion3-4-0/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -352,6 +714,21 @@ "data": "ClusterVersion340D193688A" } ], + "/KafkaVersionTestStack/ClusterVersion3-5-1": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion3-5-1/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion3-5-1/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -364,6 +741,21 @@ "data": "ClusterVersion3515E181C3E" } ], + "/KafkaVersionTestStack/ClusterVersion3-6-0": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion3-6-0/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion3-6-0/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -376,6 +768,21 @@ "data": "ClusterVersion360A3C740F1" } ], + "/KafkaVersionTestStack/ClusterVersion3-7-x": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion3-7-x/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion3-7-x/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -388,6 +795,21 @@ "data": "ClusterVersion37xF25198B0" } ], + "/KafkaVersionTestStack/ClusterVersion3-7-x-kraft": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/KafkaVersionTestStack/ClusterVersion3-7-x-kraft/SecurityGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } + } + ], "/KafkaVersionTestStack/ClusterVersion3-7-x-kraft/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", @@ -400,88 +822,70 @@ "data": "ClusterVersion37xkraft42DC71DF" } ], - "/KafkaVersionTestStack/BootstrapVersion": [ + "/KafkaVersionTestStack/ClusterVersion3-8-x": [ { - "type": "aws:cdk:logicalId", - "data": "BootstrapVersion" + "type": "aws:cdk:analytics:construct", + "data": "*" } ], - "/KafkaVersionTestStack/CheckBootstrapVersion": [ + "/KafkaVersionTestStack/ClusterVersion3-8-x/SecurityGroup": [ { - "type": "aws:cdk:logicalId", - "data": "CheckBootstrapVersion" + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } } ], - "ClusterVersion221SecurityGroup7D79A634": [ + "/KafkaVersionTestStack/ClusterVersion3-8-x/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", - "data": "ClusterVersion221SecurityGroup7D79A634", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] + "data": "ClusterVersion38xSecurityGroupF2DB8982" } ], - "ClusterVersion2216E958BDB": [ + "/KafkaVersionTestStack/ClusterVersion3-8-x/Resource": [ { "type": "aws:cdk:logicalId", - "data": "ClusterVersion2216E958BDB", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] + "data": "ClusterVersion38x7A89E888" } ], - "ClusterVersion231SecurityGroup9CC906F6": [ + "/KafkaVersionTestStack/ClusterVersion3-8-x-kraft": [ { - "type": "aws:cdk:logicalId", - "data": "ClusterVersion231SecurityGroup9CC906F6", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] + "type": "aws:cdk:analytics:construct", + "data": "*" } ], - "ClusterVersion231ECA150B0": [ + "/KafkaVersionTestStack/ClusterVersion3-8-x-kraft/SecurityGroup": [ { - "type": "aws:cdk:logicalId", - "data": "ClusterVersion231ECA150B0", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] + "type": "aws:cdk:analytics:construct", + "data": { + "description": "*", + "vpc": "*" + } } ], - "ClusterVersion2411SecurityGroup1C6605A8": [ + "/KafkaVersionTestStack/ClusterVersion3-8-x-kraft/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", - "data": "ClusterVersion2411SecurityGroup1C6605A8", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] + "data": "ClusterVersion38xkraftSecurityGroup0FA5642D" } ], - "ClusterVersion2411B601F534": [ + "/KafkaVersionTestStack/ClusterVersion3-8-x-kraft/Resource": [ { "type": "aws:cdk:logicalId", - "data": "ClusterVersion2411B601F534", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] + "data": "ClusterVersion38xkraft98AC7604" } ], - "ClusterVersion251SecurityGroup54D25418": [ + "/KafkaVersionTestStack/BootstrapVersion": [ { "type": "aws:cdk:logicalId", - "data": "ClusterVersion251SecurityGroup54D25418", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] + "data": "BootstrapVersion" } ], - "ClusterVersion251B0616FDE": [ + "/KafkaVersionTestStack/CheckBootstrapVersion": [ { "type": "aws:cdk:logicalId", - "data": "ClusterVersion251B0616FDE", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] + "data": "CheckBootstrapVersion" } ] }, 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 75ba28ae32a77..4d5ae88e49cef 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 @@ -45,7 +45,14 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "availabilityZone": "test-region-1a", + "availabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, "cidrBlock": "10.0.0.0/18", "mapPublicIpOnLaunch": true, "tags": [ @@ -77,7 +84,8 @@ "path": "KafkaVersionTestStack/Vpc/PublicSubnet1/Acl", "constructInfo": { "fqn": "aws-cdk-lib.Resource", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [] } }, "RouteTable": { @@ -192,7 +200,31 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + {}, + { + "addNatGateway": [ + "*" + ] + } + ] } }, "PublicSubnet2": { @@ -205,7 +237,14 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "availabilityZone": "test-region-1b", + "availabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, "cidrBlock": "10.0.64.0/18", "mapPublicIpOnLaunch": true, "tags": [ @@ -237,7 +276,8 @@ "path": "KafkaVersionTestStack/Vpc/PublicSubnet2/Acl", "constructInfo": { "fqn": "aws-cdk-lib.Resource", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [] } }, "RouteTable": { @@ -352,7 +392,31 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": true, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + {}, + { + "addNatGateway": [ + "*" + ] + } + ] } }, "PrivateSubnet1": { @@ -365,7 +429,14 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "availabilityZone": "test-region-1a", + "availabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, "cidrBlock": "10.0.128.0/18", "mapPublicIpOnLaunch": false, "tags": [ @@ -397,7 +468,8 @@ "path": "KafkaVersionTestStack/Vpc/PrivateSubnet1/Acl", "constructInfo": { "fqn": "aws-cdk-lib.Resource", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [] } }, "RouteTable": { @@ -464,7 +536,26 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + {} + ] } }, "PrivateSubnet2": { @@ -477,7 +568,14 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "availabilityZone": "test-region-1b", + "availabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, "cidrBlock": "10.0.192.0/18", "mapPublicIpOnLaunch": false, "tags": [ @@ -509,7 +607,8 @@ "path": "KafkaVersionTestStack/Vpc/PrivateSubnet2/Acl", "constructInfo": { "fqn": "aws-cdk-lib.Resource", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [] } }, "RouteTable": { @@ -576,7 +675,26 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + { + "availabilityZone": "*", + "vpcId": "*", + "cidrBlock": "*", + "mapPublicIpOnLaunch": false, + "ipv6CidrBlock": "*", + "assignIpv6AddressOnCreation": "*" + }, + {} + ] } }, "IGW": { @@ -620,7 +738,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.Vpc", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "maxAzs": "*", + "restrictDefaultSecurityGroup": false + } + ] } }, "ClusterVersion2-6-0": { @@ -658,7 +782,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -722,8 +852,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion2-6-1": { @@ -761,7 +894,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -825,8 +964,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion2-6-2": { @@ -864,7 +1006,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -928,8 +1076,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion2-6-3": { @@ -967,7 +1118,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -1031,8 +1188,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion2-7-0": { @@ -1070,7 +1230,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -1134,8 +1300,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion2-7-1": { @@ -1173,7 +1342,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -1237,8 +1412,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion2-7-2": { @@ -1276,7 +1454,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -1340,8 +1524,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion2-8-0": { @@ -1379,7 +1566,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -1443,8 +1636,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion2-8-1": { @@ -1482,7 +1678,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -1546,8 +1748,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion2-8-2-tiered": { @@ -1585,7 +1790,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -1649,8 +1860,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion3-1-1": { @@ -1688,7 +1902,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -1752,8 +1972,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion3-2-0": { @@ -1791,7 +2014,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -1855,8 +2084,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion3-3-1": { @@ -1894,7 +2126,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -1958,8 +2196,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion3-3-2": { @@ -1997,7 +2238,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -2061,8 +2308,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion3-4-0": { @@ -2100,7 +2350,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -2164,8 +2420,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion3-5-1": { @@ -2203,7 +2462,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -2267,8 +2532,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion3-6-0": { @@ -2306,7 +2574,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -2370,8 +2644,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion3-7-x": { @@ -2409,7 +2686,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -2473,8 +2756,11 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "ClusterVersion3-7-x-kraft": { @@ -2512,7 +2798,13 @@ }, "constructInfo": { "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" + "version": "0.0.0", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] } }, "Resource": { @@ -2576,8 +2868,235 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-msk-alpha.Cluster", - "version": "0.0.0" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] + } + }, + "ClusterVersion3-8-x": { + "id": "ClusterVersion3-8-x", + "path": "KafkaVersionTestStack/ClusterVersion3-8-x", + "children": { + "SecurityGroup": { + "id": "SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion3-8-x/SecurityGroup", + "children": { + "Resource": { + "id": "Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-8-x/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", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] + } + }, + "Resource": { + "id": "Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-8-x/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": [ + "ClusterVersion38xSecurityGroupF2DB8982", + "GroupId" + ] + } + ], + "storageInfo": { + "ebsStorageInfo": { + "volumeSize": 1000 + } + } + }, + "clusterName": "cluster-v3-8-x", + "encryptionInfo": { + "encryptionInTransit": { + "clientBroker": "TLS", + "inCluster": true + } + }, + "kafkaVersion": "3.8.x", + "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-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] + } + }, + "ClusterVersion3-8-x-kraft": { + "id": "ClusterVersion3-8-x-kraft", + "path": "KafkaVersionTestStack/ClusterVersion3-8-x-kraft", + "children": { + "SecurityGroup": { + "id": "SecurityGroup", + "path": "KafkaVersionTestStack/ClusterVersion3-8-x-kraft/SecurityGroup", + "children": { + "Resource": { + "id": "Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-8-x-kraft/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", + "metadata": [ + { + "description": "*", + "vpc": "*" + } + ] + } + }, + "Resource": { + "id": "Resource", + "path": "KafkaVersionTestStack/ClusterVersion3-8-x-kraft/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": [ + "ClusterVersion38xkraftSecurityGroup0FA5642D", + "GroupId" + ] + } + ], + "storageInfo": { + "ebsStorageInfo": { + "volumeSize": 1000 + } + } + }, + "clusterName": "cluster-v3-8-x-kraft", + "encryptionInfo": { + "encryptionInTransit": { + "clientBroker": "TLS", + "inCluster": true + } + }, + "kafkaVersion": "3.8.x.kraft", + "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-lib.Resource", + "version": "0.0.0", + "metadata": [ + "*" + ] } }, "BootstrapVersion": { 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 6cdf2e1f05904..3374f991678d3 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 @@ -48,9 +48,7 @@ class KafkaVersionTest extends Stack { const app = new App(); new IntegTest(app, 'KafkaVersionIntegTest', { - enableLookups: true, testCases: [ new KafkaVersionTest(app, 'KafkaVersionTestStack'), ], }); -app.synth();