From 329d5a7b9cb10b9399ec2dd189573427977d9364 Mon Sep 17 00:00:00 2001
From: Conor Mongey <conor@mongey.net>
Date: Thu, 14 Mar 2024 11:50:52 +0000
Subject: [PATCH] fix

---
 README.md         |  1 -
 docs/index.md     | 11 ++++++-----
 kafka/provider.go |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d155c4dd..3474e151 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,6 @@ provider "kafka" {
 ```
 
 Due to Redpanda not implementing some Metadata APIs, we need to force the Kafka version to use when creating the provider.
->>>>>>> d9b1386 (Add support for Kafka version configuration)
 
 | Property                | Description                                                                                                           | Default    |
 | -------------------     | --------------------------------------------------------------------------------------------------------------------- | ---------- |
diff --git a/docs/index.md b/docs/index.md
index 5afee892..f26e22c2 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -28,14 +28,15 @@ description: |-
 - `client_key` (String) The private key that the certificate was issued for.
 - `client_key_file` (String, Deprecated) Path to a file containing the private key that the certificate was issued for.
 - `client_key_passphrase` (String) The passphrase for the private key that the certificate was issued for.
-- `kafka_version` (String) The version of Kafka protocol to use in `$MAJOR.$MINOR.$PATCH` format. Some features may not be available on older versions.
+- `kafka_version` (String) The version of Kafka protocol to use in `$MAJOR.$MINOR.$PATCH` format. Some features may not be available on older versions. Default is 2.7.0.
+- `sasl_aws_creds_debug` (Boolean) Set this to true to turn AWS credentials debug.
+- `sasl_aws_profile` (String) AWS profile name to use
+- `sasl_aws_region` (String) AWS region where MSK is deployed.
+- `sasl_aws_role_arn` (String) Arn of an AWS IAM role to assume
 - `sasl_mechanism` (String) SASL mechanism, can be plain, scram-sha512, scram-sha256, aws-iam
 - `sasl_password` (String) Password for SASL authentication.
+- `sasl_token_url` (String) The url to retrieve oauth2 tokens from, when using sasl mechanism oauthbearer
 - `sasl_username` (String) Username for SASL authentication.
-- `sasl_aws_region` (String) AWS region where MSK is deployed. Required when sasl_mechanism is aws-iam.
-- `sasl_aws_role_arn` (String) IAM role ARN to Assume.
-- `sasl_aws_profile` (String) AWS profile name to use.
-- `sasl_aws_creds_debug` (Boolean) Set this to true to turn AWS credentials debug.
 - `skip_tls_verify` (Boolean) Set this to true only if the target Kafka server is an insecure development instance.
 - `timeout` (Number) Timeout in seconds
 - `tls_enabled` (Boolean) Enable communication with the Kafka Cluster over TLS.
diff --git a/kafka/provider.go b/kafka/provider.go
index 67d5d1e7..58fcabba 100644
--- a/kafka/provider.go
+++ b/kafka/provider.go
@@ -66,6 +66,7 @@ func Provider() *schema.Provider {
 				Optional:    true,
 				DefaultFunc: schema.EnvDefaultFunc("KAFKA_SASL_IAM_AWS_REGION", nil),
 				Description: "AWS region where MSK is deployed.",
+			},
 			"kafka_version": {
 				Type:        schema.TypeString,
 				Optional:    true,