Merge pull request #288 from swrlab/dev/update-node

Dev/update node
swrlab · Mar 28, 2022 · ff7cddd · ff7cddd
2 parents 3a882a5 + 9cf6680
commit ff7cddd
Show file tree

Hide file tree

Showing 7 changed files with 160 additions and 101 deletions.
diff --git a/.github/workflows/ingest-pull.yml b/.github/workflows/ingest-pull.yml
@@ -6,7 +6,7 @@ on:
     types: [labeled]
 
 env:
-  NODE_VERSION: 16.14
+  NODE_VERSION: 16.14.2
 
 
 jobs:
@@ -38,7 +38,7 @@ jobs:
       run: yarn
 
     - name: 🔑 Setup Google Cloud Auth
-      uses: google-github-actions/setup-gcloud@master
+      uses: google-github-actions/setup-gcloud@v0
       with:
         service_account_key: ${{ secrets.GCP_GITHUB_SERVICE_ACCOUNT_KEY }}
         export_default_credentials: true

diff --git a/.github/workflows/ingest-push.yml b/.github/workflows/ingest-push.yml
@@ -10,7 +10,7 @@ on:
     types: [ closed ]
 
 env:
-  NODE_VERSION: 16.14
+  NODE_VERSION: 16.14.2
   IMAGE_NAME: de.swr.ard.eventhub/ingest
   REGISTRY_DOMAIN: eu.gcr.io
 
@@ -43,7 +43,7 @@ jobs:
       run: yarn
 
     - name: 🔑 Setup Google Cloud Auth
-      uses: google-github-actions/setup-gcloud@master
+      uses: google-github-actions/setup-gcloud@v0
       with:
         service_account_key: ${{ secrets.GCP_GITHUB_SERVICE_ACCOUNT_KEY }}
         export_default_credentials: true
@@ -69,7 +69,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: 🔑 Setup Google Cloud Auth
-      uses: google-github-actions/setup-gcloud@master
+      uses: google-github-actions/setup-gcloud@v0
       with:
         service_account_key: ${{ secrets.GCP_GITHUB_SERVICE_ACCOUNT_KEY }}
         export_default_credentials: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,11 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.3.0] - 2022-03-21
+## [1.3.0] - 2022-03-28
 
+- chore: update Node to `v16.14.2`
 - chore: change name of `Dockerfile`
 - chore: update node-crc to `v2`
 - add: `rustup` to build process
+- fix: `setup-gcloud` default branch
+- security: fix `CVE-2021-44906`
 
 ## [1.2.9] - 2022-03-17
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Load desired node pckg
-FROM node:16.14-alpine
+FROM node:16.14.2-alpine
 
 # Add python
 RUN apk add g++ make python3

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ These ARD broadcasters are currently sending live metadata via ARD Eventhub:
 | MDR              | ✅    | ✅    |
 | NDR              | ✅    | ✅    |
 | Radio Bremen     | ✅    | ✅    |
-| RBB              | ⌛️    | -    |
+| RBB              | ✅    | ⌛️    |
 | SR               | -    | -    |
 | SWR              | ✅    | ✅    |
 | WDR              | ✅    | ⌛️    |
@@ -69,13 +69,14 @@ This source code is provided under EUPL v1.2, except for the [`spdx-exceptions`]
 
 | Type    | Name                           | License                                                                                            |
 | ------- | ------------------------------ | -------------------------------------------------------------------------------------------------- |
-| Docker  | `node:16.14-alpine`            | [MIT](https://github.com/nodejs/node/blob/master/LICENSE)                                          |
+| Docker  | `node:16.14.2-alpine`          | [MIT](https://github.com/nodejs/node/blob/master/LICENSE)                                          |
 | NPM     | `@google-cloud/datastore`      | [Apache License 2.0](https://github.com/googleapis/nodejs-datastore/blob/master/LICENSE)           |
 | NPM     | `@google-cloud/pubsub`         | [Apache License 2.0](https://github.com/googleapis/nodejs-pubsub/blob/master/LICENSE)              |
 | NPM     | `@google-cloud/secret-manager` | [Apache License 2.0](https://github.com/googleapis/nodejs-secret-manager/blob/master/LICENSE)      |
 | NPM     | `@swrlab/utils`                | [MIT](https://github.com/swrlab/node-utils/blob/main/LICENSE.md)                                   |
 | NPM     | `compression`                  | [MIT](https://github.com/expressjs/compression/blob/master/LICENSE)                                |
 | NPM     | `dd-trace`                     | [Apache-2.0 OR BSD-3-Clause](https://github.com/DataDog/dd-trace-js/blob/master/LICENSE)           |
+| NPM     | `dotenv`                       | [BSD-2-Clause](https://github.com/motdotla/dotenv/blob/master/LICENSE)                             |
 | NPM     | `express`                      | [MIT](https://github.com/expressjs/express/blob/master/LICENSE)                                    |
 | NPM     | `express-openapi-validator`    | [MIT](https://github.com/cdimascio/express-openapi-validator/blob/master/LICENSE)                  |
 | NPM     | `firebase-admin`               | [Apache License 2.0](https://github.com/firebase/firebase-admin-node/blob/master/LICENSE)          |
@@ -87,18 +88,18 @@ This source code is provided under EUPL v1.2, except for the [`spdx-exceptions`]
 | NPM     | `swagger-ui-express`           | [MIT](https://github.com/scottie1984/swagger-ui-express/blob/master/LICENSE)                       |
 | NPM     | `uuid`                         | [MIT](https://github.com/uuidjs/uuid/blob/master/LICENSE.md)                                       |
 | NPM     | `winston`                      | [MIT](https://github.com/winstonjs/winston/blob/master/LICENSE)                                    |
-| NPM DEV | `@swrlab/eslint-plugin-swr`    | [ISC](https://github.com/swrlab/eslint-plugin-swr/)                                                |
+| NPM DEV | `@swrlab/eslint-plugin-swr`    | [ISC](https://github.com/swrlab/eslint-plugin-swr/blob/main/package.json)                          |
 | NPM DEV | `@swrlab/swr-prettier-config`  | [ISC](https://github.com/swrlab/prettier-config/blob/main/license.md)                              |
 | NPM DEV | `chai`                         | [MIT](https://github.com/chaijs/chai/blob/master/LICENSE)                                          |
 | NPM DEV | `chai-http`                    | [MIT](https://github.com/chaijs/chai-http/blob/master/package.json)                                |
 | NPM DEV | `docsify-cli`                  | [MIT](https://github.com/docsifyjs/docsify-cli/blob/master/LICENSE)                                |
-| NPM DEV | `dotenv`                       | [BSD-2-Clause](https://github.com/motdotla/dotenv/blob/master/LICENSE)                             |
 | NPM DEV | `eslint`                       | [MIT](https://github.com/eslint/eslint/blob/master/LICENSE)                                        |
 | NPM DEV | `eslint-plugin-chai-friendly`  | [MIT](https://github.com/ihordiachenko/eslint-plugin-chai-friendly/blob/master/LICENSE)            |
 | NPM DEV | `license-compliance`           | [MIT](https://github.com/tmorell/license-compliance/blob/master/LICENSE)                           |
 | NPM DEV | `mocha`                        | [MIT](https://github.com/mochajs/mocha/blob/master/LICENSE)                                        |
 | NPM DEV | `nodemon`                      | [MIT](https://github.com/remy/nodemon/blob/master/LICENSE)                                         |
 | NPM DEV | `prettier`                     | [MIT](https://github.com/prettier/prettier/blob/main/LICENSE)                                      |
+| NPM DEV | `typescript`                   | [Apache License 2.0](https://github.com/microsoft/TypeScript/blob/main/LICENSE.txt)                |
 
 ## Authors
 

diff --git a/package.json b/package.json
@@ -32,9 +32,9 @@
 		"dd-trace": "^1.7.1",
 		"dotenv": "^16.0.0",
 		"express": "4.17.3",
-		"express-openapi-validator": "^4.13.6",
+		"express-openapi-validator": "^4.13.7",
 		"firebase-admin": "^10.0.2",
-		"google-auth-library": "^7.14.0",
+		"google-auth-library": "^7.14.1",
 		"jsonwebtoken": "^8.5.1",
 		"moment": "^2.29.1",
 		"node-crc": "^2.0.11",
@@ -49,13 +49,13 @@
 		"chai": "^4.3.6",
 		"chai-http": "^4.3.0",
 		"docsify-cli": "^4.4.4",
-		"eslint": "^8.11.0",
+		"eslint": "^8.12.0",
 		"eslint-plugin-chai-friendly": "^0.7.2",
 		"license-compliance": "^1.2.3",
 		"mocha": "^9.2.2",
 		"nodemon": "^2.0.15",
-		"prettier": "^2.6.0",
-		"typescript": "^4.6.2"
+		"prettier": "^2.6.1",
+		"typescript": "^4.6.3"
 	},
 	"resolutions": {
 		"ansi-regex": "^5.0.1",