From dcf41787d23ec5c474a69eb4386c5ac6e681d07d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arwid=20Thornstr=C3=B6m?= Date: Wed, 20 May 2026 13:48:30 +0200 Subject: [PATCH] =?UTF-8?q?Enhance=20ECS=20CloudFormation=20template=20by?= =?UTF-8?q?=20adding=20EnvironmentName=20paramet=E2=80=A6=20(#192)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Enhance ECS CloudFormation template by adding EnvironmentName parameter with allowed values and tagging resources with Project and Environment details for better organization and management. * fixed * Update CloudFormation templates to include Project tag in create and update stack commands, while removing redundant Project tags from resources in ecs-service.yaml for improved consistency and organization. * Add COST_ENVIRONMENT variable to CloudFormation Makefile for production and testing environments, and include it in stack creation and update commands for improved tagging consistency. * revert ecs service --- cloudformation/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cloudformation/Makefile b/cloudformation/Makefile index 8ff423c..148c9f4 100644 --- a/cloudformation/Makefile +++ b/cloudformation/Makefile @@ -28,6 +28,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 + COST_ENVIRONMENT=production BERNARD_QUEUE_ARN=arn:aws:sqs:eu-west-1:954747537408:photowall-bernard-production SAMPLE_RIPPER_QUEUE_ARN=$(SAMPLE_RIPPER_QUEUE_ARN_PRODUCTION) GITHUB_BRANCH=master @@ -39,6 +40,7 @@ ifeq ($(STACK_ENVIRONMENT_NAME),production) else SUBDOMAIN=$(STACK_NAME)-$(STACK_ENVIRONMENT_NAME) ENVIRONMENT_NAME=$(STACK_ENVIRONMENT_NAME) + COST_ENVIRONMENT=testing BERNARD_QUEUE_ARN=arn:aws:sqs:eu-west-1:954747537408:photowall-bernard-stage SAMPLE_RIPPER_QUEUE_ARN=$(SAMPLE_RIPPER_QUEUE_ARN_STAGING) GITHUB_BRANCH=$(STACK_ENVIRONMENT_NAME) @@ -97,7 +99,7 @@ delete-stack: create-stack: check-create-variables-set check-create-initial-ecr-image aws cloudformation create-stack --stack-name $(STACK_NAME)-$(STACK_ENVIRONMENT_NAME) --template-body file://ecs-service.yaml \ --capabilities CAPABILITY_NAMED_IAM \ - --tags Key=EnvironmentName,Value=$(STACK_ENVIRONMENT_NAME) \ + --tags Key=EnvironmentName,Value=$(STACK_ENVIRONMENT_NAME) Key=Project,Value=GraphQLServer Key=CostEnvironment,Value=$(COST_ENVIRONMENT) \ --parameters ParameterKey="EnvironmentName",ParameterValue="$(ENVIRONMENT_NAME)" \ ParameterKey="BernardQueueArn",ParameterValue="${BERNARD_QUEUE_ARN}" \ ParameterKey="SampleRipperQueueArn",ParameterValue="${SAMPLE_RIPPER_QUEUE_ARN}" \ @@ -117,14 +119,14 @@ update-stack: set-repository-lifecycle-policy $(call checkdef,ENVIRONMENT_NAME) aws cloudformation update-stack --stack-name $(STACK_NAME)-$(STACK_ENVIRONMENT_NAME) --template-body file://ecs-service.yaml \ --capabilities CAPABILITY_NAMED_IAM \ - --tags Key=EnvironmentName,Value=$(STACK_ENVIRONMENT_NAME) \ + --tags Key=EnvironmentName,Value=$(STACK_ENVIRONMENT_NAME) Key=Project,Value=GraphQLServer Key=CostEnvironment,Value=$(COST_ENVIRONMENT) \ --parameters ParameterKey="EnvironmentName",UsePreviousValue=true \ ParameterKey="BernardQueueArn",ParameterValue="${BERNARD_QUEUE_ARN}" \ ParameterKey="SampleRipperQueueArn",ParameterValue="${SAMPLE_RIPPER_QUEUE_ARN}" \ ParameterKey="Image",UsePreviousValue=true \ ParameterKey="Subdomain",UsePreviousValue=true \ ParameterKey="Certificate",UsePreviousValue=true \ - ParameterKey="DatabaseSecurityGroup",,UsePreviousValue=true \ + ParameterKey="DatabaseSecurityGroup",UsePreviousValue=true \ ParameterKey="GitHubRepo",ParameterValue="$(GITHUB_REPO)" \ ParameterKey="GitHubBranch",UsePreviousValue=true \ ParameterKey="CpuSize",ParameterValue="$(CPU_SIZE)" \