Commit 427f57a5 authored by Jason's avatar Jason
Browse files

Merge branch 'add-api-prefix-in-base-url' into 'master'

change context path from /entitlements/v2 to /api/entitlements/v2

See merge request !12
parents 5e569d09 2e0c3112
Pipeline #24729 passed with stages
in 12 minutes and 5 seconds
...@@ -15,4 +15,4 @@ image: ...@@ -15,4 +15,4 @@ image:
server: server:
servlet: servlet:
contextPath: /entitlements/v2 contextPath: /api/entitlements/v2
...@@ -33,5 +33,5 @@ spec: ...@@ -33,5 +33,5 @@ spec:
"*/swagger","*/swagger-resources","*/swagger-ui.html", "*/swagger","*/swagger-resources","*/swagger-ui.html",
"*/actuator/health", "*/health", "*/actuator/health", "*/health",
"*/configuration/ui","*/configuration/security", "*/configuration/ui","*/configuration/security",
"/entitlements/v2/swagger-resources/*", "/api/entitlements/v2/swagger-resources/*",
"/entitlements/v2/webjars/*" ] "/api/entitlements/v2/webjars/*" ]
...@@ -22,4 +22,4 @@ image: ...@@ -22,4 +22,4 @@ image:
server: server:
servlet: servlet:
contextPath: /entitlements/v2 contextPath: /api/entitlements/v2
...@@ -49,7 +49,7 @@ with these settings service expects "x-payload" header which contains Base64 enc ...@@ -49,7 +49,7 @@ with these settings service expects "x-payload" header which contains Base64 enc
| name | value | description | sensitive? | source | | name | value | description | sensitive? | source |
| --- | --- | --- | --- | --- | | --- | --- | --- | --- | --- |
| `HOST_URL` | ex `http://localhost:8080/entitlements/v2` | The host where the service is running | no | -- | | `ENTITLEMENT_V2_URL` | ex `http://localhost:8080/api/entitlements/v2` | The host where the service is running | no | -- |
| `INTEGRATION_TESTER` | `********` | System identity to assume for API calls. Note: this user must have entitlements configured already | no | -- | | `INTEGRATION_TESTER` | `********` | System identity to assume for API calls. Note: this user must have entitlements configured already | no | -- |
| `AZURE_TESTER_SERVICEPRINCIPAL_SECRET` | `********` | Secret for `$INTEGRATION_TESTER` | yes | -- | | `AZURE_TESTER_SERVICEPRINCIPAL_SECRET` | `********` | Secret for `$INTEGRATION_TESTER` | yes | -- |
| `AZURE_AD_TENANT_ID` | `********` | AD tenant to authenticate users from | yes | -- | | `AZURE_AD_TENANT_ID` | `********` | AD tenant to authenticate users from | yes | -- |
......
...@@ -4,7 +4,7 @@ LOG_PREFIX=entitlements-v2 ...@@ -4,7 +4,7 @@ LOG_PREFIX=entitlements-v2
logging.level.org.springframework.web=${LOGGING_LEVEL:DEBUG} logging.level.org.springframework.web=${LOGGING_LEVEL:DEBUG}
# Server configuration # Server configuration
server.servlet.contextPath=/entitlements/v2 server.servlet.contextPath=/api/entitlements/v2
server.error.whitelabel.enabled=false server.error.whitelabel.enabled=false
# Spring configuration # Spring configuration
......
...@@ -4,7 +4,7 @@ LOG_PREFIX=entitlements-v2 ...@@ -4,7 +4,7 @@ LOG_PREFIX=entitlements-v2
logging.level.org.springframework.web=${LOGGING_LEVEL:DEBUG} logging.level.org.springframework.web=${LOGGING_LEVEL:DEBUG}
# Server configuration # Server configuration
server.servlet.contextPath=/entitlements/v2 server.servlet.contextPath=/api/entitlements/v2
server.error.whitelabel.enabled=false server.error.whitelabel.enabled=false
# Spring configuration # Spring configuration
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
logging.level.org.springframework.web=DEBUG logging.level.org.springframework.web=DEBUG
# Server configuration # Server configuration
server.servlet.contextPath=/entitlements/v2 server.servlet.contextPath=/api/entitlements/v2
server.error.whitelabel.enabled=false server.error.whitelabel.enabled=false
# Spring configuration # Spring configuration
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
app.gremlin.port to '8901' app.gremlin.port to '8901'
6. Run Entitlements V2 service from Azure provider 6. Run Entitlements V2 service from Azure provider
7. Define 5 env variables for integration tests (e.g. maven options): 7. Define 5 env variables for integration tests (e.g. maven options):
1. HOST_URL=`http://localhost:8080/entitlements/v2` 1. ENTITLEMENT_V2_URL=`http://localhost:8080/api/entitlements/v2`
2. INTEGRATION_TESTER=`Keyvault > Choose 'app-dev-sp-username' -> Copy Secret value` 2. INTEGRATION_TESTER=`Keyvault > Choose 'app-dev-sp-username' -> Copy Secret value`
3. AZURE_TESTER_SERVICEPRINCIPAL_SECRET=`Keyvault > Choose 'app-dev-sp-password' -> Copy Secret value` 3. AZURE_TESTER_SERVICEPRINCIPAL_SECRET=`Keyvault > Choose 'app-dev-sp-password' -> Copy Secret value`
4. AZURE_AD_TENANT_ID=`Keyvault > Choose 'app-dev-sp-tenant-id' -> Copy Secret value` 4. AZURE_AD_TENANT_ID=`Keyvault > Choose 'app-dev-sp-tenant-id' -> Copy Secret value`
......
...@@ -25,7 +25,7 @@ public class AzureConfigurationService implements ConfigurationService { ...@@ -25,7 +25,7 @@ public class AzureConfigurationService implements ConfigurationService {
if (Strings.isNullOrEmpty(SERVICE_URL)) { if (Strings.isNullOrEmpty(SERVICE_URL)) {
String serviceUrl = System.getProperty("ENTITLEMENT_V2_URL", System.getenv("ENTITLEMENT_V2_URL")); String serviceUrl = System.getProperty("ENTITLEMENT_V2_URL", System.getenv("ENTITLEMENT_V2_URL"));
if (serviceUrl == null || serviceUrl.contains("-null")) { if (serviceUrl == null || serviceUrl.contains("-null")) {
serviceUrl = "http://localhost:8080/entitlements/v2"; serviceUrl = "http://localhost:8080/api/entitlements/v2";
} }
SERVICE_URL = serviceUrl; SERVICE_URL = serviceUrl;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment