From 77f8973a3299303ba6541c56d311415ee4dbd828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arwid=20Thornstr=C3=B6m?= <arwid.thornstrom@photowall.se>
Date: Thu, 30 Mar 2023 13:01:14 +0200
Subject: [PATCH] 3111: added bernard queue value (#148)

* added bernard queue value

* dont use previous value
---
 cloudformation/Makefile         | 5 +++++
 cloudformation/ecs-service.yaml | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/cloudformation/Makefile b/cloudformation/Makefile
index 5b4bd07..6c63508 100644
--- a/cloudformation/Makefile
+++ b/cloudformation/Makefile
@@ -26,6 +26,7 @@ DOCKER_IMAGE=$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(STACK_NAME)
 ifeq ($(STACK_ENVIRONMENT_NAME),production)
 	SUBDOMAIN=$(STACK_NAME)
 	ENVIRONMENT_NAME=production
+	BERNARD_QUEUE_ARN=arn:aws:sqs:eu-west-1:954747537408:photowall-bernard-production
 	GITHUB_BRANCH=master
 	DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_PRODUCTION)
 	CPU_SIZE=1024
@@ -35,6 +36,7 @@ ifeq ($(STACK_ENVIRONMENT_NAME),production)
 else ifeq ($(STACK_ENVIRONMENT_NAME),production-web)
 	SUBDOMAIN=data
 	ENVIRONMENT_NAME=production
+	BERNARD_QUEUE_ARN=arn:aws:sqs:eu-west-1:954747537408:photowall-bernard-production
 	GITHUB_BRANCH=master
 	DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_PRODUCTION)
 	CPU_SIZE=1024
@@ -44,6 +46,7 @@ else ifeq ($(STACK_ENVIRONMENT_NAME),production-web)
 else
 	SUBDOMAIN=$(STACK_NAME)-$(STACK_ENVIRONMENT_NAME)
 	ENVIRONMENT_NAME=$(STACK_ENVIRONMENT_NAME)
+	BERNARD_QUEUE_ARN=arn:aws:sqs:eu-west-1:954747537408:photowall-bernard-stage
 	GITHUB_BRANCH=$(STACK_ENVIRONMENT_NAME)
 	DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_STAGING)
 	CPU_SIZE=512
@@ -102,6 +105,7 @@ create-stack: check-create-variables-set check-create-initial-ecr-image
 		--capabilities CAPABILITY_NAMED_IAM \
 		--tags Key=EnvironmentName,Value=$(STACK_ENVIRONMENT_NAME) \
 		--parameters ParameterKey="EnvironmentName",ParameterValue="$(ENVIRONMENT_NAME)" \
+								 ParameterKey="BernardQueueArn",ParameterValue="${BERNARD_QUEUE_ARN}" \
 								 ParameterKey="Image",ParameterValue="$(DOCKER_IMAGE)" \
 		             ParameterKey="Subdomain",ParameterValue="$(SUBDOMAIN)" \
 		             ParameterKey="Certificate",ParameterValue="$(CERTIFICATE_ARN)" \
@@ -120,6 +124,7 @@ update-stack: set-repository-lifecycle-policy
 		--capabilities CAPABILITY_NAMED_IAM \
 		--tags Key=EnvironmentName,Value=$(STACK_ENVIRONMENT_NAME) \
 		--parameters ParameterKey="EnvironmentName",UsePreviousValue=true \
+								 ParameterKey="BernardQueueArn",ParameterValue="${BERNARD_QUEUE_ARN}" \
 								 ParameterKey="Image",UsePreviousValue=true \
 		             ParameterKey="Subdomain",UsePreviousValue=true \
 		             ParameterKey="Certificate",UsePreviousValue=true \
diff --git a/cloudformation/ecs-service.yaml b/cloudformation/ecs-service.yaml
index d81144d..d4c4335 100644
--- a/cloudformation/ecs-service.yaml
+++ b/cloudformation/ecs-service.yaml
@@ -26,6 +26,10 @@ Parameters:
     Type: String
     Description: Name of env such as staging or production
 
+  BernardQueueArn:
+    Type: String
+    Description: For policy connection the Bernard queue arn is required
+
   # CPU
   # 256 (.25 vCPU) - Available memory values: 0.5GB, 1GB, 2GB
   # 512 (.5 vCPU) - Available memory values: 1GB, 2GB, 3GB, 4GB
@@ -208,7 +212,7 @@ Resources:
           - Effect: Allow
             Action:
               - 'sqs:SendMessage'
-            Resource: !Sub arn:aws:sqs:eu-west-1:954747537408:photowall-bernard-${EnvironmentName}
+            Resource: !Sub ${BernardQueueArn}
 
   # A role for the containers
   TaskRole: