photowall/graphql-api-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3111: added bernard queue value (#148)

Browse Source 
* added bernard queue value

* dont use previous value
This commit is contained in:
Arwid Thornström
2023-03-30 13:01:14 +02:00
committed by GitHub
parent aaaf8c052e
commit 77f8973a32
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cloudformation/Makefile
+5
View File
@@ -26,6 +26,7 @@ DOCKER_IMAGE=$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(STACK_NAME)
ifeq ($(STACK_ENVIRONMENT_NAME),production) ifeq ($(STACK_ENVIRONMENT_NAME),production)
SUBDOMAIN=$(STACK_NAME) SUBDOMAIN=$(STACK_NAME)
ENVIRONMENT_NAME=production ENVIRONMENT_NAME=production
BERNARD_QUEUE_ARN=arn:aws:sqs:eu-west-1:954747537408:photowall-bernard-production
GITHUB_BRANCH=master GITHUB_BRANCH=master
DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_PRODUCTION) DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_PRODUCTION)
CPU_SIZE=1024 CPU_SIZE=1024
@@ -35,6 +36,7 @@ ifeq ($(STACK_ENVIRONMENT_NAME),production)
else ifeq ($(STACK_ENVIRONMENT_NAME),production-web) else ifeq ($(STACK_ENVIRONMENT_NAME),production-web)
SUBDOMAIN=data SUBDOMAIN=data
ENVIRONMENT_NAME=production ENVIRONMENT_NAME=production
BERNARD_QUEUE_ARN=arn:aws:sqs:eu-west-1:954747537408:photowall-bernard-production
GITHUB_BRANCH=master GITHUB_BRANCH=master
DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_PRODUCTION) DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_PRODUCTION)
CPU_SIZE=1024 CPU_SIZE=1024
@@ -44,6 +46,7 @@ else ifeq ($(STACK_ENVIRONMENT_NAME),production-web)
else else
SUBDOMAIN=$(STACK_NAME)-$(STACK_ENVIRONMENT_NAME) SUBDOMAIN=$(STACK_NAME)-$(STACK_ENVIRONMENT_NAME)
ENVIRONMENT_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) GITHUB_BRANCH=$(STACK_ENVIRONMENT_NAME)
DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_STAGING) DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_STAGING)
CPU_SIZE=512 CPU_SIZE=512
@@ -102,6 +105,7 @@ create-stack: check-create-variables-set check-create-initial-ecr-image
--capabilities CAPABILITY_NAMED_IAM \ --capabilities CAPABILITY_NAMED_IAM \
--tags Key=EnvironmentName,Value=$(STACK_ENVIRONMENT_NAME) \ --tags Key=EnvironmentName,Value=$(STACK_ENVIRONMENT_NAME) \
--parameters ParameterKey="EnvironmentName",ParameterValue="$(ENVIRONMENT_NAME)" \ --parameters ParameterKey="EnvironmentName",ParameterValue="$(ENVIRONMENT_NAME)" \
ParameterKey="BernardQueueArn",ParameterValue="${BERNARD_QUEUE_ARN}" \
ParameterKey="Image",ParameterValue="$(DOCKER_IMAGE)" \ ParameterKey="Image",ParameterValue="$(DOCKER_IMAGE)" \
ParameterKey="Subdomain",ParameterValue="$(SUBDOMAIN)" \ ParameterKey="Subdomain",ParameterValue="$(SUBDOMAIN)" \
ParameterKey="Certificate",ParameterValue="$(CERTIFICATE_ARN)" \ ParameterKey="Certificate",ParameterValue="$(CERTIFICATE_ARN)" \
@@ -120,6 +124,7 @@ update-stack: set-repository-lifecycle-policy
--capabilities CAPABILITY_NAMED_IAM \ --capabilities CAPABILITY_NAMED_IAM \
--tags Key=EnvironmentName,Value=$(STACK_ENVIRONMENT_NAME) \ --tags Key=EnvironmentName,Value=$(STACK_ENVIRONMENT_NAME) \
--parameters ParameterKey="EnvironmentName",UsePreviousValue=true \ --parameters ParameterKey="EnvironmentName",UsePreviousValue=true \
ParameterKey="BernardQueueArn",ParameterValue="${BERNARD_QUEUE_ARN}" \
ParameterKey="Image",UsePreviousValue=true \ ParameterKey="Image",UsePreviousValue=true \
ParameterKey="Subdomain",UsePreviousValue=true \ ParameterKey="Subdomain",UsePreviousValue=true \
ParameterKey="Certificate",UsePreviousValue=true \ ParameterKey="Certificate",UsePreviousValue=true \
cloudformation/ecs-service.yaml
+5 -1
View File
@@ -26,6 +26,10 @@ Parameters:
Type: String Type: String
Description: Name of env such as staging or production Description: Name of env such as staging or production
BernardQueueArn:
Type: String
Description: For policy connection the Bernard queue arn is required
# CPU # CPU
# 256 (.25 vCPU) - Available memory values: 0.5GB, 1GB, 2GB # 256 (.25 vCPU) - Available memory values: 0.5GB, 1GB, 2GB
# 512 (.5 vCPU) - Available memory values: 1GB, 2GB, 3GB, 4GB # 512 (.5 vCPU) - Available memory values: 1GB, 2GB, 3GB, 4GB
@@ -208,7 +212,7 @@ Resources:
- Effect: Allow - Effect: Allow
Action: Action:
- 'sqs:SendMessage' - 'sqs:SendMessage'
Resource: !Sub arn:aws:sqs:eu-west-1:954747537408:photowall-bernard-${EnvironmentName} Resource: !Sub ${BernardQueueArn}
# A role for the containers # A role for the containers
TaskRole: TaskRole: