Merge pull request #47 from bheesham/upgrade-terraform-and-friends

bheesham · web-flow · commit 3ade10a26c31 · 2024-12-09T11:03:58.000-05:00
Upgrade terraform and friends
diff --git a/terraform/INFRA.md b/terraform/INFRA.md
@@ -6,40 +6,3 @@ psql -U dinopark -W oneTimePassword -h XXX.rds.amazonaws.com postgres
 alter user dinopark with encrypted password 'XXX';
 create database "dino-park-packs";
 ```
-
-### Setting up Terraform on an ARM Mac
-
-New developers at Mozilla are issued an ARM-based Mac, and so the installation
-steps will be different.
-
-To get started, install Terraform (using [asdf](https://asdf-vm.com/)):
-
-```
-ASDF_HASHICORP_OVERWRITE_ARCH=amd64 asdf install terraform 0.12.31
-```
-
-Next, you'll need to export your credentials:
-
-```
-$(aws configure export-credentials --format env --profile iam-admin)
-```
-
-(Consider using something like [direnv](https://direnv.net/).)
-
-Next, initialize the working directory:
-
-```
-arch -arch x86_64 terraform init
-```
-
-And then, finally, when you're ready, generate a plan:
-
-```
-arch -arch x86_64 terraform plan -out plan
-```
-
-Once you're ready, you can ship your changes using:
-
-```
-arch -arch x86_64 terraform apply plan
-```
diff --git a/terraform/codebuild/.terraform.lock.hcl b/terraform/codebuild/.terraform.lock.hcl
diff --git a/terraform/codebuild/.tool-versions b/terraform/codebuild/.tool-versions
@@ -1 +1 @@
-terraform 0.12.31
+terraform 1.10.0
diff --git a/terraform/codebuild/provider.tf b/terraform/codebuild/provider.tf
@@ -7,13 +7,6 @@ provider "aws" {
 }
 
 terraform {
-  required_version = "~> 0.12"
-  required_providers {
-    aws = {
-      version = "~> 2.62.0"
-    }
-  }
-
   backend "s3" {
     bucket = "eks-terraform-shared-state"
     key    = "global/codebuild/dino-park-packs/terraform.tfstate"
diff --git a/terraform/codebuild/versions.tf b/terraform/codebuild/versions.tf
@@ -1,4 +1,9 @@
-
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 1.0"
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.0"
+    }
+  }
 }
diff --git a/terraform/dev/.terraform.lock.hcl b/terraform/dev/.terraform.lock.hcl
diff --git a/terraform/dev/.tool-versions b/terraform/dev/.tool-versions
@@ -1 +1 @@
-terraform 0.12.31
+terraform 1.10.0
diff --git a/terraform/dev/provider.tf b/terraform/dev/provider.tf
@@ -7,13 +7,6 @@ provider "aws" {
 }
 
 terraform {
-  required_version = "~> 0.12"
-  required_providers {
-    aws = {
-      version = "~> 2.62.0"
-    }
-  }
-
   backend "s3" {
     bucket = "eks-terraform-shared-state"
     key    = "stage/us-west-2/apps/dino-park-packs-dev/terraform.tfstate"
diff --git a/terraform/dev/versions.tf b/terraform/dev/versions.tf
@@ -1,4 +1,9 @@
-
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 1.0"
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.0"
+    }
+  }
 }
diff --git a/terraform/prod/.terraform.lock.hcl b/terraform/prod/.terraform.lock.hcl
diff --git a/terraform/prod/.tool-versions b/terraform/prod/.tool-versions
@@ -1 +1 @@
-terraform 0.12.31
+terraform 1.10.0
diff --git a/terraform/prod/db.tf b/terraform/prod/db.tf
@@ -4,7 +4,7 @@ resource "aws_db_instance" "dino_park_packs_db" {
   max_allocated_storage       = 100
   storage_type                = "gp2"
   engine                      = "postgres"
-  engine_version              = "11"
+  engine_version              = "11.22"
   instance_class              = "db.t3.micro"
   allow_major_version_upgrade = true
   username                    = "dinopark"
diff --git a/terraform/prod/provider.tf b/terraform/prod/provider.tf
@@ -7,13 +7,6 @@ provider "aws" {
 }
 
 terraform {
-  required_version = "~> 0.12"
-  required_providers {
-    aws = {
-      version = "~> 2.62.0"
-    }
-  }
-
   backend "s3" {
     bucket = "eks-terraform-shared-state"
     key    = "prod/us-west-2/apps/dino-park-packs-prod/terraform.tfstate"
diff --git a/terraform/prod/versions.tf b/terraform/prod/versions.tf
@@ -1,3 +1,9 @@
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 1.0"
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.0"
+    }
+  }
 }
diff --git a/terraform/test/.terraform.lock.hcl b/terraform/test/.terraform.lock.hcl
diff --git a/terraform/test/.tool-versions b/terraform/test/.tool-versions
@@ -1 +1 @@
-terraform 0.12.31
+terraform 1.10.0
diff --git a/terraform/test/db.tf b/terraform/test/db.tf
@@ -4,7 +4,7 @@ resource "aws_db_instance" "dino_park_packs_db" {
   max_allocated_storage               = 100
   storage_type                        = "gp2"
   engine                              = "postgres"
-  engine_version                      = "11"
+  engine_version                      = "11.22"
   instance_class                      = "db.t3.micro"
   allow_major_version_upgrade         = true
   username                            = "dinopark"
diff --git a/terraform/test/provider.tf b/terraform/test/provider.tf
@@ -7,13 +7,6 @@ provider "aws" {
 }
 
 terraform {
-  required_version = "~> 0.12"
-  required_providers {
-    aws = {
-      version = "~> 2.62.0"
-    }
-  }
-
   backend "s3" {
     bucket = "eks-terraform-shared-state"
     key    = "stage/us-west-2/apps/dino-park-packs-test/terraform.tfstate"
diff --git a/terraform/test/versions.tf b/terraform/test/versions.tf
@@ -1,4 +1,9 @@
-
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 1.0"
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.0"
+    }
+  }
 }
