Merge pull request #365 from swrlab/dev/update-1.3.7

chore: update 1.3.7
swrlab · Aug 1, 2022 · 8e18005 · 8e18005
2 parents 48ccb18 + bec3482
commit 8e18005
Show file tree

Hide file tree

Showing 18 changed files with 1,083 additions and 1,123 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.15
+  NODE_VERSION: 18
 
 
 jobs:
@@ -44,6 +44,9 @@ jobs:
         service_account_key: ${{ secrets.GCP_GITHUB_SERVICE_ACCOUNT_KEY }}
         export_default_credentials: true
 
+    - name: 📚 Lint Code
+      run: yarn ingest:lint
+
     - name: 🧪 Run Ingest Tests
       env:
         SERVICE_NAME: ard-eventhub

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.15
+  NODE_VERSION: 18
   IMAGE_NAME: de.swr.ard.eventhub/ingest
   REGISTRY_DOMAIN: eu.gcr.io
 
@@ -49,6 +49,9 @@ jobs:
         service_account_key: ${{ secrets.GCP_GITHUB_SERVICE_ACCOUNT_KEY }}
         export_default_credentials: true
 
+    - name: 📚 Lint Code
+      run: yarn ingest:lint
+
     - name: 🧪 Run Ingest Tests
       env:
         SERVICE_NAME: ard-eventhub
@@ -83,6 +86,10 @@ jobs:
     - name: 🚧 Building docker image
       run: "docker build ./ --file ./Dockerfile -t image"
 
+    - name: 🔖 Get Package Version
+      id: package-version
+      uses: martinbeentjes/npm-get-version-action@main
+
     - name: 🏷 Tagging & Pushing docker
       id: push
       run: |
@@ -93,7 +100,7 @@ jobs:
         [[ "${{ github.ref }}" == "refs/tags/"* ]] && BRANCH=$(echo $BRANCH | sed -e 's/^v//')
 
         # Add custom wrapper syntax
-        VERSION=g${{ github.run_number }}-d$(date +%j)-$BRANCH-${{ github.actor }}-$GITHUB_SHA
+        VERSION=${{ steps.package-version.outputs.current-version }}-g${{ github.run_number }}
 
         # Set registry
         IMAGE_URI=$REGISTRY_DOMAIN/${{ secrets.GCP_PROJECT_ID }}/$IMAGE_NAME:$VERSION

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,54 +5,56 @@ 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.7] - 2022-07-25
+
+- chore: update Node to `v18`
+- chore: update node-utils to `v1.0.0`
+- fix: resolve eslint errors
+- fix: reorder core-dump (alphabetically institutions)
+- feat: update docker version tag from `package.json`
+- feat: add eslint check to github-actions
+
 ## [1.3.6] - 2022-07-18
 
 - chore: add publisherId to logs
 
 ## [1.3.5] - 2022-06-21
 
-- security:
-  - fix `CVE-2022-24434`
-  - fix `CVE-2022-32210`
-  - fix `CVE-2022-33987`
-- update:
-  - github-actions to use latest versions
-  - @google-cloud/secret-manager to `v4.0.0`
-  - @google-cloud/datastore to `v7.0.0`
-  - firebase-admin to `v11.0.0`
+- security: fix `CVE-2022-24434`
+- security: fix `CVE-2022-32210`
+- security: fix `CVE-2022-33987`
+- update: github-actions to use latest versions
+- update: @google-cloud/secret-manager to `v4.0.0`
+- update: @google-cloud/datastore to `v7.0.0`
+- update: firebase-admin to `v11.0.0`
 - use node-crc from `@swrlab/utils`
 
 ## [1.3.4] - 2022-06-07
 
 - security: fix `CVE-2022-25878`
-- update:
-  - actions/setup-node to `v3.2.0`
-  - @google-cloud/pubsub to `v3.0.1`
+- update: actions/setup-node to `v3.2.0`
+- update: @google-cloud/pubsub to `v3.0.1`
 
 ## [1.3.3] - 2022-05-10
 
 - add: BR channel `BR Heimat`
-- update:
-  - dd-trace to `v2.7.0`
-  - google-auth-library to `v8.0.2`
+- update: dd-trace to `v2.7.0`
+- update: google-auth-library to `v8.0.2`
 
 ## [1.3.2] - 2022-05-03
 
 - chore: update Node to `v16.15`
 - fix: require service-name
-- update:
-  - mocha to `v10.0.0`
-  - /create-or-update-comment to `v2.0.0`
+- update: mocha to `v10.0.0`
+- update: /create-or-update-comment to `v2.0.0`
 
 ## [1.3.1] - 2022-04-26
 
-- add: SR channels
-  - `UNSERDING` and `AntenneSaar`
+- add: SR channels `UNSERDING` and `AntenneSaar`
 - security: fix `CVE-2022-24785`
-- update: github actions
-  - /checkout to `v3.0.2`
-  - /setup-node to `v3.1.1`
-  - /setup-gcloud to `v0.6.0`
+- update: actions/checkout to `v3.0.2`
+- update: actions/setup-node to `v3.1.1`
+- update: actions/setup-gcloud to `v0.6.0`
 
 ## [1.3.0] - 2022-03-28
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Load desired node image
-FROM node:16.15-alpine
+FROM node:18-alpine
 
 # Create app directory
 WORKDIR /web/app

diff --git a/README.md b/README.md
@@ -21,13 +21,13 @@ These ARD broadcasters are currently sending live metadata via ARD Eventhub:
 | ---------------- | ---- | ---- |
 | BR               | ✅    | ✅    |
 | HR               | ✅    | ✅    |
-| MDR              | ✅    | ✅    |
+| MDR              | -    | ✅    |
 | NDR              | ✅    | ✅    |
-| Radio Bremen     | ✅    | ✅    |
-| RBB              | ✅    | ✅    |
-| SR               | ⌛️    | -    |
+| Radio Bremen     | -    | ✅    |
+| RBB              | -    | ✅    |
+| SR               | -    | ✅    |
 | SWR              | ✅    | ✅    |
-| WDR              | ⌛️    | ⌛️    |
+| WDR              | ✅    | ✅    |
 | Deutschlandradio | -    | -    |
 
 ## Get Started and Documentation
@@ -69,7 +69,7 @@ This source code is provided under EUPL v1.2, except for the [`spdx-exceptions`]
 
 | Type    | Name                           | License                                                                                            |
 | ------- | ------------------------------ | -------------------------------------------------------------------------------------------------- |
-| Docker  | `node:16.15-alpine`            | [MIT](https://github.com/nodejs/node/blob/master/LICENSE)                                          |
+| Docker  | `node:18-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)      |

diff --git a/openapi.json b/openapi.json
@@ -11,7 +11,7 @@
       "name": "European Union Public License 1.2",
       "url": "https://spdx.org/licenses/EUPL-1.2.html"
     },
-    "version": "1.3.6"
+    "version": "1.3.7"
   },
   "externalDocs": {
     "description": "ARD-Eventhub Documentation",

diff --git a/openapi.yaml b/openapi.yaml
@@ -10,7 +10,7 @@ info:
   license:
     name: European Union Public License 1.2
     url: 'https://spdx.org/licenses/EUPL-1.2.html'
-  version: 1.3.6
+  version: 1.3.7
 externalDocs:
   description: ARD-Eventhub Documentation
   url: 'https://swrlab.github.io/ard-eventhub/'

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ard-eventhub",
-	"version": "1.3.6",
+	"version": "1.3.7",
 	"description": "ARD system to distribute real-time (live) metadata for primarily radio broadcasts.",
 	"main": "./src/ingest/index.js",
 	"engines": {
@@ -9,14 +9,16 @@
 	"scripts": {
 		"docs:serve": "docsify serve . --port 3000",
 		"coreId": "node ./src/coreId/index.js",
-		"ingest:test": "mocha test/ingest.test.js --timeout 15000 --exit -r dotenv/config",
 		"ingest:local": "nodemon -r dotenv/config ./src/ingest/index.js",
 		"ingest:cloud": "node -r dotenv/config ./src/ingest/index.js",
+		"ingest:test": "mocha test/ingest.test.js --timeout 15000 --exit -r dotenv/config",
+		"ingest:lint": "eslint src",
 		"docker:build": "docker build . -t swr/ard-eventhub",
-		"docker:run": "docker run --env-file .env -p 8080:8080 swr/ard-eventhub",
+		"docker:clean": "docker rm ard-eventhub",
+		"docker:run": "docker run --env-file .env -p 8080:8080 --name ard-eventhub swr/ard-eventhub",
 		"license": "chmod +x license.sh && ./license.sh",
-		"reinstall": "rm -rf node_modules && rm yarn.lock && yarn",
-		"test": "mocha test/example.test.js"
+		"test": "mocha test/example.test.js",
+		"reinstall": "rm -rf node_modules && rm yarn.lock && yarn"
 	},
 	"keywords": [
 		"ard",
@@ -29,13 +31,13 @@
 		"@google-cloud/datastore": "^7.0.0",
 		"@google-cloud/pubsub": "^3.1.0",
 		"@google-cloud/secret-manager": "^4.0.0",
-		"@swrlab/utils": "swrlab/node-utils#1.0.9-beta",
+		"@swrlab/utils": "^1.0.0",
 		"compression": "^1.7.4",
-		"dd-trace": "^2.11.0",
+		"dd-trace": "^2.12.1",
 		"dotenv": "^16.0.1",
 		"express": "4.18.1",
 		"express-openapi-validator": "^4.13.8",
-		"firebase-admin": "^11.0.0",
+		"firebase-admin": "^11.0.1",
 		"google-auth-library": "^8.1.1",
 		"jsonwebtoken": "^8.5.1",
 		"moment": "^2.29.4",
@@ -45,14 +47,14 @@
 		"winston": "^3.8.1"
 	},
 	"devDependencies": {
-		"@swrlab/eslint-plugin-swr": "^0.1.2",
+		"@swrlab/eslint-plugin-swr": "^0.2.0",
 		"@swrlab/swr-prettier-config": "^0.1.2",
 		"chai": "^4.3.6",
 		"chai-http": "^4.3.0",
 		"docsify-cli": "^4.4.4",
-		"eslint": "^8.20.0",
+		"eslint": "^8.21.0",
 		"eslint-plugin-chai-friendly": "^0.7.2",
-		"license-compliance": "^1.2.3",
+		"license-compliance": "^1.2.4",
 		"mocha": "^10.0.0",
 		"nodemon": "^2.0.19",
 		"prettier": "^2.7.1",