Skip to content

Commit ca9447e

Browse files
kcantrelkcantrel
committed
Made some changes to satisfy tflint.
1 parent 5d357f6 commit ca9447e

File tree

7 files changed

+45
-21
lines changed

7 files changed

+45
-21
lines changed

‎.github/linters/.tflint.hcl‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
tflint {
2+
required_version = ">= 0.50"
3+
}
4+
5+
config {
6+
rule "terraform_typed_variables" {
7+
enabled = false
8+
}
9+
rule "terraform_module_version" {
10+
enabled = false
11+
}
12+
rule "terraform_required_providers" {
13+
enabled = false
14+
}
15+
rule "terraform_unused_declarations" {
16+
enabled = false
17+
}
18+
}

‎EKS/FSxN-as-PVC-for-EKS/terraform/eks-cluster.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ resource "aws_iam_policy" "trident_policy" {
8181
{
8282
"Action": "secretsmanager:GetSecretValue",
8383
"Effect": "Allow",
84-
"Resource": "${aws_secretsmanager_secret_version.fsx_secret_password.arn}"
84+
"Resource": aws_secretsmanager_secret_version.fsx_secret_password.arn
8585
}
8686
],
8787
})

‎Terraform/deploy-fsx-ontap-fileshare-access/modules/vpn/main.tf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,18 @@ resource "aws_acm_certificate" "server_vpn_cert" {
66
certificate_body = var.server_cert
77
private_key = var.server_private_key
88
certificate_chain = var.ca_crt
9+
lifecycle {
10+
create_before_destroy = true
11+
}
912
}
1013

1114
resource "aws_acm_certificate" "client_vpn_cert" {
1215
certificate_body = var.client_cert
1316
private_key = var.client_private_key
1417
certificate_chain = var.ca_crt
18+
lifecycle {
19+
create_before_destroy = true
20+
}
1521
}
1622

1723
resource "aws_ec2_client_vpn_endpoint" "my_client_vpn" {

‎Terraform/deploy-fsx-ontap-fileshare-access/networking.tf‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ resource "aws_eip" "nat_eip" {
2828
# NAT
2929
resource "aws_nat_gateway" "nat" {
3030
allocation_id = aws_eip.nat_eip.id
31-
subnet_id = element(aws_subnet.public_subnet.*.id, 0)
31+
subnet_id = element(aws_subnet.public_subnet[*].id, 0)
3232

3333
tags = {
3434
Name = "nat"
35-
Environment = "${var.environment}"
35+
Environment = var.environment
3636
}
3737
}
3838

@@ -46,7 +46,7 @@ resource "aws_subnet" "public_subnet" {
4646

4747
tags = {
4848
Name = "${var.creator_tag}-${var.environment}-${element(var.availability_zones, count.index)}-public-subnet"
49-
Environment = "${var.environment}"
49+
Environment = var.environment
5050
}
5151
}
5252

@@ -61,7 +61,7 @@ resource "aws_subnet" "private_subnet" {
6161

6262
tags = {
6363
Name = "${var.creator_tag}-${var.environment}-${element(var.availability_zones, count.index)}-private-subnet"
64-
Environment = "${var.environment}"
64+
Environment = var.environment
6565
}
6666
}
6767

@@ -72,7 +72,7 @@ resource "aws_route_table" "private" {
7272

7373
tags = {
7474
Name = "${var.creator_tag}-${var.environment}-private-route-table"
75-
Environment = "${var.environment}"
75+
Environment = var.environment
7676
}
7777
}
7878

@@ -82,7 +82,7 @@ resource "aws_route_table" "public" {
8282

8383
tags = {
8484
Name = "${var.creator_tag}-${var.environment}-public-route-table"
85-
Environment = "${var.environment}"
85+
Environment = var.environment
8686
}
8787
}
8888

@@ -103,13 +103,13 @@ resource "aws_route" "private_nat_gateway" {
103103
# Route table associations for both Public & Private Subnets
104104
resource "aws_route_table_association" "public" {
105105
count = length(var.public_subnets_cidr)
106-
subnet_id = element(aws_subnet.public_subnet.*.id, count.index)
106+
subnet_id = element(aws_subnet.public_subnet[*].id, count.index)
107107
route_table_id = aws_route_table.public.id
108108
}
109109

110110
resource "aws_route_table_association" "private" {
111111
count = length(var.private_subnets_cidr)
112-
subnet_id = element(aws_subnet.private_subnet.*.id, count.index)
112+
subnet_id = element(aws_subnet.private_subnet[*].id, count.index)
113113
route_table_id = aws_route_table.private.id
114114
}
115115

‎Terraform/deploy-fsx-ontap-sqlserver/networking.tf‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ resource "aws_eip" "nat_eip" {
2828
# NAT
2929
resource "aws_nat_gateway" "nat" {
3030
allocation_id = aws_eip.nat_eip.id
31-
subnet_id = element(aws_subnet.public_subnet.*.id, 0)
31+
subnet_id = element(aws_subnet.public_subnet[*].id, 0)
3232

3333
tags = {
3434
Name = "nat"
35-
Environment = "${var.environment}"
35+
Environment = var.environment
3636
}
3737
}
3838

@@ -46,7 +46,7 @@ resource "aws_subnet" "public_subnet" {
4646

4747
tags = {
4848
Name = "${var.creator_tag}-${var.environment}-${element(var.availability_zones, count.index)}-public-subnet"
49-
Environment = "${var.environment}"
49+
Environment = var.environment
5050
}
5151
}
5252

@@ -61,7 +61,7 @@ resource "aws_subnet" "private_subnet" {
6161

6262
tags = {
6363
Name = "${var.creator_tag}-${var.environment}-${element(var.availability_zones, count.index)}-private-subnet"
64-
Environment = "${var.environment}"
64+
Environment = var.environment
6565
}
6666
}
6767

@@ -72,7 +72,7 @@ resource "aws_route_table" "private" {
7272

7373
tags = {
7474
Name = "${var.creator_tag}-${var.environment}-private-route-table"
75-
Environment = "${var.environment}"
75+
Environment = var.environment
7676
}
7777
}
7878

@@ -82,7 +82,7 @@ resource "aws_route_table" "public" {
8282

8383
tags = {
8484
Name = "${var.creator_tag}-${var.environment}-public-route-table"
85-
Environment = "${var.environment}"
85+
Environment = var.environment
8686
}
8787
}
8888

@@ -103,13 +103,13 @@ resource "aws_route" "private_nat_gateway" {
103103
# Route table associations for both Public & Private Subnets
104104
resource "aws_route_table_association" "public" {
105105
count = length(var.public_subnets_cidr)
106-
subnet_id = element(aws_subnet.public_subnet.*.id, count.index)
106+
subnet_id = element(aws_subnet.public_subnet[*].id, count.index)
107107
route_table_id = aws_route_table.public.id
108108
}
109109

110110
resource "aws_route_table_association" "private" {
111111
count = length(var.private_subnets_cidr)
112-
subnet_id = element(aws_subnet.private_subnet.*.id, count.index)
112+
subnet_id = element(aws_subnet.private_subnet[*].id, count.index)
113113
route_table_id = aws_route_table.private.id
114114
}
115115

@@ -137,7 +137,7 @@ resource "aws_security_group" "default" {
137137
}
138138

139139
tags = {
140-
Environment = "${var.environment}"
140+
Environment = var.environment
141141
}
142142
}
143143

‎Terraform/deploy-fsx-ontap/module/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ resource "aws_fsx_ontap_file_system" "terraform-fsxn" {
1919

2020
// OPTIONAL PARAMETERS
2121
storage_capacity = var.capacity_size_gb
22-
security_group_ids = var.create_sg ? [element(aws_security_group.fsx_sg.*.id, 0)] : [var.security_group_id]
22+
security_group_ids = var.create_sg ? [element(aws_security_group.fsx_sg[*].id, 0)] : [var.security_group_id]
2323
deployment_type = var.deployment_type
2424
throughput_capacity = var.throughput_in_MBps
2525
weekly_maintenance_start_time = var.maintenance_start_time

‎Terraform/deploy-fsx-ontap/module/output.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
output "my_fsx_ontap_security_group_id" {
22
description = "The ID of the FSxN Security Group"
3-
value = var.create_sg ? [element(aws_security_group.fsx_sg.*.id, 0)] : []
3+
value = var.create_sg ? [element(aws_security_group.fsx_sg[*].id, 0)] : []
44
}
55

66
output "my_filesystem_id" {
@@ -16,4 +16,4 @@ output "my_svm_id" {
1616
output "my_vol_id" {
1717
description = "The ID of the ONTAP volume in the File System"
1818
value = aws_fsx_ontap_volume.myvol.id
19-
}
19+
}

0 commit comments

Comments
 (0)