From 0620047f46f90b0479e46461139b1c69c9c3a491 Mon Sep 17 00:00:00 2001 From: Jonathan Harden Date: Fri, 6 Sep 2024 16:21:39 +0100 Subject: [PATCH] PP-13145: Accept BIND_HOST env var and default to localhost --- README.md | 1 + src/main/resources/config/config.yaml | 2 ++ .../uk/gov/pay/card/it/resources/CardIdResourceITest.java | 6 +++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f9648979..16ca09b5 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ The service provides an API that can be accessed to retrieve card information fo ## Environment Variables - `ADMIN_PORT`: The port number to listen for Dropwizard admin requests on. Defaults to `8081`. +- `BIND_HOST`: The IP address for the application to bind to. Defaults to `127.0.0.1` - `JAVA_OPTS`: Options to pass to the JRE. Defaults to `-Xms1500m -Xmx1500m`. - `PORT`: The port number to listen for requests on. Defaults to `8080`. - `TEST_CARD_DATA_LOCATION`: The path to load bin ranges for test cards from. Defaults diff --git a/src/main/resources/config/config.yaml b/src/main/resources/config/config.yaml index 4b33302d..bc0bddab 100644 --- a/src/main/resources/config/config.yaml +++ b/src/main/resources/config/config.yaml @@ -1,9 +1,11 @@ server: applicationConnectors: - type: http + bindHost: ${BIND_HOST:-127.0.0.1} port: ${PORT:-8080} adminConnectors: - type: http + bindHost: ${BIND_HOST:-127.0.0.1} port: ${ADMIN_PORT:-8081} requestLog: appenders: diff --git a/src/test/java/uk/gov/pay/card/it/resources/CardIdResourceITest.java b/src/test/java/uk/gov/pay/card/it/resources/CardIdResourceITest.java index 1e6dd27c..31df8b6d 100644 --- a/src/test/java/uk/gov/pay/card/it/resources/CardIdResourceITest.java +++ b/src/test/java/uk/gov/pay/card/it/resources/CardIdResourceITest.java @@ -23,7 +23,9 @@ public class CardIdResourceITest { CardApi.class , resourceFilePath("config/config.yaml") , config("server.applicationConnectors[0].port", "0") + , config("server.applicationConnectors[0].bindHost", "127.0.0.1") , config("server.adminConnectors[0].port", "0") + , config("server.adminConnectors[0].bindHost", "127.0.0.1") , config("worldpayDataLocation", "file://" + resourceFilePath("card-id-resource-integration-test/worldpay-bin-ranges.csv")) , config("discoverDataLocation", "file://" + resourceFilePath("card-id-resource-integration-test/discover-bin-ranges.csv")) , config("testCardDataLocation", "file://" + resourceFilePath("card-id-resource-integration-test/test-bin-ranges.csv"))); @@ -32,7 +34,9 @@ public class CardIdResourceITest { CardApi.class , resourceFilePath("config/config.yaml") , config("server.applicationConnectors[0].port", "0") - , config("server.adminConnectors[0].port", "0")); + , config("server.applicationConnectors[0].bindHost", "127.0.0.1") + , config("server.adminConnectors[0].port", "0") + , config("server.adminConnectors[0].bindHost", "127.0.0.1")); @Test public void shouldFindDiscoverCardInformation() {