Merge branch 'slb-merge-resolve' into 'master'

Slb merge resolve

See merge request !60

devops/azure/azure-wellbore.yml

@@ -30,8 +30,6 @@
   variables:
     LOG_LEVEL: INFO
     # Common Section
-    ENTITLEMENT_URL: https://${AZURE_DNS_NAME}/entitlements/v1/
-    ENTITLEMENT_V2_URL: https://${AZURE_DNS_NAME}/api/entitlements/v2/
     LEGAL_URL: https://${AZURE_DNS_NAME}/api/legal/v1/
     STORAGE_URL: https://${AZURE_DNS_NAME}/api/storage/v2/
     SEARCH_URL: https://${AZURE_DNS_NAME}/api/search/v2/

devops/azure/chart/templates/configmap.yaml

@@ -17,7 +17,6 @@ apiVersion: v1
 data:
   CLOUD_PROVIDER: az
   OPENAPI_PREFIX: {{ include "os-wellbore-ddms.prefix" . }}
-  SERVICE_HOST_ENTITLEMENTS: {{ .Values.configMap.data.entitlementsEndpoint }}
   SERVICE_HOST_STORAGE: {{ .Values.configMap.data.storageEndpoint }}
   SERVICE_HOST_SEARCH: {{ .Values.configMap.data.searchEndpoint }}
   SERVICE_HOST_PARTITION: {{ .Values.configMap.data.partitionEndpoint }}

devops/azure/chart/values.yaml

@@ -48,7 +48,6 @@ labels:
 
 configMap:
   data:
-    entitlementsEndpoint: http://entitlements-azure.osdu/api/entitlements
     storageEndpoint: http://storage.osdu/api/storage
     searchEndpoint: http://search-service.osdu/api/search
     partitionEndpoint: http://partition.osdu/api/partition

devops/gcp/templates/configmap.yaml

@@ -3,7 +3,6 @@ apiVersion: v1
 data:
   CLOUD_PROVIDER: gcp
   OS_WELLBORE_DDMS_DATA_PROJECT_ID: {{ .Values.configMap.data.projectId }}
-  SERVICE_HOST_ENTITLEMENTS: {{ .Values.configMap.data.entitlementsEndpoint }}
   SERVICE_HOST_STORAGE: {{ .Values.configMap.data.storageEndpoint }}
   SERVICE_HOST_SEARCH: {{ .Values.configMap.data.searchEndpoint }}
 metadata:

devops/gcp/values.yaml

@@ -8,7 +8,6 @@ configMap:
     cloudProvider: gcp
     projectId: nice-etching-277309
     searchEndpoint: https://os-search-attcrcktoa-uc.a.run.app/api/search
-    entitlementsEndpoint: https://os-entitlements-gcp-attcrcktoa-uc.a.run.app/entitlements/v1/
     storageEndpoint: https://os-storage-attcrcktoa-uc.a.run.app/api/storage
   name: wellbore
 

provider/os-wellbore-ddms-azure/README.md

@@ -14,7 +14,6 @@ In order to run this service locally, you will need the following:
 ## Service Dependencies
 - [Storage Service](https://community.opengroup.org/osdu/platform/system/storage)
 - [Search Service](https://community.opengroup.org/osdu/platform/system/search-service)
-- [Entitlements Service](https://community.opengroup.org/osdu/platform/security-and-compliance/entitlements)
 
 > Add service dependencies here
 
@@ -40,7 +39,6 @@ az keyvault secret show --vault-name $KEY_VAULT_NAME --name $KEY_VAULT_SECRET_NA
 | `CLOUDPROVIDER` | `azure` | Cloud provider for this deployment | no | Constant |
 | `SERVICE_HOST` | `$DNS_HOST` | Description | no |  |
 | `SERVICE_PORT` | `8080` | Description | no |  |
-| `SERVICE_HOST_ENTITLEMENTS` | `https://${ENV_HOST}/entitlements/v1` | Entitlements service host | no | 
 | `SERVICE_HOST_STORAGE` | `https://${ENV_HOST}/api/storage/v2` | Storage service host | no | 
 | `SERVICE_HOST_SEARCH` | `https://${ENV_HOST}/api/search/v2` | Search service host | no | 
 | `SERVICE_HOST_PARTITION` | `https://${ENV_HOST}/api/partition/v2` | Partition service host | no | 

spec/README.md

@@ -32,4 +32,4 @@ Log Recognition	| OSDU Wellbore DMS - Data Services | baseURL/osdu/wdms/log-reco
 `geology.yaml`, `log-recognition.yaml`, `search.yaml`, and `wellbore.yaml`, placed under `spec/edited`.
 
 
-_**Latest synced version:**_ Commit REMOVED_FOR_CICD_SCAN (Dec/10/2020)
\ No newline at end of file
+_**Latest synced version:**_ Commit 6bad362 (Dec/10/2020)
\ No newline at end of file