Merge: remote-tracking branch 'origin/master' into feature/GONRG-4061-Common-Helm-Release-Logic

app/sdms/NOTICE

@@ -580,7 +580,7 @@ The following software have components provided under the terms of this license:
 - ms (from https://www.npmjs.com/package/ms)
 - ms (from https://www.npmjs.com/package/ms)
 - nan (from https://www.npmjs.com/package/nan)
-- native-promise-only (from http://github.com/getify/native-promise-only)
+- native-promise-only (from https://www.npmjs.com/package/native-promise-only)
 - negotiator (from https://www.npmjs.com/package/negotiator)
 - node-abort-controller (from https://www.npmjs.com/package/node-abort-controller)
 - node-fetch (from https://www.npmjs.com/package/node-fetch)

app/sdms/devops/gcp/configmap/templates/seismic-store-configmap.yaml

@@ -7,8 +7,9 @@ metadata:
   namespace: "{{ .Release.Namespace }}"
 data:
   CLOUDPROVIDER: {{ .Values.data.cloudProvider }}
-  DES_SERVICE_HOST: https://{{ .Values.data.des_service_host }}
-  REDIS_INSTANCE_PORT: "{{ .Values.data.des_redis_instance_address }}"
+  DES_SERVICE_HOST: {{ .Values.data.des_service_host }}
+  REDIS_INSTANCE_ADDRESS: "{{ .Values.data.des_redis_instance_address }}"
+  REDIS_INSTANCE_PORT: "{{ .Values.data.des_redis_instance_port }}"
   APP_ENVIRONMENT_IDENTIFIER: "{{ .Values.data.app_environment_identifier }}"
   PORT: "{{ .Values.data.port }}"
   SDMS_PREFIX: "{{ .Values.data.url_prefix }}"

app/sdms/devops/gcp/configmap/values.yaml

 data:
   log_level: "INFO"
   cloudProvider: "google"
-  port: 80
+  port: "5000"
   des_service_host: https://des
   des_service_host_partition: "http://partition/api/partition/v1/"
   entitlement_base_url_path: "/entitlements/v2"
@@ -20,5 +20,5 @@ data:
   locksmap_redis_instance_port: "6379"
   url_prefix: #{SDMS_PREFIX}#
 conf:
-  configmap: "seismic-store-config"
   app_name: "seismic-store"
+  configmap: "seismic-store-config"

app/sdms/devops/gcp/deploy/templates/seismic-store-virtual-service.yaml

@@ -12,8 +12,10 @@ spec:
     - match:
         - uri:
             prefix: "{{ .Values.conf.url_prefix }}"
+      rewrite:
+        uri: /api/v3
       route:
         - destination:
             port:
               number: 80
-            host: "{{ .Values.conf.app_name }}.{{ .Release.Namespace }}.svc.cluster.local"
\ No newline at end of file
+            host: "{{ .Values.conf.app_name }}.{{ .Release.Namespace }}.svc.cluster.local"

app/sdms/devops/osdu/cloud-providers/azure.yml

@@ -29,8 +29,7 @@ sdms_push_runtime_image_azure:
     # Azure Container Registry
     - cd app/$SDMS_SERVICE
     - sed -i 's|#{SDMS_PREFIX}#|'$AZURE_SDMS_PREFIX'|' ./docs/api/openapi.osdu.yaml
-    - docker build -t builder_sdms:latest --file docker/builder.Dockerfile .
-    - docker build -t $SDMS_UTEST_RUNTIME_IMAGE --file docker/runtime.Dockerfile --build-arg docker_builder_image=builder_sdms .
+    - docker build -t $SDMS_UTEST_RUNTIME_IMAGE --file docker/runtime.Dockerfile .
     - docker tag $SDMS_UTEST_RUNTIME_IMAGE ${AZURE_REGISTRY}.azurecr.io/$SHA_IMAGE
     - docker push ${AZURE_REGISTRY}.azurecr.io/$SHA_IMAGE
     - docker tag $SDMS_UTEST_RUNTIME_IMAGE ${AZURE_REGISTRY}.azurecr.io/$LATEST_IMAGE
@@ -126,4 +125,4 @@ sdms_azure_test:
     refs:
       - branches
       - main
-      - merge_requests
\ No newline at end of file
+      - merge_requests

app/sdms/devops/osdu/containerize/osdu.yml

@@ -12,8 +12,7 @@ sdms_push_runtime_image:
   script:
     # Gitlab Container Registry
     - cd app/$SDMS_SERVICE
-    - docker build -t builder_sdms:latest --file docker/builder.Dockerfile .
-    - docker build -t $SDMS_UTEST_RUNTIME_IMAGE --file docker/runtime.Dockerfile --build-arg docker_builder_image=builder_sdms .
+    - docker build -t $SDMS_UTEST_RUNTIME_IMAGE --file docker/runtime.Dockerfile  .
     - docker tag $SDMS_UTEST_RUNTIME_IMAGE $CI_REGISTRY_IMAGE/$SHA_IMAGE
     - docker push $CI_REGISTRY_IMAGE/$SHA_IMAGE
     - docker tag $SDMS_UTEST_RUNTIME_IMAGE $CI_REGISTRY_IMAGE/$LATEST_IMAGE
@@ -25,4 +24,4 @@ sdms_push_runtime_image:
     refs:
       - branches
       - main
-      - merge_requests
\ No newline at end of file
+      - merge_requests

app/sdms/docker/builder.Dockerfile

-# ============================================================================
-# Copyright 2017-2021, Schlumberger
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============================================================================
-
-# [seistore builder image]
-
-# use node as base image
-FROM node:14
-# install typescript
-RUN npm install -g typescript
\ No newline at end of file