Merge branch 'release/2.7'

dockstore · Nov 24, 2020 · fa4b99a · fa4b99a
2 parents d291735 + bb2dd4a
commit fa4b99a
Show file tree

Hide file tree

Showing 666 changed files with 13,220 additions and 9,319 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,51 +1,72 @@
 version: 2.1
 orbs:
   aws-s3: circleci/[email protected]
+  slack: circleci/[email protected]
 executors:
   integration_test_exec: # declares a reusable executor
     docker:
       - image: circleci/buildpack-deps:18.04-browsers
+        auth:
+          username: dockstoretestuser
+          password: $DOCKERHUB_PASSWORD
         environment:
           JAVA_TOOL_OPTIONS: -Xmx2g # Java can read cgroup. Sadly the cgroup in CircleCI is wrong. Have to manually set. Using 1/2 memory as heap.
       - image: circleci/postgres:11.6-alpine-ram
+        auth:
+          username: dockstoretestuser
+          password: $DOCKERHUB_PASSWORD
         environment:
           POSTGRES_USER: postgres
           POSTGRES_DB: postgres
           POSTGRES_PASSWORD: postgres
           POSTGRES_HOST_AUTH_METHOD: trust
 jobs:
 
-  uptime_monitor:
+  uptime_monitor_no_auth:
     working_directory: ~/repo
     docker:
       - image: circleci/buildpack-deps:18.04-browsers
+        auth:
+          username: dockstoretestuser
+          password: $DOCKERHUB_PASSWORD
     steps:
-      - checkout
-      - install_container_dependencies
-      - restore_cache:
-          key: cypress-cache-{{ checksum "./package-lock.json" }}
-      - run:
-          name: Install dependencies
-          #Only run 'npm ci' if node_modules was not restored from cache
-          command: |
-            if [ ! -d "./node_modules" ]
-            then
-              bash -i -c 'npm ci'
-            fi
-      - run:
-          name: Prebuild
-          command: bash -i -c 'npm run prebuild.prod'
+      - setup_nightly_tests
       - run:
           name: Run remote verification test against dev (no auth)
           command: bash -i -c 'npm run test-dev-no-auth'
+          environment:
+            MOCHA_FILE: nightly-test-results/junit/test-dev-no-auth-[hash].xml
+      - upload_nightly_artifacts
+      - slack/status:
+          fail_only: true
+          failure_message: Nightly non-auth tests failed!
+          webhook: $SLACK_WEBHOOK
+  uptime_monitor_auth:
+    working_directory: ~/repo
+    docker:
+        - image: circleci/buildpack-deps:18.04-browsers
+          auth:
+            username: dockstoretestuser
+            password: $DOCKERHUB_PASSWORD
+    steps:
+      - setup_nightly_tests
       - run:
           name: Run remote verification test against dev (with auth)
           command: bash -i -c 'npm run test-dev-auth'
-
+          environment:
+            MOCHA_FILE: nightly-test-results/junit/test-dev-auth-[hash].xml
+      - upload_nightly_artifacts
+      - slack/status:
+          fail_only: true
+          failure_message: Nightly auth tests failed!
+          webhook: $SLACK_WEBHOOK
   lint_unit_test_coverage:
     working_directory: ~/repo
     docker:
       - image: circleci/buildpack-deps:18.04-browsers
+        auth:
+          username: dockstoretestuser
+          password: $DOCKERHUB_PASSWORD
     steps:
       - checkout
       - run:
@@ -58,7 +79,7 @@ jobs:
             fi
       - install_container_dependencies
       - restore_cache:
-          key: dep-cache-{{ checksum "./package-lock.json" }}
+          key: dep-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "./package-lock.json" }}
       - run:
           name: Install dependencies
           #Only run 'npm ci' if node_modules was not restored from cache
@@ -68,16 +89,17 @@ jobs:
                 bash -i -c 'npm ci'
               fi
       - save_cache:
-          key: dep-cache-{{ checksum "./package-lock.json" }}
+          key: dep-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "./package-lock.json" }}
           paths:
             - ./node_modules
       - save_cache:
-          key: cypress-cache-{{ checksum "./package-lock.json" }}
+          key: cypress-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "./package-lock.json" }}
           paths:
             - ~/.cache
-      - run:
-          name: Check dependencies
-          command: bash -i -c 'npm ls'
+              # Disabled until ng2-ui-auth and @ngx-lite/json is replaced. Currently they do not support Angular 9
+              #      - run:
+              #          name: Check dependencies
+              #          command: bash -i -c 'npm ls'
       - run:
           name: Lint
           command: bash -i -c 'npm run lint'
@@ -89,7 +111,7 @@ jobs:
           command: bash -i -c 'npm i --no-save codecov'
       - run:
           name: Unit Test
-          command: bash -i -c 'npx ng test --progress=false --watch=false --code-coverage --browsers ChromeHeadless'
+          command: bash -i -c 'npx ng test --progress=false --watch=false --code-coverage --browsers ChromeHeadless --source-map=false'
       - run:
           name: Codecov
           command: bash -i -c 'npx codecov'
@@ -101,6 +123,9 @@ jobs:
     working_directory: ~/repo
     docker:
       - image: circleci/buildpack-deps:18.04-browsers
+        auth:
+          username: dockstoretestuser
+          password: $DOCKERHUB_PASSWORD
     steps:
       - checkout
       - run: bash scripts/detect-package-json-changes.sh
@@ -110,7 +135,7 @@ jobs:
     steps:
       - setup_integration_test
       - restore_cache:
-          key: cypress-cache-{{ checksum "./package-lock.json" }}
+          key: cypress-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "./package-lock.json" }}
       - run:
           name: Test
           command: bash -i -c 'npx cypress run --record --config numTestsKeptInMemory=1 --reporter junit --spec cypress/integration/group1/**/*'
@@ -124,7 +149,7 @@ jobs:
     steps:
       - setup_integration_test
       - restore_cache:
-          key: cypress-cache-{{ checksum "./package-lock.json" }}
+          key: cypress-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "./package-lock.json" }}
       - run:
           name: Test
           command: bash -i -c 'npx cypress run --record --config numTestsKeptInMemory=1 --reporter junit --spec cypress/integration/group2/**/*'
@@ -138,7 +163,7 @@ jobs:
     steps:
       - setup_integration_test
       - restore_cache:
-          key: cypress-cache-{{ checksum "./package-lock.json" }}
+          key: cypress-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "./package-lock.json" }}
       - run:
           name: Test
           command: bash -i -c 'npx cypress run --record --config numTestsKeptInMemory=1 --reporter junit --spec cypress/integration/immutableDatabaseTests/**/*'
@@ -150,6 +175,9 @@ jobs:
     working_directory: ~/repo
     docker:
       - image: circleci/python:2.7
+        auth:
+          username: dockstoretestuser
+          password: $DOCKERHUB_PASSWORD
     parameters:
       aws_bucket:
         type: string
@@ -184,6 +212,9 @@ jobs:
     working_directory: ~/repo
     docker:
       - image: circleci/python:2.7
+        auth:
+          username: dockstoretestuser
+          password: $DOCKERHUB_PASSWORD
     steps:
       - get_workspace
       - install_container_dependencies
@@ -204,31 +235,41 @@ workflows:
           filters:
             tags:
               only: /.*/
+          context:
+            - dockerhub
       - licenses_test:
           filters:
             tags:
               only: /.*/
+          context:
+            - dockerhub
       - integration_test_1:
           filters:
             tags:
               only: /.*/
           requires:
             - lint_unit_test_coverage
             - licenses_test
+          context:
+            - dockerhub
       - integration_test_2:
           filters:
             tags:
               only: /.*/
           requires:
             - lint_unit_test_coverage
             - licenses_test
+          context:
+            - dockerhub
       - integration_test_3:
           filters:
             tags:
               only: /.*/
           requires:
             - lint_unit_test_coverage
             - licenses_test
+          context:
+            - dockerhub
       # Upload builds for tags and branches to s3.
       - upload_to_s3:
           requires:
@@ -240,12 +281,16 @@ workflows:
               only: /.*/
             branches:
               only: /.*/
+          context:
+            - dockerhub
       - check_build_develop:
           requires:
             - upload_to_s3
           filters:
             branches:
               only: /^develop/
+          context:
+            - dockerhub
 
   nightly:
     triggers:
@@ -256,7 +301,12 @@ workflows:
               only:
                 - develop
     jobs:
-      - uptime_monitor
+      - uptime_monitor_no_auth:
+          context:
+            - dockerhub
+      - uptime_monitor_auth:
+          context:
+            - dockerhub
 
 commands:
   install_container_dependencies:
@@ -316,3 +366,31 @@ commands:
       - run:
           name: Wait for services
           command: bash scripts/wait-for.sh
+  setup_nightly_tests:
+    steps:
+      - checkout
+      - install_container_dependencies
+      - restore_cache:
+          key: cypress-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "./package-lock.json" }}
+      - run:
+          name: Install dependencies
+          #Only run 'npm ci' if node_modules was not restored from cache
+          command: |
+            if [ ! -d "./node_modules" ]
+            then
+              bash -i -c 'npm ci'
+            fi
+            mkdir -p nightly-test-results/junit
+      - run:
+          name: Prebuild
+          command: bash -i -c 'npm run prebuild.prod'
+  upload_nightly_artifacts:
+    steps:
+      - store_test_results:
+          path: nightly-test-results/
+      - store_artifacts:
+          path: nightly-test-results/
+      - store_artifacts:
+          path: cypress/videos
+      - store_artifacts:
+          path: cypress/screenshots
diff --git a/.gitallowed b/.gitallowed
@@ -0,0 +1,36 @@
+# Each line is a regular expression against the output of git-secrets
+# travisci/dbdump.sql:.*
+# Can match on the content of the string
+
+# travisci/dbdump.sql
+travisci/db_dump.sql:.*
+
+# src/app/organizations/events/events.component.html
+src/app/organizations/events/events.component.html:.*EventType.REMOVEFROMCOLLECTION
+
+# src/app/organizations/state/events.service.ts
+src/app/organizations/state/events.service.ts:.*EventType.REMOVEFROMCOLLECTION
+
+# cypress/fixtures/searchTableResponse.json
+cypress/fixtures/searchTableResponse.json:.*image_id":*
+
+# cypress/integration/immutableDatabaseTests/searchTable.ts
+cypress/integration/immutableDatabaseTests/searchTable.ts:.*image_id:*
+
+# src/app/container/paramfiles/paramfiles.service.spec.ts
+src/app/container/paramfiles/paramfiles.service.spec.ts:.*image_id:*
+
+# src/app/shared/descriptor.service.spec.ts
+src/app/shared/descriptor.service.spec.ts:.*image_id:*
+
+# README.md
+README.md:.*https://api.codacy.com/project/badge/Grade/58c43301d4b84c8ab74bdbeb2a962973
+
+# src/app/shared/entry/commit-url.pipe.spec.ts
+src/app/shared/entry/commit-url.pipe.spec.ts:.*868a1c6b02344dd679eb0548889de03e6affef99
+
+# src/app/workflow/dag/cwl-viewer/cwl-viewer.service.spec.ts
+src/app/workflow/dag/cwl-viewer/cwl-viewer.service.spec.ts:.*9283b35ae651477f5e722111b07c8128aa66c0ea
+
+# src/app/workflow/launch-third-party/launch-third-party.component.ts
+src/app/workflow/launch-third-party/launch-third-party.component.ts:.*https://github.com/dockstore/dockstore/blob/0a734abe9dbe34eed12404d4697ebc43b71da8d8*
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v12.14.1
+v12.18.1
diff --git a/angular.json b/angular.json
@@ -11,6 +11,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "aot": true,
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -52,6 +53,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -69,6 +76,12 @@
               ]
             },
             "staging": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
@@ -179,13 +192,14 @@
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",
-      "styleext": "scss"
+      "style": "scss"
     },
     "@schematics/angular:directive": {
       "prefix": "app"
     }
   },
   "cli": {
-    "defaultCollection": "@datorama/akita"
+    "defaultCollection": "@datorama/akita",
+    "analytics": false
   }
 }
diff --git a/cypress.json b/cypress.json
@@ -4,5 +4,10 @@
   "viewportHeight": 900,
   "viewportWidth": 1440,
   "defaultCommandTimeout": 30000,
-  "requestTimeout": 30000
+  "requestTimeout": 30000,
+  "retries": {
+    "runMode": 1,
+    "openMode": 3
+  }
 }
+