Prod Release 2023-09-28 - Take 2 (#1993)

usdigitalresponse · Sep 29, 2023 · abb9fdf · abb9fdf
1 parent 099fd41
commit abb9fdf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -197,8 +197,7 @@ jobs:
     if: |
       always() &&
       needs.build_api.result == 'success' &&
-      (needs.deploy_terraform.result == 'success' || needs.deploy_terraform.result == 'skipped') &&
-      needs.select_target_environment.outputs.selected == 'staging'
+      (needs.deploy_terraform.result == 'success' || needs.deploy_terraform.result == 'skipped')
     environment: ${{ needs.select_target_environment.outputs.selected }}
     steps:
       - name: Configure AWS Credentials

diff --git a/terraform/main.tf b/terraform/main.tf
@@ -222,8 +222,7 @@ data "aws_iam_policy_document" "arpa_audit_report_rw_reports_bucket" {
 
 module "arpa_audit_report" {
   source                   = "./modules/sqs_consumer_task"
-  namespace                = var.namespace
-  name                     = "arpa_audit_report"
+  namespace                = "${var.namespace}-arpa_audit_report"
   permissions_boundary_arn = local.permissions_boundary_arn
 
   # Networking

diff --git a/terraform/modules/sqs_consumer_task/compute.tf b/terraform/modules/sqs_consumer_task/compute.tf
@@ -163,7 +163,7 @@ resource "aws_ecs_task_definition" "consumer" {
 }
 
 resource "aws_iam_role" "execution" {
-  name_prefix          = "${var.namespace}-ECSExec-"
+  name_prefix          = "${var.namespace}-Exec-"
   permissions_boundary = var.permissions_boundary_arn
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
@@ -191,7 +191,7 @@ resource "aws_iam_role_policy" "execution" {
 }
 
 resource "aws_iam_role" "task" {
-  name_prefix          = "${var.namespace}-ECSTask-"
+  name_prefix          = "${var.namespace}-Task-"
   permissions_boundary = var.permissions_boundary_arn
   assume_role_policy = jsonencode({
     Version = "2012-10-17"

diff --git a/terraform/modules/sqs_consumer_task/variables.tf b/terraform/modules/sqs_consumer_task/variables.tf
@@ -3,11 +3,6 @@ variable "namespace" {
   type        = string
 }
 
-variable "name" {
-  description = "Name prefix for resource names and identifiers"
-  type        = string
-}
-
 variable "tags" {
   type    = map(string)
   default = {}