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

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

See merge request !12

devops/azure/chart/helm-config.yaml

@@ -15,4 +15,4 @@ image:
 
 server:
   servlet:
-    contextPath: /entitlements/v2
+    contextPath: /api/entitlements/v2

devops/azure/chart/templates/azure-istio-auth-policy.yaml

@@ -33,5 +33,5 @@ spec:
                        "*/swagger","*/swagger-resources","*/swagger-ui.html",
                        "*/actuator/health", "*/health",
                        "*/configuration/ui","*/configuration/security",
-                       "/entitlements/v2/swagger-resources/*",
-                       "/entitlements/v2/webjars/*" ]
+                       "/api/entitlements/v2/swagger-resources/*",
+                       "/api/entitlements/v2/webjars/*" ]

devops/azure/chart/values.yaml

@@ -22,4 +22,4 @@ image:
 
 server:
   servlet:
-    contextPath: /entitlements/v2
+    contextPath: /api/entitlements/v2

provider/entitlements-v2-azure/README.md

@@ -49,7 +49,7 @@ with these settings service expects "x-payload" header which contains Base64 enc
 
 | 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 | -- |
 | `AZURE_TESTER_SERVICEPRINCIPAL_SECRET` | `********` | Secret for `$INTEGRATION_TESTER` | yes | -- |
 | `AZURE_AD_TENANT_ID` | `********` | AD tenant to authenticate users from | yes | -- |

provider/entitlements-v2-azure/src/main/resources/application.properties

@@ -4,7 +4,7 @@ LOG_PREFIX=entitlements-v2
 logging.level.org.springframework.web=${LOGGING_LEVEL:DEBUG}
 
 # Server configuration
-server.servlet.contextPath=/entitlements/v2
+server.servlet.contextPath=/api/entitlements/v2
 server.error.whitelabel.enabled=false
 
 # Spring configuration

provider/entitlements-v2-gcp/src/main/resources/application.properties

@@ -4,7 +4,7 @@ LOG_PREFIX=entitlements-v2
 logging.level.org.springframework.web=${LOGGING_LEVEL:DEBUG}
 
 # Server configuration
-server.servlet.contextPath=/entitlements/v2
+server.servlet.contextPath=/api/entitlements/v2
 server.error.whitelabel.enabled=false
 
 # Spring configuration

provider/entitlements-v2-gcp/src/test/resources/application.properties

@@ -2,7 +2,7 @@
 logging.level.org.springframework.web=DEBUG
 
 # Server configuration
-server.servlet.contextPath=/entitlements/v2
+server.servlet.contextPath=/api/entitlements/v2
 server.error.whitelabel.enabled=false
 
 # Spring configuration

testing/entitlements-v2-test-azure/README.md

@@ -31,7 +31,7 @@
     app.gremlin.port to '8901'
 6. Run Entitlements V2 service from Azure provider
 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`
    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`

testing/entitlements-v2-test-azure/src/test/java/org/opengroup/osdu/entitlements/v2/util/AzureConfigurationService.java

@@ -25,7 +25,7 @@ public class AzureConfigurationService implements ConfigurationService {
         if (Strings.isNullOrEmpty(SERVICE_URL)) {
             String serviceUrl = System.getProperty("ENTITLEMENT_V2_URL", System.getenv("ENTITLEMENT_V2_URL"));
             if (serviceUrl == null || serviceUrl.contains("-null")) {
-                serviceUrl = "http://localhost:8080/entitlements/v2";
+                serviceUrl = "http://localhost:8080/api/entitlements/v2";
             }
             SERVICE_URL = serviceUrl;
         }