From da3ca9202435573e1f03d0bcbfeaead828ff7614 Mon Sep 17 00:00:00 2001 From: mabarano Date: Thu, 24 Oct 2024 10:11:09 +0200 Subject: [PATCH] workflow change --- .github/workflows/datacenterMap.yml | 4 ++-- .github/workflows/provisionWithTerraform.yml | 1 + README.md | 2 +- .../src/main/resources/fargate/BACKEND_EMEA_TEST/task.json | 6 +++--- .../src/main/resources/fargate/BACKEND_US_TEST/task.json | 4 ++-- aws-infrastructure/docker-elasticsearch/README.md | 6 +++--- aws-infrastructure/docker-filebeat/README.md | 6 +++--- aws-infrastructure/docker-filebeat/filebeat.yml | 2 +- aws-infrastructure/docker-grafana/README.md | 6 +++--- aws-infrastructure/docker-kibana/README.md | 6 +++--- aws-infrastructure/docker-prometheus/README.md | 6 +++--- .../backend-test/emea/eu-central-1/globals/outputs.tf | 2 +- .../backend-test/us/us-east-1/globals/outputs.tf | 2 +- loadtest/README.md | 6 +++--- 14 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.github/workflows/datacenterMap.yml b/.github/workflows/datacenterMap.yml index f1728ef..6fabeaf 100644 --- a/.github/workflows/datacenterMap.yml +++ b/.github/workflows/datacenterMap.yml @@ -45,7 +45,7 @@ jobs: "BACKEND_EMEA_TEST": { "HUB": "EMEA", "STAGE": "TEST", - "AWS_ACCOUNT": "<>", + "AWS_ACCOUNT": "<<605134466559>>", "PROFILE": "backend-test", "REGION": "eu-central-1", "CLUSTER_NAME": "backend-ecs-test", @@ -55,7 +55,7 @@ jobs: "BACKEND_US_TEST": { "HUB": "US", "STAGE": "TEST", - "AWS_ACCOUNT": "<>", + "AWS_ACCOUNT": "<<605134466559>>", "PROFILE": "backend-test", "REGION": "us-east-1", "CLUSTER_NAME": "backend-ecs-test", diff --git a/.github/workflows/provisionWithTerraform.yml b/.github/workflows/provisionWithTerraform.yml index e2a216f..b582a3b 100644 --- a/.github/workflows/provisionWithTerraform.yml +++ b/.github/workflows/provisionWithTerraform.yml @@ -1,6 +1,7 @@ name: Provision with Terraform run-name: Provision with Terraform + on: workflow_dispatch: inputs: diff --git a/README.md b/README.md index b2318e6..42798df 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ To do it, go to: and click on Fork button and then (+) Create new fork. After forking repository to your account, please clone it to your local machine and search for all occurrences of: -* <> +* <<605134466559>> This is base AWS account id that we use for the base repository. You must replace this with your own account id in all files. diff --git a/assembly-fargate/src/main/resources/fargate/BACKEND_EMEA_TEST/task.json b/assembly-fargate/src/main/resources/fargate/BACKEND_EMEA_TEST/task.json index 088e158..5d8c2d1 100644 --- a/assembly-fargate/src/main/resources/fargate/BACKEND_EMEA_TEST/task.json +++ b/assembly-fargate/src/main/resources/fargate/BACKEND_EMEA_TEST/task.json @@ -1,6 +1,6 @@ { "family": "backend-task-test", - "executionRoleArn": "arn:aws:iam::<>:role/backend-ecs-execution-role-eu-central-1", + "executionRoleArn": "arn:aws:iam::<<605134466559>>:role/backend-ecs-execution-role-eu-central-1", "containerDefinitions": [ { "logConfiguration": { @@ -47,7 +47,7 @@ "cpu": 1024, "memory": 2048, "memoryReservation": 1024, - "image": "<>.dkr.ecr.eu-central-1.amazonaws.com/backend:latest", + "image": "<<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/backend:latest", "dockerLabels": { "PROMETHEUS_EXPORTER_PORT": "8081", "PROMETHEUS_EXPORTER_PATH": "/backend/status/v1/prometheus", @@ -57,7 +57,7 @@ "name": "backend" } ], - "taskRoleArn": "arn:aws:iam::<>:role/backend-ecs-task-role-eu-central-1", + "taskRoleArn": "arn:aws:iam::<<605134466559>>:role/backend-ecs-task-role-eu-central-1", "requiresCompatibilities": [ "FARGATE" ], diff --git a/assembly-fargate/src/main/resources/fargate/BACKEND_US_TEST/task.json b/assembly-fargate/src/main/resources/fargate/BACKEND_US_TEST/task.json index 2970fc2..f9abf19 100644 --- a/assembly-fargate/src/main/resources/fargate/BACKEND_US_TEST/task.json +++ b/assembly-fargate/src/main/resources/fargate/BACKEND_US_TEST/task.json @@ -1,6 +1,6 @@ { "family": "backend-task-test", - "executionRoleArn": "arn:aws:iam::<>:role/backend-ecs-execution-role-us-east-1", + "executionRoleArn": "arn:aws:iam::<<605134466559>>:role/backend-ecs-execution-role-us-east-1", "containerDefinitions": [ { "logConfiguration": { @@ -47,7 +47,7 @@ "cpu": 1024, "memory": 2048, "memoryReservation": 1024, - "image": "<>.dkr.ecr.us-east-1.amazonaws.com/backend:latest", + "image": "<<605134466559>>.dkr.ecr.us-east-1.amazonaws.com/backend:latest", "dockerLabels": { "PROMETHEUS_EXPORTER_PORT": "8081", "PROMETHEUS_EXPORTER_PATH": "/backend/status/v1/prometheus", diff --git a/aws-infrastructure/docker-elasticsearch/README.md b/aws-infrastructure/docker-elasticsearch/README.md index 5d17832..e3551ba 100644 --- a/aws-infrastructure/docker-elasticsearch/README.md +++ b/aws-infrastructure/docker-elasticsearch/README.md @@ -1,7 +1,7 @@ # Push image to ECR Run below commands to push our custom Elasticsearch image to ECR. ``` -aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <>.dkr.ecr.eu-central-1.amazonaws.com +aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com ``` ``` @@ -9,9 +9,9 @@ docker build -t elasticsearch-custom . ``` ``` -docker tag elasticsearch-custom <>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:elasticsearch +docker tag elasticsearch-custom <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:elasticsearch ``` ``` -docker push <>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:elasticsearch +docker push <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:elasticsearch ``` \ No newline at end of file diff --git a/aws-infrastructure/docker-filebeat/README.md b/aws-infrastructure/docker-filebeat/README.md index ca9eb91..7de6e24 100644 --- a/aws-infrastructure/docker-filebeat/README.md +++ b/aws-infrastructure/docker-filebeat/README.md @@ -1,7 +1,7 @@ # Push image to ECR Run below commands to push our custom Filebeat image to ECR. ``` -aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <>.dkr.ecr.eu-central-1.amazonaws.com +aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com ``` ``` @@ -9,9 +9,9 @@ docker build -t filebeat-custom . ``` ``` -docker tag filebeat-custom <>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:filebeat +docker tag filebeat-custom <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:filebeat ``` ``` -docker push <>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:filebeat +docker push <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:filebeat ``` \ No newline at end of file diff --git a/aws-infrastructure/docker-filebeat/filebeat.yml b/aws-infrastructure/docker-filebeat/filebeat.yml index 42f07f1..6641297 100644 --- a/aws-infrastructure/docker-filebeat/filebeat.yml +++ b/aws-infrastructure/docker-filebeat/filebeat.yml @@ -1,6 +1,6 @@ filebeat.inputs: - type: aws-cloudwatch - log_group_arn: arn:aws:logs:eu-central-1:<>:log-group:/ecs/backend:* + log_group_arn: arn:aws:logs:eu-central-1:<<605134466559>>:log-group:/ecs/backend:* scan_frequency: 1m start_position: beginning diff --git a/aws-infrastructure/docker-grafana/README.md b/aws-infrastructure/docker-grafana/README.md index 45f3eb9..7357d95 100644 --- a/aws-infrastructure/docker-grafana/README.md +++ b/aws-infrastructure/docker-grafana/README.md @@ -1,7 +1,7 @@ # Push image to ECR Run below commands to push our custom Grafana image to ECR. ``` -aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <>.dkr.ecr.eu-central-1.amazonaws.com +aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com ``` ``` @@ -9,9 +9,9 @@ docker build -t grafana-custom . ``` ``` -docker tag grafana-custom <>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:grafana +docker tag grafana-custom <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:grafana ``` ``` -docker push <>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:grafana +docker push <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:grafana ``` \ No newline at end of file diff --git a/aws-infrastructure/docker-kibana/README.md b/aws-infrastructure/docker-kibana/README.md index fb27aff..47ccce6 100644 --- a/aws-infrastructure/docker-kibana/README.md +++ b/aws-infrastructure/docker-kibana/README.md @@ -1,7 +1,7 @@ # Push image to ECR Run below commands to push our custom Kibana image to ECR. ``` -aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <>.dkr.ecr.eu-central-1.amazonaws.com +aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com ``` ``` @@ -9,9 +9,9 @@ docker build -t kibana-custom . ``` ``` -docker tag kibana-custom <>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:kibana +docker tag kibana-custom <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:kibana ``` ``` -docker push <>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:kibana +docker push <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:kibana ``` \ No newline at end of file diff --git a/aws-infrastructure/docker-prometheus/README.md b/aws-infrastructure/docker-prometheus/README.md index 0ff25d2..cbc8e19 100644 --- a/aws-infrastructure/docker-prometheus/README.md +++ b/aws-infrastructure/docker-prometheus/README.md @@ -1,7 +1,7 @@ # Push image to ECR Run below commands to push our custom Prometheus image to ECR. ``` -aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <>.dkr.ecr.eu-central-1.amazonaws.com +aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com ``` ``` @@ -9,9 +9,9 @@ docker build -t prometheus-custom . ``` ``` -docker tag prometheus-custom <>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:prometheus +docker tag prometheus-custom <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:prometheus ``` ``` -docker push <>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:prometheus +docker push <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:prometheus ``` \ No newline at end of file diff --git a/aws-infrastructure/terraform/environments/backend-test/emea/eu-central-1/globals/outputs.tf b/aws-infrastructure/terraform/environments/backend-test/emea/eu-central-1/globals/outputs.tf index bd7ed14..c5496d8 100644 --- a/aws-infrastructure/terraform/environments/backend-test/emea/eu-central-1/globals/outputs.tf +++ b/aws-infrastructure/terraform/environments/backend-test/emea/eu-central-1/globals/outputs.tf @@ -3,7 +3,7 @@ output "hub" { } output "account_id" { - value = "<>" + value = "<<605134466559>>" } output "availability_zones" { diff --git a/aws-infrastructure/terraform/environments/backend-test/us/us-east-1/globals/outputs.tf b/aws-infrastructure/terraform/environments/backend-test/us/us-east-1/globals/outputs.tf index d9ee967..9367e9f 100644 --- a/aws-infrastructure/terraform/environments/backend-test/us/us-east-1/globals/outputs.tf +++ b/aws-infrastructure/terraform/environments/backend-test/us/us-east-1/globals/outputs.tf @@ -3,7 +3,7 @@ output "hub" { } output "account_id" { - value = "<>" + value = "<<605134466559>>" } output "availability_zones" { diff --git a/loadtest/README.md b/loadtest/README.md index 1ebfd2f..02024a5 100644 --- a/loadtest/README.md +++ b/loadtest/README.md @@ -42,7 +42,7 @@ mvn clean install 3. Dockerize load test app and push to ECR ``` -aws ecr get-login-password --region eu-central-1 --profile [PROFILE] | docker login --username AWS --password-stdin <>.dkr.ecr.eu-central-1.amazonaws.com +aws ecr get-login-password --region eu-central-1 --profile [PROFILE] | docker login --username AWS --password-stdin <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com ``` ``` @@ -50,11 +50,11 @@ docker build -t backend-loadtest . ``` ``` -docker tag backend-loadtest:latest <>.dkr.ecr.eu-central-1.amazonaws.com/backend-loadtest:latest +docker tag backend-loadtest:latest <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/backend-loadtest:latest ``` ``` -docker push <>.dkr.ecr.eu-central-1.amazonaws.com/backend-loadtest:latest +docker push <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/backend-loadtest:latest ``` 4. Force new service deployment in backend-loadtest cluster