photowall/api2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P5-4983 give access to bernard sqs queue

Browse Source
This commit is contained in:
Martin Carlsson
2020-03-31 12:59:11 +02:00
committed by GitHub
parent 576877d61b
commit 2ebfec0f8f
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cloudformation/Makefile
+6 -2
View File
@@ -27,12 +27,14 @@ ifeq ($(ENVIRONMENT_NAME),production)
DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_PRODUCTION) DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_PRODUCTION)
CPU_SIZE=1024 CPU_SIZE=1024
MEMORY_SIZE=4GB MEMORY_SIZE=4GB
BERNARD_SQS_POLICY=arn:aws:iam::954747537408:policy/pw-publish-photowall-bernard-live-queue
else else
SUBDOMAIN=$(STACK_NAME)-$(ENVIRONMENT_NAME) SUBDOMAIN=$(STACK_NAME)-$(ENVIRONMENT_NAME)
GITHUB_BRANCH=$(ENVIRONMENT_NAME) GITHUB_BRANCH=$(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
MEMORY_SIZE=2GB MEMORY_SIZE=2GB
BERNARD_SQS_POLICY=arn:aws:iam::954747537408:policy/pw-publish-photowall-bernard-stage-queue
endif endif
check-create-initial-ecr-image: check-create-initial-ecr-image:
@@ -72,7 +74,8 @@ create-stack: check-create-variables-set check-create-initial-ecr-image
ParameterKey="GitHubBranch",ParameterValue="$(GITHUB_BRANCH)" \ ParameterKey="GitHubBranch",ParameterValue="$(GITHUB_BRANCH)" \
ParameterKey="GitHubToken",ParameterValue="$(GITHUB_TOKEN)" \ ParameterKey="GitHubToken",ParameterValue="$(GITHUB_TOKEN)" \
ParameterKey="CpuSize",ParameterValue="$(CPU_SIZE)" \ ParameterKey="CpuSize",ParameterValue="$(CPU_SIZE)" \
ParameterKey="MemorySize",ParameterValue="$(MEMORY_SIZE)" ParameterKey="MemorySize",ParameterValue="$(MEMORY_SIZE)" \
ParameterKey="BernardSQSPolicy",ParameterValue="$(BERNARD_SQS_POLICY)"
update-stack: update-stack:
$(call checkdef,STACK_NAME) $(call checkdef,STACK_NAME)
@@ -89,4 +92,5 @@ update-stack:
ParameterKey="GitHubBranch",UsePreviousValue=true \ ParameterKey="GitHubBranch",UsePreviousValue=true \
ParameterKey="GitHubToken",UsePreviousValue=true \ ParameterKey="GitHubToken",UsePreviousValue=true \
ParameterKey="CpuSize",ParameterValue="$(CPU_SIZE)" \ ParameterKey="CpuSize",ParameterValue="$(CPU_SIZE)" \
ParameterKey="MemorySize",ParameterValue="$(MEMORY_SIZE)" ParameterKey="MemorySize",ParameterValue="$(MEMORY_SIZE)" \
ParameterKey="BernardSQSPolicy",ParameterValue="$(BERNARD_SQS_POLICY)"
cloudformation/ecs-service.yaml
+6
View File
@@ -26,6 +26,9 @@ Parameters:
Type: String Type: String
Description: Name of env such as staging or production Description: Name of env such as staging or production
BernardSQSPolicy:
Type: String
# 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
@@ -158,6 +161,9 @@ Resources:
Principal: Principal:
Service: ecs-tasks.amazonaws.com Service: ecs-tasks.amazonaws.com
Action: 'sts:AssumeRole' Action: 'sts:AssumeRole'
ManagedPolicyArns:
- !Ref BernardSQSPolicy
# A role needed for auto scaling # A role needed for auto scaling
AutoScalingRole: AutoScalingRole:
fabfile.py
Vendored
-2
View File
@@ -12,8 +12,6 @@ def production():
env.environment = 'production' env.environment = 'production'
def cloudformation_update(): def cloudformation_update():
if env.environment != 'staging':
abort('Only staging is deployed soo far')
with lcd('./cloudformation/'): with lcd('./cloudformation/'):
local('make update-stack ENVIRONMENT_NAME={0} STACK_NAME={1}'.format(env.environment, env.stack_name)) local('make update-stack ENVIRONMENT_NAME={0} STACK_NAME={1}'.format(env.environment, env.stack_name))