BBL-263 | updating examples config.tf to use terraform 0.14.2

binbashar · Dec 16, 2020 · c9a0910 · c9a0910
1 parent 74dee44
commit c9a0910
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 36 deletions.
diff --git a/examples/s3-tfstate-backend-crr-ssl/config.tf b/examples/s3-tfstate-backend-crr-ssl/config.tf
@@ -3,18 +3,16 @@
 #=============================#
 provider "aws" {
   alias                   = "main_region"
-  version                 = "~> 3.0"
   region                  = var.region
   profile                 = var.profile
-  shared_credentials_file = "~/.aws/bb/config"
+  shared_credentials_file = "~/.aws/${var.namespace}/config"
 }
 
 provider "aws" {
   alias                   = "secondary_region"
-  version                 = "~> 3.0"
   region                  = var.region_secondary
   profile                 = var.profile
-  shared_credentials_file = "~/.aws/bb/config"
+  shared_credentials_file = "~/.aws/${var.namespace}/config"
 }
 
 variable "region" {
@@ -35,16 +33,13 @@ variable "profile" {
   default     = "bb-dev-deploymaster"
 }
 
-# Uncomment for local testing
-//variable "profile" {
-//  type        = string
-//  description = "AWS Profile"
-//  default     = "bb-apps-devstg-devops"
-//}
-
 #=============================#
 # Backend Config (partial)    #
 #=============================#
 terraform {
-  required_version = ">= 0.12.28"
+  required_version = ">= 0.14.2"
+
+  required_providers {
+    aws = "~> 3.0"
+  }
 }
diff --git a/examples/s3-tfstate-backend-crr/config.tf b/examples/s3-tfstate-backend-crr/config.tf
@@ -3,18 +3,16 @@
 #=============================#
 provider "aws" {
   alias                   = "main_region"
-  version                 = "~> 3.0"
   region                  = var.region
   profile                 = var.profile
-  shared_credentials_file = "~/.aws/bb/config"
+  shared_credentials_file = "~/.aws/${var.namespace}/config"
 }
 
 provider "aws" {
   alias                   = "secondary_region"
-  version                 = "~> 3.0"
   region                  = var.region_secondary
   profile                 = var.profile
-  shared_credentials_file = "~/.aws/bb/config"
+  shared_credentials_file = "~/.aws/${var.namespace}/config"
 }
 
 variable "region" {
@@ -35,16 +33,13 @@ variable "profile" {
   default     = "bb-dev-deploymaster"
 }
 
-# Uncomment for local testing
-//variable "profile" {
-//  type        = string
-//  description = "AWS Profile"
-//  default     = "bb-apps-devstg-devops"
-//}
-
 #=============================#
 # Backend Config (partial)    #
 #=============================#
 terraform {
-  required_version = ">= 0.12.28"
+  required_version = ">= 0.14.2"
+
+  required_providers {
+    aws = "~> 3.0"
+  }
 }
diff --git a/examples/s3-tfstate-backend/config.tf b/examples/s3-tfstate-backend/config.tf
@@ -3,18 +3,16 @@
 #=============================#
 provider "aws" {
   alias                   = "main_region"
-  version                 = "~> 3.0"
   region                  = var.region
   profile                 = var.profile
-  shared_credentials_file = "~/.aws/bb/config"
+  shared_credentials_file = "~/.aws/${var.namespace}/config"
 }
 
 provider "aws" {
   alias                   = "secondary_region"
-  version                 = "~> 3.0"
   region                  = var.region_secondary
   profile                 = var.profile
-  shared_credentials_file = "~/.aws/bb/config"
+  shared_credentials_file = "~/.aws/${var.namespace}/config"
 }
 
 variable "region" {
@@ -35,16 +33,13 @@ variable "profile" {
   default     = "bb-dev-deploymaster"
 }
 
-# Uncomment for local testing
-//variable "profile" {
-//  type        = string
-//  description = "AWS Profile"
-//  default     = "bb-apps-devstg-devops"
-//}
-
 #=============================#
 # Backend Config (partial)    #
 #=============================#
 terraform {
-  required_version = ">= 0.12.28"
+  required_version = ">= 0.14.2"
+
+  required_providers {
+    aws = "~> 3.0"
+  }
 }