0.12 upgrading on examples vpc-scenario-3/remote-environment

The upgrading is done via 'terraform 0.12upgrade .` and reviewed by human.

Author: Magicloud

examples/vpc-scenario-3/remote-environment/main.tf

@@ -50,68 +50,67 @@ variable "openvpn_ami_owner_id" {
 }
 
 provider "aws" {
-  region = "${var.region}"
+  region = var.region
 }
 
-
 module "vpc" {
   source      = "../../../modules/vpc"
   name_prefix = "${var.name}-vpc"
-  region      = "${var.region}"
-  cidr        = "${var.vpc_cidr}"
+  region      = var.region
+  cidr        = var.vpc_cidr
 }
 
 module "vpc-public-subnets" {
   source      = "../../../modules/subnets"
-  azs         = ["${var.aws_availability_zones}"]
-  vpc_id      = "${module.vpc.vpc_id}"
+  azs         = [var.aws_availability_zones]
+  vpc_id      = module.vpc.vpc_id
   name_prefix = "${var.name}-vpc-public"
-  cidr_blocks = "${var.vpc_public_subnet_cidrs}"
-  extra_tags  = "${var.extra_tags}"
+  cidr_blocks = var.vpc_public_subnet_cidrs
+  extra_tags  = var.extra_tags
 }
 
 module "vpc-sg" {
   source      = "../../../modules/security-group-base"
   description = "Test project security group"
   name        = "${var.name}-vpc-sg"
-  vpc_id      = "${module.vpc.vpc_id}"
+  vpc_id      = module.vpc.vpc_id
 }
 
 module "vpc-open-ssh" {
   source = "../../../modules/ssh-sg"
 
   # this is actually used as a name-prefix
-  security_group_id = "${module.vpc-sg.id}"
+  security_group_id = module.vpc-sg.id
 }
 
 module "vpc-open-egress" {
   source = "../../../modules/open-egress-sg"
 
   # this is actually used as a name-prefix
-  security_group_id = "${module.vpc-sg.id}"
+  security_group_id = module.vpc-sg.id
 }
 
 module "openvpn-sg" {
   source      = "../../../modules/security-group-base"
   description = "Openvpn security group"
   name        = "${var.name}-openvpn-sg"
-  vpc_id      = "${module.vpc.vpc_id}"
+  vpc_id      = module.vpc.vpc_id
 }
 
 module "https-rule" {
   source            = "../../../modules/single-port-sg"
   port              = 443
   description       = "allow ingress, HTTPS (443)"
   cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = "${module.openvpn-sg.id}"
+  security_group_id = module.openvpn-sg.id
 }
 
 module "openvpn-web-rule" {
   source            = "../../../modules/single-port-sg"
   port              = 943
   description       = "allow ingress, HTTP (943) openvpn server"
   cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = "${module.openvpn-sg.id}"
+  security_group_id = module.openvpn-sg.id
 }
 
 module "openvpn-rule" {
@@ -120,19 +119,20 @@ module "openvpn-rule" {
   protocol          = "udp"
   description       = "allow ingress, HTTP (943) openvpn server"
   cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = "${module.openvpn-sg.id}"
+  security_group_id = module.openvpn-sg.id
 }
 
 module "openvpn-egress" {
-  source = "../../../modules/open-egress-sg"
-  security_group_id = "${module.openvpn-sg.id}"
+  source            = "../../../modules/open-egress-sg"
+  security_group_id = module.openvpn-sg.id
 }
+
 module "vpc-public-gateway" {
   source            = "../../../modules/route-public"
-  vpc_id            = "${module.vpc.vpc_id}"
+  vpc_id            = module.vpc.vpc_id
   name_prefix       = "${var.name}-vpc-public"
-  extra_tags        = "${var.extra_tags}"
-  public_subnet_ids = ["${concat(module.vpc-public-subnets.ids)}"]
+  extra_tags        = var.extra_tags
+  public_subnet_ids = [concat(module.vpc-public-subnets.ids)]
 }
 
 # EC2 Instances setup
@@ -154,52 +154,53 @@ data "aws_ami" "openvpn-ami" {
     values = ["hvm"]
   }
 
-  owners = ["${var.openvpn_ami_owner_id}"]
+  owners = [var.openvpn_ami_owner_id]
 }
 
 resource "aws_key_pair" "main" {
-  key_name   = "${var.name}"
-  public_key = "${file(var.ssh_pubkey)}"
+  key_name   = var.name
+  public_key = file(var.ssh_pubkey)
 }
 
 data "template_file" "openvpn-setup" {
-  template = "${file("${path.module}/init-script.sh")}"
+  template = file("${path.module}/init-script.sh")
 }
 
 resource "aws_instance" "vpn-machine" {
   # setup openvpn ami
-  ami               = "${data.aws_ami.openvpn-ami.id}"
+  ami               = data.aws_ami.openvpn-ami.id
   count             = "1"
-  key_name          = "${aws_key_pair.main.key_name}"
+  key_name          = aws_key_pair.main.key_name
   instance_type     = "t2.nano"
-  availability_zone = "${var.aws_availability_zones}"
+  availability_zone = var.aws_availability_zones
 
   root_block_device {
     volume_type = "gp2"
     volume_size = "8"
   }
 
   associate_public_ip_address = "true"
-  vpc_security_group_ids      = ["${module.vpc-sg.id}","${module.openvpn-sg.id}"]
-  subnet_id                   = "${element(module.vpc-public-subnets.ids, count.index)}"
+  vpc_security_group_ids      = [module.vpc-sg.id, module.openvpn-sg.id]
+  subnet_id                   = element(module.vpc-public-subnets.ids, count.index)
 
-  tags {
+  tags = {
     Name = "${var.name}-vpn-server-${count.index}"
   }
 
-  user_data     = "${data.template_file.openvpn-setup.rendered}"
+  user_data = data.template_file.openvpn-setup.rendered
 
   provisioner "remote-exec" {
     connection {
+      host        = coalesce(self.public_ip, self.private_ip)
       type        = "ssh"
       user        = "openvpnas"
-      private_key = "${file(var.ssh_key)}"
+      private_key = file(var.ssh_key)
     }
   }
-
 }
 
 output "openvpn-public-eip" {
-  value = "${aws_instance.vpn-machine.public_ip}"
+  value       = aws_instance.vpn-machine[0].public_ip
   description = "OpenVPN Public IP"
 }
+

examples/vpc-scenario-3/remote-environment/versions.tf

@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}