correct the entitlements service ingress path

charts/osdu-common/templates/appgw-ingress.yaml

@@ -94,7 +94,7 @@ spec:
           - backend:
               serviceName: entitlements
               servicePort: 80
-            path: /entitlements/v2/*
+            path: /api/entitlements/v2/*
           - backend:
               serviceName: seismic-store-service
               servicePort: 80

docs/service-automation.md

@@ -24,7 +24,7 @@ This variable group will be used to hold the common values for the services to b
 | SERVICE_CONNECTION_NAME                       | <your_service_connection_name>              |
 | GOOGLE_CLOUD_PROJECT                          | `opendes`                                   |
 | ENTITLEMENT_URL                               | `https://<your_fqdn>/entitlements/v1/`      |
-| ENTITLEMENT_V2_URL                            | `https://<your_fqdn>/entitlements/v2/`      |
+| ENTITLEMENT_V2_URL                            | `https://<your_fqdn>/api/entitlements/v2/`  |
 | LEGAL_URL                                     | `https://<your_fqdn>/api/legal/v1/`         |
 | STORAGE_URL                                   | `https://<your_fqdn>/api/storage/v2/`       |
 | SEARCH_URL                                    | `https://<your_fqdn>/api/search/v2/`        |
@@ -75,7 +75,7 @@ az pipelines variable-group create \
   SERVICE_CONNECTION_NAME=$SERVICE_CONNECTION_NAME \
   GOOGLE_CLOUD_PROJECT="opendes" \
   ENTITLEMENT_URL="https://${DNS_HOST}/entitlements/v1/" \
-  ENTITLEMENT_V2_URL="https://${DNS_HOST}/entitlements/v2/" \
+  ENTITLEMENT_V2_URL="https://${DNS_HOST}/api/entitlements/v2/" \
   LEGAL_URL="https://${DNS_HOST}/api/legal/v1/" \
   STORAGE_URL="https://${DNS_HOST}/api/storage/v2/" \
   SEARCH_URL="https://${DNS_HOST}/api/search/v2/" \
@@ -218,8 +218,6 @@ This variable group is a linked variable group that links to the Environment Key
 - osdu-identity-id
 - subscription-id
 - tenant-id
-- graph-db-endpoint
-- graph-db-primary-key
 
 
 __Setup and Configure the ADO Library `Azure Service Release - partition`__
@@ -271,7 +269,7 @@ az pipelines variable-group create \
 
 __Setup and Configure the ADO Library `Azure Service Release - entitlements`__
 
-This variable group is the service specific variables necessary for testing and deploying the `entitlements-v2` service.
+This variable group is the service specific variables necessary for testing and deploying the `entitlements` service.
 
 | Variable | Value |
 |----------|-------|
@@ -279,8 +277,6 @@ This variable group is the service specific variables necessary for testing and
 | MAVEN_INTEGRATION_TEST_OPTIONS | `-DargLine="-DENTITLEMENT_V2_URL=$(ENTITLEMENT_V2_URL) -DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DAZURE_TESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -DNO_DATA_ACCESS_TESTER=$(NO_DATA_ACCESS_TESTER) -DNO_DATA_ACCESS_TESTER_SERVICEPRINCIPAL_SECRET=$(NO_DATA_ACCESS_TESTER_SERVICEPRINCIPAL_SECRET)"`  |
 | MAVEN_INTEGRATION_TEST_POM_FILE_PATH | `drop/deploy/testing/entitlements-v2-test-azure/pom.xml` |
 | SERVICE_RESOURCE_NAME | `$(AZURE_ENTITLEMENTS_V2_SERVICE_NAME)` |
-| GRAPH_DB_ENDPOINT | `$(graph-db-endpoint)` |
-| GRAPH_DB_PASSWORD | `$(graph-db-primary-key)` |
 
 ```bash
 az pipelines variable-group create \
@@ -291,8 +287,6 @@ az pipelines variable-group create \
   MAVEN_INTEGRATION_TEST_OPTIONS='-DargLine="-DENTITLEMENT_V2_URL=$(ENTITLEMENT_V2_URL) -DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DAZURE_TESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -DNO_DATA_ACCESS_TESTER=$(NO_DATA_ACCESS_TESTER) -DNO_DATA_ACCESS_TESTER_SERVICEPRINCIPAL_SECRET=$(NO_DATA_ACCESS_TESTER_SERVICEPRINCIPAL_SECRET)"' \
   MAVEN_INTEGRATION_TEST_POM_FILE_PATH="drop/deploy/testing/entitlements-v2-test-azure/pom.xml" \
   SERVICE_RESOURCE_NAME='$(AZURE_ENTITLEMENTS_V2_SERVICE_NAME)' \
-  GRAPH_DB_ENDPOINT='$(graph-db-endpoint)' \
-  GRAPH_DB_PASSWORD='$(graph-db-primary-key)' \
   -ojson
 ```
 
@@ -1033,16 +1027,16 @@ az pipelines create \
   -ojson
 ```
 
-17. Add a Pipeline for __service-entitlements-v2__  to deploy the Entitlements V2 Service.
+17. Add a Pipeline for __service-entitlements__  to deploy the Entitlements Service.
     > This pipeline may have to be run twice for integration tests to pass due to a preload data issue.
 
     _Repo:_ `entitlements`
     _Path:_ `/devops/azure/pipeline.yml`
-    _Validate:_ https://<your_dns_name>/entitlements/v1/swagger-ui.html is alive.
+    _Validate:_ https://<your_dns_name>/api/entitlements/v2/swagger-ui.html is alive.
 
 ```bash
 az pipelines create \
-  --name 'service-entitlements-v2'  \
+  --name 'service-entitlements'  \
   --repository entitlements  \
   --branch master  \
   --repository-type tfsgit  \

tools/rest/entitlement-v2.http

@@ -36,7 +36,7 @@ grant_type=refresh_token
 ###
 @access_token = {{refresh.response.body.access_token}}
 @ENDPOINT = https://{{OSDU_HOST}}
-@ENTITLEMENTS_HOST = {{ENDPOINT}}/entitlements/v2
+@ENTITLEMENTS_HOST = {{ENDPOINT}}/api/entitlements/v2
 @data_partition_id = opendes