From 439342cc6000e1188277ef6ce2fbcc7a39ce18a4 Mon Sep 17 00:00:00 2001 From: oikkoikk Date: Fri, 1 Dec 2023 15:49:23 +0900 Subject: [PATCH 1/8] update task-definition-release --- task-definition-release.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/task-definition-release.json b/task-definition-release.json index 4381a33..fe18278 100644 --- a/task-definition-release.json +++ b/task-definition-release.json @@ -1,5 +1,5 @@ { - "executionRoleArn": "arn:aws:iam::224066583965:role/AWSECSTaskExecutionRole", + "executionRoleArn": "arn:aws:iam::804073597504:role/ecsTaskExecutionRole", "containerDefinitions": [ { "dnsSearchDomains": null, @@ -8,7 +8,7 @@ "logDriver": "awslogs", "secretOptions": null, "options": { - "awslogs-group": "/ecs/frontend-task", + "awslogs-group": "/ecs/fe-release", "awslogs-region": "ap-northeast-2", "awslogs-stream-prefix": "ecs" } @@ -32,20 +32,20 @@ "workingDirectory": null, "secrets": [ { - "valueFrom": "arn:aws:ssm:ap-northeast-2:224066583965:parameter/sroom/fe/NEXT_PUBLIC_GOOGLE_CLIENT_ID", - "name": "NEXT_PUBLIC_GOOGLE_CLIENT_ID" + "name": "NEXTAUTH_SECRET", + "valueFrom": "arn:aws:ssm:ap-northeast-2:804073597504:parameter/sroom/fe/NEXTAUTH_SECRET" }, { - "valueFrom": "arn:aws:ssm:ap-northeast-2:224066583965:parameter/sroom/fe/NEXT_PUBLIC_CHANNEL_TALK_PLUGIN_KEY", - "name": "NEXT_PUBLIC_CHANNEL_TALK_PLUGIN_KEY" + "name": "NEXT_PUBLIC_CHANNEL_TALK_PLUGIN_KEY", + "valueFrom": "arn:aws:ssm:ap-northeast-2:804073597504:parameter/sroom/fe/NEXT_PUBLIC_CHANNEL_TALK_PLUGIN_KEY" }, { - "valueFrom": "arn:aws:ssm:ap-northeast-2:224066583965:parameter/sroom/fe/NEXTAUTH_SECRET", - "name": "NEXTAUTH_SECRET" + "name": "NEXT_PUBLIC_GOOGLE_CLIENT_ID", + "valueFrom": "arn:aws:ssm:ap-northeast-2:804073597504:parameter/sroom/fe/NEXT_PUBLIC_GOOGLE_CLIENT_ID" }, { - "valueFrom": "arn:aws:ssm:ap-northeast-2:224066583965:parameter/sroom/fe/NEXT_PUBLIC_SENTRY_DSN", - "name": "NEXT_PUBLIC_SENTRY_DSN" + "name": "NEXT_PUBLIC_SENTRY_DSN", + "valueFrom": "arn:aws:ssm:ap-northeast-2:804073597504:parameter/sroom/fe/NEXT_PUBLIC_SENTRY_DSN" } ], "dockerSecurityOptions": null, @@ -53,7 +53,7 @@ "memoryReservation": 500, "volumesFrom": [], "stopTimeout": null, - "image": "224066583965.dkr.ecr.ap-northeast-2.amazonaws.com/fe-repo:release", + "image": "804073597504.dkr.ecr.ap-northeast-2.amazonaws.com/fe-repo:release", "startTimeout": null, "firelensConfiguration": null, "dependsOn": null, @@ -75,8 +75,8 @@ ], "placementConstraints": [], "memory": null, - "taskRoleArn": "arn:aws:iam::224066583965:role/AWSECSTaskExecutionRole", - "family": "frontend-task", + "taskRoleArn": "arn:aws:iam::804073597504:role/AWSECSTaskExecutionRole", + "family": "fe-release", "pidMode": null, "requiresCompatibilities": ["EC2"], "networkMode": "bridge", From 31152360cfde9f4ba150487a52cfbba2aed9fe97 Mon Sep 17 00:00:00 2001 From: oikkoikk Date: Fri, 1 Dec 2023 15:50:26 +0900 Subject: [PATCH 2/8] Update : github actions workflow for testing migration --- .github/workflows/deploy.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 529e897..1ef9e09 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,5 +1,9 @@ name: Deploy to Amazon ECS on: + pull_request: + branches: + - main + types: [opened, reopened, synchronize] push: branches: - main From 487317c5531501c97062a4cded19e543d9cb052e Mon Sep 17 00:00:00 2001 From: oikkoikk Date: Fri, 1 Dec 2023 16:10:32 +0900 Subject: [PATCH 3/8] for testing CI/CD --- task-definition-test.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task-definition-test.json b/task-definition-test.json index b437a86..c25d0f3 100644 --- a/task-definition-test.json +++ b/task-definition-test.json @@ -33,7 +33,7 @@ "secrets": [ { "valueFrom": "arn:aws:ssm:ap-northeast-2:224066583965:parameter/sroom/fe/NEXT_PUBLIC_GOOGLE_CLIENT_ID", - "name": "NEXT_PUBLIC_GOOGLE_CLIENT_ID" + "name": "NEXT_PUBLIC_GOOGLE_CLIENT_IDs" }, { "valueFrom": "arn:aws:ssm:ap-northeast-2:224066583965:parameter/sroom/fe/NEXT_PUBLIC_CHANNEL_TALK_PLUGIN_KEY", From 0cc41b73f5603a574dbbc1da0aa9c63b94db1eef Mon Sep 17 00:00:00 2001 From: oikkoikk Date: Fri, 1 Dec 2023 16:15:56 +0900 Subject: [PATCH 4/8] for testing CI/CD 2 --- task-definition-test.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task-definition-test.json b/task-definition-test.json index c25d0f3..b437a86 100644 --- a/task-definition-test.json +++ b/task-definition-test.json @@ -33,7 +33,7 @@ "secrets": [ { "valueFrom": "arn:aws:ssm:ap-northeast-2:224066583965:parameter/sroom/fe/NEXT_PUBLIC_GOOGLE_CLIENT_ID", - "name": "NEXT_PUBLIC_GOOGLE_CLIENT_IDs" + "name": "NEXT_PUBLIC_GOOGLE_CLIENT_ID" }, { "valueFrom": "arn:aws:ssm:ap-northeast-2:224066583965:parameter/sroom/fe/NEXT_PUBLIC_CHANNEL_TALK_PLUGIN_KEY", From 929b3063b9719de283af6627d9ca067e527d98f3 Mon Sep 17 00:00:00 2001 From: oikkoikk Date: Fri, 1 Dec 2023 17:35:45 +0900 Subject: [PATCH 5/8] for testing CI/CD 3 --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1ef9e09..ddf54bd 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -49,5 +49,5 @@ jobs: with: task-definition: ${{ steps.task-def.outputs.task-definition }} service: fe-service - cluster: fe-cluster + cluster: fe-release-cluster wait-for-service-stability: true From 066a30fd8c453e5e24cd3c6cbf534c8a390d631e Mon Sep 17 00:00:00 2001 From: oikkoikk Date: Fri, 1 Dec 2023 22:22:45 +0900 Subject: [PATCH 6/8] Update : task-definition-test --- .github/workflows/deploy.yml | 2 +- task-definition-release.json | 2 +- task-definition-test.json | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ddf54bd..1ef9e09 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -49,5 +49,5 @@ jobs: with: task-definition: ${{ steps.task-def.outputs.task-definition }} service: fe-service - cluster: fe-release-cluster + cluster: fe-cluster wait-for-service-stability: true diff --git a/task-definition-release.json b/task-definition-release.json index fe18278..6d8791e 100644 --- a/task-definition-release.json +++ b/task-definition-release.json @@ -1,5 +1,5 @@ { - "executionRoleArn": "arn:aws:iam::804073597504:role/ecsTaskExecutionRole", + "executionRoleArn": "arn:aws:iam::804073597504:role/AWSECSTaskExecutionRole", "containerDefinitions": [ { "dnsSearchDomains": null, diff --git a/task-definition-test.json b/task-definition-test.json index b437a86..e9550f8 100644 --- a/task-definition-test.json +++ b/task-definition-test.json @@ -1,5 +1,5 @@ { - "executionRoleArn": "arn:aws:iam::224066583965:role/AWSECSTaskExecutionRole", + "executionRoleArn": "arn:aws:iam::804073597504:role/AWSECSTaskExecutionRole", "containerDefinitions": [ { "dnsSearchDomains": null, @@ -32,20 +32,20 @@ "workingDirectory": null, "secrets": [ { - "valueFrom": "arn:aws:ssm:ap-northeast-2:224066583965:parameter/sroom/fe/NEXT_PUBLIC_GOOGLE_CLIENT_ID", - "name": "NEXT_PUBLIC_GOOGLE_CLIENT_ID" + "name": "NEXTAUTH_SECRET", + "valueFrom": "arn:aws:ssm:ap-northeast-2:804073597504:parameter/sroom/fe/NEXTAUTH_SECRET" }, { - "valueFrom": "arn:aws:ssm:ap-northeast-2:224066583965:parameter/sroom/fe/NEXT_PUBLIC_CHANNEL_TALK_PLUGIN_KEY", - "name": "NEXT_PUBLIC_CHANNEL_TALK_PLUGIN_KEY" + "name": "NEXT_PUBLIC_CHANNEL_TALK_PLUGIN_KEY", + "valueFrom": "arn:aws:ssm:ap-northeast-2:804073597504:parameter/sroom/fe/NEXT_PUBLIC_CHANNEL_TALK_PLUGIN_KEY" }, { - "valueFrom": "arn:aws:ssm:ap-northeast-2:224066583965:parameter/sroom/fe/NEXTAUTH_SECRET", - "name": "NEXTAUTH_SECRET" + "name": "NEXT_PUBLIC_GOOGLE_CLIENT_ID", + "valueFrom": "arn:aws:ssm:ap-northeast-2:804073597504:parameter/sroom/fe/NEXT_PUBLIC_GOOGLE_CLIENT_ID" }, { - "valueFrom": "arn:aws:ssm:ap-northeast-2:224066583965:parameter/sroom/fe/NEXT_PUBLIC_SENTRY_DSN", - "name": "NEXT_PUBLIC_SENTRY_DSN" + "name": "NEXT_PUBLIC_SENTRY_DSN", + "valueFrom": "arn:aws:ssm:ap-northeast-2:804073597504:parameter/sroom/fe/NEXT_PUBLIC_SENTRY_DSN" } ], "dockerSecurityOptions": null, @@ -53,7 +53,7 @@ "memoryReservation": 500, "volumesFrom": [], "stopTimeout": null, - "image": "224066583965.dkr.ecr.ap-northeast-2.amazonaws.com/fe-repo:test", + "image": "804073597504.dkr.ecr.ap-northeast-2.amazonaws.com/fe-repo:test", "startTimeout": null, "firelensConfiguration": null, "dependsOn": null, @@ -75,7 +75,7 @@ ], "placementConstraints": [], "memory": null, - "taskRoleArn": "arn:aws:iam::224066583965:role/AWSECSTaskExecutionRole", + "taskRoleArn": "arn:aws:iam::804073597504:role/AWSECSTaskExecutionRole", "family": "fe-test", "pidMode": null, "requiresCompatibilities": ["EC2"], From 6c1acf0c7560a87afdaeb5c9eaab829d82bee49e Mon Sep 17 00:00:00 2001 From: oikkoikk Date: Mon, 4 Dec 2023 17:06:10 +0900 Subject: [PATCH 7/8] for testing CI/CD 4 --- src/components/ui/button/CloseButton.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/ui/button/CloseButton.tsx b/src/components/ui/button/CloseButton.tsx index 4a1712d..fac8ad5 100644 --- a/src/components/ui/button/CloseButton.tsx +++ b/src/components/ui/button/CloseButton.tsx @@ -1,5 +1,3 @@ -import React from 'react'; - type Props = { className?: string; onClick: () => void; From d3078aa5facd5646c59f4922eededa1607bb2110 Mon Sep 17 00:00:00 2001 From: oikkoikk Date: Fri, 8 Dec 2023 10:46:20 +0900 Subject: [PATCH 8/8] Fix: github actions deploy flow --- .github/workflows/deploy.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1ef9e09..529e897 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,9 +1,5 @@ name: Deploy to Amazon ECS on: - pull_request: - branches: - - main - types: [opened, reopened, synchronize] push: branches: - main