Skip to content

Commit a2978f8

Browse files
ryanjjungryanjjung
authored
Fix stage configs (#640)
* Fix stage configs * Update stage images
1 parent c4cc17b commit a2978f8

File tree

1 file changed

+17
-37
lines changed

1 file changed

+17
-37
lines changed

‎pulumi/config.stage.yaml‎

Lines changed: 17 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
### Special variables used throughout this file
44

55
# Update this value to update all containers based on this thunderbird/accounts image
6-
.accounts_image: &ACCOUNTS_IMAGE 768512802988.dkr.ecr.eu-central-1.amazonaws.com/thunderbird/accounts:0ca8bc25c05a3e87012db11d5141e03cc7f8da7b
6+
.accounts_image: &ACCOUNTS_IMAGE 768512802988.dkr.ecr.eu-central-1.amazonaws.com/thunderbird/accounts:c4cc17bbc24a58fdc7ef71983a579529385855bf
77

88
# Update this value to update all containers based on this Keycloak image
9-
.keycloak_image: &KEYCLOAK_IMAGE 768512802988.dkr.ecr.eu-central-1.amazonaws.com/thunderbird/accounts:keycloak-ecdbdfc1c9ad2394836dff14bfb26f1589005623
9+
.keycloak_image: &KEYCLOAK_IMAGE 768512802988.dkr.ecr.eu-central-1.amazonaws.com/thunderbird/accounts:keycloak-592208aba42635bb752a05a4683af3c4fad7264b
1010

1111
# These variables are common to Accounts application environments. Some tasks will require additional configuration.
1212
.admin_contact: &VAR_ADMIN_CONTACT {name: "ADMIN_CONTACT", value: "dummy@example.org"}
@@ -24,26 +24,23 @@
2424
.imap_host: &VAR_IMAP_HOST {name: "IMAP_HOST", value: "mail.stage-thundermail.com"}
2525
.imap_port: &VAR_IMAP_PORT {name: "IMAP_PORT", value: "993"}
2626
.imap_tls: &VAR_IMAP_TLS {name: "IMAP_TLS", value: "True"}
27+
.keycloak_url_api: &VAR_KEYCLOAK_URL_API {name: "KEYCLOAK_URL_API", value: "https://auth-stage.tb.pro/admin/realms/tbpro/"}
28+
.keycloak_admin_url_token: &VAR_KEYCLOAK_ADMIN_URL_TOKEN {name: "KEYCLOAK_ADMIN_URL_TOKEN", value: "https://auth-stage.tb.pro/realms/master/protocol/openid-connect/token/"}
2729
.jmap_host: &VAR_JMAP_HOST {name: "JMAP_HOST", value: "mail.stage-thundermail.com"}
2830
.jmap_port: &VAR_JMAP_PORT {name: "JMAP_PORT", value: "443"}
2931
.jmap_tls: &VAR_JMAP_TLS {name: "JMAP_TLS", value: "True"}
30-
.keycloak_admin_url_token: &VAR_KEYCLOAK_ADMIN_URL_TOKEN {name: "KEYCLOAK_ADMIN_URL_TOKEN", value: "https://auth-stage.tb.pro/realms/master/protocol/openid-connect/token/"}
31-
.keycloak_url_api: &VAR_KEYCLOAK_URL_API {name: "KEYCLOAK_URL_API", value: "https://auth-stage.tb.pro/admin/realms/tbpro/"}
32-
.log_level: &VAR_LOG_LEVEL {name: "LOG_LEVEL", "value": "DEBUG"}
3332
.min_custom_domain_alias_length: &VAR_MIN_CUSTOM_DOMAIN_ALIAS_LENGTH {name: "MIN_CUSTOM_DOMAIN_ALIAS_LENGTH", value: "3"}
3433
.oidc_url_auth: &VAR_OIDC_URL_AUTH {name: "OIDC_URL_AUTH", value: "https://auth-stage.tb.pro/realms/tbpro/protocol/openid-connect/auth"}
35-
.oidc_url_jwks: &VAR_OIDC_URL_JWKS {name: "OIDC_URL_JWKS", value: "https://auth-stage.tb.pro/realms/tbpro/protocol/openid-connect/certs"}
36-
.oidc_url_logout: &VAR_OIDC_URL_LOGOUT {name: "OIDC_URL_LOGOUT", value: "https://auth-stage.tb.pro/realms/tbpro/protocol/openid-connect/logout"}
3734
.oidc_url_token: &VAR_OIDC_URL_TOKEN {name: "OIDC_URL_TOKEN", value: "https://auth-stage.tb.pro/realms/tbpro/protocol/openid-connect/token"}
3835
.oidc_url_user: &VAR_OIDC_URL_USER {name: "OIDC_URL_USER", value: "https://auth-stage.tb.pro/realms/tbpro/protocol/openid-connect/userinfo"}
39-
.public_base_url: &VAR_PUBLIC_BASE_URL {name: "PUBLIC_BASE_URL", value: "https://accounts-stage.tb.pro"}
36+
.oidc_url_jwks: &VAR_OIDC_URL_JWKS {name: "OIDC_URL_JWKS", value: "https://auth-stage.tb.pro/realms/tbpro/protocol/openid-connect/certs"}
37+
.oidc_url_logout: &VAR_OIDC_URL_LOGOUT {name: "OIDC_URL_LOGOUT", value: "https://auth-stage.tb.pro/realms/tbpro/protocol/openid-connect/logout"}
4038
.paddle_env: &VAR_PADDLE_ENV {name: "PADDLE_ENV", value: "sandbox"}
39+
.public_base_url: &VAR_PUBLIC_BASE_URL {name: "PUBLIC_BASE_URL", value: "https://accounts-stage.tb.pro"}
4140
.redis_celery_db: &VAR_REDIS_CELERY_DB {name: "REDIS_CELERY_DB", value: "5"}
4241
.redis_celery_results_db: &VAR_REDIS_CELERY_RESULTS_DB {name: "REDIS_CELERY_RESULTS_DB", value: "6"}
4342
.redis_internal_db: &VAR_REDIS_INTERNAL_DB {name: "REDIS_INTERNAL_DB", value: "0"}
4443
.redis_shared_db: &VAR_REDIS_SHARED_DB {name: "REDIS_SHARED_DB", value: "10"}
45-
.sentry_profile_sample_rate: &VAR_SENTRY_PROFILE_SAMPLE_RATE {name: "SENTRY_PROFILE_SAMPLE_RATE", "value": "0.33"}
46-
.sentry_traces_sample_rate: &VAR_SENTRY_TRACES_SAMPLE_RATE {name: "SENTRY_TRACES_SAMPLE_RATE", value: "1.0"}
4744
.smtp_host: &VAR_SMTP_HOST {name: "SMTP_HOST", value: "mail.stage-thundermail.com"}
4845
.smtp_port: &VAR_SMTP_PORT {name: "SMTP_PORT", value: "465"}
4946
.smtp_tls: &VAR_SMTP_TLS {name: "SMTP_TLS", value: "True"}
@@ -55,8 +52,8 @@
5552
.tb_pro_wait_list_url: &VAR_TB_PRO_WAIT_LIST_URL {name: "TB_PRO_WAIT_LIST_URL", value: "https://tb.pro/waitlist/"}
5653
.use_allow_list: &VAR_USE_ALLOW_LIST {name: "USE_ALLOW_LIST", value: "True"}
5754
.verify_private_link_ssl: &VAR_VERIFY_PRIVATE_LINK_SSL {name: "VERIFY_PRIVATE_LINK_SSL", value: "False"}
58-
.zendesk_form_browser_field_id: &VAR_ZENDESK_FORM_BROWSER_FIELD_ID {name: "ZENDESK_FORM_BROWSER_FIELD_ID", value: "46642389601427"}
5955
.zendesk_form_id: &VAR_ZENDESK_FORM_ID {name: "ZENDESK_FORM_ID", value: "46642378723859"}
56+
.zendesk_form_browser_field_id: &VAR_ZENDESK_FORM_BROWSER_FIELD_ID {name: "ZENDESK_FORM_BROWSER_FIELD_ID", value: "46642389601427"}
6057
.zendesk_form_os_field_id: &VAR_ZENDESK_FORM_OS_FIELD_ID {name: "ZENDESK_FORM_OS_FIELD_ID", value: "46642417675539"}
6158

6259
# These variables are also common to our environments, but are pulled from secret stores instead
@@ -74,8 +71,8 @@
7471
.oidc_client_id: &SECRET_OIDC_CLIENT_ID {name: "OIDC_CLIENT_ID", valueFrom: "arn:aws:secretsmanager:eu-central-1:768512802988:secret:accounts/stage/oidc-client-id-UzCPWF"}
7572
.oidc_client_secret: &SECRET_OIDC_CLIENT_SECRET {name: "OIDC_CLIENT_SECRET", valueFrom: "arn:aws:secretsmanager:eu-central-1:768512802988:secret:accounts/stage/oidc-client-secret-RzOIiH"}
7673
.oidc_sign_algo: &SECRET_OIDC_SIGN_ALGO {name: "OIDC_SIGN_ALGO", valueFrom: "arn:aws:secretsmanager:eu-central-1:768512802988:secret:accounts/stage/oidc-sign-algo-nEhTVJ"}
77-
.paddle_api_key: &SECRET_PADDLE_API_KEY {Name: "PADDLE_API_KEY", valueFrom: "arn:aws:secretsmanager:eu-central-1:768512802988:secret:accounts/stage/paddle-api-key-WlhcMj"}
7874
.paddle_price_id_lo: &SECRET_PADDLE_PRICE_ID_LO {name: "PADDLE_PRICE_ID_LO", valueFrom: "arn:aws:secretsmanager:eu-central-1:768512802988:secret:accounts/stage/paddle-price-id-lo-BOxRwS"}
75+
.paddle_api_key: &SECRET_PADDLE_API_KEY {Name: "PADDLE_API_KEY", valueFrom: "arn:aws:secretsmanager:eu-central-1:768512802988:secret:accounts/stage/paddle-api-key-WlhcMj"}
7976
.paddle_price_id_md: &SECRET_PADDLE_PRICE_ID_MD {name: "PADDLE_PRICE_ID_MD", valueFrom: "arn:aws:secretsmanager:eu-central-1:768512802988:secret:accounts/stage/paddle-price-id-md-YShIxp"}
8077
.paddle_price_id_hi: &SECRET_PADDLE_PRICE_ID_HI {name: "PADDLE_PRICE_ID_HI", valueFrom: "arn:aws:secretsmanager:eu-central-1:768512802988:secret:accounts/stage/paddle-price-id-hi-8muS08"}
8178
.paddle_token: &SECRET_PADDLE_TOKEN {name: "PADDLE_TOKEN", valueFrom: "arn:aws:secretsmanager:eu-central-1:768512802988:secret:accounts/stage/paddle-token-1Xo0np"}
@@ -303,7 +300,6 @@ resources:
303300
- stalwart-api-auth-key
304301
- keycloak-admin-client-id
305302
- keycloak-admin-client-secret
306-
- appointment-caldav-secret
307303

308304
tb:ec2:SshableInstance: {}
309305
# Fill out this template to build an SSH bastion
@@ -358,26 +354,23 @@ resources:
358354
- *VAR_IMAP_HOST
359355
- *VAR_IMAP_PORT
360356
- *VAR_IMAP_TLS
357+
- *VAR_KEYCLOAK_URL_API
358+
- *VAR_KEYCLOAK_ADMIN_URL_TOKEN
361359
- *VAR_JMAP_HOST
362360
- *VAR_JMAP_PORT
363361
- *VAR_JMAP_TLS
364-
- *VAR_KEYCLOAK_ADMIN_URL_TOKEN
365-
- *VAR_KEYCLOAK_URL_API
366-
- *VAR_LOG_LEVEL
367362
- *VAR_MIN_CUSTOM_DOMAIN_ALIAS_LENGTH
368363
- *VAR_OIDC_URL_AUTH
369-
- *VAR_OIDC_URL_JWKS
370-
- *VAR_OIDC_URL_LOGOUT
371364
- *VAR_OIDC_URL_TOKEN
372365
- *VAR_OIDC_URL_USER
366+
- *VAR_OIDC_URL_JWKS
367+
- *VAR_OIDC_URL_LOGOUT
373368
- *VAR_PADDLE_ENV
374369
- *VAR_PUBLIC_BASE_URL
375370
- *VAR_REDIS_CELERY_DB
376371
- *VAR_REDIS_CELERY_RESULTS_DB
377372
- *VAR_REDIS_INTERNAL_DB
378373
- *VAR_REDIS_SHARED_DB
379-
- *VAR_SENTRY_PROFILE_SAMPLE_RATE
380-
- *VAR_SENTRY_TRACES_SAMPLE_RATE
381374
- *VAR_SMTP_HOST
382375
- *VAR_SMTP_PORT
383376
- *VAR_SMTP_TLS
@@ -389,10 +382,9 @@ resources:
389382
- *VAR_TB_PRO_WAIT_LIST_URL
390383
- *VAR_USE_ALLOW_LIST
391384
- *VAR_VERIFY_PRIVATE_LINK_SSL
392-
- *VAR_ZENDESK_FORM_BROWSER_FIELD_ID
393385
- *VAR_ZENDESK_FORM_ID
386+
- *VAR_ZENDESK_FORM_BROWSER_FIELD_ID
394387
- *VAR_ZENDESK_FORM_OS_FIELD_ID
395-
# These vars indicate this container runs as Celery, not Flower or Django
396388
- name: TBA_CELERY
397389
value: "yes"
398390
- name: TBA_FLOWER
@@ -432,12 +424,11 @@ resources:
432424
- *VAR_IMAP_HOST
433425
- *VAR_IMAP_PORT
434426
- *VAR_IMAP_TLS
427+
- *VAR_KEYCLOAK_URL_API
428+
- *VAR_KEYCLOAK_ADMIN_URL_TOKEN
435429
- *VAR_JMAP_HOST
436430
- *VAR_JMAP_PORT
437431
- *VAR_JMAP_TLS
438-
- *VAR_KEYCLOAK_URL_API
439-
- *VAR_KEYCLOAK_ADMIN_URL_TOKEN
440-
- *VAR_LOG_LEVEL
441432
- *VAR_MIN_CUSTOM_DOMAIN_ALIAS_LENGTH
442433
- *VAR_OIDC_URL_AUTH
443434
- *VAR_OIDC_URL_TOKEN
@@ -464,21 +455,12 @@ resources:
464455
- *VAR_ZENDESK_FORM_ID
465456
- *VAR_ZENDESK_FORM_BROWSER_FIELD_ID
466457
- *VAR_ZENDESK_FORM_OS_FIELD_ID
467-
- *VAR_SENTRY_PROFILE_SAMPLE_RATE
468-
# These vars indicate this container runs as Flower, not Celery or Django
469458
- name: TBA_CELERY
470459
value: "no"
471460
- name: TBA_FLOWER
472461
value: "yes"
473-
# Since this service is on private network space, we allow the API without auth
474462
- name: FLOWER_UNAUTHENTICATED_API
475463
value: 'true'
476-
# Flower is not our product, and it's for infrequent internal use only.
477-
# Disable all Sentry monitoring except for actual errors.
478-
- name: SENTRY_PROFILE_SAMPLE_RATE
479-
value: "0.0"
480-
- name: SENTRY_TRACES_SAMPLE_RATE
481-
value: "0.0"
482464

483465
targets:
484466
flower:
@@ -872,8 +854,6 @@ resources:
872854
value: '46642417675539'
873855
- name: VERIFY_PRIVATE_LINK_SSL
874856
value: 'False'
875-
- *VAR_LOG_LEVEL
876-
- *VAR_SENTRY_PROFILE_SAMPLE_RATE
877857

878858
tb:autoscale:EcsServiceAutoscaler:
879859
accounts:
@@ -918,7 +898,7 @@ resources:
918898
- accounts-stage
919899
fargate_task_role_arns:
920900
- arn:aws:iam::768512802988:role/accounts-stage-fargate-accounts
921-
- arn:aws:iam::768512802988:role/accounts-stage-fargate-accounts-celery
922901
- arn:aws:iam::768512802988:role/accounts-stage-fargate-keycloak
923902
- arn:aws:iam::768512802988:role/accounts-stage-afc-accounts-celery-stage
924903
- arn:aws:iam::768512802988:role/accounts-stage-afc-accounts-flower-stage
904+

0 commit comments

Comments
 (0)