trinitor/DetectionLab
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #678 from clong/terraform_1

Browse Source 
Terraform v1.0+ compatibility
This commit is contained in:
Chris Long
2021-07-11 20:14:05 -07:00
committed by GitHub
parent 41fb6c2158 ee4ff46b66
commit 8b282d5128
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -17,3 +17,4 @@ manifest.xml
HyperV/.vagrant/* HyperV/.vagrant/*
logger_variables.sh logger_variables.sh
ESXi/Packer/variables.json ESXi/Packer/variables.json
.terraform.lock.hcl

16
AWS/Terraform/main.tf
View File

@@ -172,8 +172,8 @@ resource "aws_instance" "logger" {
instance_type = "t3.medium" instance_type = "t3.medium"
ami = coalesce(var.logger_ami, data.aws_ami.logger_ami.image_id) ami = coalesce(var.logger_ami, data.aws_ami.logger_ami.image_id)
tags = merge(var.custom-tags, map( tags = merge(var.custom-tags, tomap(
"Name", "${var.instance_name_prefix}logger" {"Name" = "${var.instance_name_prefix}logger"}
)) ))
subnet_id = aws_subnet.default.id subnet_id = aws_subnet.default.id
@@ -229,8 +229,8 @@ resource "aws_instance" "dc" {
# Uses the local variable if external data source resolution fails # Uses the local variable if external data source resolution fails
ami = coalesce(var.dc_ami, data.aws_ami.dc_ami.image_id) ami = coalesce(var.dc_ami, data.aws_ami.dc_ami.image_id)
tags = merge(var.custom-tags, map( tags = merge(var.custom-tags, tomap(
"Name", "${var.instance_name_prefix}dc.windomain.local" {"Name" = "${var.instance_name_prefix}dc.windomain.local"}
)) ))
subnet_id = aws_subnet.default.id subnet_id = aws_subnet.default.id
@@ -264,8 +264,8 @@ resource "aws_instance" "wef" {
# Uses the local variable if external data source resolution fails # Uses the local variable if external data source resolution fails
ami = coalesce(var.wef_ami, data.aws_ami.wef_ami.image_id) ami = coalesce(var.wef_ami, data.aws_ami.wef_ami.image_id)
tags = merge(var.custom-tags, map( tags = merge(var.custom-tags, tomap(
"Name", "${var.instance_name_prefix}wef.windomain.local" {"Name" = "${var.instance_name_prefix}wef.windomain.local"}
)) ))
subnet_id = aws_subnet.default.id subnet_id = aws_subnet.default.id
@@ -299,8 +299,8 @@ resource "aws_instance" "win10" {
# Uses the local variable if external data source resolution fails # Uses the local variable if external data source resolution fails
ami = coalesce(var.win10_ami, data.aws_ami.win10_ami.image_id) ami = coalesce(var.win10_ami, data.aws_ami.win10_ami.image_id)
tags = merge(var.custom-tags, map( tags = merge(var.custom-tags, tomap(
"Name", "${var.instance_name_prefix}win10.windomain.local" {"Name" = "${var.instance_name_prefix}win10.windomain.local"}
)) ))
subnet_id = aws_subnet.default.id subnet_id = aws_subnet.default.id

2
AWS/Terraform/versions.tf
View File

@@ -1,3 +1,3 @@
terraform { terraform {
required_version = ">= 0.12, < 15.0.0" required_version = ">= 1.0.0"
} }

1
Azure/Terraform/main.tf
View File

@@ -12,7 +12,6 @@
# Specify the provider and access details # Specify the provider and access details
provider "azurerm" { provider "azurerm" {
version = "=2.12.0"
features {} features {}
} }

2
Azure/Terraform/versions.tf
View File

@@ -1,5 +1,5 @@
terraform { terraform {
required_version = ">= 0.12, < 15.0.0" required_version = ">= 1.0.0"
required_providers { required_providers {
azurerm = { azurerm = {
version = "=2.12.0" version = "=2.12.0"

4
ESXi/versions.tf
View File

@@ -1,9 +1,9 @@
terraform { terraform {
required_version = ">= 0.13" required_version = ">= 1.0.0"
required_providers { required_providers {
esxi = { esxi = {
source = "josenk/esxi" source = "josenk/esxi"
version = "1.8.0" version = "1.8.2"
} }
} }
} }