Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 3082728

Browse files
authored
Fix tflint failed code (#31)
1 parent 4c77ccf commit 3082728

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

modules/msk-cluster/cluster.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ resource "aws_msk_cluster" "this" {
5555
az_distribution = "DEFAULT"
5656
client_subnets = var.broker_subnets
5757
security_groups = concat(
58-
module.security_group.*.id,
58+
module.security_group[*].id,
5959
var.broker_additional_security_groups
6060
)
6161

modules/msk-cluster/outputs.tf

+24-24
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ output "kafka_config" {
3030

3131
output "broker_security_group_id" {
3232
description = "The id of security group that were created for the MSK cluster."
33-
value = try(module.security_group.*.id[0], null)
33+
value = try(module.security_group[*].id[0], null)
3434
}
3535

3636
output "broker_nodes" {
@@ -51,18 +51,18 @@ output "broker" {
5151
EOF
5252
value = {
5353
size = aws_msk_cluster.this.number_of_broker_nodes
54-
instance_type = aws_msk_cluster.this.broker_node_group_info.0.instance_type
54+
instance_type = aws_msk_cluster.this.broker_node_group_info[0].instance_type
5555

56-
subnets = aws_msk_cluster.this.broker_node_group_info.0.client_subnets
56+
subnets = aws_msk_cluster.this.broker_node_group_info[0].client_subnets
5757
public_access_enabled = var.broker_public_access_enabled
58-
security_groups = aws_msk_cluster.this.broker_node_group_info.0.security_groups
59-
default_security_group_id = try(module.security_group.*.id[0], null)
58+
security_groups = aws_msk_cluster.this.broker_node_group_info[0].security_groups
59+
default_security_group_id = try(module.security_group[*].id[0], null)
6060

6161
volume = {
62-
size = aws_msk_cluster.this.broker_node_group_info.0.storage_info.0.ebs_storage_info.0.volume_size
62+
size = aws_msk_cluster.this.broker_node_group_info[0].storage_info[0].ebs_storage_info[0].volume_size
6363
provisioned_throughput = {
64-
enabled = try(aws_msk_cluster.this.broker_node_group_info.0.storage_info.0.ebs_storage_info.0.provisioned_throughput.0.enabled, false)
65-
throughput = try(aws_msk_cluster.this.broker_node_group_info.0.storage_info.0.ebs_storage_info.0.provisioned_throughput.0.volume_throughput, null)
64+
enabled = try(aws_msk_cluster.this.broker_node_group_info[0].storage_info[0].ebs_storage_info[0].provisioned_throughput[0].enabled, false)
65+
throughput = try(aws_msk_cluster.this.broker_node_group_info[0].storage_info[0].ebs_storage_info[0].provisioned_throughput[0].volume_throughput, null)
6666
}
6767
}
6868
}
@@ -72,21 +72,21 @@ output "auth" {
7272
description = "A configuration for authentication of the Kafka cluster."
7373
value = {
7474
unauthenticated_access = {
75-
enabled = aws_msk_cluster.this.client_authentication.0.unauthenticated
75+
enabled = aws_msk_cluster.this.client_authentication[0].unauthenticated
7676
}
7777
sasl = {
7878
iam = {
79-
enabled = aws_msk_cluster.this.client_authentication.0.sasl.0.iam
79+
enabled = aws_msk_cluster.this.client_authentication[0].sasl[0].iam
8080
}
8181
scram = {
82-
enabled = aws_msk_cluster.this.client_authentication.0.sasl.0.scram
82+
enabled = aws_msk_cluster.this.client_authentication[0].sasl[0].scram
8383
kms_key = var.auth_sasl_scram_kms_key
8484
users = var.auth_sasl_scram_users
8585
}
8686
}
8787
tls = {
8888
enabled = var.auth_tls_enabled
89-
acm_ca_arns = try(aws_msk_cluster.this.client_authentication.0.tls.0.certificate_authority_arns, [])
89+
acm_ca_arns = try(aws_msk_cluster.this.client_authentication[0].tls[0].certificate_authority_arns, [])
9090
}
9191
}
9292
}
@@ -99,11 +99,11 @@ output "encryption" {
9999
EOF
100100
value = {
101101
at_rest = {
102-
kms_key = aws_msk_cluster.this.encryption_info.0.encryption_at_rest_kms_key_arn
102+
kms_key = aws_msk_cluster.this.encryption_info[0].encryption_at_rest_kms_key_arn
103103
}
104104
in_transit = {
105-
in_cluster_enabled = aws_msk_cluster.this.encryption_info.0.encryption_in_transit.0.in_cluster
106-
client_mode = aws_msk_cluster.this.encryption_info.0.encryption_in_transit.0.client_broker
105+
in_cluster_enabled = aws_msk_cluster.this.encryption_info[0].encryption_in_transit[0].in_cluster
106+
client_mode = aws_msk_cluster.this.encryption_info[0].encryption_in_transit[0].client_broker
107107
}
108108
}
109109
}
@@ -117,17 +117,17 @@ output "logging" {
117117
EOF
118118
value = {
119119
cloudwatch = {
120-
enabled = aws_msk_cluster.this.logging_info.0.broker_logs.0.cloudwatch_logs.0.enabled
121-
log_group = aws_msk_cluster.this.logging_info.0.broker_logs.0.cloudwatch_logs.0.log_group
120+
enabled = aws_msk_cluster.this.logging_info[0].broker_logs[0].cloudwatch_logs[0].enabled
121+
log_group = aws_msk_cluster.this.logging_info[0].broker_logs[0].cloudwatch_logs[0].log_group
122122
}
123123
firehose = {
124-
enabled = aws_msk_cluster.this.logging_info.0.broker_logs.0.firehose.0.enabled
125-
delivery_stream = aws_msk_cluster.this.logging_info.0.broker_logs.0.firehose.0.delivery_stream
124+
enabled = aws_msk_cluster.this.logging_info[0].broker_logs[0].firehose[0].enabled
125+
delivery_stream = aws_msk_cluster.this.logging_info[0].broker_logs[0].firehose[0].delivery_stream
126126
}
127127
s3 = {
128-
enabled = aws_msk_cluster.this.logging_info.0.broker_logs.0.s3.0.enabled
129-
bucket = aws_msk_cluster.this.logging_info.0.broker_logs.0.s3.0.bucket
130-
prefix = aws_msk_cluster.this.logging_info.0.broker_logs.0.s3.0.prefix
128+
enabled = aws_msk_cluster.this.logging_info[0].broker_logs[0].s3[0].enabled
129+
bucket = aws_msk_cluster.this.logging_info[0].broker_logs[0].s3[0].bucket
130+
prefix = aws_msk_cluster.this.logging_info[0].broker_logs[0].s3[0].prefix
131131
}
132132
}
133133
}
@@ -143,8 +143,8 @@ output "monitoring" {
143143
level = aws_msk_cluster.this.enhanced_monitoring
144144
}
145145
prometheus = {
146-
jmx_exporter_enabled = aws_msk_cluster.this.open_monitoring.0.prometheus.0.jmx_exporter.0.enabled_in_broker
147-
node_exporter_enabled = aws_msk_cluster.this.open_monitoring.0.prometheus.0.node_exporter.0.enabled_in_broker
146+
jmx_exporter_enabled = aws_msk_cluster.this.open_monitoring[0].prometheus[0].jmx_exporter[0].enabled_in_broker
147+
node_exporter_enabled = aws_msk_cluster.this.open_monitoring[0].prometheus[0].node_exporter[0].enabled_in_broker
148148
}
149149
}
150150
}

0 commit comments

Comments
 (0)