[NDR-108] set for pr

Author: SWhyteAnswer

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

@@ -33,6 +33,7 @@ jobs:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout Base
@@ -54,18 +55,23 @@ jobs:
 =======
 =======
 >>>>>>> f5406c0 ([NDR-108] re-adding db and making action right)
+=======
+>>>>>>> 1f51c26 ([NDR-108] set for pr)
       - name: Checkout Base
         uses: actions/checkout@v4
         with:
           ref: main
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 0716aef ([NDR-108] reverting the workflow)
 =======
 >>>>>>> ae84789 ([NDR-108] temp removing base)
 =======
 >>>>>>> f5406c0 ([NDR-108] re-adding db and making action right)
 =======
 >>>>>>> 043bc42 ([NDR-108] temp standing down base init)
+=======
+>>>>>>> 1f51c26 ([NDR-108] set for pr)
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -85,25 +91,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@v5
         with:

infrastructure/main.tf

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