Merge remote-tracking branch 'origin/master' into...

Merge remote-tracking branch 'origin/master' into master-dev-merge-auto-generated_2022_01_19_15_13_45

.gitlab-ci.yml

@@ -16,6 +16,7 @@ variables:
   OSDU_GCP_SERVICE: legal
   OSDU_GCP_VENDOR: gcp
   OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.project_id=$OSDU_GCP_PROJECT --set data.authorize_api=$OSDU_GCP_AUTHORIZE_API --set data.google_audiences=$GOOGLE_AUDIENCE --set data.partition_api=$OSDU_GCP_PARTITION_API --set data.log_level=INFO --set enable_full_bucket_name=$ENABLE_FULL_BUCKET_NAME"
+  OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.project_id=$OSDU_GCP_PROJECT --set data.authorize_api=$OSDU_GCP_AUTHORIZE_API --set data.google_audiences=$GOOGLE_AUDIENCE --set data.partition_api=$OSDU_GCP_PARTITION_API --set data.log_level=INFO --set enable_full_bucket_name=$ENABLE_FULL_BUCKET_NAME"
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s --set data.limits_cpu=1.5 --set data.limits_memory=512M"
   OSDU_GCP_HELM_CONFIG_SERVICE: legal-config
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE: legal-deploy
@@ -51,6 +52,7 @@ include:
     file: "cloud-providers/azure.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"
+    ref: "gcp-fix-hardcoded-values"
     file: "cloud-providers/osdu-gcp-gke.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"

devops/gcp/deploy/templates/legal-deploy.yml

@@ -20,6 +20,7 @@ spec:
       containers:
       - name: "{{ .Values.conf.app_name }}"
         image: "{{ .Values.data.image }}"
+        imagePullPolicy: "{{ .Values.data.imagePullPolicy }}"
         envFrom:
         - configMapRef:
             name: "{{ .Values.conf.configmap }}"

devops/gcp/deploy/values.yaml

@@ -8,6 +8,7 @@ data:
   limits_cpu: "1.5"
   limits_memory: "1G"
   serviceAccountName: ""
+  imagePullPolicy: "IfNotPresent"
   image: ""
 
 conf:

provider/legal-gcp/src/main/java/org/opengroup/osdu/legal/mappers/osm/PgTenantOsmDestinationResolver.java

@@ -54,8 +54,10 @@ public class PgTenantOsmDestinationResolver implements PgDestinationResolver {
 
   private final PgOsmConfigurationProperties properties;
 
-  private static final String DATASOURCE = ".datasource.";
-  private static final String PASSWORD = DATASOURCE.concat("password");
+  private final static String DATASOURCE = ".datasource.";
+  private final static String URL = DATASOURCE.concat("url");
+  private final static String USERNAME = DATASOURCE.concat("username");
+  private final static String PASSWORD = DATASOURCE.concat("password");
 
   private static final String DRIVER_CLASS_NAME = "org.postgresql.Driver";
 
@@ -82,10 +84,9 @@ public class PgTenantOsmDestinationResolver implements PgDestinationResolver {
           }
           Map<String, Property> partitionProperties = partitionInfo.getProperties();
 
-          String url = "jdbc:postgresql://localhost:5432/postgres";//getPartitionProperty(partitionId, partitionProperties, URL);
-          String username = "postgres";//getPartitionProperty(partitionId, partitionProperties, USERNAME);
-          String password = "st4s";
-          getPartitionProperty(partitionId, partitionProperties, PASSWORD);
+          String url = getPartitionProperty(partitionId, partitionProperties, URL);
+          String username = getPartitionProperty(partitionId, partitionProperties, USERNAME);
+          String password = getPartitionProperty(partitionId, partitionProperties, PASSWORD);
 
           dataSource = DataSourceBuilder.create()
               .driverClassName(DRIVER_CLASS_NAME)