From 56b2c376a925132f3bf2c7e6cad4911400955129 Mon Sep 17 00:00:00 2001
From: Alex Schofield <git@ajschof.me>
Date: Mon, 19 Aug 2024 19:07:30 +0100
Subject: infra(tf): enforce version constraint on terraform

---
 terraform/main.tf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'terraform/main.tf')

diff --git a/terraform/main.tf b/terraform/main.tf
index 310a251..206fc74 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -1,4 +1,5 @@
 terraform {
+  required_version = ">= 1.8.0"
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-- 
cgit v1.2.3


From 35bf4e8668309cb28175ef0224a6bce453abb47f Mon Sep 17 00:00:00 2001
From: Alex Schofield <git@ajschof.me>
Date: Mon, 19 Aug 2024 19:19:44 +0100
Subject: chore(tf): replace static tag values in main.tf with variables

---
 terraform/main.tf |  8 ++++----
 terraform/vars.tf | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

(limited to 'terraform/main.tf')

diff --git a/terraform/main.tf b/terraform/main.tf
index 206fc74..5ccbec2 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -25,11 +25,11 @@ provider "aws" {
   region = "eu-west-2"
   default_tags {
     tags = {
-      ProjectName = "Terrific-Totes"
-      Team        = "Team-Bentley"
-      Environment = "Dev"
-      GitHubRepo  = "de-project-bentley"
+      ProjectName = var.project_name
+      Environment = var.environment
       ManagedBy   = "Terraform"
+      GitHubRepo  = var.github_repo
+      Team        = var.team_name
     }
   }
 }
diff --git a/terraform/vars.tf b/terraform/vars.tf
index 3c88731..1adbcf7 100644
--- a/terraform/vars.tf
+++ b/terraform/vars.tf
@@ -33,6 +33,26 @@ variable "project_name" {
   default = "tt"
 }
 
+variable "aws_region" {
+  type    = string
+  default = "eu-west-2"
+}
+
+variable "environment" {
+  type    = string
+  default = "dev"
+}
+
+variable "github_repo" {
+  type    = string
+  default = "de-project-bentley"
+}
+
+variable "team_name" {
+  type    = string
+  default = "Team-Bentley"
+}
+
 data "aws_caller_identity" "current" {}
 
 data "aws_region" "current" {}
-- 
cgit v1.2.3


From 95c4fe80aea75a9a63b1cfd85abadaab6b96b876 Mon Sep 17 00:00:00 2001
From: Alex Schofield <git@ajschof.me>
Date: Mon, 19 Aug 2024 19:24:23 +0100
Subject: infra(tf): add state file encryption

---
 terraform/main.tf | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'terraform/main.tf')

diff --git a/terraform/main.tf b/terraform/main.tf
index 5ccbec2..33c760c 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -15,9 +15,10 @@ terraform {
     }
   }
   backend "s3" {
-    bucket = "bentley-project-secrets"
-    key    = "bentley-project/terraform.tfstate"
-    region = "eu-west-2"
+    bucket  = "bentley-project-secrets"
+    key     = "bentley-project/terraform.tfstate"
+    region  = "eu-west-2"
+    encrypt = true
   }
 }
 
-- 
cgit v1.2.3


From c091506dc8e01741f54f9a8d289515c8d5ffbecf Mon Sep 17 00:00:00 2001
From: Alex Schofield <git@ajschof.me>
Date: Mon, 19 Aug 2024 21:49:00 +0100
Subject: infra(tf): add version constraint for random in main.tf

---
 terraform/main.tf | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'terraform/main.tf')

diff --git a/terraform/main.tf b/terraform/main.tf
index 33c760c..ad7b335 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -13,6 +13,10 @@ terraform {
       source  = "hashicorp/archive"
       version = "~>2.5.0"
     }
+    random_string = {
+      source  = "hashicorp/random"
+      version = "~>3.6.2"
+    }
   }
   backend "s3" {
     bucket  = "bentley-project-secrets"
-- 
cgit v1.2.3


From ce2761b311523a118cdead885ba7fcf1f7a4cd68 Mon Sep 17 00:00:00 2001
From: Alex Schofield <git@ajschof.me>
Date: Mon, 19 Aug 2024 21:52:15 +0100
Subject: fix(tf): correct random_string to random in main.tf

---
 terraform/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'terraform/main.tf')

diff --git a/terraform/main.tf b/terraform/main.tf
index ad7b335..6577b70 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -13,7 +13,7 @@ terraform {
       source  = "hashicorp/archive"
       version = "~>2.5.0"
     }
-    random_string = {
+    random = {
       source  = "hashicorp/random"
       version = "~>3.6.2"
     }
-- 
cgit v1.2.3