Skip to content

Commit

Permalink
Merge branch 'develop' into snyk-upgrade-feeba5efcfb21eafb2a01af6de16…
Browse files Browse the repository at this point in the history
…1180
  • Loading branch information
seaerchin committed Mar 14, 2024
2 parents 7ed9508 + db88553 commit eafbd06
Show file tree
Hide file tree
Showing 240 changed files with 25,386 additions and 12,826 deletions.
17 changes: 17 additions & 0 deletions .aws/deploy/appspec.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 1,
"Resources": [
{
"TargetService": {
"Type": "AWS::ECS::Service",
"Properties": {
"TaskDefinition": "arn:aws:ecs:ap-southeast-1:<AWS_ACCOUNT_ID>:task-definition/isomer-<SHORTENV>-ecs:1",
"LoadBalancerInfo": {
"ContainerName": "backend",
"ContainerPort": 8081
}
}
}
}
]
}
302 changes: 302 additions & 0 deletions .aws/deploy/backend-task-definition.prod.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,302 @@
{
"containerDefinitions": [
{
"name": "backend",
"portMappings": [
{
"containerPort": 8081,
"hostPort": 8081,
"protocol": "tcp"
}
],
"essential": true,
"environment": [{ "name": "ENV_TYPE", "value": "PROD" }],
"mountPoints": [
{
"sourceVolume": "ggs-efs",
"containerPath": "/efs",
"readOnly": false
}
],
"linuxParameters": {
"initProcessEnabled": true
},
"volumesFrom": [],
"secrets": [
{
"name": "AUTH_TOKEN_EXPIRY_DURATION_IN_MILLISECONDS",
"valueFrom": "PROD_AUTH_TOKEN_EXPIRY_DURATION_IN_MILLISECONDS"
},
{
"name": "AWS_BACKEND_EB_ENV_NAME",
"valueFrom": "PROD_AWS_BACKEND_EB_ENV_NAME"
},
{ "name": "AWS_REGION", "valueFrom": "PROD_AWS_REGION" },
{ "name": "CLIENT_ID", "valueFrom": "PROD_CLIENT_ID" },
{ "name": "CLIENT_SECRET", "valueFrom": "PROD_CLIENT_SECRET" },
{
"name": "CLOUDMERSIVE_API_KEY",
"valueFrom": "PROD_CLOUDMERSIVE_API_KEY"
},
{ "name": "COOKIE_DOMAIN", "valueFrom": "PROD_COOKIE_DOMAIN" },
{ "name": "DB_ACQUIRE", "valueFrom": "PROD_DB_ACQUIRE" },
{ "name": "DB_MAX_POOL", "valueFrom": "PROD_DB_MAX_POOL" },
{ "name": "DB_MIN_POOL", "valueFrom": "PROD_DB_MIN_POOL" },
{ "name": "DB_TIMEOUT", "valueFrom": "PROD_DB_TIMEOUT" },
{ "name": "DB_URI", "valueFrom": "PROD_DB_URI" },
{
"name": "DD_AGENT_MAJOR_VERSION",
"valueFrom": "PROD_DD_AGENT_MAJOR_VERSION"
},
{ "name": "DD_ENV", "valueFrom": "PROD_DD_ENV" },
{ "name": "DD_LOGS_INJECTION", "valueFrom": "PROD_DD_LOGS_INJECTION" },
{ "name": "DD_SERVICE", "valueFrom": "PROD_DD_SERVICE" },
{ "name": "DD_TAGS", "valueFrom": "PROD_DD_TAGS" },
{
"name": "DD_TRACE_STARTUP_LOGS",
"valueFrom": "PROD_DD_TRACE_STARTUP_LOGS"
},
{ "name": "E2E_TEST_GH_TOKEN", "valueFrom": "PROD_E2E_TEST_GH_TOKEN" },
{ "name": "E2E_TEST_REPO", "valueFrom": "PROD_E2E_TEST_REPO" },
{ "name": "E2E_TEST_SECRET", "valueFrom": "PROD_E2E_TEST_SECRET" },
{ "name": "EFS_VOL_PATH", "valueFrom": "PROD_EFS_VOL_PATH" },
{ "name": "ENCRYPTION_SECRET", "valueFrom": "PROD_ENCRYPTION_SECRET" },
{
"name": "FF_DEPRECATE_SITE_QUEUES",
"valueFrom": "PROD_FF_DEPRECATE_SITE_QUEUES"
},
{ "name": "FRONTEND_URL", "valueFrom": "PROD_FRONTEND_URL" },
{
"name": "GGS_REPAIR_FORM_KEY",
"valueFrom": "PROD_GGS_REPAIR_FORM_KEY"
},
{
"name": "GGS_EXPERIMENTAL_TRACKING_SITES",
"valueFrom": "PROD_GGS_EXPERIMENTAL_TRACKING_SITES"
},
{
"name": "GITHUB_BUILD_ORG_NAME",
"valueFrom": "PROD_GITHUB_BUILD_ORG_NAME"
},
{
"name": "GITHUB_BUILD_REPO_NAME",
"valueFrom": "PROD_GITHUB_BUILD_REPO_NAME"
},
{ "name": "GITHUB_ORG_NAME", "valueFrom": "PROD_GITHUB_ORG_NAME" },
{
"name": "GROWTHBOOK_CLIENT_KEY",
"valueFrom": "PROD_GROWTHBOOK_CLIENT_KEY"
},
{
"name": "INCOMING_QUEUE_URL",
"valueFrom": "PROD_INCOMING_QUEUE_URL"
},
{
"name": "ISOMERPAGES_REPO_PAGE_COUNT",
"valueFrom": "PROD_ISOMERPAGES_REPO_PAGE_COUNT"
},
{ "name": "JWT_SECRET", "valueFrom": "PROD_JWT_SECRET" },
{
"name": "MAX_NUM_OTP_ATTEMPTS",
"valueFrom": "PROD_MAX_NUM_OTP_ATTEMPTS"
},
{
"name": "MOCK_AMPLIFY_DOMAIN_ASSOCIATION_CALLS",
"valueFrom": "PROD_MOCK_AMPLIFY_DOMAIN_ASSOCIATION_CALLS"
},
{ "name": "MUTEX_TABLE_NAME", "valueFrom": "PROD_MUTEX_TABLE_NAME" },
{
"name": "NETLIFY_ACCESS_TOKEN",
"valueFrom": "PROD_NETLIFY_ACCESS_TOKEN"
},
{ "name": "NODE_ENV", "valueFrom": "PROD_NODE_ENV" },
{ "name": "OTP_EXPIRY", "valueFrom": "PROD_OTP_EXPIRY" },
{ "name": "OTP_SECRET", "valueFrom": "PROD_OTP_SECRET" },
{
"name": "OUTGOING_QUEUE_URL",
"valueFrom": "PROD_OUTGOING_QUEUE_URL"
},
{ "name": "POSTMAN_API_KEY", "valueFrom": "PROD_POSTMAN_API_KEY" },
{
"name": "POSTMAN_SMS_CRED_NAME",
"valueFrom": "PROD_POSTMAN_SMS_CRED_NAME"
},
{
"name": "REDIRECT_URI",
"valueFrom": "PROD_REDIRECT_URI"
},
{
"name": "SESSION_SECRET",
"valueFrom": "PROD_SESSION_SECRET"
},
{ "name": "SGID_CLIENT_ID", "valueFrom": "PROD_SGID_CLIENT_ID" },
{
"name": "SGID_CLIENT_SECRET",
"valueFrom": "PROD_SGID_CLIENT_SECRET"
},
{
"name": "SGID_REDIRECT_URI",
"valueFrom": "PROD_SGID_REDIRECT_URI"
},
{
"name": "SGID_PRIVATE_KEY",
"valueFrom": "PROD_SGID_PRIVATE_KEY"
},
{
"name": "SITE_CLONE_FORM_KEY",
"valueFrom": "PROD_SITE_CLONE_FORM_KEY"
},
{
"name": "SITE_CREATE_FORM_KEY",
"valueFrom": "PROD_SITE_CREATE_FORM_KEY"
},
{
"name": "SITE_LAUNCH_DYNAMO_DB_TABLE_NAME",
"valueFrom": "PROD_SITE_LAUNCH_DYNAMO_DB_TABLE_NAME"
},
{
"name": "SITE_LAUNCH_FORM_KEY",
"valueFrom": "PROD_SITE_LAUNCH_FORM_KEY"
},
{
"name": "SITE_PASSWORD_SECRET_KEY",
"valueFrom": "PROD_SITE_PASSWORD_SECRET_KEY"
},
{
"name": "PROD_SSH_PUBLIC_KEY",
"valueFrom": "PROD_SSH_PUBLIC_KEY"
},
{
"name": "PROD_SSH_PRIVATE_KEY",
"valueFrom": "PROD_SSH_PRIVATE_KEY"
},
{
"name": "STEP_FUNCTIONS_ARN",
"valueFrom": "PROD_STEP_FUNCTIONS_ARN"
},
{
"name": "SYSTEM_GITHUB_TOKEN",
"valueFrom": "PROD_SYSTEM_GITHUB_TOKEN"
},
{
"name": "UPTIME_ROBOT_API_KEY",
"valueFrom": "PROD_UPTIME_ROBOT_API_KEY"
},
{
"name": "SITE_CHECKER_FORM_KEY",
"valueFrom": "PROD_SITE_CHECKER_FORM_KEY"
},
{
"name": "SITE_AUDIT_LOGS_FORM_KEY",
"valueFrom": "PROD_SITE_AUDIT_LOGS_FORM_KEY"
}
],
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "/aws/elasticbeanstalk/cms-backend-prod-node18/var/log/web.stdout.log",
"awslogs-region": "ap-southeast-1",
"awslogs-stream-prefix": "ecs"
}
}
},
{
"name": "dd-agent",
"image": "public.ecr.aws/datadog/agent:latest",
"portMappings": [
{
"containerPort": 8126,
"hostPort": 8126,
"protocol": "tcp"
}
],
"essential": true,
"environment": [
{
"name": "TZ",
"value": "Asia/Singapore"
},
{
"name": "DD_APM_NON_LOCAL_TRAFFIC",
"value": "true"
},
{
"name": "ECS_FARGATE",
"value": "true"
},
{
"name": "DD_APM_ENABLED",
"value": "true"
},
{
"name": "DD_SITE",
"value": "datadoghq.com"
},
{
"name": "DD_ENV",
"value": "prod"
},
{
"name": "DD_SERVICE",
"value": "isomer"
},
{
"name": "DD_TAGS",
"value": "service:isomer"
},
{
"name": "DD_AGENT_MAJOR_VERSION",
"value": "7"
},
{
"name": "DD_LOGS_INJECTION",
"value": "true"
},
{
"name": "DD_TRACE_STARTUP_LOGS",
"value": "true"
},
{
"name": "DD_API_KEY",
"value": "<DD_API_KEY>"
}
],
"dockerLabels": {
"com.datadoghq.tags.env": "prod",
"com.datadoghq.tags.service": "isomer-infra",
"com.datadoghq.tags.version": "7"
},
"mountPoints": [],
"volumesFrom": [],
"secrets": [],
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "isomer-infra-prod/ecs/dd-agent",
"awslogs-region": "ap-southeast-1",
"awslogs-stream-prefix": "ecs"
}
}
}
],
"family": "isomer-infra",
"networkMode": "awsvpc",
"volumes": [
{
"name": "ggs-efs",
"efsVolumeConfiguration": {
"fileSystemId": "<EFS_FILE_SYSTEM_ID>",
"rootDirectory": "/"
}
}
],
"placementConstraints": [],
"runtimePlatform": {
"operatingSystemFamily": "LINUX"
},
"requiresCompatibilities": ["FARGATE"],
"taskRoleArn": "arn:aws:iam::<AWS_ACCOUNT_ID>:role/isomer-prod-ecs-task-role",
"executionRoleArn": "arn:aws:iam::<AWS_ACCOUNT_ID>:role/isomer-prod-ecs-task-exec-role",
"cpu": "4096",
"memory": "8192"
}
Loading

0 comments on commit eafbd06

Please sign in to comment.