(GONRG-3383) unify hosts values

.gitlab-ci.yml

@@ -12,12 +12,15 @@ variables:
    # --- osdu-gcp specific variables ---
   OSDU_GCP_SERVICE: dataset
   OSDU_GCP_VENDOR: gcp
-  OSDU_GCP_APPLICATION_NAME: os-dataset
+  OSDU_GCP_APPLICATION_NAME: dataset
   OSDU_GCP_FILE_DMS_BUCKET: "file-dms-bucket"
   OSDU_GCP_EXPIRATION_DAYS: 1
-  OSDU_GCP_ENV_VARS: AUTHORIZE_API=$OSDU_GCP_ENTITLEMENTS_V2_URL,GCP_STORAGE_API=$OSDU_GCP_STORAGE_URL,GCP_SCHEMA_API=$OSDU_GCP_SCHEMA_URL/api/schema-service/v1,FILE_DMS_BUCKET=$OSDU_GCP_FILE_DMS_BUCKET,EXPIRATION_DAYS=$OSDU_GCP_EXPIRATION_DAYS,REDIS_GROUP_HOST=$REDIS_GROUP_HOST,REDIS_GROUP_PORT=$OSDU_GCP_REDIS_SEARCH_PORT,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE,PARTITION_API=$OSDU_GCP_PARTITION_API --vpc-connector=$OSDU_GCP_VPC_CONNECTOR
   OSDU_GCP_TEST_SUBDIR: testing/$OSDU_GCP_SERVICE-test-$OSDU_GCP_VENDOR
   OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
+  OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.google_audiences=$GOOGLE_AUDIENCE --set data.redis_group_host=$REDIS_GROUP_HOST --set data.file_dms_bucket=$OSDU_GCP_FILE_DMS_BUCKET --set data.expiration_days=$OSDU_GCP_EXPIRATION_DAYS"
+  OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=workload-identity-dataset"
+  OSDU_GCP_HELM_CONFIG_SERVICE: dataset-config
+  OSDU_GCP_HELM_DEPLOYMENT_SERVICE: dataset-deploy
 
   #Azure
   AZURE_SERVICE: dataset
@@ -50,7 +53,7 @@ include:
     file: "scanners/gitlab-ultimate.yml"
 
   - project: 'osdu/platform/ci-cd-pipelines'
-    file: 'cloud-providers/osdu-gcp-cloudrun.yml'
+    file: 'cloud-providers/osdu-gcp-gke.yml'
 
 
 # disable the eslint scanner
@@ -62,12 +65,12 @@ eslint-sast:
 
 osdu-gcp-test:
   variables:
-    STORAGE_BASE_URL: $OSDU_GCP_STORAGE_URL
-    LEGAL_BASE_URL: $OSDU_GCP_LEGALTAG_API/
-    DATASET_BASE_URL: $OSDU_GCP_DATASET_URL
-    SCHEMA_API: $OSDU_GCP_SCHEMA_URL/api/schema-service/v1
+    STORAGE_BASE_URL: $OSDU_GCP_STORAGE_EXTERNAL_URL
+    LEGAL_BASE_URL: $OSDU_GCP_LEGAL_EXTERNAL_URL
+    DATASET_BASE_URL: $OSDU_GCP_DATASET_EXTERNAL_URL
+    SCHEMA_API: $OSDU_GCP_SCHEMA_URL
     PROVIDER_KEY: GCP
     KIND_SUBTYPE: DatasetTest
     LEGAL_TAG: datatest-int-tag
-    LEGAL_HOST: $OSDU_GCP_LEGALTAG_API/
+    LEGAL_HOST: $OSDU_GCP_LEGAL_EXTERNAL_URL
     GCP_STORAGE_PERSISTENT_AREA: persisten-area

devops/gcp/configmap/templates/variables.yml

@@ -7,10 +7,6 @@ metadata:
   namespace: "{{ .Release.Namespace }}"
 data:
   LOG_LEVEL: "{{ .Values.data.log_level }}"
-  GCP_SCHEMA_API: "{{ .Values.data.schema_api }}"
-  GCP_STORAGE_API: "{{ .Values.data.storage_api }}"
-  AUTHORIZE_API: "{{ .Values.data.authorize_api }}"
-  PARTITION_API: "{{ .Values.data.partition_api }}"
   FILE_DMS_BUCKET: "{{ .Values.data.file_dms_bucket }}"
   EXPIRATION_DAYS: "{{ .Values.data.expiration_days }}"
   REDIS_GROUP_HOST: "{{ .Values.data.redis_group_host }}"

devops/gcp/configmap/values.yaml

@@ -3,11 +3,7 @@
 # Declare variables to be passed into your templates.
 
 data:
-  authorize_api: "http://entitlements/api/entitlements/v2/"
-  partition_api: "http://partition/api/partition/v1/"
   log_level: "INFO"
-  schema_api: "http://schema/api/schema-service/v1"
-  storage_api: "http://storage/api/storage/v2"
   file_dms_bucket: "file-dms-bucket"
   expiration_days: 1
   redis_group_host: ""

provider/dataset-gcp/src/main/resources/application.properties

@@ -20,25 +20,37 @@ log.prefix=dataset
 redis-group-host=127.0.0.1
 redis-group-port=6379
 
-gcp.schema.api=https://os-schema-jvmvia5dea-uc.a.run.app/api/schema-service/v1
-gcp.storage.api=https://os-storage-jvmvia5dea-uc.a.run.app/api/storage/v2
-authorize.api=https://os-entitlements-gcp-jvmvia5dea-uc.a.run.app/entitlements/v1
 
 file-dms-bucket=file-dms-bucket
 expiration-days=1
 file-location-sequence=DatasetProperties,FileSourceInfo,FileSource
 file-collection-location-sequence=DatasetProperties,FileCollectionPath
 
-SCHEMA_API=${gcp.schema.api}
-STORAGE_API=${gcp.storage.api}
-AUTHORIZE_API=${authorize.api}
+AUTHORIZE_API=${ENTITLEMENTS_API}
+partition.api=${PARTITION_API}
+
 LOG_PREFIX=${log.prefix}
 
 google.audiences=123.apps.googleusercontent.com
-partition.api=http://localhost:8081/api/partition/v1
 
 DMS_API_BASE=
 
 osdu.dataset.config.useRestDms=false
 
 spring.cloud.gcp.datastore.namespace=
+
+SCHEMA_HOST=http://schema
+SCHEMA_PATH=/api/schema-service/v1
+SCHEMA_API=${SCHEMA_HOST}${SCHEMA_PATH}
+
+STORAGE_HOST=http://storage
+STORAGE_PATH=/api/storage/v2
+STORAGE_API=${STORAGE_HOST}${STORAGE_PATH}
+
+PARTITION_HOST=http://partition
+PARTITION_PATH=/api/partition/v1
+PARTITION_API=${PARTITION_HOST}${PARTITION_PATH}
+
+ENTITLEMENTS_HOST=http://entitlements
+ENTITLEMENTS_PATH=/api/entitlements/v2
+ENTITLEMENTS_API=${ENTITLEMENTS_HOST}${ENTITLEMENTS_PATH}