From 344d838a8294bc46c09113e7735d84ed89419136 Mon Sep 17 00:00:00 2001 From: Matthew Swain Date: Wed, 26 Feb 2020 10:15:22 +0000 Subject: [PATCH 1/2] Correct default value for client-broker encryption setting. --- website/docs/r/msk_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/msk_cluster.html.markdown b/website/docs/r/msk_cluster.html.markdown index ab104cd76f42..933fc4e844ee 100644 --- a/website/docs/r/msk_cluster.html.markdown +++ b/website/docs/r/msk_cluster.html.markdown @@ -142,7 +142,7 @@ The following arguments are supported: #### encryption_info encryption_in_transit Argument Reference -* `client_broker` - (Optional) Encryption setting for data in transit between clients and brokers. Valid values: `TLS`, `TLS_PLAINTEXT`, and `PLAINTEXT`. Default value: `TLS_PLAINTEXT`. +* `client_broker` - (Optional) Encryption setting for data in transit between clients and brokers. Valid values: `TLS`, `TLS_PLAINTEXT`, and `PLAINTEXT`. Default value: `TLS`. * `in_cluster` - (Optional) Whether data communication among broker nodes is encrypted. Default value: `true`. #### open_monitoring Argument Reference From 43c4c47f440cf2d9cf20bd67e49d9b98053f406c Mon Sep 17 00:00:00 2001 From: Matthew Swain Date: Tue, 3 Mar 2020 21:10:35 +0000 Subject: [PATCH 2/2] Updated MSK docs to better explain client_broker default. While TLS_PLAINTEXT is the default, if the parent block is omitted the AWS default of TLS takes effect. The documentation did not make this clear. --- website/docs/r/msk_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/msk_cluster.html.markdown b/website/docs/r/msk_cluster.html.markdown index 933fc4e844ee..6c089e19317c 100644 --- a/website/docs/r/msk_cluster.html.markdown +++ b/website/docs/r/msk_cluster.html.markdown @@ -142,7 +142,7 @@ The following arguments are supported: #### encryption_info encryption_in_transit Argument Reference -* `client_broker` - (Optional) Encryption setting for data in transit between clients and brokers. Valid values: `TLS`, `TLS_PLAINTEXT`, and `PLAINTEXT`. Default value: `TLS`. +* `client_broker` - (Optional) Encryption setting for data in transit between clients and brokers. Valid values: `TLS`, `TLS_PLAINTEXT`, and `PLAINTEXT`. Default value is `TLS_PLAINTEXT` when `encryption_in_transit` block defined, but `TLS` when `encryption_in_transit` block omitted. * `in_cluster` - (Optional) Whether data communication among broker nodes is encrypted. Default value: `true`. #### open_monitoring Argument Reference