Skip to content

Commit

Permalink
fix linting errors
Browse files Browse the repository at this point in the history
  • Loading branch information
anGie44 committed Nov 18, 2020
1 parent 5c92608 commit 3380eaa
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions aws/resource_aws_msk_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@ resource "aws_kms_key" "test" {
}
resource "aws_secretsmanager_secret" "test" {
name = "AmazonMSK_%[1]q"
name = "AmazonMSK_%[1]s"
kms_key_id = aws_kms_key.test.key_id
}
Expand All @@ -844,7 +844,7 @@ resource "aws_msk_scram_secret_association" "test" {
cluster_arn = aws_msk_cluster.test.arn
secret_arn_list = [aws_secretsmanager_secret.test.arn]
depends_on = [aws_secretsmanager_secret_version.test]
depends_on = [aws_secretsmanager_secret_version.test]
}
resource "aws_msk_cluster" "test" {
Expand Down
6 changes: 3 additions & 3 deletions aws/resource_aws_msk_scram_secret_association_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,12 +197,12 @@ resource "aws_msk_cluster" "test" {
resource "aws_kms_key" "test" {
count = %[2]d
description = "%[1]s-${count.index+1}"
description = "%[1]s-${count.index + 1}"
}
resource "aws_secretsmanager_secret" "test" {
count = %[2]d
name = "AmazonMSK_%[1]s-${count.index+1}"
name = "AmazonMSK_%[1]s-${count.index + 1}"
kms_key_id = aws_kms_key.test[count.index].id
}
Expand Down Expand Up @@ -241,7 +241,7 @@ resource "aws_msk_scram_secret_association" "test" {
cluster_arn = aws_msk_cluster.test.arn
secret_arn_list = aws_secretsmanager_secret.test[*].arn
depends_on = [aws_secretsmanager_secret_version.test]
depends_on = [aws_secretsmanager_secret_version.test]
}
`)
}
10 changes: 5 additions & 5 deletions website/docs/r/msk_cluster.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,17 @@ The following arguments are supported:

### client_authentication Argument Reference

* `tls` - (Optional) Configuration block for specifying TLS client authentication. See below.
* `sasl` - (Optional) Configuration block for specifying Sasl client authentication. See below.

#### client_authentication tls Argument Reference

* `certificate_authority_arns` - (Optional) List of ACM Certificate Authority Amazon Resource Names (ARNs).
* `tls` - (Optional) Configuration block for specifying TLS client authentication. See below.

#### client_authentication sasl Argument Reference

* `scram` - (Optional) Enables scram client authentication via AWS Secrets Manager. Defaults to `false`.

#### client_authentication tls Argument Reference

* `certificate_authority_arns` - (Optional) List of ACM Certificate Authority Amazon Resource Names (ARNs).

### configuration_info Argument Reference

* `arn` - (Required) Amazon Resource Name (ARN) of the MSK Configuration to use in the cluster.
Expand Down
10 changes: 5 additions & 5 deletions website/docs/r/msk_scram_secret_association.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ resource "aws_msk_scram_secret_association" "example" {
}
resource "aws_msk_cluster" "example" {
cluster_name = "example"
kafka_version = "2.4.1"
cluster_name = "example"
kafka_version = "2.4.1"
# ... other configuration...
client_authentication {
sasl {
Expand All @@ -30,7 +30,7 @@ resource "aws_msk_cluster" "example" {
}
resource "aws_secretsmanager_secret" "example" {
name = "AmazonMSK_example"
name = "AmazonMSK_example"
}
resource "aws_secretsmanager_secret_policy" "msk" {
Expand Down Expand Up @@ -66,10 +66,10 @@ In addition to all arguments above, the following attributes are exported:
* `id` - Amazon Resource Name (ARN) of the MSK cluster.


## Import
## Import

MSK Scram Secret Associations can be imported using the `id` e.g.

```
$ terraform import aws_msk_scram_secret_association.example arn:aws:kafka:us-west-2:123456789012:cluster/example/279c0212-d057-4dba-9aa9-1c4e5a25bfc7-3
```
```

0 comments on commit 3380eaa

Please sign in to comment.