Skip to content

Commit

Permalink
Update all to version 2.55, update blocks to suppress deprecation war…
Browse files Browse the repository at this point in the history
…ning. (#180)

Co-authored-by: Bree Stryker <[email protected]>
  • Loading branch information
Breanna-Stryker and Bree Stryker authored Apr 28, 2021
1 parent 624e07e commit fb1fbe6
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ RUN wget -O terraform.zip https://releases.hashicorp.com/terraform/0.13.4/terraf
# Download Terraform providers (plugins)
# Setting the TF_PLUGIN_CACHE_DIR environment variable instructs Terraform to search that folder for plugins first
ENV TF_PLUGIN_CACHE_DIR=/usr/lib/tf-plugins
ARG AZURERM_LOCAL_PATH="${TF_PLUGIN_CACHE_DIR}/registry.terraform.io/hashicorp/azurerm/2.50.0/linux_amd64"
ARG AZURERM_LOCAL_PATH="${TF_PLUGIN_CACHE_DIR}/registry.terraform.io/hashicorp/azurerm/2.55.0/linux_amd64"
ARG RANDOM_LOCAL_PATH="${TF_PLUGIN_CACHE_DIR}/registry.terraform.io/hashicorp/random/3.1.0/linux_amd64"
ARG AZURERM_PROVIDER=https://releases.hashicorp.com/terraform-provider-azurerm/2.50.0/terraform-provider-azurerm_2.50.0_linux_amd64.zip
ARG AZURERM_PROVIDER=https://releases.hashicorp.com/terraform-provider-azurerm/2.55.0/terraform-provider-azurerm_2.55.0_linux_amd64.zip
ARG RANDOM_PROVIDER=https://releases.hashicorp.com/terraform-provider-random/3.1.0/terraform-provider-random_3.1.0_linux_amd64.zip
RUN wget -O azurerm.zip ${AZURERM_PROVIDER} \
&& wget -O random.zip ${RANDOM_PROVIDER} \
Expand Down
4 changes: 2 additions & 2 deletions src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ RUN wget -O terraform.zip https://releases.hashicorp.com/terraform/0.14.3/terraf
# Download Terraform providers (plugins)
# Setting the TF_PLUGIN_CACHE_DIR environment variable instructs Terraform to search that folder for plugins first
ENV TF_PLUGIN_CACHE_DIR=/usr/lib/tf-plugins
ARG AZURERM_LOCAL_PATH="${TF_PLUGIN_CACHE_DIR}/registry.terraform.io/hashicorp/azurerm/2.50.0/linux_amd64"
ARG AZURERM_LOCAL_PATH="${TF_PLUGIN_CACHE_DIR}/registry.terraform.io/hashicorp/azurerm/2.55.0/linux_amd64"
ARG RANDOM_LOCAL_PATH="${TF_PLUGIN_CACHE_DIR}/registry.terraform.io/hashicorp/random/3.1.0/linux_amd64"
ARG AZURERM_PROVIDER=https://releases.hashicorp.com/terraform-provider-azurerm/2.50.0/terraform-provider-azurerm_2.50.0_linux_amd64.zip
ARG AZURERM_PROVIDER=https://releases.hashicorp.com/terraform-provider-azurerm/2.55.0/terraform-provider-azurerm_2.55.0_linux_amd64.zip
ARG RANDOM_PROVIDER=https://releases.hashicorp.com/terraform-provider-random/3.1.0/terraform-provider-random_3.1.0_linux_amd64.zip
RUN wget -O azurerm.zip ${AZURERM_PROVIDER} \
&& wget -O random.zip ${RANDOM_PROVIDER} \
Expand Down
13 changes: 11 additions & 2 deletions src/core/saca-hub/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,20 @@
# Licensed under the MIT License.
terraform {
backend "azurerm" {}

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "= 2.55.0"
}
random = {
source = "hashicorp/random"
version = "= 3.1.0"
}
}
}

provider "azurerm" {
version = "~> 2.50.0"
environment = var.tf_environment
metadata_host = var.mlz_metadatahost
tenant_id = var.mlz_tenantid
Expand All @@ -21,7 +31,6 @@ provider "azurerm" {
}

provider "random" {
version = "3.1.0"
}

resource "azurerm_resource_group" "hub" {
Expand Down
14 changes: 11 additions & 3 deletions src/core/tier-0/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,20 @@
# Licensed under the MIT License.
terraform {
backend "azurerm" {}

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "= 2.55.0"
}
random = {
source = "hashicorp/random"
version = "= 3.1.0"
}
}
}

provider "azurerm" {
version = "~> 2.50.0"
environment = var.tf_environment
metadata_host = var.mlz_metadatahost
tenant_id = var.mlz_tenantid
Expand All @@ -17,7 +27,6 @@ provider "azurerm" {
}

provider "azurerm" {
version = "~> 2.50.0"
alias = "hub"
environment = var.tf_environment
metadata_host = var.mlz_metadatahost
Expand All @@ -30,7 +39,6 @@ provider "azurerm" {
}

provider "random" {
version = "3.1.0"
}

data "azurerm_resource_group" "hub" {
Expand Down
14 changes: 11 additions & 3 deletions src/core/tier-1/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,20 @@
# Licensed under the MIT License.
terraform {
backend "azurerm" {}

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "= 2.55.0"
}
random = {
source = "hashicorp/random"
version = "= 3.1.0"
}
}
}

provider "azurerm" {
version = "~> 2.50.0"
environment = var.tf_environment
metadata_host = var.mlz_metadatahost
tenant_id = var.mlz_tenantid
Expand All @@ -17,7 +27,6 @@ provider "azurerm" {
}

provider "azurerm" {
version = "~> 2.50.0"
alias = "hub"
environment = var.tf_environment
metadata_host = var.mlz_metadatahost
Expand All @@ -30,7 +39,6 @@ provider "azurerm" {
}

provider "random" {
version = "3.1.0"
}

data "azurerm_resource_group" "hub" {
Expand Down
14 changes: 11 additions & 3 deletions src/core/tier-2/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,20 @@
# Licensed under the MIT License.
terraform {
backend "azurerm" {}

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "= 2.55.0"
}
random = {
source = "hashicorp/random"
version = "= 3.1.0"
}
}
}

provider "azurerm" {
version = "~> 2.50.0"
environment = var.tf_environment
metadata_host = var.mlz_metadatahost
tenant_id = var.mlz_tenantid
Expand All @@ -17,7 +27,6 @@ provider "azurerm" {
}

provider "azurerm" {
version = "~> 2.50.0"
alias = "hub"
environment = var.tf_environment
metadata_host = var.mlz_metadatahost
Expand All @@ -30,7 +39,6 @@ provider "azurerm" {
}

provider "random" {
version = "3.1.0"
}

data "azurerm_resource_group" "hub" {
Expand Down

0 comments on commit fb1fbe6

Please sign in to comment.