diff --git a/README.md b/README.md index ae116b3dbb..cd7966a37f 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,8 @@ The GOV.UK Pay Connector in Java (Dropwizard) |---------|---------|---------| | `AWS_SQS_REGION` | - | SQS capture queue region | | `AWS_SQS_CAPTURE_QUEUE_URL` | - | SQS capture queue URL | +| `AWS_SQS_EVENT_QUEUE_URL` | - | SQS event queue URL | +| `AWS_SQS_PAYOUT_RECONCILE_QUEUE_URL` | - | SQS payout reconcile queue URL | | `AWS_SQS_NON_STANDARD_SERVICE_ENDPOINT` | false | Set to true to use non standard (eg: http://my-own-sqs-endpoint) SQS endpoint | | `AWS_SQS_ENDPOINT` | - | URL that is the entry point for SQS. Only required when AWS_SQS_NON_STANDARD_SERVICE_ENDPOINT is `true` | | `AWS_SECRET_KEY` | - | Secret key. Only required when AWS_SQS_NON_STANDARD_SERVICE_ENDPOINT is `true` | diff --git a/manifest.yml b/manifest.yml index 85f5faf638..a0a2ca353e 100644 --- a/manifest.yml +++ b/manifest.yml @@ -52,14 +52,13 @@ applications: GDS_CONNECTOR_STRIPE_WEBHOOK_LIVE_SIGN_SECRET: "" # Provided by the sqs service - see src/main/resources/env-map.yml + AWS_SQS_REGION: "" AWS_SQS_CAPTURE_QUEUE_URL: "" - AWS_SQS_ENDPOINT: "" AWS_SQS_PAYMENT_EVENT_QUEUE_URL: "" + AWS_SQS_PAYOUT_RECONCILE_QUEUE_URL: "" # Other sqs settings AWS_SQS_MESSAGE_MAXIMUM_WAIT_TIME_IN_SECONDS: '20' - AWS_SQS_NON_STANDARD_SERVICE_ENDPOINT: 'true' - AWS_SQS_REGION: region-1 # Provided by the card-connector-db service - see src/main/resources/env-map.yml DB_HOST: "" diff --git a/src/main/resources/env-map.yml b/src/main/resources/env-map.yml index 0e39db0f65..8da9dc1a15 100644 --- a/src/main/resources/env-map.yml +++ b/src/main/resources/env-map.yml @@ -1,15 +1,16 @@ env_vars: - DB_HOST: '.[][] | select(.name == "card-connector-db") | .credentials.host ' - DB_NAME: '.[][] | select(.name == "card-connector-db") | .credentials.name ' - DB_PASSWORD: '.[][] | select(.name == "card-connector-db") | .credentials.password ' - DB_USER: '.[][] | select(.name == "card-connector-db") | .credentials.username ' - DB_SSL_OPTION: '.[][] | select(.name == "card-connector-db") | .credentials.ssl_option // "ssl=true"' - FRONTEND_URL: '.[][] | select(.name == "app-catalog") | .credentials.card_frontend_url ' - METRICS_HOST: '.[][] | select(.name == "app-catalog") | .credentials.carbon_relay_route ' - METRICS_PORT: '.[][] | select(.name == "app-catalog") | .credentials.carbon_relay_port ' - AWS_SQS_CAPTURE_QUEUE_URL: '.[][] | select(.name == "sqs") | .credentials.capture_queue_url ' - AWS_SQS_ENDPOINT: '.[][] | select(.name == "sqs") | .credentials.endpoint ' - AWS_SQS_PAYMENT_EVENT_QUEUE_URL: '.[][] | select(.name == "sqs") | .credentials.event_queue_url ' + DB_HOST: '.[][] | select(.name == "card-connector-db") | .credentials.host ' + DB_NAME: '.[][] | select(.name == "card-connector-db") | .credentials.name ' + DB_PASSWORD: '.[][] | select(.name == "card-connector-db") | .credentials.password ' + DB_USER: '.[][] | select(.name == "card-connector-db") | .credentials.username ' + DB_SSL_OPTION: '.[][] | select(.name == "card-connector-db") | .credentials.ssl_option // "ssl=true"' + FRONTEND_URL: '.[][] | select(.name == "app-catalog") | .credentials.card_frontend_url ' + METRICS_HOST: '.[][] | select(.name == "app-catalog") | .credentials.carbon_relay_route ' + METRICS_PORT: '.[][] | select(.name == "app-catalog") | .credentials.carbon_relay_port ' + AWS_SQS_REGION: '.[][] | select(.name == "sqs") | .credentials.region ' + AWS_SQS_CAPTURE_QUEUE_URL: '.[][] | select(.name == "sqs") | .credentials.capture_queue_url ' + AWS_SQS_PAYMENT_EVENT_QUEUE_URL: '.[][] | select(.name == "sqs") | .credentials.event_queue_url ' + AWS_SQS_PAYOUT_RECONCILE_QUEUE_URL: '.[][] | select(.name == "sqs") | .credentials.payout_reconcile_queue_url ' CAPTURE_USING_SQS_FEATURE_FLAG: '.[][] | select(.name == "card-connector-secret-service") | .credentials.sqs_enabled' EVENT_QUEUE_ENABLED: '.[][] | select(.name == "card-connector-secret-service") | .credentials.sqs_enabled'