Fixes for python version CircleCi (#42)

python version upgrade updated dependencies and audit issues
mojaloop · Jun 17, 2020 · 697445e · 697445e
1 parent 5cb27b5
commit 697445e
Show file tree

Hide file tree

Showing 4 changed files with 1,153 additions and 1,031 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,14 +25,14 @@ defaults_Dependencies: &defaults_Dependencies |
     npm install -g node-gyp
 
 defaults_awsCliDependencies: &defaults_awsCliDependencies |
-    apk --no-cache add \
-            python \
-            py-pip \
-            groff \
-            less \
-            mailcap
-    pip install --upgrade awscli==1.14.5 s3cmd==2.0.1 python-magic
-    apk -v --purge del py-pip
+  apk upgrade --no-cache
+  apk --no-cache add \
+          python3 \
+          py3-pip \
+          groff \
+          less \
+          mailcap
+  pip3 install --upgrade pip awscli==1.14.5 s3cmd==2.0.1 python-magic
 
 defaults_license_scanner: &defaults_license_scanner
   name: Install and set up license-scanner
@@ -140,7 +140,7 @@ jobs:
             else
                 echo "Not a release (env CIRCLE_BRANCH != 'master'), skipping sending lcov.info to SonarQube."
             fi
-  
+
   vulnerability-check:
     executor: default-docker
     steps:
@@ -155,11 +155,11 @@ jobs:
           command: mkdir -p ./audit/results
       - run:
           name: Check for new npm vulnerabilities
-          command: npm run audit:check --silent -- --json > ./audit/results/auditResults.json 
+          command: npm run audit:check --silent -- --json > ./audit/results/auditResults.json
       - store_artifacts:
           path: ./audit/results
           prefix: audit
-          
+
   audit-licenses:
     executor: default-docker
     steps:
@@ -217,6 +217,20 @@ jobs:
     steps:
       - setup_remote_docker
       - checkout
+      - run:
+          name: Install docker dependencies for anchore
+          command: |
+            apk add --update python3 py3-pip docker python3-dev libffi-dev openssl-dev gcc libc-dev make jq npm
+      - run:
+          name: Install general dependencies
+          command: |
+            apk --no-cache add git
+            apk --no-cache add ca-certificates
+            apk --no-cache add curl
+            apk --no-cache add openssh-client
+            apk add --no-cache -t build-dependencies make gcc g++ python3 libtool autoconf automake
+            npm config set unsafe-perm true
+            npm install -g node-gyp
       - run:
           name: Install AWS CLI dependencies
           command: *defaults_awsCliDependencies
@@ -301,7 +315,7 @@ jobs:
       - deploy-kube/setup_and_run:
           helm_set_values: |
             --set transaction-requests-service.image.repository=$DOCKER_ORG/$CIRCLE_PROJECT_REPONAME \
-            --set transaction-requests-service.image.tag=$CIRCLE_TAG 
+            --set transaction-requests-service.image.tag=$CIRCLE_TAG
 
 ##
 # Workflows

diff --git a/audit-resolve.json b/audit-resolve.json
@@ -1,51 +0,0 @@
-{
-  "decisions": {
-    "1179|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>mkdirp>minimist": {
-      "decision": "ignore",
-      "madeAt": 1591612159816,
-      "expiresAt": 1592216942843
-    },
-    "1179|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>mkdirp>minimist": {
-      "decision": "ignore",
-      "madeAt": 1591612159816,
-      "expiresAt": 1592216942843
-    },
-    "1179|@mojaloop/event-sdk>grpc>node-pre-gyp>mkdirp>minimist": {
-      "decision": "ignore",
-      "madeAt": 1591612159816,
-      "expiresAt": 1592216942843
-    },
-    "1179|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>tar>mkdirp>minimist": {
-      "decision": "ignore",
-      "madeAt": 1591612159816,
-      "expiresAt": 1592216942843
-    },
-    "1179|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>tar>mkdirp>minimist": {
-      "decision": "ignore",
-      "madeAt": 1591612159816,
-      "expiresAt": 1592216942843
-    },
-    "1179|@mojaloop/event-sdk>grpc>node-pre-gyp>tar>mkdirp>minimist": {
-      "decision": "ignore",
-      "madeAt": 1591612159816,
-      "expiresAt": 1592216942843
-    },
-    "1179|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>rc>minimist": {
-      "decision": "ignore",
-      "madeAt": 1591612164795,
-      "expiresAt": 1592216942843
-    },
-    "1179|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>rc>minimist": {
-      "decision": "ignore",
-      "madeAt": 1591612164795,
-      "expiresAt": 1592216942843
-    },
-    "1179|@mojaloop/event-sdk>grpc>node-pre-gyp>rc>minimist": {
-      "decision": "ignore",
-      "madeAt": 1591612164796,
-      "expiresAt": 1592216942843
-    }
-  },
-  "rules": {},
-  "version": 1
-}