fix: tweak deployment approaches (#438)

* fix: tweak deployment approaches to make this more stable. * fix: amend readonly role to prevent sts assume failures in pipeline * fix: resolve provider conflict * fix: update provider * fix: remove hard coded provider variables * fix: typo * fix: explicit provider version * fix: provider upgrade * fix: downgrade provider to resolve issues * fix: amend provider * fix: resolve provider checksum
dvsa · Nov 7, 2024 · 985aaae · 985aaae
1 parent 1de9af3
commit 985aaae
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 35 deletions.
diff --git a/infra/terraform/accounts/nonprod/.terraform.lock.hcl b/infra/terraform/accounts/nonprod/.terraform.lock.hcl
diff --git a/infra/terraform/accounts/nonprod/main.tf b/infra/terraform/accounts/nonprod/main.tf
@@ -38,9 +38,12 @@ module "account" {
     ],
   )
 
-  github_oidc_readonly_subjects = [
-    for env in local.environments : "dvsa/vol-app:pull_request"
-  ]
+  github_oidc_readonly_subjects = concat(
+    [
+      "dvsa/vol-app:ref:refs/heads/main",
+      "dvsa/vol-app:pull_request",
+    ]
+  )
 
   github_oidc_readonly_role_policies = merge(
     {

diff --git a/infra/terraform/accounts/nonprod/provider.tf b/infra/terraform/accounts/nonprod/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.49.0"
+      version = ">= 5.49.0"
     }
   }
 

diff --git a/infra/terraform/modules/service/ecs.tf b/infra/terraform/modules/service/ecs.tf
@@ -144,5 +144,6 @@ module "ecs_service" {
 
   #Altered to false as applies are timing out due to health status not pulling through correctly
   wait_for_steady_state = false
-  wait_until_stable     = false
+  wait_until_stable     = true
+  force_new_deployment  = false
 }