Merge pull request #678 from clong/terraform_1

Terraform v1.0+ compatibility
clong · Jul 12, 2021 · 8b282d5128fbed8c3f9195ceb56fdbad4e1ea4be · 8b282d5
2 parents 41fb6c2 + ee4ff46
commit 8b282d5128fbed8c3f9195ceb56fdbad4e1ea4be
Unified Split

Showing with 13 additions and 13 deletions.

+1 −0 .gitignore

+8 −8 AWS/Terraform/main.tf

+1 −1 AWS/Terraform/versions.tf

+0 −1 Azure/Terraform/main.tf

+1 −1 Azure/Terraform/versions.tf

+2 −2 ESXi/versions.tf
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,4 @@ manifest.xml
 HyperV/.vagrant/*
 logger_variables.sh
 ESXi/Packer/variables.json
+.terraform.lock.hcl
diff --git a/AWS/Terraform/main.tf b/AWS/Terraform/main.tf
@@ -172,8 +172,8 @@ resource "aws_instance" "logger" {
   instance_type = "t3.medium"
   ami           = coalesce(var.logger_ami, data.aws_ami.logger_ami.image_id)
 
-  tags = merge(var.custom-tags, map(
-    "Name", "${var.instance_name_prefix}logger"
+  tags = merge(var.custom-tags, tomap(
+    {"Name" = "${var.instance_name_prefix}logger"}
   ))
 
   subnet_id              = aws_subnet.default.id
@@ -229,8 +229,8 @@ resource "aws_instance" "dc" {
   # Uses the local variable if external data source resolution fails
   ami = coalesce(var.dc_ami, data.aws_ami.dc_ami.image_id)
 
-  tags = merge(var.custom-tags, map(
-    "Name", "${var.instance_name_prefix}dc.windomain.local"
+  tags = merge(var.custom-tags, tomap(
+    {"Name" = "${var.instance_name_prefix}dc.windomain.local"}
   ))
 
   subnet_id              = aws_subnet.default.id
@@ -264,8 +264,8 @@ resource "aws_instance" "wef" {
   # Uses the local variable if external data source resolution fails
   ami = coalesce(var.wef_ami, data.aws_ami.wef_ami.image_id)
 
-  tags = merge(var.custom-tags, map(
-    "Name", "${var.instance_name_prefix}wef.windomain.local"
+  tags = merge(var.custom-tags, tomap(
+    {"Name" = "${var.instance_name_prefix}wef.windomain.local"}
   ))
 
   subnet_id              = aws_subnet.default.id
@@ -299,8 +299,8 @@ resource "aws_instance" "win10" {
   # Uses the local variable if external data source resolution fails
   ami = coalesce(var.win10_ami, data.aws_ami.win10_ami.image_id)
 
-  tags = merge(var.custom-tags, map(
-    "Name", "${var.instance_name_prefix}win10.windomain.local"
+  tags = merge(var.custom-tags, tomap(
+    {"Name" = "${var.instance_name_prefix}win10.windomain.local"}
   ))
 
   subnet_id              = aws_subnet.default.id

diff --git a/AWS/Terraform/versions.tf b/AWS/Terraform/versions.tf
@@ -1,3 +1,3 @@
 terraform {
-  required_version = ">= 0.12, < 15.0.0"
+  required_version = ">= 1.0.0"
 }
diff --git a/Azure/Terraform/main.tf b/Azure/Terraform/main.tf
@@ -12,7 +12,6 @@
 
 # Specify the provider and access details
 provider "azurerm" {
-  version = "=2.12.0"
   features {}
 }
 

diff --git a/Azure/Terraform/versions.tf b/Azure/Terraform/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 0.12, < 15.0.0"
+  required_version = ">= 1.0.0"
   required_providers {
     azurerm = {
       version = "=2.12.0"

diff --git a/ESXi/versions.tf b/ESXi/versions.tf
@@ -1,9 +1,9 @@
 terraform {     
-  required_version = ">= 0.13"                                                                                                                                                                                                    
+  required_version = ">= 1.0.0"                                                                                                                                                                                                    
   required_providers {                                                                                                                                                                                              
     esxi = {                                                                                                                                                                                                        
       source = "josenk/esxi"                                                                                                                                                                                        
-      version = "1.8.0"                                                                                                                                                                                             
+      version = "1.8.2"                                                                                                                                                                                             
     }
   }
 }