[NDR-108] re-adding db and making action right

Author: SWhyteAnswer

.github/workflows/terraform-deploy-feature-to-sandbox.yml

@@ -29,10 +29,10 @@ jobs:
     environment: ${{ github.event.inputs.environment }}
 
     steps:
-      # - name: Checkout Base
-      #   uses: actions/checkout@v4
-      #   with:
-      #     ref: main
+      - name: Checkout Base
+        uses: actions/checkout@v4
+        with:
+          ref: main
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -52,25 +52,25 @@ jobs:
           terraform_version: 1.11.4
           terraform_wrapper: false
 
-      # - name: Terraform Init Base
-      #   id: base_init
-      #   run: terraform init -backend-config=backend.conf
-      #   working-directory: ./infrastructure
-      #   shell: bash
-      # - name: Terraform Set Workspace Base
-      #   id: base_workspace
-      #   run: terraform workspace select -or-create ${{ github.event.inputs.sandboxWorkspace}}
-      #   working-directory: ./infrastructure
-      #   shell: bash
-      # - name: Terraform Plan Base
-      #   id: base_plan
-      #   run: |
-      #     terraform plan -input=false -no-color -var-file="${{vars.TF_VARS_FILE}}" -out tf-base.plan
-      #   working-directory: ./infrastructure
-      #   shell: bash
-      # - name: Terraform Apply Base
-      #   run: terraform apply -auto-approve -input=false tf-base.plan
-      #   working-directory: ./infrastructure
+      - name: Terraform Init Base
+        id: base_init
+        run: terraform init -backend-config=backend.conf
+        working-directory: ./infrastructure
+        shell: bash
+      - name: Terraform Set Workspace Base
+        id: base_workspace
+        run: terraform workspace select -or-create ${{ github.event.inputs.sandboxWorkspace}}
+        working-directory: ./infrastructure
+        shell: bash
+      - name: Terraform Plan Base
+        id: base_plan
+        run: |
+          terraform plan -input=false -no-color -var-file="${{vars.TF_VARS_FILE}}" -out tf-base.plan
+        working-directory: ./infrastructure
+        shell: bash
+      - name: Terraform Apply Base
+        run: terraform apply -auto-approve -input=false tf-base.plan
+        working-directory: ./infrastructure
       - name: Checkout Branch
         uses: actions/checkout@v4
         with:

backup-vault/teraform/main.tf

@@ -6,11 +6,11 @@ terraform {
     }
   }
   backend "s3" {
-    # dynamodb_table = "ndr-backup-terraform-lock"
-    use_lockfile = true
-    region       = "eu-west-2"
-    key          = "ndr/terraform.tfstate"
-    encrypt      = true
+    dynamodb_table = "ndr-backup-terraform-lock"
+    use_lockfile   = true
+    region         = "eu-west-2"
+    key            = "ndr/terraform.tfstate"
+    encrypt        = true
   }
 }
 provider "aws" {

bootstrap/main.tf

@@ -68,20 +68,20 @@ resource "aws_s3_bucket_public_access_block" "public_access_block" {
 
 data "aws_caller_identity" "current" {}
 
-# resource "aws_dynamodb_table" "dynamodb_terraform_state_lock" {
-#   name           = "ndr-terraform-locks"
-#   hash_key       = "LockID"
-#   read_capacity  = 20
-#   write_capacity = 20
+resource "aws_dynamodb_table" "dynamodb_terraform_state_lock" {
+  name           = "ndr-terraform-locks"
+  hash_key       = "LockID"
+  read_capacity  = 20
+  write_capacity = 20
 
-#   attribute {
-#     name = "LockID"
-#     type = "S"
-#   }
-#   lifecycle {
-#     prevent_destroy = true
-#   }
-# }
+  attribute {
+    name = "LockID"
+    type = "S"
+  }
+  lifecycle {
+    prevent_destroy = true
+  }
+}
 
 variable "region" {
   type        = string

infrastructure/main.tf

@@ -12,11 +12,11 @@ terraform {
     }
   }
   backend "s3" {
-    use_lockfile = true
-    # dynamodb_table = "ndr-terraform-locks"
-    region  = "eu-west-2"
-    key     = "ndr/terraform.tfstate"
-    encrypt = true
+    use_lockfile   = true
+    dynamodb_table = "ndr-terraform-locks"
+    region         = "eu-west-2"
+    key            = "ndr/terraform.tfstate"
+    encrypt        = true
   }
 }
 provider "aws" {