Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix in resource aws_msk_cluster enhanced_monitoring PER_TOPIC_PER_PARTITION #16914

Merged
merged 2 commits into from
Jan 5, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 9 additions & 17 deletions aws/resource_aws_msk_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,15 +190,11 @@ func resourceAwsMskCluster() *schema.Resource {
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"client_broker": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Default: kafka.ClientBrokerTls,
ValidateFunc: validation.StringInSlice([]string{
kafka.ClientBrokerPlaintext,
kafka.ClientBrokerTlsPlaintext,
kafka.ClientBrokerTls,
}, false),
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Default: kafka.ClientBrokerTls,
ValidateFunc: validation.StringInSlice(kafka.ClientBroker_Values(), false),
},
"in_cluster": {
Type: schema.TypeBool,
Expand All @@ -213,14 +209,10 @@ func resourceAwsMskCluster() *schema.Resource {
},
},
"enhanced_monitoring": {
Type: schema.TypeString,
Optional: true,
Default: kafka.EnhancedMonitoringDefault,
ValidateFunc: validation.StringInSlice([]string{
kafka.EnhancedMonitoringDefault,
kafka.EnhancedMonitoringPerBroker,
kafka.EnhancedMonitoringPerTopicPerBroker,
}, true),
Type: schema.TypeString,
Optional: true,
Default: kafka.EnhancedMonitoringDefault,
ValidateFunc: validation.StringInSlice(kafka.EnhancedMonitoring_Values(), true),
},
"kafka_version": {
Type: schema.TypeString,
Expand Down
1 change: 1 addition & 0 deletions tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require (
github.com/client9/misspell v0.3.4
github.com/golangci/golangci-lint v1.33.0
github.com/katbyte/terrafmt v0.2.1-0.20200913185704-5ff4421407b4
github.com/pavius/impi v0.0.3 // indirect
github.com/terraform-linters/tflint v0.20.3
)

Expand Down
2 changes: 2 additions & 0 deletions tools/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,8 @@ github.com/onsi/gomega v1.10.2 h1:aY/nuoWlKJud2J6U0E3NWsjlg+0GtwXxgEqthRdzlcs=
github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pavius/impi v0.0.3 h1:DND6MzU+BLABhOZXbELR3FU8b+zDgcq4dOCNLhiTYuI=
github.com/pavius/impi v0.0.3/go.mod h1:x/hU0bfdWIhuOT1SKwiJg++yvkk6EuOtJk8WtDZqgr8=
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
Expand Down