@aws-cdk/aws-msk-alpha 2.40.0-alpha.0 → 2.42.0-alpha.0

package/.jsii

@@ -8,7 +8,7 @@
     "url": "https://aws.amazon.com"
   },
   "dependencies": {
-    "aws-cdk-lib": "^2.40.0",
+    "aws-cdk-lib": "^2.42.0",
     "constructs": "^10.0.0"
   },
   "dependencyClosure": {
@@ -730,6 +730,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_controltower": {
+          "targets": {
+            "dotnet": {
+              "namespace": "Amazon.CDK.AWS.ControlTower"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.controltower"
+            },
+            "python": {
+              "module": "aws_cdk.aws_controltower"
+            }
+          }
+        },
         "aws-cdk-lib.aws_cur": {
           "targets": {
             "dotnet": {
@@ -1848,6 +1861,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_m2": {
+          "targets": {
+            "dotnet": {
+              "namespace": "Amazon.CDK.AWS.M2"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.m2"
+            },
+            "python": {
+              "module": "aws_cdk.aws_m2"
+            }
+          }
+        },
         "aws-cdk-lib.aws_macie": {
           "targets": {
             "dotnet": {
@@ -2706,6 +2732,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_supportapp": {
+          "targets": {
+            "dotnet": {
+              "namespace": "Amazon.CDK.AWS.SupportApp"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.supportapp"
+            },
+            "python": {
+              "module": "aws_cdk.aws_supportapp"
+            }
+          }
+        },
         "aws-cdk-lib.aws_synthetics": {
           "targets": {
             "dotnet": {
@@ -3024,7 +3063,7 @@
     "stability": "experimental"
   },
   "homepage": "https://github.com/aws/aws-cdk",
-  "jsiiVersion": "1.66.0 (build 3c9512b)",
+  "jsiiVersion": "1.67.0 (build 2c027f5)",
   "keywords": [
     "aws",
     "cdk",
@@ -3046,7 +3085,7 @@
   },
   "name": "@aws-cdk/aws-msk-alpha",
   "readme": {
-    "markdown": "# Amazon Managed Streaming for Apache Kafka Construct Library\n<!--BEGIN STABILITY BANNER-->\n\n---\n\n![cdk-constructs: Experimental](https://img.shields.io/badge/cdk--constructs-experimental-important.svg?style=for-the-badge)\n\n> The APIs of higher level constructs in this module are experimental and under active development.\n> They are subject to non-backward compatible changes or removal in any future version. These are\n> not subject to the [Semantic Versioning](https://semver.org/) model and breaking changes will be\n> announced in the release notes. This means that while you may use them, you may need to update\n> your source code when upgrading to a newer version of this package.\n\n---\n\n<!--END STABILITY BANNER-->\n\n[Amazon MSK](https://aws.amazon.com/msk/) is a fully managed service that makes it easy for you to build and run applications that use Apache Kafka to process streaming data.\n\nThe following example creates an MSK Cluster.\n\n```ts\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'Cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n});\n```\n\n## Allowing Connections\n\nTo control who can access the Cluster, use the `.connections` attribute. For a list of ports used by MSK, refer to the [MSK documentation](https://docs.aws.amazon.com/msk/latest/developerguide/client-access.html#port-info).\n\n```ts\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'Cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n});\n\ncluster.connections.allowFrom(\n  ec2.Peer.ipv4('1.2.3.4/8'),\n  ec2.Port.tcp(2181),\n);\ncluster.connections.allowFrom(\n  ec2.Peer.ipv4('1.2.3.4/8'),\n  ec2.Port.tcp(9094),\n);\n```\n\n## Cluster Endpoints\n\nYou can use the following attributes to get a list of the Kafka broker or ZooKeeper node endpoints\n\n```ts\ndeclare const cluster: msk.Cluster;\nnew CfnOutput(this, 'BootstrapBrokers', { value: cluster.bootstrapBrokers });\nnew CfnOutput(this, 'BootstrapBrokersTls', { value: cluster.bootstrapBrokersTls });\nnew CfnOutput(this, 'BootstrapBrokersSaslScram', { value: cluster.bootstrapBrokersSaslScram });\nnew CfnOutput(this, 'BootstrapBrokerStringSaslIam', { value: cluster.bootstrapBrokersSaslIam });\nnew CfnOutput(this, 'ZookeeperConnection', { value: cluster.zookeeperConnectionString });\nnew CfnOutput(this, 'ZookeeperConnectionTls', { value: cluster.zookeeperConnectionStringTls });\n```\n\n## Importing an existing Cluster\n\nTo import an existing MSK cluster into your CDK app use the `.fromClusterArn()` method.\n\n```ts\nconst cluster = msk.Cluster.fromClusterArn(this, 'Cluster',\n  'arn:aws:kafka:us-west-2:1234567890:cluster/a-cluster/11111111-1111-1111-1111-111111111111-1',\n);\n```\n\n## Client Authentication\n\n[MSK supports](https://docs.aws.amazon.com/msk/latest/developerguide/kafka_apis_iam.html) the following authentication mechanisms.\n\n> Only one authentication method can be enabled.\n\n### TLS\n\nTo enable client authentication with TLS set the `certificateAuthorityArns` property to reference your ACM Private CA. [More info on Private CAs.](https://docs.aws.amazon.com/msk/latest/developerguide/msk-authentication.html)\n\n```ts\nimport * as acmpca from 'aws-cdk-lib/aws-acmpca';\n\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'Cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  encryptionInTransit: {\n    clientBroker: msk.ClientBrokerEncryption.TLS,\n  },\n  clientAuthentication: msk.ClientAuthentication.tls({\n    certificateAuthorities: [\n      acmpca.CertificateAuthority.fromCertificateAuthorityArn(\n        this,\n        'CertificateAuthority',\n        'arn:aws:acm-pca:us-west-2:1234567890:certificate-authority/11111111-1111-1111-1111-111111111111',\n      ),\n    ],\n  }),\n});\n```\n\n### SASL/SCRAM\n\nEnable client authentication with [SASL/SCRAM](https://docs.aws.amazon.com/msk/latest/developerguide/msk-password.html):\n\n```ts\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  encryptionInTransit: {\n    clientBroker: msk.ClientBrokerEncryption.TLS,\n  },\n  clientAuthentication: msk.ClientAuthentication.sasl({\n    scram: true,\n  }),\n});\n```\n\n### SASL/IAM\n\nEnable client authentication with [IAM](https://docs.aws.amazon.com/msk/latest/developerguide/iam-access-control.html):\n\n```ts\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  encryptionInTransit: {\n    clientBroker: msk.ClientBrokerEncryption.TLS,\n  },\n  clientAuthentication: msk.ClientAuthentication.sasl({\n    iam: true,\n  }),\n});\n```\n\n## Logging\n\nYou can deliver Apache Kafka broker logs to one or more of the following destination types:\nAmazon CloudWatch Logs, Amazon S3, Amazon Kinesis Data Firehose.\n\nTo configure logs to be sent to an S3 bucket, provide a bucket in the `logging` config.\n\n```ts\ndeclare const vpc: ec2.Vpc;\ndeclare const bucket: s3.IBucket;\nconst cluster = new msk.Cluster(this, 'cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  logging: {\n    s3: {\n      bucket,\n    },\n  },\n});\n```\n\nWhen the S3 destination is configured, AWS will automatically create an S3 bucket policy\nthat allows the service to write logs to the bucket. This makes it impossible to later update\nthat bucket policy. To have CDK create the bucket policy so that future updates can be made,\nthe `@aws-cdk/aws-s3:createDefaultLoggingPolicy` [feature flag](https://docs.aws.amazon.com/cdk/v2/guide/featureflags.html) can be used. This can be set\nin the `cdk.json` file.\n\n```json\n{\n  \"context\": {\n    \"@aws-cdk/aws-s3:createDefaultLoggingPolicy\": true\n  }\n}\n```\n\n"
+    "markdown": "# Amazon Managed Streaming for Apache Kafka Construct Library\n<!--BEGIN STABILITY BANNER-->\n\n---\n\n![cdk-constructs: Experimental](https://img.shields.io/badge/cdk--constructs-experimental-important.svg?style=for-the-badge)\n\n> The APIs of higher level constructs in this module are experimental and under active development.\n> They are subject to non-backward compatible changes or removal in any future version. These are\n> not subject to the [Semantic Versioning](https://semver.org/) model and breaking changes will be\n> announced in the release notes. This means that while you may use them, you may need to update\n> your source code when upgrading to a newer version of this package.\n\n---\n\n<!--END STABILITY BANNER-->\n\n[Amazon MSK](https://aws.amazon.com/msk/) is a fully managed service that makes it easy for you to build and run applications that use Apache Kafka to process streaming data.\n\nThe following example creates an MSK Cluster.\n\n```ts\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'Cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n});\n```\n\n## Allowing Connections\n\nTo control who can access the Cluster, use the `.connections` attribute. For a list of ports used by MSK, refer to the [MSK documentation](https://docs.aws.amazon.com/msk/latest/developerguide/client-access.html#port-info).\n\n```ts\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'Cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n});\n\ncluster.connections.allowFrom(\n  ec2.Peer.ipv4('1.2.3.4/8'),\n  ec2.Port.tcp(2181),\n);\ncluster.connections.allowFrom(\n  ec2.Peer.ipv4('1.2.3.4/8'),\n  ec2.Port.tcp(9094),\n);\n```\n\n## Cluster Endpoints\n\nYou can use the following attributes to get a list of the Kafka broker or ZooKeeper node endpoints\n\n```ts\ndeclare const cluster: msk.Cluster;\nnew CfnOutput(this, 'BootstrapBrokers', { value: cluster.bootstrapBrokers });\nnew CfnOutput(this, 'BootstrapBrokersTls', { value: cluster.bootstrapBrokersTls });\nnew CfnOutput(this, 'BootstrapBrokersSaslScram', { value: cluster.bootstrapBrokersSaslScram });\nnew CfnOutput(this, 'BootstrapBrokerStringSaslIam', { value: cluster.bootstrapBrokersSaslIam });\nnew CfnOutput(this, 'ZookeeperConnection', { value: cluster.zookeeperConnectionString });\nnew CfnOutput(this, 'ZookeeperConnectionTls', { value: cluster.zookeeperConnectionStringTls });\n```\n\n## Importing an existing Cluster\n\nTo import an existing MSK cluster into your CDK app use the `.fromClusterArn()` method.\n\n```ts\nconst cluster = msk.Cluster.fromClusterArn(this, 'Cluster',\n  'arn:aws:kafka:us-west-2:1234567890:cluster/a-cluster/11111111-1111-1111-1111-111111111111-1',\n);\n```\n\n## Client Authentication\n\n[MSK supports](https://docs.aws.amazon.com/msk/latest/developerguide/kafka_apis_iam.html) the following authentication mechanisms.\n\n### TLS\n\nTo enable client authentication with TLS set the `certificateAuthorityArns` property to reference your ACM Private CA. [More info on Private CAs.](https://docs.aws.amazon.com/msk/latest/developerguide/msk-authentication.html)\n\n```ts\nimport * as acmpca from 'aws-cdk-lib/aws-acmpca';\n\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'Cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  encryptionInTransit: {\n    clientBroker: msk.ClientBrokerEncryption.TLS,\n  },\n  clientAuthentication: msk.ClientAuthentication.tls({\n    certificateAuthorities: [\n      acmpca.CertificateAuthority.fromCertificateAuthorityArn(\n        this,\n        'CertificateAuthority',\n        'arn:aws:acm-pca:us-west-2:1234567890:certificate-authority/11111111-1111-1111-1111-111111111111',\n      ),\n    ],\n  }),\n});\n```\n\n### SASL/SCRAM\n\nEnable client authentication with [SASL/SCRAM](https://docs.aws.amazon.com/msk/latest/developerguide/msk-password.html):\n\n```ts\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  encryptionInTransit: {\n    clientBroker: msk.ClientBrokerEncryption.TLS,\n  },\n  clientAuthentication: msk.ClientAuthentication.sasl({\n    scram: true,\n  }),\n});\n```\n\n### SASL/IAM\n\nEnable client authentication with [IAM](https://docs.aws.amazon.com/msk/latest/developerguide/iam-access-control.html):\n\n```ts\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  encryptionInTransit: {\n    clientBroker: msk.ClientBrokerEncryption.TLS,\n  },\n  clientAuthentication: msk.ClientAuthentication.sasl({\n    iam: true,\n  }),\n});\n```\n\n\n### SASL/IAM + TLS\n\nEnable client authentication with [IAM](https://docs.aws.amazon.com/msk/latest/developerguide/iam-access-control.html)\nas well as enable client authentication with TLS by setting the `certificateAuthorityArns` property to reference your ACM Private CA. [More info on Private CAs.](https://docs.aws.amazon.com/msk/latest/developerguide/msk-authentication.html)\n\n```ts\nimport * as acmpca from 'aws-cdk-lib/aws-acmpca';\n\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'Cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  encryptionInTransit: {\n    clientBroker: msk.ClientBrokerEncryption.TLS,\n  },\n  clientAuthentication: msk.ClientAuthentication.saslTls({\n    iam: true,\n    certificateAuthorities: [\n      acmpca.CertificateAuthority.fromCertificateAuthorityArn(\n        this,\n        'CertificateAuthority',\n        'arn:aws:acm-pca:us-west-2:1234567890:certificate-authority/11111111-1111-1111-1111-111111111111',\n      ),\n    ],\n  }),\n});\n```\n\n\n## Logging\n\nYou can deliver Apache Kafka broker logs to one or more of the following destination types:\nAmazon CloudWatch Logs, Amazon S3, Amazon Kinesis Data Firehose.\n\nTo configure logs to be sent to an S3 bucket, provide a bucket in the `logging` config.\n\n```ts\ndeclare const vpc: ec2.Vpc;\ndeclare const bucket: s3.IBucket;\nconst cluster = new msk.Cluster(this, 'cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  logging: {\n    s3: {\n      bucket,\n    },\n  },\n});\n```\n\nWhen the S3 destination is configured, AWS will automatically create an S3 bucket policy\nthat allows the service to write logs to the bucket. This makes it impossible to later update\nthat bucket policy. To have CDK create the bucket policy so that future updates can be made,\nthe `@aws-cdk/aws-s3:createDefaultLoggingPolicy` [feature flag](https://docs.aws.amazon.com/cdk/v2/guide/featureflags.html) can be used. This can be set\nin the `cdk.json` file.\n\n```json\n{\n  \"context\": {\n    \"@aws-cdk/aws-s3:createDefaultLoggingPolicy\": true\n  }\n}\n```\n\n"
   },
   "repository": {
     "directory": "packages/individual-packages/aws-msk",
@@ -3165,7 +3204,7 @@
       "docs": {
         "stability": "experimental",
         "summary": "Configuration properties for client authentication.",
-        "example": "declare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  encryptionInTransit: {\n    clientBroker: msk.ClientBrokerEncryption.TLS,\n  },\n  clientAuthentication: msk.ClientAuthentication.sasl({\n    scram: true,\n  }),\n});",
+        "example": "import * as acmpca from 'aws-cdk-lib/aws-acmpca';\n\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'Cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  encryptionInTransit: {\n    clientBroker: msk.ClientBrokerEncryption.TLS,\n  },\n  clientAuthentication: msk.ClientAuthentication.tls({\n    certificateAuthorities: [\n      acmpca.CertificateAuthority.fromCertificateAuthorityArn(\n        this,\n        'CertificateAuthority',\n        'arn:aws:acm-pca:us-west-2:1234567890:certificate-authority/11111111-1111-1111-1111-111111111111',\n      ),\n    ],\n  }),\n});",
         "custom": {
           "exampleMetadata": "infused"
         }
@@ -3174,7 +3213,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/cluster.ts",
-        "line": 349
+        "line": 354
       },
       "methods": [
         {
@@ -3184,7 +3223,7 @@
           },
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 353
+            "line": 358
           },
           "name": "sasl",
           "parameters": [
@@ -3202,6 +3241,31 @@
           },
           "static": true
         },
+        {
+          "docs": {
+            "stability": "experimental",
+            "summary": "SASL + TLS authentication."
+          },
+          "locationInModule": {
+            "filename": "lib/cluster.ts",
+            "line": 372
+          },
+          "name": "saslTls",
+          "parameters": [
+            {
+              "name": "saslTlsProps",
+              "type": {
+                "fqn": "@aws-cdk/aws-msk-alpha.SaslTlsAuthProps"
+              }
+            }
+          ],
+          "returns": {
+            "type": {
+              "fqn": "@aws-cdk/aws-msk-alpha.ClientAuthentication"
+            }
+          },
+          "static": true
+        },
         {
           "docs": {
             "stability": "experimental",
@@ -3209,7 +3273,7 @@
           },
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 360
+            "line": 365
           },
           "name": "tls",
           "parameters": [
@@ -3238,7 +3302,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 369
+            "line": 381
           },
           "name": "saslProps",
           "optional": true,
@@ -3254,7 +3318,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 370
+            "line": 382
           },
           "name": "tlsProps",
           "optional": true,
@@ -3270,7 +3334,7 @@
       "docs": {
         "stability": "experimental",
         "summary": "Indicates the encryption setting for data in transit between clients and brokers.",
-        "example": "declare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  encryptionInTransit: {\n    clientBroker: msk.ClientBrokerEncryption.TLS,\n  },\n  clientAuthentication: msk.ClientAuthentication.sasl({\n    scram: true,\n  }),\n});",
+        "example": "import * as acmpca from 'aws-cdk-lib/aws-acmpca';\n\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'Cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  encryptionInTransit: {\n    clientBroker: msk.ClientBrokerEncryption.TLS,\n  },\n  clientAuthentication: msk.ClientAuthentication.tls({\n    certificateAuthorities: [\n      acmpca.CertificateAuthority.fromCertificateAuthorityArn(\n        this,\n        'CertificateAuthority',\n        'arn:aws:acm-pca:us-west-2:1234567890:certificate-authority/11111111-1111-1111-1111-111111111111',\n      ),\n    ],\n  }),\n});",
         "custom": {
           "exampleMetadata": "infused"
         }
@@ -3326,7 +3390,7 @@
         },
         "locationInModule": {
           "filename": "lib/cluster.ts",
-          "line": 403
+          "line": 415
         },
         "parameters": [
           {
@@ -3355,7 +3419,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/cluster.ts",
-        "line": 379
+        "line": 391
       },
       "methods": [
         {
@@ -3365,7 +3429,7 @@
           },
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 383
+            "line": 395
           },
           "name": "fromClusterArn",
           "parameters": [
@@ -3403,7 +3467,7 @@
           },
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 812
+            "line": 834
           },
           "name": "addUser",
           "parameters": [
@@ -3433,7 +3497,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 767
+            "line": 789
           },
           "name": "bootstrapBrokers",
           "type": {
@@ -3450,7 +3514,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 800
+            "line": 822
           },
           "name": "bootstrapBrokersSaslIam",
           "type": {
@@ -3467,7 +3531,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 789
+            "line": 811
           },
           "name": "bootstrapBrokersSaslScram",
           "type": {
@@ -3484,7 +3548,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 778
+            "line": 800
           },
           "name": "bootstrapBrokersTls",
           "type": {
@@ -3499,7 +3563,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 396
+            "line": 408
           },
           "name": "clusterArn",
           "overrides": "@aws-cdk/aws-msk-alpha.ICluster",
@@ -3515,7 +3579,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 397
+            "line": 409
           },
           "name": "clusterName",
           "overrides": "@aws-cdk/aws-msk-alpha.ICluster",
@@ -3549,7 +3613,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 718
+            "line": 740
           },
           "name": "zookeeperConnectionString",
           "type": {
@@ -3566,7 +3630,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 729
+            "line": 751
           },
           "name": "zookeeperConnectionStringTls",
           "type": {
@@ -3581,7 +3645,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/cluster.ts",
-            "line": 399
+            "line": 411
           },
           "name": "saslScramAuthenticationKey",
           "optional": true,
@@ -4036,7 +4100,7 @@
         "see": "https://docs.aws.amazon.com/msk/latest/developerguide/msk-encryption.html#msk-encryption-in-transit",
         "stability": "experimental",
         "summary": "The settings for encrypting data in transit.",
-        "example": "declare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  encryptionInTransit: {\n    clientBroker: msk.ClientBrokerEncryption.TLS,\n  },\n  clientAuthentication: msk.ClientAuthentication.sasl({\n    scram: true,\n  }),\n});",
+        "example": "import * as acmpca from 'aws-cdk-lib/aws-acmpca';\n\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'Cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  encryptionInTransit: {\n    clientBroker: msk.ClientBrokerEncryption.TLS,\n  },\n  clientAuthentication: msk.ClientAuthentication.tls({\n    certificateAuthorities: [\n      acmpca.CertificateAuthority.fromCertificateAuthorityArn(\n        this,\n        'CertificateAuthority',\n        'arn:aws:acm-pca:us-west-2:1234567890:certificate-authority/11111111-1111-1111-1111-111111111111',\n      ),\n    ],\n  }),\n});",
         "custom": {
           "exampleMetadata": "infused"
         }
@@ -4661,6 +4725,30 @@
       ],
       "symbolId": "lib/cluster:SaslAuthProps"
     },
+    "@aws-cdk/aws-msk-alpha.SaslTlsAuthProps": {
+      "assembly": "@aws-cdk/aws-msk-alpha",
+      "datatype": true,
+      "docs": {
+        "stability": "experimental",
+        "summary": "SASL + TLS authentication properties.",
+        "example": "import * as acmpca from 'aws-cdk-lib/aws-acmpca';\n\ndeclare const vpc: ec2.Vpc;\nconst cluster = new msk.Cluster(this, 'Cluster', {\n  clusterName: 'myCluster',\n  kafkaVersion: msk.KafkaVersion.V2_8_1,\n  vpc,\n  encryptionInTransit: {\n    clientBroker: msk.ClientBrokerEncryption.TLS,\n  },\n  clientAuthentication: msk.ClientAuthentication.saslTls({\n    iam: true,\n    certificateAuthorities: [\n      acmpca.CertificateAuthority.fromCertificateAuthorityArn(\n        this,\n        'CertificateAuthority',\n        'arn:aws:acm-pca:us-west-2:1234567890:certificate-authority/11111111-1111-1111-1111-111111111111',\n      ),\n    ],\n  }),\n});",
+        "custom": {
+          "exampleMetadata": "infused"
+        }
+      },
+      "fqn": "@aws-cdk/aws-msk-alpha.SaslTlsAuthProps",
+      "interfaces": [
+        "@aws-cdk/aws-msk-alpha.SaslAuthProps",
+        "@aws-cdk/aws-msk-alpha.TlsAuthProps"
+      ],
+      "kind": "interface",
+      "locationInModule": {
+        "filename": "lib/cluster.ts",
+        "line": 349
+      },
+      "name": "SaslTlsAuthProps",
+      "symbolId": "lib/cluster:SaslTlsAuthProps"
+    },
     "@aws-cdk/aws-msk-alpha.TlsAuthProps": {
       "assembly": "@aws-cdk/aws-msk-alpha",
       "datatype": true,
@@ -4707,6 +4795,6 @@
       "symbolId": "lib/cluster:TlsAuthProps"
     }
   },
-  "version": "2.40.0-alpha.0",
+  "version": "2.42.0-alpha.0",
   "fingerprint": "**********"
 }

package/.warnings.jsii.js

@@ -86,6 +86,18 @@ function _aws_cdk_aws_msk_alpha_TlsAuthProps(p) {
         visitedObjects.delete(p);
     }
 }
+function _aws_cdk_aws_msk_alpha_SaslTlsAuthProps(p) {
+    if (p == null)
+        return;
+    visitedObjects.add(p);
+    try {
+        if (!visitedObjects.has(p.certificateAuthorities))
+            require("aws-cdk-lib/.warnings.jsii.js").aws_cdk_lib_aws_acmpca_ICertificateAuthority(p.certificateAuthorities);
+    }
+    finally {
+        visitedObjects.delete(p);
+    }
+}
 function _aws_cdk_aws_msk_alpha_ClientAuthentication(p) {
 }
 function _aws_cdk_aws_msk_alpha_Cluster(p) {
@@ -128,4 +140,4 @@ class DeprecationError extends Error {
         });
     }
 }
-module.exports = { print, getPropertyDescriptor, DeprecationError, _aws_cdk_aws_msk_alpha_ICluster, _aws_cdk_aws_msk_alpha_ClusterProps, _aws_cdk_aws_msk_alpha_EbsStorageInfo, _aws_cdk_aws_msk_alpha_ClusterConfigurationInfo, _aws_cdk_aws_msk_alpha_ClusterMonitoringLevel, _aws_cdk_aws_msk_alpha_MonitoringConfiguration, _aws_cdk_aws_msk_alpha_BrokerLogging, _aws_cdk_aws_msk_alpha_S3LoggingConfiguration, _aws_cdk_aws_msk_alpha_ClientBrokerEncryption, _aws_cdk_aws_msk_alpha_EncryptionInTransitConfig, _aws_cdk_aws_msk_alpha_SaslAuthProps, _aws_cdk_aws_msk_alpha_TlsAuthProps, _aws_cdk_aws_msk_alpha_ClientAuthentication, _aws_cdk_aws_msk_alpha_Cluster, _aws_cdk_aws_msk_alpha_KafkaVersion };
+module.exports = { print, getPropertyDescriptor, DeprecationError, _aws_cdk_aws_msk_alpha_ICluster, _aws_cdk_aws_msk_alpha_ClusterProps, _aws_cdk_aws_msk_alpha_EbsStorageInfo, _aws_cdk_aws_msk_alpha_ClusterConfigurationInfo, _aws_cdk_aws_msk_alpha_ClusterMonitoringLevel, _aws_cdk_aws_msk_alpha_MonitoringConfiguration, _aws_cdk_aws_msk_alpha_BrokerLogging, _aws_cdk_aws_msk_alpha_S3LoggingConfiguration, _aws_cdk_aws_msk_alpha_ClientBrokerEncryption, _aws_cdk_aws_msk_alpha_EncryptionInTransitConfig, _aws_cdk_aws_msk_alpha_SaslAuthProps, _aws_cdk_aws_msk_alpha_TlsAuthProps, _aws_cdk_aws_msk_alpha_SaslTlsAuthProps, _aws_cdk_aws_msk_alpha_ClientAuthentication, _aws_cdk_aws_msk_alpha_Cluster, _aws_cdk_aws_msk_alpha_KafkaVersion };

package/README.md

@@ -78,8 +78,6 @@ const cluster = msk.Cluster.fromClusterArn(this, 'Cluster',
 
 [MSK supports](https://docs.aws.amazon.com/msk/latest/developerguide/kafka_apis_iam.html) the following authentication mechanisms.
 
-> Only one authentication method can be enabled.
-
 ### TLS
 
 To enable client authentication with TLS set the `certificateAuthorityArns` property to reference your ACM Private CA. [More info on Private CAs.](https://docs.aws.amazon.com/msk/latest/developerguide/msk-authentication.html)
@@ -145,6 +143,37 @@ const cluster = new msk.Cluster(this, 'cluster', {
 });
 ```
 
+
+### SASL/IAM + TLS
+
+Enable client authentication with [IAM](https://docs.aws.amazon.com/msk/latest/developerguide/iam-access-control.html) 
+as well as enable client authentication with TLS by setting the `certificateAuthorityArns` property to reference your ACM Private CA. [More info on Private CAs.](https://docs.aws.amazon.com/msk/latest/developerguide/msk-authentication.html)
+
+```ts
+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,
+  vpc,
+  encryptionInTransit: {
+    clientBroker: msk.ClientBrokerEncryption.TLS,
+  },
+  clientAuthentication: msk.ClientAuthentication.saslTls({
+    iam: true,
+    certificateAuthorities: [
+      acmpca.CertificateAuthority.fromCertificateAuthorityArn(
+        this,
+        'CertificateAuthority',
+        'arn:aws:acm-pca:us-west-2:1234567890:certificate-authority/11111111-1111-1111-1111-111111111111',
+      ),
+    ],
+  }),
+});
+```
+
+
 ## Logging
 
 You can deliver Apache Kafka broker logs to one or more of the following destination types:

package/lib/cluster-version.js

@@ -24,7 +24,7 @@ class KafkaVersion {
 }
 exports.KafkaVersion = KafkaVersion;
 _a = JSII_RTTI_SYMBOL_1;
-KafkaVersion[_a] = { fqn: "@aws-cdk/aws-msk-alpha.KafkaVersion", version: "2.40.0-alpha.0" };
+KafkaVersion[_a] = { fqn: "@aws-cdk/aws-msk-alpha.KafkaVersion", version: "2.42.0-alpha.0" };
 /**
  * Kafka version 1.1.1
  */

package/lib/cluster.d.ts

@@ -315,6 +315,11 @@ export interface TlsAuthProps {
      */
     readonly certificateAuthorities?: acmpca.ICertificateAuthority[];
 }
+/**
+ * SASL + TLS authentication properties
+ */
+export interface SaslTlsAuthProps extends SaslAuthProps, TlsAuthProps {
+}
 /**
  * Configuration properties for client authentication.
  */
@@ -329,6 +334,10 @@ export declare class ClientAuthentication {
      * TLS authentication
      */
     static tls(props: TlsAuthProps): ClientAuthentication;
+    /**
+     * SASL + TLS authentication
+     */
+    static saslTls(saslTlsProps: SaslTlsAuthProps): ClientAuthentication;
     /**
      * @param saslProps - properties for SASL authentication
      * @param tlsProps - properties for TLS authentication