Update aws templates to be terraform v15 compliant

- This adds a '=' to each "tags" block as required by aws provider
- This adds a "required_providers" block as recommended by terraform
  deprecation warning
- This removes quotes from the types for variables as required by
  terraform v15
- This removes quotes from arrays as recommended by terraform
  deprecation warning

Signed-off-by: Neil Hickey <nhickey@vmware.com>

terraform/aws/templates/base.tf

@@ -1,13 +1,20 @@
+terraform {
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+      version = ">= 3.49"
+    }
+    tls = {
+      source = "hashicorp/tls"
+      version = ">= 3.1"
+    }
+  }
+}
+
 provider "aws" {
   access_key = "${var.access_key}"
   secret_key = "${var.secret_key}"
   region     = "${var.region}"
-
-  version = "~> 1.60"
-}
-
-provider "tls" {
-  version = "~> 1.2"
 }
 
 variable "access_key" {
@@ -27,7 +34,7 @@ variable "bosh_inbound_cidr" {
 }
 
 variable "availability_zones" {
-  type = "list"
+  type = list
 }
 
 variable "env_id" {
@@ -44,7 +51,7 @@ variable "vpc_cidr" {
 }
 
 resource "aws_eip" "jumpbox_eip" {
-  depends_on = ["aws_internet_gateway.ig"]
+  depends_on = [aws_internet_gateway.ig]
   vpc        = true
 }
 
@@ -63,7 +70,7 @@ resource "aws_security_group" "nat_security_group" {
   description = "NAT"
   vpc_id      = "${local.vpc_id}"
 
-  tags {
+  tags = {
     Name = "${var.env_id}-nat-security-group"
   }
 
@@ -116,7 +123,7 @@ resource "aws_nat_gateway" "nat" {
   subnet_id     = "${aws_subnet.bosh_subnet.id}"
   allocation_id = "${aws_eip.nat_eip.id}"
 
-  tags {
+  tags = {
     Name  = "${var.env_id}-nat"
     EnvID = "${var.env_id}"
   }
@@ -125,7 +132,7 @@ resource "aws_nat_gateway" "nat" {
 resource "aws_eip" "nat_eip" {
   vpc = true
 
-  tags {
+  tags = {
     Name  = "${var.env_id}-nat"
     EnvID = "${var.env_id}"
   }
@@ -140,12 +147,12 @@ resource "aws_security_group" "internal_security_group" {
   description = "Internal"
   vpc_id      = "${local.vpc_id}"
 
-  tags {
+  tags = {
     Name = "${var.env_id}-internal-security-group"
   }
 
   lifecycle {
-    ignore_changes = ["name"]
+    ignore_changes = [name]
   }
 }
 
@@ -199,12 +206,12 @@ resource "aws_security_group" "bosh_security_group" {
   description = "BOSH Director"
   vpc_id      = "${local.vpc_id}"
 
-  tags {
+  tags = {
     Name = "${var.env_id}-bosh-security-group"
   }
 
   lifecycle {
-    ignore_changes = ["name", "description"]
+    ignore_changes = [name, description]
   }
 }
 
@@ -285,12 +292,12 @@ resource "aws_security_group" "jumpbox" {
   description = "Jumpbox"
   vpc_id      = "${local.vpc_id}"
 
-  tags {
+  tags = {
     Name = "${var.env_id}-jumpbox-security-group"
   }
 
   lifecycle {
-    ignore_changes = ["name", "description"]
+    ignore_changes = [name, description]
   }
 }
 
@@ -361,7 +368,7 @@ resource "aws_subnet" "bosh_subnet" {
   vpc_id     = "${local.vpc_id}"
   cidr_block = "${cidrsubnet(var.vpc_cidr, 8, 0)}"
 
-  tags {
+  tags = {
     Name = "${var.env_id}-bosh-subnet"
   }
 }
@@ -387,7 +394,7 @@ resource "aws_subnet" "internal_subnets" {
   cidr_block        = "${cidrsubnet(var.vpc_cidr, 4, count.index+1)}"
   availability_zone = "${element(var.availability_zones, count.index)}"
 
-  tags {
+  tags = {
     Name = "${var.env_id}-internal-subnet${count.index}"
   }
 

terraform/aws/templates/cf_dns.tf

@@ -28,7 +28,7 @@ resource "aws_route53_zone" "env_dns_zone" {
 
   name = "${var.system_domain}"
 
-  tags {
+  tags = {
     Name = "${var.env_id}-hosted-zone"
   }
 }

terraform/aws/templates/cf_lb.tf

@@ -17,12 +17,12 @@ resource "aws_security_group" "cf_ssh_lb_security_group" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
-  tags {
+  tags = {
     Name = "${var.env_id}-cf-ssh-lb-security-group"
   }
 
   lifecycle {
-    ignore_changes = ["name"]
+    ignore_changes = [name]
   }
 }
 
@@ -49,12 +49,12 @@ resource "aws_security_group" "cf_ssh_lb_internal_security_group" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
-  tags {
+  tags = {
     Name = "${var.env_id}-cf-ssh-lb-internal-security-group"
   }
 
   lifecycle {
-    ignore_changes = ["name"]
+    ignore_changes = [name]
   }
 }
 
@@ -84,7 +84,7 @@ resource "aws_elb" "cf_ssh_lb" {
   security_groups = ["${aws_security_group.cf_ssh_lb_security_group.id}"]
   subnets         = ["${aws_subnet.lb_subnets.*.id}"]
 
-  tags {
+  tags = {
     Name = "${var.env_id}"
   }
 }
@@ -130,12 +130,12 @@ resource "aws_security_group" "cf_router_lb_security_group" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
-  tags {
+  tags = {
     Name = "${var.env_id}-cf-router-lb-security-group"
   }
 
   lifecycle {
-    ignore_changes = ["name"]
+    ignore_changes = [name]
   }
 }
 
@@ -162,12 +162,12 @@ resource "aws_security_group" "cf_router_lb_internal_security_group" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
-  tags {
+  tags = {
     Name = "${var.env_id}-cf-router-lb-internal-security-group"
   }
 
   lifecycle {
-    ignore_changes = ["name"]
+    ignore_changes = [name]
   }
 }
 
@@ -213,7 +213,7 @@ resource "aws_elb" "cf_router_lb" {
   security_groups = ["${aws_security_group.cf_router_lb_security_group.id}"]
   subnets         = ["${aws_subnet.lb_subnets.*.id}"]
 
-  tags {
+  tags = {
     Name = "${var.env_id}"
   }
 }
@@ -228,7 +228,7 @@ resource "aws_lb_target_group" "cf_router_4443" {
     protocol = "TCP"
   }
 
-  tags {
+  tags = {
     Name = "${var.env_id}"
   }
 }
@@ -260,12 +260,12 @@ resource "aws_security_group" "cf_tcp_lb_security_group" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
-  tags {
+  tags = {
     Name = "${var.env_id}-cf-tcp-lb-security-group"
   }
 
   lifecycle {
-    ignore_changes = ["name"]
+    ignore_changes = [name]
   }
 }
 
@@ -299,12 +299,12 @@ resource "aws_security_group" "cf_tcp_lb_internal_security_group" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
-  tags {
+  tags = {
     Name = "${var.env_id}-cf-tcp-lb-security-group"
   }
 
   lifecycle {
-    ignore_changes = ["name"]
+    ignore_changes = [name]
   }
 }
 
@@ -1027,7 +1027,7 @@ resource "aws_elb" "cf_tcp_lb" {
   security_groups = ["${aws_security_group.cf_tcp_lb_security_group.id}"]
   subnets         = ["${aws_subnet.lb_subnets.*.id}"]
 
-  tags {
+  tags = {
     Name = "${var.env_id}"
   }
 }

terraform/aws/templates/concourse_lb.tf

@@ -3,12 +3,12 @@ resource "aws_security_group" "concourse_lb_internal_security_group" {
   description = "Concourse Internal"
   vpc_id      = "${local.vpc_id}"
 
-  tags {
+  tags = {
     Name = "${var.env_id}-concourse-lb-internal-security-group"
   }
 
   lifecycle {
-    ignore_changes = ["name"]
+    ignore_changes = [name]
   }
 }
 
@@ -57,7 +57,7 @@ resource "aws_lb" "concourse_lb" {
   load_balancer_type = "network"
   subnets            = ["${aws_subnet.lb_subnets.*.id}"]
 
-  tags {
+  tags = {
     Name = "${var.env_id}"
   }
 }
@@ -86,7 +86,7 @@ resource "aws_lb_target_group" "concourse_lb_80" {
     protocol            = "TCP"
   }
 
-  tags {
+  tags = {
     Name = "${var.env_id}"
   }
 }
@@ -108,7 +108,7 @@ resource "aws_lb_target_group" "concourse_lb_2222" {
   protocol = "TCP"
   vpc_id   = "${local.vpc_id}"
 
-  tags {
+  tags = {
     Name = "${var.env_id}"
   }
 }
@@ -130,7 +130,7 @@ resource "aws_lb_target_group" "concourse_lb_443" {
   protocol = "TCP"
   vpc_id   = "${local.vpc_id}"
 
-  tags {
+  tags = {
     Name = "${var.env_id}"
   }
 }
@@ -172,7 +172,7 @@ resource "aws_lb_target_group" "concourse_lb_8844" {
   protocol = "TCP"
   vpc_id   = "${local.vpc_id}"
 
-  tags {
+  tags = {
     Name = "${var.env_id}"
   }
 }
@@ -194,7 +194,7 @@ resource "aws_lb_target_group" "concourse_lb_8443" {
   protocol = "TCP"
   vpc_id   = "${local.vpc_id}"
 
-  tags {
+  tags = {
     Name = "${var.env_id}"
   }
 }