Skip to content

Commit

Permalink
Merge branch 'main' into stage
Browse files Browse the repository at this point in the history
  • Loading branch information
@MelissaAutumn
MelissaAutumn committed Nov 13, 2023
2 parents b8f30a7 + 373a058 commit f5af7d0
Show file tree
Hide file tree
Showing 2 changed files with 168 additions and 168 deletions.
334 changes: 167 additions & 167 deletions .aws/task-definition.json
View file
Original file line number Diff line number Diff line change
@@ -1,167 +1,167 @@
{
"taskDefinitionArn": "arn:aws:ecs:us-east-1:768512802988:task-definition/appointments-definition:24",
"containerDefinitions": [
{
"name": "backend",
"image": "backend-latest",
"cpu": 0,
"portMappings": [
{
"name": "backend-5000-tcp",
"containerPort": 5000,
"hostPort": 5000,
"protocol": "tcp",
"appProtocol": "http"
}
],
"essential": true,
"environment": [
{
"name": "FRONTEND_URL",
"value": "https://stage.appointment.day"
},
{
"name": "SHORT_BASE_URL",
"value": "https://stage.apmt.day"
},
{
"name": "TIER_BASIC_CALENDAR_LIMIT",
"value": "3"
},
{
"name": "TIER_PLUS_CALENDAR_LIMIT",
"value": "5"
},
{
"name": "TIER_PRO_CALENDAR_LIMIT",
"value": "10"
},
{
"name": "LOG_USE_STREAM",
"value": "True"
},
{
"name": "LOG_LEVEL",
"value": "INFO"
},
{
"name": "APP_ENV",
"value": "stage"
},
{
"name": "SENTRY_DSN",
"value": "https://5dddca3ecc964284bb8008bc2beef808@o4505428107853824.ingest.sentry.io/4505428124827648"
}
],
"secrets": [
{
"name": "DATABASE_SECRETS",
"valueFrom": "arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/db-mysql-Ixf6qD"
},
{
"name": "AUTH0_SECRETS",
"valueFrom": "arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/auth0-0gzF6d"
},
{
"name": "DB_ENC_SECRET",
"valueFrom": "arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/db-secret-CYKglI"
},
{
"name": "SMTP_SECRETS",
"valueFrom": "arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/socketlabs-UYmjaC"
},
{
"name": "GOOGLE_OAUTH_SECRETS",
"valueFrom": "arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/google-cal-oauth-VevaSo"
}
],
"mountPoints": [],
"volumesFrom": [],
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-create-group": "true",
"awslogs-group": "/ecs/appointments-definition",
"awslogs-region": "us-east-1",
"awslogs-stream-prefix": "ecs"
}
}
},
{
"name": "frontend",
"image": "frontend-latest",
"cpu": 0,
"portMappings": [
{
"name": "frontend-80-tcp",
"containerPort": 80,
"hostPort": 80,
"protocol": "tcp",
"appProtocol": "http"
}
],
"essential": true,
"environment": [],
"mountPoints": [],
"volumesFrom": [],
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-create-group": "true",
"awslogs-group": "/ecs/appointments-definition",
"awslogs-region": "us-east-1",
"awslogs-stream-prefix": "ecs"
}
}
}
],
"family": "appointments-definition",
"executionRoleArn": "arn:aws:iam::768512802988:role/apointments-ci-role",
"networkMode": "awsvpc",
"revision": 24,
"volumes": [],
"status": "ACTIVE",
"requiresAttributes": [
{
"name": "com.amazonaws.ecs.capability.logging-driver.awslogs"
},
{
"name": "ecs.capability.execution-role-awslogs"
},
{
"name": "com.amazonaws.ecs.capability.ecr-auth"
},
{
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.19"
},
{
"name": "ecs.capability.execution-role-ecr-pull"
},
{
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.18"
},
{
"name": "ecs.capability.task-eni"
},
{
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.29"
}
],
"placementConstraints": [],
"compatibilities": [
"EC2",
"FARGATE"
],
"requiresCompatibilities": [
"FARGATE"
],
"cpu": "512",
"memory": "1024",
"runtimePlatform": {
"cpuArchitecture": "X86_64",
"operatingSystemFamily": "LINUX"
},
"registeredAt": "2023-03-15T22:19:59.642Z",
"registeredBy": "arn:aws:iam::768512802988:user/melissa",
"tags": []
}
{
"taskDefinitionArn": "arn:aws:ecs:us-east-1:768512802988:task-definition/appointments-definition:24",
"containerDefinitions": [
{
"name": "backend",
"image": "backend-latest",
"cpu": 0,
"portMappings": [
{
"name": "backend-5000-tcp",
"containerPort": 5000,
"hostPort": 5000,
"protocol": "tcp",
"appProtocol": "http"
}
],
"essential": true,
"environment": [
{
"name": "FRONTEND_URL",
"value": "https://appointment.day"
},
{
"name": "SHORT_BASE_URL",
"value": "https://stage.apmt.day"
},
{
"name": "TIER_BASIC_CALENDAR_LIMIT",
"value": "3"
},
{
"name": "TIER_PLUS_CALENDAR_LIMIT",
"value": "5"
},
{
"name": "TIER_PRO_CALENDAR_LIMIT",
"value": "10"
},
{
"name": "LOG_USE_STREAM",
"value": "True"
},
{
"name": "LOG_LEVEL",
"value": "INFO"
},
{
"name": "APP_ENV",
"value": "stage"
},
{
"name": "SENTRY_DSN",
"value": "https://5dddca3ecc964284bb8008bc2beef808@o4505428107853824.ingest.sentry.io/4505428124827648"
}
],
"secrets": [
{
"name": "DATABASE_SECRETS",
"valueFrom": "arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/db-mysql-Ixf6qD"
},
{
"name": "AUTH0_SECRETS",
"valueFrom": "arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/auth0-0gzF6d"
},
{
"name": "DB_ENC_SECRET",
"valueFrom": "arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/db-secret-CYKglI"
},
{
"name": "SMTP_SECRETS",
"valueFrom": "arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/socketlabs-UYmjaC"
},
{
"name": "GOOGLE_OAUTH_SECRETS",
"valueFrom": "arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/google-cal-oauth-VevaSo"
}
],
"mountPoints": [],
"volumesFrom": [],
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-create-group": "true",
"awslogs-group": "/ecs/appointments-definition",
"awslogs-region": "us-east-1",
"awslogs-stream-prefix": "ecs"
}
}
},
{
"name": "frontend",
"image": "frontend-latest",
"cpu": 0,
"portMappings": [
{
"name": "frontend-80-tcp",
"containerPort": 80,
"hostPort": 80,
"protocol": "tcp",
"appProtocol": "http"
}
],
"essential": true,
"environment": [],
"mountPoints": [],
"volumesFrom": [],
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-create-group": "true",
"awslogs-group": "/ecs/appointments-definition",
"awslogs-region": "us-east-1",
"awslogs-stream-prefix": "ecs"
}
}
}
],
"family": "appointments-definition",
"executionRoleArn": "arn:aws:iam::768512802988:role/apointments-ci-role",
"networkMode": "awsvpc",
"revision": 24,
"volumes": [],
"status": "ACTIVE",
"requiresAttributes": [
{
"name": "com.amazonaws.ecs.capability.logging-driver.awslogs"
},
{
"name": "ecs.capability.execution-role-awslogs"
},
{
"name": "com.amazonaws.ecs.capability.ecr-auth"
},
{
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.19"
},
{
"name": "ecs.capability.execution-role-ecr-pull"
},
{
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.18"
},
{
"name": "ecs.capability.task-eni"
},
{
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.29"
}
],
"placementConstraints": [],
"compatibilities": [
"EC2",
"FARGATE"
],
"requiresCompatibilities": [
"FARGATE"
],
"cpu": "512",
"memory": "1024",
"runtimePlatform": {
"cpuArchitecture": "X86_64",
"operatingSystemFamily": "LINUX"
},
"registeredAt": "2023-03-15T22:19:59.642Z",
"registeredBy": "arn:aws:iam::768512802988:user/melissa",
"tags": []
}
2 changes: 1 addition & 1 deletion backend/src/appointment/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def server():
# Work around for now :)
allow_origins=[
os.getenv("FRONTEND_URL", "http://localhost:8080"),
"https://appointment.day", # Temp for now!
"https://stage.appointment.day", # Temp for now!
"https://accounts.google.com",
"https://www.googleapis.com/auth/calendar",
],
Expand Down

0 comments on commit f5af7d0

Please sign in to comment.