refactor: Allow use of Terraform >= 1.7 & < 2 (#79)

uktrade · Apr 17, 2024 · 889767f · 889767f
1 parent b042d22
commit 889767f
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 16 deletions.
diff --git a/application-load-balancer/providers.tf b/application-load-balancer/providers.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.7.5"
+  required_version = "~> 1.7"
   required_providers {
     aws = {
       source  = "hashicorp/aws"

diff --git a/domain/providers.tf b/domain/providers.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.7.5"
+  required_version = "~> 1.7"
   required_providers {
     aws = {
       source  = "hashicorp/aws"

diff --git a/elasticache-redis/e2e-tests/setup/main.tf b/elasticache-redis/e2e-tests/setup/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.7.5"
+  required_version = "~> 1.7"
   required_providers {
     aws = {
       source  = "hashicorp/aws"

diff --git a/elasticache-redis/providers.tf b/elasticache-redis/providers.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.7.5"
+  required_version = "~> 1.7"
   required_providers {
     aws = {
       source  = "hashicorp/aws"

diff --git a/example/main.tf b/example/main.tf
@@ -6,10 +6,11 @@ locals {
 }
 
 module "extensions-staging" {
-  source = "../extensions"
-
-  args = local.args
-
+  source      = "../extensions"
+  args        = local.args
   environment = "my-environment"
   vpc_name    = "my-vpc"
+  providers = {
+    aws.domain = aws.domain
+  }
 }
diff --git a/example/providers.tf b/example/providers.tf
@@ -1,9 +1,16 @@
 terraform {
-  required_version = ">= 1.7.5"
+  required_version = "~> 1.7"
   required_providers {
     aws = {
       source  = "hashicorp/aws"
       version = "~> 5"
     }
   }
 }
+
+provider "aws" {
+  region                   = "eu-west-2"
+  profile                  = "dev"
+  alias                    = "domain"
+  shared_credentials_files = ["~/.aws/config"]
+}
diff --git a/extensions/providers.tf b/extensions/providers.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.7.5"
+  required_version = "~> 1.7"
   required_providers {
     aws = {
       source  = "hashicorp/aws"

diff --git a/monitoring/providers.tf b/monitoring/providers.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.7.5"
+  required_version = "~> 1.7"
   required_providers {
     aws = {
       source  = "hashicorp/aws"

diff --git a/opensearch/providers.tf b/opensearch/providers.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.7.5"
+  required_version = "~> 1.7"
   required_providers {
     aws = {
       source  = "hashicorp/aws"

diff --git a/postgres/providers.tf b/postgres/providers.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.7.5"
+  required_version = "~> 1.7"
   required_providers {
     archive = {
       source  = "hashicorp/archive"

diff --git a/s3/providers.tf b/s3/providers.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.7.5"
+  required_version = "~> 1.7"
   required_providers {
     aws = {
       source  = "hashicorp/aws"

diff --git a/statefile-backend/providers.tf b/statefile-backend/providers.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.7.5"
+  required_version = "~> 1.7"
   required_providers {
     aws = {
       source  = "hashicorp/aws"

diff --git a/vpc/providers.tf b/vpc/providers.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.7.5"
+  required_version = "~> 1.7"
   required_providers {
     aws = {
       source  = "hashicorp/aws"