From 3202f196a482e2393e8a0c3d8b688e5f5017da0b Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Mon, 24 Jun 2024 15:16:43 -0400 Subject: [PATCH 01/38] update tasks only feature --- .github/workflows/test-workflow.yml | 1 + .idea/.gitignore | 8 ++++++++ .idea/amazon-ecs-deploy-task-definition.iml | 9 +++++++++ .idea/inspectionProfiles/Project_Default.xml | 6 ++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ 7 files changed, 44 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/amazon-ecs-deploy-task-definition.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 482aa071e..66adaa297 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -29,6 +29,7 @@ jobs: uses: aws-actions/amazon-ecs-deploy-task-definition@3491fdb09977e802b19e806aceacf94ec0d1bb64 with: task-definition: task-definition.json + run-task: github-actions-deploy-task-def-integ-test service: github-actions-deploy-task-def-integ-test cluster: github-actions-deploy-task-def-integ-test wait-for-service-stability: true diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..13566b81b --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/amazon-ecs-deploy-task-definition.iml b/.idea/amazon-ecs-deploy-task-definition.iml new file mode 100644 index 000000000..d6ebd4805 --- /dev/null +++ b/.idea/amazon-ecs-deploy-task-definition.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 000000000..03d9549ea --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..47478b911 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..32696e3aa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..35eb1ddfb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From b92d3147acd803f91e3768f495a767e20f7486de Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Mon, 29 Jul 2024 18:21:08 -0400 Subject: [PATCH 02/38] new integration tests --- .github/workflows/test-workflow.yml | 50 +++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 20c0565d7..ef0738b0d 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -33,3 +33,53 @@ jobs: service: github-actions-deploy-task-def-integ-test cluster: github-actions-deploy-task-def-integ-test wait-for-service-stability: true + + - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being False + uses: shesaave/amazon-ecs-deploy-task-definition@c279797b5851a4a8e05656a935b4847778fecd44 + with: + task-definition: task-definition.json + cluster: github-actions-deploy-task-def-integ-test + run-task: true + run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-security-groups: sg-067ebcde49c0f3ad8 + run-task-launch-type: FARGATE + wait-for-task-stopped: false + + - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True + uses: shesaave/amazon-ecs-deploy-task-definition@c279797b5851a4a8e05656a935b4847778fecd44 + with: + task-definition: task-definition.json + cluster: github-actions-deploy-task-def-integ-test + run-task: true + run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-security-groups: sg-067ebcde49c0f3ad8 + run-task-launch-type: FARGATE + wait-for-task-stopped: true + + - name: Deploy Amazon ECS task definition With A Servcie, Stand-Alone Task & Wait For Task Stopped Being False + uses: shesaave/amazon-ecs-deploy-task-definition@c279797b5851a4a8e05656a935b4847778fecd44 + with: + task-definition: ${{ steps.task-def.outputs.task-definition }} + service: ${{ env.ECS_SERVICE }} + cluster: ${{ env.ECS_CLUSTER }} + wait-for-service-stability: true + run-task: true + run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-assign-public-IP: ENABLED + run-task-security-groups: sg-067ebcde49c0f3ad8 + run-task-launch-type: FARGATE + wait-for-task-stopped: false + + - name: Deploy Amazon ECS task definition With A Service, Stand-Alone Task & Wait For Task Stopped Being True + uses: shesaave/amazon-ecs-deploy-task-definition@c279797b5851a4a8e05656a935b4847778fecd44 + with: + task-definition: ${{ steps.task-def.outputs.task-definition }} + service: ${{ env.ECS_SERVICE }} + cluster: ${{ env.ECS_CLUSTER }} + wait-for-service-stability: true + run-task: true + run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-assign-public-IP: ENABLED + run-task-security-groups: sg-067ebcde49c0f3ad8 + run-task-launch-type: FARGATE + wait-for-task-stopped: true \ No newline at end of file From d833b92fc005661795af100369ecaf3abc9d1332 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Mon, 29 Jul 2024 18:25:02 -0400 Subject: [PATCH 03/38] new integration tests with env variables defined --- .github/workflows/test-workflow.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index ef0738b0d..5f7f16c36 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -3,6 +3,14 @@ on: branches: - integ-tests +env: + AWS_REGION: us-east-1 + ECR_REPOSITORY: one-off-input + ECS_SERVICE: app-testing-service04 + ECS_CLUSTER: one-off-cluster01 + ECS_TASK_DEFINITION: task-definition.json + CONTAINER_NAME: app + name: Integration Test jobs: From 98f6d60f4f58d1b16e95c94c4b1330f96cbe11c3 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Mon, 29 Jul 2024 18:28:28 -0400 Subject: [PATCH 04/38] updated inputs --- .github/workflows/test-workflow.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 5f7f16c36..92d80be0e 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -37,9 +37,8 @@ jobs: uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: task-definition: task-definition.json - run-task: github-actions-deploy-task-def-integ-test - service: github-actions-deploy-task-def-integ-test - cluster: github-actions-deploy-task-def-integ-test + service: ${{ env.ECS_SERVICE }} + cluster: ${{ env.ECS_CLUSTER }} wait-for-service-stability: true - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being False From 57829c7f1859163271df6f964d1587fb2ade134f Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Mon, 29 Jul 2024 18:36:07 -0400 Subject: [PATCH 05/38] updated cluster inputs --- .github/workflows/test-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 92d80be0e..50b469e8b 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -45,7 +45,7 @@ jobs: uses: shesaave/amazon-ecs-deploy-task-definition@c279797b5851a4a8e05656a935b4847778fecd44 with: task-definition: task-definition.json - cluster: github-actions-deploy-task-def-integ-test + cluster: ${{ env.ECS_CLUSTER }} run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-security-groups: sg-067ebcde49c0f3ad8 @@ -56,7 +56,7 @@ jobs: uses: shesaave/amazon-ecs-deploy-task-definition@c279797b5851a4a8e05656a935b4847778fecd44 with: task-definition: task-definition.json - cluster: github-actions-deploy-task-def-integ-test + cluster: ${{ env.ECS_CLUSTER }} run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-security-groups: sg-067ebcde49c0f3ad8 From b586061850f12281c6aec50c1edce8708a1381f8 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 09:32:37 -0400 Subject: [PATCH 06/38] updated region --- .github/workflows/test-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 50b469e8b..cab14b2be 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -31,7 +31,7 @@ jobs: with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-west-2 + aws-region: us-east-1 - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 From 5c3d9dbe1bedaabdbbd282ca77e1f298ff284111 Mon Sep 17 00:00:00 2001 From: Sherlyn Date: Tue, 30 Jul 2024 09:47:58 -0400 Subject: [PATCH 07/38] Update test-workflow.yml --- .github/workflows/test-workflow.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index cab14b2be..b16ca23ec 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -4,12 +4,12 @@ on: - integ-tests env: - AWS_REGION: us-east-1 - ECR_REPOSITORY: one-off-input - ECS_SERVICE: app-testing-service04 - ECS_CLUSTER: one-off-cluster01 + AWS_REGION: us-west-2 + ECR_REPOSITORY: cdk-hnb659fds-container-assets-708414441733-us-west-2 + ECS_SERVICE: github-actions-deploy-task-def-integ-test + ECS_CLUSTER: github-actions-deploy-task-def-integ-test ECS_TASK_DEFINITION: task-definition.json - CONTAINER_NAME: app + CONTAINER_NAME: web name: Integration Test @@ -31,7 +31,7 @@ jobs: with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 + aws-region: us-west-2 - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 @@ -89,4 +89,4 @@ jobs: run-task-assign-public-IP: ENABLED run-task-security-groups: sg-067ebcde49c0f3ad8 run-task-launch-type: FARGATE - wait-for-task-stopped: true \ No newline at end of file + wait-for-task-stopped: true From b886b563e5cb0f772683e064b84fd49f2a07d62a Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 09:58:43 -0400 Subject: [PATCH 08/38] updated subnet values --- .github/workflows/test-workflow.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index cab14b2be..fe87b724b 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -47,7 +47,7 @@ jobs: task-definition: task-definition.json cluster: ${{ env.ECS_CLUSTER }} run-task: true - run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 run-task-security-groups: sg-067ebcde49c0f3ad8 run-task-launch-type: FARGATE wait-for-task-stopped: false @@ -58,7 +58,7 @@ jobs: task-definition: task-definition.json cluster: ${{ env.ECS_CLUSTER }} run-task: true - run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 run-task-security-groups: sg-067ebcde49c0f3ad8 run-task-launch-type: FARGATE wait-for-task-stopped: true @@ -71,7 +71,7 @@ jobs: cluster: ${{ env.ECS_CLUSTER }} wait-for-service-stability: true run-task: true - run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 run-task-assign-public-IP: ENABLED run-task-security-groups: sg-067ebcde49c0f3ad8 run-task-launch-type: FARGATE @@ -85,7 +85,7 @@ jobs: cluster: ${{ env.ECS_CLUSTER }} wait-for-service-stability: true run-task: true - run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 run-task-assign-public-IP: ENABLED run-task-security-groups: sg-067ebcde49c0f3ad8 run-task-launch-type: FARGATE From 038fdd10d79fed36c48f1c558cf3eb1d73072eca Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 10:05:28 -0400 Subject: [PATCH 09/38] updated values to link to my subnets, repo, cluster, and my service --- .github/workflows/test-workflow.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 0d7ae7820..f3df147ae 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -4,12 +4,12 @@ on: - integ-tests env: - AWS_REGION: us-west-2 - ECR_REPOSITORY: cdk-hnb659fds-container-assets-708414441733-us-west-2 - ECS_SERVICE: github-actions-deploy-task-def-integ-test - ECS_CLUSTER: github-actions-deploy-task-def-integ-test + AWS_REGION: us-east-1 + ECR_REPOSITORY: one-off-input + ECS_SERVICE: app-testing-service04 + ECS_CLUSTER: one-off-cluster01 ECS_TASK_DEFINITION: task-definition.json - CONTAINER_NAME: web + CONTAINER_NAME: app name: Integration Test @@ -31,7 +31,7 @@ jobs: with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-west-2 + aws-region: us-east-1 - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 From f017483ea89278024eaaad47185ccecbd6499edf Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 10:14:10 -0400 Subject: [PATCH 10/38] update security group --- .github/workflows/test-workflow.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index f3df147ae..7e4955970 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -48,7 +48,7 @@ jobs: cluster: ${{ env.ECS_CLUSTER }} run-task: true run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 - run-task-security-groups: sg-067ebcde49c0f3ad8 + run-task-security-groups: sg-09039e6de81d27e9c run-task-launch-type: FARGATE wait-for-task-stopped: false @@ -59,7 +59,7 @@ jobs: cluster: ${{ env.ECS_CLUSTER }} run-task: true run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 - run-task-security-groups: sg-067ebcde49c0f3ad8 + run-task-security-groups: sg-09039e6de81d27e9c run-task-launch-type: FARGATE wait-for-task-stopped: true @@ -73,7 +73,7 @@ jobs: run-task: true run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 run-task-assign-public-IP: ENABLED - run-task-security-groups: sg-067ebcde49c0f3ad8 + run-task-security-groups: sg-09039e6de81d27e9c run-task-launch-type: FARGATE wait-for-task-stopped: false @@ -87,6 +87,6 @@ jobs: run-task: true run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 run-task-assign-public-IP: ENABLED - run-task-security-groups: sg-067ebcde49c0f3ad8 + run-task-security-groups: sg-09039e6de81d27e9c run-task-launch-type: FARGATE - wait-for-task-stopped: true + wait-for-task-stopped: true \ No newline at end of file From b2e6e587bf1449ff5509feb20ee2cbf6675889d8 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 10:38:02 -0400 Subject: [PATCH 11/38] modified workflow to add public IP and task definition with proper inputs --- .github/workflows/test-workflow.yml | 2 ++ task-definition.json | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 7e4955970..570c59fbd 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -48,6 +48,7 @@ jobs: cluster: ${{ env.ECS_CLUSTER }} run-task: true run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 + run-task-assign-public-IP: ENABLED run-task-security-groups: sg-09039e6de81d27e9c run-task-launch-type: FARGATE wait-for-task-stopped: false @@ -59,6 +60,7 @@ jobs: cluster: ${{ env.ECS_CLUSTER }} run-task: true run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 + run-task-assign-public-IP: ENABLED run-task-security-groups: sg-09039e6de81d27e9c run-task-launch-type: FARGATE wait-for-task-stopped: true diff --git a/task-definition.json b/task-definition.json index 132cf7ee7..1a7cdb2e8 100644 --- a/task-definition.json +++ b/task-definition.json @@ -28,5 +28,10 @@ "FARGATE" ], "networkMode": "awsvpc", + "awsvpcConfiguration": { + "subnets": [ "subnet-0b55b050c50fa69fc", "subnet-0e6bad97ae3070da7", "subnet-06e1eee5d79c9c759", "subnet-04f946511ec06f6cc", "subnet-0db3feae90e6e3739", "subnet-06135d9ae548a05c3"], + "securityGroups": ["sg-09039e6de81d27e9c"], + "assignPublicIp": "ENABLED" + }, "cpu": "256" } From ef56b9ca26e765d45f523ee520cfea9e0ed51ccc Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 11:28:16 -0400 Subject: [PATCH 12/38] new task def file and yaml file changes --- .github/workflows/test-workflow.yml | 41 +++++------------------------ task-definition-run-task.json | 37 ++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 34 deletions(-) create mode 100644 task-definition-run-task.json diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 570c59fbd..16122e356 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -9,6 +9,7 @@ env: ECS_SERVICE: app-testing-service04 ECS_CLUSTER: one-off-cluster01 ECS_TASK_DEFINITION: task-definition.json + ECS_TASK_DEFINITION_RUN_TASK: task-definition-run-task.json CONTAINER_NAME: app name: Integration Test @@ -33,18 +34,10 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-1 - - name: Deploy Amazon ECS task definition - uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 - with: - task-definition: task-definition.json - service: ${{ env.ECS_SERVICE }} - cluster: ${{ env.ECS_CLUSTER }} - wait-for-service-stability: true - - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being False uses: shesaave/amazon-ecs-deploy-task-definition@c279797b5851a4a8e05656a935b4847778fecd44 with: - task-definition: task-definition.json + task-definition: task-definition-run-task.json cluster: ${{ env.ECS_CLUSTER }} run-task: true run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 @@ -56,7 +49,7 @@ jobs: - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True uses: shesaave/amazon-ecs-deploy-task-definition@c279797b5851a4a8e05656a935b4847778fecd44 with: - task-definition: task-definition.json + task-definition: task-definition-run-task.json cluster: ${{ env.ECS_CLUSTER }} run-task: true run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 @@ -65,30 +58,10 @@ jobs: run-task-launch-type: FARGATE wait-for-task-stopped: true - - name: Deploy Amazon ECS task definition With A Servcie, Stand-Alone Task & Wait For Task Stopped Being False - uses: shesaave/amazon-ecs-deploy-task-definition@c279797b5851a4a8e05656a935b4847778fecd44 - with: - task-definition: ${{ steps.task-def.outputs.task-definition }} - service: ${{ env.ECS_SERVICE }} - cluster: ${{ env.ECS_CLUSTER }} - wait-for-service-stability: true - run-task: true - run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 - run-task-assign-public-IP: ENABLED - run-task-security-groups: sg-09039e6de81d27e9c - run-task-launch-type: FARGATE - wait-for-task-stopped: false - - - name: Deploy Amazon ECS task definition With A Service, Stand-Alone Task & Wait For Task Stopped Being True - uses: shesaave/amazon-ecs-deploy-task-definition@c279797b5851a4a8e05656a935b4847778fecd44 + - name: Deploy Amazon ECS task definition + uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: - task-definition: ${{ steps.task-def.outputs.task-definition }} + task-definition: task-definition.json service: ${{ env.ECS_SERVICE }} cluster: ${{ env.ECS_CLUSTER }} - wait-for-service-stability: true - run-task: true - run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 - run-task-assign-public-IP: ENABLED - run-task-security-groups: sg-09039e6de81d27e9c - run-task-launch-type: FARGATE - wait-for-task-stopped: true \ No newline at end of file + wait-for-service-stability: true \ No newline at end of file diff --git a/task-definition-run-task.json b/task-definition-run-task.json new file mode 100644 index 000000000..c08bbc912 --- /dev/null +++ b/task-definition-run-task.json @@ -0,0 +1,37 @@ +{ + "containerDefinitions": [ + { + "entryPoint": [ + "sh", + "-c" + ], + "portMappings": [ + { + "hostPort": 80, + "protocol": "tcp", + "containerPort": 80 + } + ], + "command": [ + "/bin/sh -c \"echo ' Amazon ECS Sample App

Amazon ECS Sample App

Congratulations!

Your application is now running on a container in Amazon ECS.

' > /usr/local/apache2/htdocs/index.html && httpd-foreground\"" + ], + "cpu": 256, + "memoryReservation": 512, + "image": "public.ecr.aws/docker/library/hello-world:nanoserver", + "essential": true, + "name": "sample-app" + } + ], + "memory": "512", + "family": "github-actions-deploy-task-def-integ-tests", + "requiresCompatibilities": [ + "FARGATE" + ], + "networkMode": "awsvpc", + "awsvpcConfiguration": { + "subnets": [ "subnet-0b55b050c50fa69fc", "subnet-0e6bad97ae3070da7", "subnet-06e1eee5d79c9c759", "subnet-04f946511ec06f6cc", "subnet-0db3feae90e6e3739", "subnet-06135d9ae548a05c3"], + "securityGroups": ["sg-09039e6de81d27e9c"], + "assignPublicIp": "ENABLED" + }, + "cpu": "256" +} From 4247e8f6f8bb25ef763eb4971bdf42fd89c92162 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 11:53:32 -0400 Subject: [PATCH 13/38] updated task def run task file with different container information --- task-definition-run-task.json | 44 ++++++++++++++--------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/task-definition-run-task.json b/task-definition-run-task.json index c08bbc912..4d26693db 100644 --- a/task-definition-run-task.json +++ b/task-definition-run-task.json @@ -1,26 +1,20 @@ { + "containerDefinitions": [ - { - "entryPoint": [ - "sh", - "-c" - ], - "portMappings": [ - { - "hostPort": 80, - "protocol": "tcp", - "containerPort": 80 - } - ], - "command": [ - "/bin/sh -c \"echo ' Amazon ECS Sample App

Amazon ECS Sample App

Congratulations!

Your application is now running on a container in Amazon ECS.

' > /usr/local/apache2/htdocs/index.html && httpd-foreground\"" - ], - "cpu": 256, - "memoryReservation": 512, - "image": "public.ecr.aws/docker/library/hello-world:nanoserver", - "essential": true, - "name": "sample-app" - } + { + "memory": 32, + "essential": true, + "entryPoint": ["ping"], + "name": "alpine_ping", + "readonlyRootFilesystem": true, + "image": "alpine:3.4", + "command": [ + "-c", + "4", + "example.com" + ], + "cpu": 16 + } ], "memory": "512", "family": "github-actions-deploy-task-def-integ-tests", @@ -28,10 +22,6 @@ "FARGATE" ], "networkMode": "awsvpc", - "awsvpcConfiguration": { - "subnets": [ "subnet-0b55b050c50fa69fc", "subnet-0e6bad97ae3070da7", "subnet-06e1eee5d79c9c759", "subnet-04f946511ec06f6cc", "subnet-0db3feae90e6e3739", "subnet-06135d9ae548a05c3"], - "securityGroups": ["sg-09039e6de81d27e9c"], - "assignPublicIp": "ENABLED" - }, - "cpu": "256" + "cpu": "16" + } From 91e9ed21fd252bdd775a620eabe010ab44e61f95 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 11:55:02 -0400 Subject: [PATCH 14/38] updated task def run task file with new cpu --- task-definition-run-task.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task-definition-run-task.json b/task-definition-run-task.json index 4d26693db..969e698be 100644 --- a/task-definition-run-task.json +++ b/task-definition-run-task.json @@ -22,6 +22,6 @@ "FARGATE" ], "networkMode": "awsvpc", - "cpu": "16" + "cpu": "256" } From a63b1ef3b0f9c2a3a8b3a6d0c732178bbef8a6fb Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 14:42:11 -0400 Subject: [PATCH 15/38] new changes for integ tests with deploy task def credentials --- .github/workflows/test-workflow.yml | 22 +++++++++++----------- test-workflow.yml | 24 ++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 16122e356..f81b18086 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -5,12 +5,12 @@ on: env: AWS_REGION: us-east-1 - ECR_REPOSITORY: one-off-input - ECS_SERVICE: app-testing-service04 - ECS_CLUSTER: one-off-cluster01 + ECR_REPOSITORY: cdk-hnb659fds-container-assets-708414441733-us-west-2 + ECS_SERVICE: github-actions-deploy-task-def-integ-test + ECS_CLUSTER: github-actions-deploy-task-def-integ-test ECS_TASK_DEFINITION: task-definition.json ECS_TASK_DEFINITION_RUN_TASK: task-definition-run-task.json - CONTAINER_NAME: app + CONTAINER_NAME: web name: Integration Test @@ -32,29 +32,29 @@ jobs: with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 + aws-region: us-west-2 - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being False - uses: shesaave/amazon-ecs-deploy-task-definition@c279797b5851a4a8e05656a935b4847778fecd44 + uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: task-definition: task-definition-run-task.json cluster: ${{ env.ECS_CLUSTER }} run-task: true - run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 + run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-assign-public-IP: ENABLED - run-task-security-groups: sg-09039e6de81d27e9c + run-task-security-groups: sg-067ebcde49c0f3ad8, sg-148d093a run-task-launch-type: FARGATE wait-for-task-stopped: false - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True - uses: shesaave/amazon-ecs-deploy-task-definition@c279797b5851a4a8e05656a935b4847778fecd44 + uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: task-definition: task-definition-run-task.json cluster: ${{ env.ECS_CLUSTER }} run-task: true - run-task-subnets: subnet-0b55b050c50fa69fc, subnet-0e6bad97ae3070da7, subnet-04f946511ec06f6cc, subnet-06135d9ae548a05c3 + run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-assign-public-IP: ENABLED - run-task-security-groups: sg-09039e6de81d27e9c + run-task-security-groups: sg-067ebcde49c0f3ad8, sg-148d093a run-task-launch-type: FARGATE wait-for-task-stopped: true diff --git a/test-workflow.yml b/test-workflow.yml index 288591211..380f1b633 100644 --- a/test-workflow.yml +++ b/test-workflow.yml @@ -25,6 +25,30 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-west-2 + - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being False + uses: aws-actions/amazon-ecs-deploy-task-definition@v1 + with: + task-definition: task-definition-run-task.json + cluster: ${{ env.ECS_CLUSTER }} + run-task: true + run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-assign-public-IP: ENABLED + run-task-security-groups: sg-067ebcde49c0f3ad8, sg-148d093a + run-task-launch-type: FARGATE + wait-for-task-stopped: false + + - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True + uses: aws-actions/amazon-ecs-deploy-task-definition@v1 + with: + task-definition: task-definition-run-task.json + cluster: ${{ env.ECS_CLUSTER }} + run-task: true + run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-assign-public-IP: ENABLED + run-task-security-groups: sg-067ebcde49c0f3ad8, sg-148d093a + run-task-launch-type: FARGATE + wait-for-task-stopped: true + - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: From 509793021510a8ba221be3eea5598760f31c83af Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 14:46:10 -0400 Subject: [PATCH 16/38] updating task definition --- .github/workflows/test-workflow.yml | 2 +- test-workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index f81b18086..7e138bc62 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -61,7 +61,7 @@ jobs: - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: - task-definition: task-definition.json + task-definition: task-definition-run-task.json service: ${{ env.ECS_SERVICE }} cluster: ${{ env.ECS_CLUSTER }} wait-for-service-stability: true \ No newline at end of file diff --git a/test-workflow.yml b/test-workflow.yml index 380f1b633..01f9d3d3f 100644 --- a/test-workflow.yml +++ b/test-workflow.yml @@ -52,7 +52,7 @@ jobs: - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: - task-definition: task-definition.json + task-definition: task-definition-run-task.json service: github-actions-deploy-task-def-integ-test cluster: github-actions-deploy-task-def-integ-test wait-for-service-stability: true From 23d4244eaed1a4e64fe2c24d84c08e1465eb0632 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 14:49:28 -0400 Subject: [PATCH 17/38] updating env variables to inputs --- .github/workflows/test-workflow.yml | 2 +- test-workflow.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 7e138bc62..f81b18086 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -61,7 +61,7 @@ jobs: - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: - task-definition: task-definition-run-task.json + task-definition: task-definition.json service: ${{ env.ECS_SERVICE }} cluster: ${{ env.ECS_CLUSTER }} wait-for-service-stability: true \ No newline at end of file diff --git a/test-workflow.yml b/test-workflow.yml index 01f9d3d3f..8985ac14e 100644 --- a/test-workflow.yml +++ b/test-workflow.yml @@ -52,7 +52,7 @@ jobs: - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: - task-definition: task-definition-run-task.json - service: github-actions-deploy-task-def-integ-test - cluster: github-actions-deploy-task-def-integ-test + task-definition: task-definition.json + service: ${{ env.ECS_SERVICE }} + cluster: ${{ env.ECS_CLUSTER }} wait-for-service-stability: true From a84b8c859554108deab2a68f824b9c41371696f9 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 14:52:01 -0400 Subject: [PATCH 18/38] updated region --- .github/workflows/test-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index f81b18086..9c3bd407f 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -4,7 +4,7 @@ on: - integ-tests env: - AWS_REGION: us-east-1 + AWS_REGION: us-west-2 ECR_REPOSITORY: cdk-hnb659fds-container-assets-708414441733-us-west-2 ECS_SERVICE: github-actions-deploy-task-def-integ-test ECS_CLUSTER: github-actions-deploy-task-def-integ-test From b5db6990d9e27928b39bb2949a404ebe1374aaf6 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 15:01:36 -0400 Subject: [PATCH 19/38] updated env to both workflow files --- .github/workflows/test-workflow.yml | 6 +++--- test-workflow.yml | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 9c3bd407f..c10943653 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -37,7 +37,7 @@ jobs: - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being False uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: - task-definition: task-definition-run-task.json + task-definition: ${{ env.ECS_TASK_DEFINITION_RUN_TASK }} cluster: ${{ env.ECS_CLUSTER }} run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 @@ -49,7 +49,7 @@ jobs: - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: - task-definition: task-definition-run-task.json + task-definition: ${{ env.ECS_TASK_DEFINITION_RUN_TASK }} cluster: ${{ env.ECS_CLUSTER }} run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 @@ -61,7 +61,7 @@ jobs: - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: - task-definition: task-definition.json + task-definition: ${{ env.ECS_TASK_DEFINITION }} service: ${{ env.ECS_SERVICE }} cluster: ${{ env.ECS_CLUSTER }} wait-for-service-stability: true \ No newline at end of file diff --git a/test-workflow.yml b/test-workflow.yml index 8985ac14e..9d7acce51 100644 --- a/test-workflow.yml +++ b/test-workflow.yml @@ -3,6 +3,15 @@ on: branches: - integ-tests +env: + AWS_REGION: us-west-2 + ECR_REPOSITORY: cdk-hnb659fds-container-assets-708414441733-us-west-2 + ECS_SERVICE: github-actions-deploy-task-def-integ-test + ECS_CLUSTER: github-actions-deploy-task-def-integ-test + ECS_TASK_DEFINITION: task-definition.json + ECS_TASK_DEFINITION_RUN_TASK: task-definition-run-task.json + CONTAINER_NAME: web + name: Integration Test jobs: @@ -28,7 +37,7 @@ jobs: - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being False uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: - task-definition: task-definition-run-task.json + task-definition: ${{ env.ECS_TASK_DEFINITION_RUN_TASK }} cluster: ${{ env.ECS_CLUSTER }} run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 @@ -40,7 +49,7 @@ jobs: - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: - task-definition: task-definition-run-task.json + task-definition: ${{ env.ECS_TASK_DEFINITION_RUN_TASK }} cluster: ${{ env.ECS_CLUSTER }} run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 @@ -52,7 +61,7 @@ jobs: - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: - task-definition: task-definition.json + task-definition: ${{ env.ECS_TASK_DEFINITION }} service: ${{ env.ECS_SERVICE }} cluster: ${{ env.ECS_CLUSTER }} wait-for-service-stability: true From 3d454934e4856e8462bc53ec756b1fcb47e4f897 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 15:20:35 -0400 Subject: [PATCH 20/38] removing env block --- .github/workflows/test-workflow.yml | 23 +++++++---------------- test-workflow.yml | 23 +++++++---------------- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index c10943653..702272c5b 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -3,15 +3,6 @@ on: branches: - integ-tests -env: - AWS_REGION: us-west-2 - ECR_REPOSITORY: cdk-hnb659fds-container-assets-708414441733-us-west-2 - ECS_SERVICE: github-actions-deploy-task-def-integ-test - ECS_CLUSTER: github-actions-deploy-task-def-integ-test - ECS_TASK_DEFINITION: task-definition.json - ECS_TASK_DEFINITION_RUN_TASK: task-definition-run-task.json - CONTAINER_NAME: web - name: Integration Test jobs: @@ -37,8 +28,8 @@ jobs: - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being False uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: - task-definition: ${{ env.ECS_TASK_DEFINITION_RUN_TASK }} - cluster: ${{ env.ECS_CLUSTER }} + task-definition: task-definition-run-task.json + cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-assign-public-IP: ENABLED @@ -49,8 +40,8 @@ jobs: - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: - task-definition: ${{ env.ECS_TASK_DEFINITION_RUN_TASK }} - cluster: ${{ env.ECS_CLUSTER }} + task-definition: task-definition-run-task.json + cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-assign-public-IP: ENABLED @@ -61,7 +52,7 @@ jobs: - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: - task-definition: ${{ env.ECS_TASK_DEFINITION }} - service: ${{ env.ECS_SERVICE }} - cluster: ${{ env.ECS_CLUSTER }} + task-definition: task-definition.json + service: github-actions-deploy-task-def-integ-test + cluster: github-actions-deploy-task-def-integ-test wait-for-service-stability: true \ No newline at end of file diff --git a/test-workflow.yml b/test-workflow.yml index 9d7acce51..b1b6a9f77 100644 --- a/test-workflow.yml +++ b/test-workflow.yml @@ -3,15 +3,6 @@ on: branches: - integ-tests -env: - AWS_REGION: us-west-2 - ECR_REPOSITORY: cdk-hnb659fds-container-assets-708414441733-us-west-2 - ECS_SERVICE: github-actions-deploy-task-def-integ-test - ECS_CLUSTER: github-actions-deploy-task-def-integ-test - ECS_TASK_DEFINITION: task-definition.json - ECS_TASK_DEFINITION_RUN_TASK: task-definition-run-task.json - CONTAINER_NAME: web - name: Integration Test jobs: @@ -37,8 +28,8 @@ jobs: - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being False uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: - task-definition: ${{ env.ECS_TASK_DEFINITION_RUN_TASK }} - cluster: ${{ env.ECS_CLUSTER }} + task-definition: task-definition-run-task.json + cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-assign-public-IP: ENABLED @@ -49,8 +40,8 @@ jobs: - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: - task-definition: ${{ env.ECS_TASK_DEFINITION_RUN_TASK }} - cluster: ${{ env.ECS_CLUSTER }} + task-definition: task-definition-run-task.json + cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-assign-public-IP: ENABLED @@ -61,7 +52,7 @@ jobs: - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: - task-definition: ${{ env.ECS_TASK_DEFINITION }} - service: ${{ env.ECS_SERVICE }} - cluster: ${{ env.ECS_CLUSTER }} + task-definition: task-definition.json + service: github-actions-deploy-task-def-integ-test + cluster: github-actions-deploy-task-def-integ-test wait-for-service-stability: true From 87b02dc4aca7c192a91f68789ed5a2e871c7b7ed Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 15:22:37 -0400 Subject: [PATCH 21/38] removing old commit and using commit from offical deploy repo --- .github/workflows/test-workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 702272c5b..f2085bfd4 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -26,7 +26,7 @@ jobs: aws-region: us-west-2 - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being False - uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 + uses: aws-actions/amazon-ecs-deploy-task-definition@b3a528eb690c86037acd19fd6a2a86337f4e3657 with: task-definition: task-definition-run-task.json cluster: github-actions-deploy-task-def-integ-test @@ -38,7 +38,7 @@ jobs: wait-for-task-stopped: false - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True - uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 + uses: aws-actions/amazon-ecs-deploy-task-definition@b3a528eb690c86037acd19fd6a2a86337f4e3657 with: task-definition: task-definition-run-task.json cluster: github-actions-deploy-task-def-integ-test @@ -50,7 +50,7 @@ jobs: wait-for-task-stopped: true - name: Deploy Amazon ECS task definition - uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 + uses: aws-actions/amazon-ecs-deploy-task-definition@b3a528eb690c86037acd19fd6a2a86337f4e3657 with: task-definition: task-definition.json service: github-actions-deploy-task-def-integ-test From cb5f1e80365947659d2ab59c2b013e49cada6a08 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 15:24:49 -0400 Subject: [PATCH 22/38] new echo integ test run no. --- .github/workflows/test-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index f2085bfd4..a328135ef 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -16,7 +16,7 @@ jobs: - name: Print current build ID run: | - echo Integration test run: githubactionsamazonecsdeplo-NWcjHIgDJLXw:73193632-fdb5-4eea-b8b8-7c9afb374ce0 + echo Integration test run: githubactionsamazonecsdeplo-NWcjHIgDJLXw:b758d9f2-aea6-4592-906f-aae8754d98b4 - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 From 777e820c5083c18c8044a6770858120063fd30f0 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 15:28:07 -0400 Subject: [PATCH 23/38] update original task definition --- task-definition.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/task-definition.json b/task-definition.json index 1a7cdb2e8..132cf7ee7 100644 --- a/task-definition.json +++ b/task-definition.json @@ -28,10 +28,5 @@ "FARGATE" ], "networkMode": "awsvpc", - "awsvpcConfiguration": { - "subnets": [ "subnet-0b55b050c50fa69fc", "subnet-0e6bad97ae3070da7", "subnet-06e1eee5d79c9c759", "subnet-04f946511ec06f6cc", "subnet-0db3feae90e6e3739", "subnet-06135d9ae548a05c3"], - "securityGroups": ["sg-09039e6de81d27e9c"], - "assignPublicIp": "ENABLED" - }, "cpu": "256" } From 2b2e22b4b17b77cd2e64b3592b937a2da5ee726c Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 15:30:22 -0400 Subject: [PATCH 24/38] remove public IP input --- test-workflow.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/test-workflow.yml b/test-workflow.yml index b1b6a9f77..0c5f6855d 100644 --- a/test-workflow.yml +++ b/test-workflow.yml @@ -32,7 +32,6 @@ jobs: cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 - run-task-assign-public-IP: ENABLED run-task-security-groups: sg-067ebcde49c0f3ad8, sg-148d093a run-task-launch-type: FARGATE wait-for-task-stopped: false @@ -44,7 +43,6 @@ jobs: cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 - run-task-assign-public-IP: ENABLED run-task-security-groups: sg-067ebcde49c0f3ad8, sg-148d093a run-task-launch-type: FARGATE wait-for-task-stopped: true From d3be320c746c38391693ef79b8fafe1b87b0794f Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 15:32:38 -0400 Subject: [PATCH 25/38] keep only basic run task inputs --- .github/workflows/test-workflow.yml | 8 -------- test-workflow.yml | 6 ------ 2 files changed, 14 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index a328135ef..a65924211 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -31,10 +31,6 @@ jobs: task-definition: task-definition-run-task.json cluster: github-actions-deploy-task-def-integ-test run-task: true - run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 - run-task-assign-public-IP: ENABLED - run-task-security-groups: sg-067ebcde49c0f3ad8, sg-148d093a - run-task-launch-type: FARGATE wait-for-task-stopped: false - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True @@ -43,10 +39,6 @@ jobs: task-definition: task-definition-run-task.json cluster: github-actions-deploy-task-def-integ-test run-task: true - run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 - run-task-assign-public-IP: ENABLED - run-task-security-groups: sg-067ebcde49c0f3ad8, sg-148d093a - run-task-launch-type: FARGATE wait-for-task-stopped: true - name: Deploy Amazon ECS task definition diff --git a/test-workflow.yml b/test-workflow.yml index 0c5f6855d..c89a1b6b5 100644 --- a/test-workflow.yml +++ b/test-workflow.yml @@ -31,9 +31,6 @@ jobs: task-definition: task-definition-run-task.json cluster: github-actions-deploy-task-def-integ-test run-task: true - run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 - run-task-security-groups: sg-067ebcde49c0f3ad8, sg-148d093a - run-task-launch-type: FARGATE wait-for-task-stopped: false - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True @@ -42,9 +39,6 @@ jobs: task-definition: task-definition-run-task.json cluster: github-actions-deploy-task-def-integ-test run-task: true - run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 - run-task-security-groups: sg-067ebcde49c0f3ad8, sg-148d093a - run-task-launch-type: FARGATE wait-for-task-stopped: true - name: Deploy Amazon ECS task definition From 58c566a970262b2bac9fc46b0b23b3974ae8610d Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 15:41:28 -0400 Subject: [PATCH 26/38] original inputs and different security group --- .github/workflows/test-workflow.yml | 12 +++++++++--- test-workflow.yml | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index a65924211..20cdf362f 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -29,16 +29,22 @@ jobs: uses: aws-actions/amazon-ecs-deploy-task-definition@b3a528eb690c86037acd19fd6a2a86337f4e3657 with: task-definition: task-definition-run-task.json - cluster: github-actions-deploy-task-def-integ-test + cluster: github-actions-deploy-task-def-integ-test run-task: true + run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-security-groups: sg-148d093a + run-task-launch-type: FARGATE wait-for-task-stopped: false - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True uses: aws-actions/amazon-ecs-deploy-task-definition@b3a528eb690c86037acd19fd6a2a86337f4e3657 with: task-definition: task-definition-run-task.json - cluster: github-actions-deploy-task-def-integ-test + cluster: github-actions-deploy-task-def-integ-test run-task: true + run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-security-groups: sg-148d093a + run-task-launch-type: FARGATE wait-for-task-stopped: true - name: Deploy Amazon ECS task definition @@ -46,5 +52,5 @@ jobs: with: task-definition: task-definition.json service: github-actions-deploy-task-def-integ-test - cluster: github-actions-deploy-task-def-integ-test + cluster: github-actions-deploy-task-def-integ-test wait-for-service-stability: true \ No newline at end of file diff --git a/test-workflow.yml b/test-workflow.yml index c89a1b6b5..a6e4a22f3 100644 --- a/test-workflow.yml +++ b/test-workflow.yml @@ -29,16 +29,22 @@ jobs: uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: task-definition: task-definition-run-task.json - cluster: github-actions-deploy-task-def-integ-test + cluster: github-actions-deploy-task-def-integ-test run-task: true + run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-security-groups: sg-148d093a + run-task-launch-type: FARGATE wait-for-task-stopped: false - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: task-definition: task-definition-run-task.json - cluster: github-actions-deploy-task-def-integ-test + cluster: github-actions-deploy-task-def-integ-test run-task: true + run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-security-groups: sg-148d093a + run-task-launch-type: FARGATE wait-for-task-stopped: true - name: Deploy Amazon ECS task definition @@ -46,5 +52,5 @@ jobs: with: task-definition: task-definition.json service: github-actions-deploy-task-def-integ-test - cluster: github-actions-deploy-task-def-integ-test + cluster: github-actions-deploy-task-def-integ-test wait-for-service-stability: true From 071cc2178a3e4d00bd648677c5be548b3e88a840 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Tue, 30 Jul 2024 16:13:14 -0400 Subject: [PATCH 27/38] final changes --- .github/workflows/test-workflow.yml | 4 ++-- test-workflow.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 20cdf362f..daf89baf2 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -32,7 +32,7 @@ jobs: cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 - run-task-security-groups: sg-148d093a + run-task-security-groups: sg-067ebcde49c0f3ad8 run-task-launch-type: FARGATE wait-for-task-stopped: false @@ -43,7 +43,7 @@ jobs: cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 - run-task-security-groups: sg-148d093a + run-task-security-groups: sg-067ebcde49c0f3ad8 run-task-launch-type: FARGATE wait-for-task-stopped: true diff --git a/test-workflow.yml b/test-workflow.yml index a6e4a22f3..a89010004 100644 --- a/test-workflow.yml +++ b/test-workflow.yml @@ -32,7 +32,7 @@ jobs: cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 - run-task-security-groups: sg-148d093a + run-task-security-groups: sg-067ebcde49c0f3ad8 run-task-launch-type: FARGATE wait-for-task-stopped: false @@ -43,7 +43,7 @@ jobs: cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 - run-task-security-groups: sg-148d093a + run-task-security-groups: sg-067ebcde49c0f3ad8 run-task-launch-type: FARGATE wait-for-task-stopped: true From 2d78ba55808b043cfea54604eb4d74c343a650ab Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Wed, 31 Jul 2024 09:57:53 -0400 Subject: [PATCH 28/38] made changes from comments --- .github/workflows/test-workflow.yml | 14 +++++++------- task-definition-run-task.json | 2 -- test-workflow.yml | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index daf89baf2..721703e01 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -16,7 +16,7 @@ jobs: - name: Print current build ID run: | - echo Integration test run: githubactionsamazonecsdeplo-NWcjHIgDJLXw:b758d9f2-aea6-4592-906f-aae8754d98b4 + echo Integration test run: githubactionsamazonecsdeplo-NWcjHIgDJLXw:73193632-fdb5-4eea-b8b8-7c9afb374ce0 - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 @@ -26,18 +26,18 @@ jobs: aws-region: us-west-2 - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being False - uses: aws-actions/amazon-ecs-deploy-task-definition@b3a528eb690c86037acd19fd6a2a86337f4e3657 + uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: task-definition: task-definition-run-task.json cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 - run-task-security-groups: sg-067ebcde49c0f3ad8 + run-task-security-groups: sg-067ebcde49c0f3ad8 run-task-launch-type: FARGATE - wait-for-task-stopped: false + wait-for-task-stopped: false - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True - uses: aws-actions/amazon-ecs-deploy-task-definition@b3a528eb690c86037acd19fd6a2a86337f4e3657 + uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: task-definition: task-definition-run-task.json cluster: github-actions-deploy-task-def-integ-test @@ -48,9 +48,9 @@ jobs: wait-for-task-stopped: true - name: Deploy Amazon ECS task definition - uses: aws-actions/amazon-ecs-deploy-task-definition@b3a528eb690c86037acd19fd6a2a86337f4e3657 + uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: task-definition: task-definition.json - service: github-actions-deploy-task-def-integ-test + service: github-actions-deploy-task-def-integ-test cluster: github-actions-deploy-task-def-integ-test wait-for-service-stability: true \ No newline at end of file diff --git a/task-definition-run-task.json b/task-definition-run-task.json index 969e698be..79589ffaa 100644 --- a/task-definition-run-task.json +++ b/task-definition-run-task.json @@ -1,5 +1,4 @@ { - "containerDefinitions": [ { "memory": 32, @@ -23,5 +22,4 @@ ], "networkMode": "awsvpc", "cpu": "256" - } diff --git a/test-workflow.yml b/test-workflow.yml index a89010004..366b5e7c4 100644 --- a/test-workflow.yml +++ b/test-workflow.yml @@ -51,6 +51,6 @@ jobs: uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: task-definition: task-definition.json - service: github-actions-deploy-task-def-integ-test + service: github-actions-deploy-task-def-integ-test cluster: github-actions-deploy-task-def-integ-test - wait-for-service-stability: true + wait-for-service-stability: true \ No newline at end of file From 61116d5ecf6ca6c787019390bef792f310ca2be2 Mon Sep 17 00:00:00 2001 From: Sherlyn Date: Wed, 31 Jul 2024 09:58:28 -0400 Subject: [PATCH 29/38] Delete .idea/.gitignore --- .idea/.gitignore | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .idea/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b81b..000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml From e6db5fa66390eef780bf5519da3bb87f7ffcd37f Mon Sep 17 00:00:00 2001 From: Sherlyn Date: Wed, 31 Jul 2024 09:58:44 -0400 Subject: [PATCH 30/38] Delete .idea/vcs.xml --- .idea/vcs.xml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfb..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From cf87c536175c3c0b83c05a52e8d35af862c945d1 Mon Sep 17 00:00:00 2001 From: Sherlyn Date: Wed, 31 Jul 2024 09:59:04 -0400 Subject: [PATCH 31/38] Delete .idea/amazon-ecs-deploy-task-definition.iml --- .idea/amazon-ecs-deploy-task-definition.iml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .idea/amazon-ecs-deploy-task-definition.iml diff --git a/.idea/amazon-ecs-deploy-task-definition.iml b/.idea/amazon-ecs-deploy-task-definition.iml deleted file mode 100644 index d6ebd4805..000000000 --- a/.idea/amazon-ecs-deploy-task-definition.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file From ffc13d13d8b5173842b47687d73d7b777ad250c1 Mon Sep 17 00:00:00 2001 From: Sherlyn Date: Wed, 31 Jul 2024 09:59:14 -0400 Subject: [PATCH 32/38] Delete .idea/inspectionProfiles/Project_Default.xml --- .idea/inspectionProfiles/Project_Default.xml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .idea/inspectionProfiles/Project_Default.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 03d9549ea..000000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file From b40579928317163bfc65c0e9ff0d8bd9113cd103 Mon Sep 17 00:00:00 2001 From: Sherlyn Date: Wed, 31 Jul 2024 09:59:25 -0400 Subject: [PATCH 33/38] Delete .idea/misc.xml --- .idea/misc.xml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .idea/misc.xml diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 47478b911..000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 69c279d5ae3d76cec3d022a8abbaa9d8468eebe5 Mon Sep 17 00:00:00 2001 From: Sherlyn Date: Wed, 31 Jul 2024 09:59:35 -0400 Subject: [PATCH 34/38] Delete .idea/modules.xml --- .idea/modules.xml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .idea/modules.xml diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 32696e3aa..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file From 4cc8fdc2a3f272959af66bdbdd04d5f4b1c108f9 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Wed, 31 Jul 2024 10:29:24 -0400 Subject: [PATCH 35/38] clearer description name of each test --- .github/workflows/test-workflow.yml | 6 +++--- test-workflow.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 721703e01..cb2f03f08 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -25,7 +25,7 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-west-2 - - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being False + - name: Deploy Amazon ECS task definition with one-off task and wait for task stopped set to false uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: task-definition: task-definition-run-task.json @@ -36,7 +36,7 @@ jobs: run-task-launch-type: FARGATE wait-for-task-stopped: false - - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True + - name: Deploy Amazon ECS task definition with one-off task and wait for task stopped set to true uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: task-definition: task-definition-run-task.json @@ -47,7 +47,7 @@ jobs: run-task-launch-type: FARGATE wait-for-task-stopped: true - - name: Deploy Amazon ECS task definition + - name: Deploy Amazon ECS task definition with ECS Service uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: task-definition: task-definition.json diff --git a/test-workflow.yml b/test-workflow.yml index 366b5e7c4..8f42d01db 100644 --- a/test-workflow.yml +++ b/test-workflow.yml @@ -25,7 +25,7 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-west-2 - - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being False + - name: Deploy Amazon ECS task definition with one-off task and wait for task stopped set to false uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: task-definition: task-definition-run-task.json @@ -36,7 +36,7 @@ jobs: run-task-launch-type: FARGATE wait-for-task-stopped: false - - name: Deploy Amazon ECS task definition With Wait For Task Stopped Being True + - name: Deploy Amazon ECS task definition with one-off task and wait for task stopped set to true uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: task-definition: task-definition-run-task.json @@ -47,7 +47,7 @@ jobs: run-task-launch-type: FARGATE wait-for-task-stopped: true - - name: Deploy Amazon ECS task definition + - name: Deploy Amazon ECS task definition with ECS Service uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: task-definition: task-definition.json From efd92ad3a1774f6d4d02521b4922b4ce79308096 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Wed, 31 Jul 2024 13:08:49 -0400 Subject: [PATCH 36/38] updating task definition name --- .github/workflows/test-workflow.yml | 6 +++--- test-workflow.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index cb2f03f08..c587b8fbd 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -29,7 +29,7 @@ jobs: uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: task-definition: task-definition-run-task.json - cluster: github-actions-deploy-task-def-integ-test + cluster: github-actions-deploy-task-def-integ-tests run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-security-groups: sg-067ebcde49c0f3ad8 @@ -40,7 +40,7 @@ jobs: uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: task-definition: task-definition-run-task.json - cluster: github-actions-deploy-task-def-integ-test + cluster: github-actions-deploy-task-def-integ-tests run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-security-groups: sg-067ebcde49c0f3ad8 @@ -52,5 +52,5 @@ jobs: with: task-definition: task-definition.json service: github-actions-deploy-task-def-integ-test - cluster: github-actions-deploy-task-def-integ-test + cluster: github-actions-deploy-task-def-integ-tests wait-for-service-stability: true \ No newline at end of file diff --git a/test-workflow.yml b/test-workflow.yml index 8f42d01db..37c1b1524 100644 --- a/test-workflow.yml +++ b/test-workflow.yml @@ -29,7 +29,7 @@ jobs: uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: task-definition: task-definition-run-task.json - cluster: github-actions-deploy-task-def-integ-test + cluster: github-actions-deploy-task-def-integ-tests run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-security-groups: sg-067ebcde49c0f3ad8 @@ -40,7 +40,7 @@ jobs: uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: task-definition: task-definition-run-task.json - cluster: github-actions-deploy-task-def-integ-test + cluster: github-actions-deploy-task-def-integ-tests run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-security-groups: sg-067ebcde49c0f3ad8 @@ -52,5 +52,5 @@ jobs: with: task-definition: task-definition.json service: github-actions-deploy-task-def-integ-test - cluster: github-actions-deploy-task-def-integ-test + cluster: github-actions-deploy-task-def-integ-tests wait-for-service-stability: true \ No newline at end of file From 03e7b1dbd32dc1a88abcbd20c94567169ea7857c Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Wed, 31 Jul 2024 13:10:49 -0400 Subject: [PATCH 37/38] updating task definition name --- .github/workflows/test-workflow.yml | 8 ++++---- test-workflow.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index c587b8fbd..f8d46444a 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -29,7 +29,7 @@ jobs: uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: task-definition: task-definition-run-task.json - cluster: github-actions-deploy-task-def-integ-tests + cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-security-groups: sg-067ebcde49c0f3ad8 @@ -39,8 +39,8 @@ jobs: - name: Deploy Amazon ECS task definition with one-off task and wait for task stopped set to true uses: aws-actions/amazon-ecs-deploy-task-definition@1a69daea10712415b65b5c90f8c41b1b6b556ab5 with: - task-definition: task-definition-run-task.json - cluster: github-actions-deploy-task-def-integ-tests + task-definition: github-actions-deploy-task-def-integ-tests + cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-security-groups: sg-067ebcde49c0f3ad8 @@ -52,5 +52,5 @@ jobs: with: task-definition: task-definition.json service: github-actions-deploy-task-def-integ-test - cluster: github-actions-deploy-task-def-integ-tests + cluster: github-actions-deploy-task-def-integ-test wait-for-service-stability: true \ No newline at end of file diff --git a/test-workflow.yml b/test-workflow.yml index 37c1b1524..c610a36c6 100644 --- a/test-workflow.yml +++ b/test-workflow.yml @@ -29,7 +29,7 @@ jobs: uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: task-definition: task-definition-run-task.json - cluster: github-actions-deploy-task-def-integ-tests + cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-security-groups: sg-067ebcde49c0f3ad8 @@ -39,8 +39,8 @@ jobs: - name: Deploy Amazon ECS task definition with one-off task and wait for task stopped set to true uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: - task-definition: task-definition-run-task.json - cluster: github-actions-deploy-task-def-integ-tests + task-definition: github-actions-deploy-task-def-integ-tests + cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 run-task-security-groups: sg-067ebcde49c0f3ad8 @@ -52,5 +52,5 @@ jobs: with: task-definition: task-definition.json service: github-actions-deploy-task-def-integ-test - cluster: github-actions-deploy-task-def-integ-tests + cluster: github-actions-deploy-task-def-integ-test wait-for-service-stability: true \ No newline at end of file From 0200e2f57b022d858e628c4891f377b37612ccc8 Mon Sep 17 00:00:00 2001 From: Sherlyn Saavedra Date: Wed, 31 Jul 2024 13:58:40 -0400 Subject: [PATCH 38/38] adding assign public IP as input and changing task def names --- .github/workflows/test-workflow.yml | 4 +++- test-workflow.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 02d9abc7b..cc9f593e6 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -32,6 +32,7 @@ jobs: cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-assign-public-IP: ENABLED run-task-security-groups: sg-067ebcde49c0f3ad8 run-task-launch-type: FARGATE wait-for-task-stopped: false @@ -39,10 +40,11 @@ jobs: - name: Deploy Amazon ECS task definition with one-off task and wait for task stopped set to true uses: aws-actions/amazon-ecs-deploy-task-definition@abe77ebded86b685c231c58bd5936280c6fcc011 with: - task-definition: github-actions-deploy-task-def-integ-tests + task-definition: task-definition-run-task.json cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-assign-public-IP: ENABLED run-task-security-groups: sg-067ebcde49c0f3ad8 run-task-launch-type: FARGATE wait-for-task-stopped: true diff --git a/test-workflow.yml b/test-workflow.yml index c610a36c6..b3da53a6f 100644 --- a/test-workflow.yml +++ b/test-workflow.yml @@ -32,6 +32,7 @@ jobs: cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-assign-public-IP: ENABLED run-task-security-groups: sg-067ebcde49c0f3ad8 run-task-launch-type: FARGATE wait-for-task-stopped: false @@ -39,10 +40,11 @@ jobs: - name: Deploy Amazon ECS task definition with one-off task and wait for task stopped set to true uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: - task-definition: github-actions-deploy-task-def-integ-tests + task-definition: task-definition-run-task.json cluster: github-actions-deploy-task-def-integ-test run-task: true run-task-subnets: subnet-e5604fce, subnet-fe9355b4, subnet-c49431bc, subnet-392f9b64 + run-task-assign-public-IP: ENABLED run-task-security-groups: sg-067ebcde49c0f3ad8 run-task-launch-type: FARGATE wait-for-task-stopped: true