diff --git a/ois-scanner/main.tf b/ois-scanner/main.tf index 29ac197..99bfc3a 100644 --- a/ois-scanner/main.tf +++ b/ois-scanner/main.tf @@ -34,30 +34,32 @@ locals { } resource "aws_security_group" "this_security_group" { - name = "${var.name}" - description = "${local.description}" - vpc_id = "${var.vpc_id}" + name = var.name + description = local.description + vpc_id = var.vpc_id ingress { description = "ALL: ${local.description}" - from_port = 0 - to_port = 0 - protocol = -1 - cidr_blocks = "${local.ipv4_cidr}" + from_port = 0 + to_port = 0 + protocol = -1 + cidr_blocks = local.ipv4_cidr } egress { description = "ALL: ${local.description}" - from_port = 0 - to_port = 0 - protocol = -1 - cidr_blocks = [ "0.0.0.0/0" ] + from_port = 0 + to_port = 0 + protocol = -1 + cidr_blocks = ["0.0.0.0/0"] } - tags = "${merge( - map("Name", "sg-${var.name}"), + tags = merge( + { + "Name" = "sg-${var.name}" + }, var.tags, - )}" + ) } # - site: bcc diff --git a/ois-scanner/output.tf b/ois-scanner/output.tf index 9e3bc1c..b7b3536 100644 --- a/ois-scanner/output.tf +++ b/ois-scanner/output.tf @@ -1,9 +1,10 @@ output "this_security_group_id" { description = "Created security group ID" - value = "${aws_security_group.this_security_group.id}" + value = aws_security_group.this_security_group.id } output "this_security_group_arn" { description = "Created security group ARN" - value = "${aws_security_group.this_security_group.arn}" + value = aws_security_group.this_security_group.arn } + diff --git a/ois-scanner/variables.tf b/ois-scanner/variables.tf index bef1644..423b238 100644 --- a/ois-scanner/variables.tf +++ b/ois-scanner/variables.tf @@ -4,15 +4,16 @@ variable "vpc_id" { variable "name" { description = "Security group Name" - default = "ois-scanner" + default = "ois-scanner" } variable "tags" { description = "Extra security group tags" - type = "map" - default = { + type = map(string) + default = { "CostAllocation" = "csvd:infrastructure" - "Environment" = "csvd-infrastructure" + "Environment" = "csvd-infrastructure" } } + diff --git a/ois-scanner/versions.tf b/ois-scanner/versions.tf new file mode 100644 index 0000000..ac97c6a --- /dev/null +++ b/ois-scanner/versions.tf @@ -0,0 +1,4 @@ + +terraform { + required_version = ">= 0.12" +} diff --git a/rds-mssql/main.tf b/rds-mssql/main.tf index 36b6bb6..049c795 100644 --- a/rds-mssql/main.tf +++ b/rds-mssql/main.tf @@ -34,7 +34,7 @@ resource "aws_security_group" "this_security_group" { for_each = local.ports iterator = p content { - description = "${local.description}" + description = local.description from_port = p.value[0] to_port = p.value[1] protocol = p.value[2] @@ -53,5 +53,5 @@ resource "aws_security_group" "this_security_group" { tags = merge( map("Name", local.name), var.tags, - ) + ) } diff --git a/rds-mssql/versions.tf b/rds-mssql/versions.tf new file mode 100644 index 0000000..ac97c6a --- /dev/null +++ b/rds-mssql/versions.tf @@ -0,0 +1,4 @@ + +terraform { + required_version = ">= 0.12" +}