Merge branch 'master' into slb/dm3/fix-vulnerabilities

.gitlab-ci.yml

@@ -13,6 +13,8 @@ variables:
   AWS_BUILD_SUBDIR: src/cloud/providers/aws/build-aws
   AWS_TEST_SUBDIR: tests
   AWS_ENVIRONMENT: dev
+  AWS_DEPLOY_TARGET: EKS
+  AWS_EKS_DEPLOYMENT_NAME: os-seismic-store
   AWS_BUILDER_DOCKERFILE_PATH: src/cloud/providers/aws/build-aws/builder.Dockerfile
   AWS_RUNTIME_DOCKERFILE_PATH: src/cloud/providers/aws/build-aws/runtime.Dockerfile
   # skipping tests here. Using a local file to run tests

NOTICE

@@ -834,7 +834,7 @@ The following software have components provided under the terms of this license:
 - tunnel (from https://www.npmjs.com/package/tunnel)
 - tweetnacl (from https://dchest.github.io/tweetnacl-js)
 - type-fest (from https://www.npmjs.com/package/type-fest)
-- type-is (from https://github.com/jshttp/type-is)
+- type-is (from https://www.npmjs.com/package/type-is)
 - typedarray (from https://github.com/substack/typedarray)
 - typedarray-to-buffer (from https://www.npmjs.com/package/typedarray-to-buffer)
 - typescript (from https://www.npmjs.com/package/typescript)

devops/aws/awstest.yml

@@ -4,14 +4,11 @@ aws-test-newman:
     - .aws_common_variables
     - .aws_variables
   stage: integration
-  image: node
+  image: $CI_REGISTRY/osdu/platform/deployment-and-operations/base-containers-aws/aws-node/aws-node:v1.0-node14
   needs: [{ job: 'aws-update-ecs', optional: true }, { job: 'aws-update-eks', optional: true }]
   script:
-    - apt-get update
-    - apt-get install -y python
-    - apt-get install -y python-pip
-    - pip install -r devops/aws/requirements.txt
-    - svctoken=$(python devops/scripts/aws_jwt_client.py)   
+    - pip3 install -r devops/aws/requirements.txt
+    - svctoken=$(python3 devops/scripts/aws_jwt_client.py)   
     - npm install -g newman
     - chmod +x ./tests/e2e/run_e2e_tests.sh
     - ./tests/e2e/run_e2e_tests.sh --seistore-svc-url=${SEISMICSTORE_SVC_URL} --seistore-svc-api-key="NA" --user-idtoken="$svctoken" --user-idtoken="$svctoken" --tenant=opendes --subproject=awsdemosubproject --admin-email="${AWS_COGNITO_AUTH_PARAMS_USER}" --datapartition=opendes --legaltag01=opendes-sdmstestlegaltag --legaltag02=opendes-sdmstestlegaltag --subproject-long-name=subprojectlonggggggggggggggggggggggname --VCS-Provider="${ISGITLAB}"

src/cloud/providers/aws/build-aws/buildspec.yaml

@@ -21,9 +21,16 @@ env:
   secrets-manager:
     DOCKER_USERNAME: /osdu/devops/docker_credentials:username
     DOCKER_PASSWORD: /osdu/devops/docker_credentials:password
+    SONAR_USERNAME: /osdu/devops/sonar_credentials:username
+    SONAR_PASSWORD: /osdu/devops/sonar_credentials:password
+  
+  parameter-store:
+    SONAR_URL: /osdu/devops/sonar_url
 
 phases:
   install:
+    runtime-versions:
+      java: corretto8
     commands:
       # fix error noted here: https://github.com/yarnpkg/yarn/issues/7866
       - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
@@ -31,6 +38,8 @@ phases:
       - export AWS_ACCOUNT_ID=`aws sts get-caller-identity | grep Account | cut -d':' -f 2 | cut -d'"' -f 2`
       - aws codeartifact login --tool npm --domain osdu-dev --domain-owner ${AWS_ACCOUNT_ID} --repository osdu-npm
       - npm install
+      - wget -nv https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip
+      - unzip -q ./sonar-scanner-cli-4.6.2.2472.zip
 
   pre_build:
     commands:
@@ -61,6 +70,11 @@ phases:
       - echo "Building integration testing assemblies and gathering artifacts..."
       - ./tests/aws-test/build-aws/prepare-dist.sh
 
+      # using jar instead of executable since exe requires 32 bit image and doesn't work on codebuild 4.0
+      - |
+        java -jar sonar-scanner-4.6.2.2472/lib/sonar-scanner-cli-4.6.2.2472.jar -Dsonar.projectKey=seismic-store-service -Dsonar.host.url=${SONAR_URL} \
+          -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME}
+
       - echo "Logging into Docker Hub..."
       - docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}