Skip to content

Commit a13467b

Browse files
committed
PP-6127 Add ledger-secret-service
Env vars which are specific to ledger and differ by environment are to be provided via the ledger-secret-service. The mapping between these vars and their keys within the vars returned by ledger-secret-service are defined within env-map.yml.
1 parent 61e00ea commit a13467b

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

manifest.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ applications:
1111
memory: ((memory))
1212
disk_quota: ((disk_quota))
1313
services:
14+
- ledger-secret-service
1415
- ledger-db
1516
- sqs
1617
env:
@@ -27,15 +28,17 @@ applications:
2728
AWS_SQS_ENDPOINT: ''
2829
AWS_SQS_PAYMENT_EVENT_QUEUE_URL: ''
2930

31+
# Provided by ledger-secret-service see src/main/resource/env-map.yml
32+
AWS_ACCESS_KEY: ""
33+
AWS_SECRET_KEY: ""
34+
SENTRY_DSN: ""
35+
3036
# Other sqs settings
31-
AWS_ACCESS_KEY: ((aws_access_key))
32-
AWS_SECRET_KEY: ((aws_secret_key))
3337
AWS_SQS_MESSAGE_MAXIMUM_WAIT_TIME_IN_SECONDS: '20'
3438
QUEUE_MESSAGE_RECEIVER_THREAD_DELAY_IN_MILLISECONDS: '1000'
3539
AWS_SQS_NON_STANDARD_SERVICE_ENDPOINT: 'true'
3640
AWS_SQS_REGION: region-1
3741

38-
3942
ADMIN_PORT: '10701'
4043
DISABLE_INTERNAL_HTTPS: ((disable_internal_https))
4144
ENVIRONMENT: ((space))
@@ -46,11 +49,5 @@ applications:
4649
JPA_SQL_LOG_LEVEL: 'INFO'
4750

4851
AWS_XRAY_CONTEXT_MISSING: LOG_ERROR
49-
50-
# Provide via Sentry service
51-
SENTRY_DSN: noop://localhost
52-
5352
RUN_APP: 'true'
54-
RUN_MIGRATION: ((run_migration))
55-
routes:
56-
- route: ((ledger_route))
53+
RUN_MIGRATION: 'false'

src/main/resources/env-map.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
env_vars:
2-
DB_HOST: '.[][] | select(.name == "ledger-db") | .credentials.host '
3-
DB_NAME: '.[][] | select(.name == "ledger-db") | .credentials.name '
4-
DB_PASSWORD: '.[][] | select(.name == "ledger-db") | .credentials.password '
5-
DB_USER: '.[][] | select(.name == "ledger-db") | .credentials.username '
6-
DB_SSL_OPTION: '.[][] | select(.name == "ledger-db") | .credentials.ssl_option // "ssl=true"'
7-
AWS_SQS_ENDPOINT: '.[][] | select(.name == "sqs") | .credentials.endpoint '
8-
AWS_SQS_PAYMENT_EVENT_QUEUE_URL: '.[][] | select(.name == "sqs") | .credentials.event_queue_url '
2+
DB_HOST: '.[][] | select(.name == "ledger-db") | .credentials.host '
3+
DB_NAME: '.[][] | select(.name == "ledger-db") | .credentials.name '
4+
DB_PASSWORD: '.[][] | select(.name == "ledger-db") | .credentials.password '
5+
DB_USER: '.[][] | select(.name == "ledger-db") | .credentials.username '
6+
DB_SSL_OPTION: '.[][] | select(.name == "ledger-db") | .credentials.ssl_option // "ssl=true"'
7+
AWS_SQS_ENDPOINT: '.[][] | select(.name == "sqs") | .credentials.endpoint '
8+
AWS_SQS_PAYMENT_EVENT_QUEUE_URL: '.[][] | select(.name == "sqs") | .credentials.event_queue_url '
9+
AWS_ACCESS_KEY: '.[][] | select(.name == "ledger-secret-service") | .credentials.aws_access_key '
10+
AWS_SECRET_KEY: '.[][] | select(.name == "ledger-secret-service") | .credentials.aws_secret_key '
11+
SENTRY_DSN: '.[][] | select(.name == "ledger-secret-service") | .credentials.sentry_dsn '
912

0 commit comments

Comments
 (0)