Merge branch 'policy_id' into 'master'

(GONRG-2702) Update .gitlab-ci.yml

See merge request !139

.gitlab-ci.yml

@@ -17,7 +17,7 @@ variables:
  # --- osdu gcp specific variables for cloudrun ---
   OSDU_GCP_SERVICE: search
   OSDU_GCP_VENDOR: gcp
-  OSDU_GCP_ENV_VARS: ENVIRONMENT=$OSDU_GCP_SPRING_PROFILES_ACTIVE,GOOGLE_CLOUD_PROJECT=$OSDU_GCP_PROJECT,REDIS_SEARCH_HOST=$REDIS_SEARCH_HOST,REDIS_SEARCH_PORT=$OSDU_GCP_REDIS_SEARCH_PORT,REDIS_GROUP_HOST=$REDIS_GROUP_HOST,INDEXER_HOST=$OSDU_GCP_INDEXER_HOST_SEARCH,AUTHORIZE_API=$OSDU_GCP_AUTHORIZE_API,ENTITLEMENTS_HOST=$OSDU_GCP_ENTITLEMENTS_URL,SECURITY_HTTPS_CERTIFICATE_TRUST=$OSDU_SECURITY_HTTPS_CERTIFICATE_TRUST,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE,PARTITION_API=$OSDU_GCP_PARTITION_API,POLICY_API=$OSDU_GCP_POLICY_API --vpc-connector=$OSDU_GCP_VPC_CONNECTOR
+  OSDU_GCP_ENV_VARS: ENVIRONMENT=$OSDU_GCP_SPRING_PROFILES_ACTIVE,GOOGLE_CLOUD_PROJECT=$OSDU_GCP_PROJECT,REDIS_SEARCH_HOST=$REDIS_SEARCH_HOST,REDIS_SEARCH_PORT=$OSDU_GCP_REDIS_SEARCH_PORT,REDIS_GROUP_HOST=$REDIS_GROUP_HOST,INDEXER_HOST=$OSDU_GCP_INDEXER_HOST_SEARCH,AUTHORIZE_API=$OSDU_GCP_AUTHORIZE_API,ENTITLEMENTS_HOST=$OSDU_GCP_ENTITLEMENTS_URL,SECURITY_HTTPS_CERTIFICATE_TRUST=$OSDU_SECURITY_HTTPS_CERTIFICATE_TRUST,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE,PARTITION_API=$OSDU_GCP_PARTITION_API,POLICY_API=$OSDU_GCP_POLICY_API,POLICY_ID=search --vpc-connector=$OSDU_GCP_VPC_CONNECTOR
   # Variables should be partially removed after migration on cloudrun gcp
   OSDU_GCP_BUILD_SUBDIR: provider/search-gcp
   OSDU_GCP_INT_TEST_SUBDIR: testing/integration-tests/search-test-gcp

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

@@ -38,6 +38,7 @@ google.audiences=${GOOGLE_AUDIENCES}
 osdu.gcp.storage.gcs.googleAudiences=${GOOGLE_AUDIENCES}
 
 service.policy.enabled=true
+service.policy.id=${POLICY_ID}
 POLICY_API=http://localhost:8081/police/api/policy/v1
 PARTITION_API=${partition_service_endpoint}
 partition_service_endpoint=https://os-partition-jvmvia5dea-uc.a.run.app/api/partition/v1