Merge pull request #302 from swrlab/dev/update

Dev/update
swrlab · Apr 26, 2022 · 0594d23 · 0594d23
2 parents 960f1af + b2334bd
commit 0594d23
Show file tree

Hide file tree

Showing 10 changed files with 449 additions and 409 deletions.
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -1,13 +1,14 @@
 version: 2
 updates:
-- package-ecosystem: npm
-  directory: "/"
-  open-pull-requests-limit: 10
-  schedule:
-    interval: "weekly"
-    day: "monday"
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: "weekly"
-    day: "monday"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    open-pull-requests-limit: 20
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+  - package-ecosystem: npm
+    directory: "/"
+    open-pull-requests-limit: 20
+    schedule:
+      interval: "weekly"
+      day: "sunday"
diff --git a/.github/workflows/ingest-pull.yml b/.github/workflows/ingest-pull.yml
@@ -25,25 +25,25 @@ jobs:
       matrix:
         STAGES: [dev]
     steps:
-    - name: Checkout repo 👀
-      uses: actions/checkout@v3
+    - name: 👀 Checkout repo
+      uses: actions/checkout@v3.0.2
 
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v3.1.1
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: 'yarn'
         cache-dependency-path: '**/yarn.lock'
 
-    - name: Install Dependencies
+    - name: 📦 Install Dependencies
       run: yarn
 
     - name: 🔑 Setup Google Cloud Auth
-      uses: google-github-actions/setup-gcloud@v0
+      uses: google-github-actions/setup-gcloud@v0.6.0
       with:
         service_account_key: ${{ secrets.GCP_GITHUB_SERVICE_ACCOUNT_KEY }}
         export_default_credentials: true
 
-    - name: Run Ingest Tests
+    - name: 🧪 Run Ingest Tests
       env:
         STAGE: ${{ matrix.STAGES }}
         GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
@@ -57,17 +57,17 @@ jobs:
     needs: security
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout repo 👀
-      uses: actions/checkout@v3
+    - name: 👀 Checkout repo
+      uses: actions/checkout@v3.0.2
 
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v3.1.1
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: 'yarn'
         cache-dependency-path: '**/yarn.lock'
 
-    - name: Install Dependencies
+    - name: 📦 Install Dependencies
       run: yarn
 
-    - name: Run License Check
+    - name: 📚 Run License Check
       run: yarn license
diff --git a/.github/workflows/ingest-push.yml b/.github/workflows/ingest-push.yml
@@ -30,25 +30,25 @@ jobs:
       matrix:
         STAGES: [dev]
     steps:
-    - name: Checkout repo 👀
-      uses: actions/checkout@v3
+    - name: 👀 Checkout repo
+      uses: actions/checkout@v3.0.2
 
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v3.1.1
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: 'yarn'
         cache-dependency-path: '**/yarn.lock'
 
-    - name: Install Dependencies
+    - name: 📦 Install Dependencies
       run: yarn
 
     - name: 🔑 Setup Google Cloud Auth
-      uses: google-github-actions/setup-gcloud@v0
+      uses: google-github-actions/setup-gcloud@v0.6.0
       with:
         service_account_key: ${{ secrets.GCP_GITHUB_SERVICE_ACCOUNT_KEY }}
         export_default_credentials: true
 
-    - name: Run Ingest Tests
+    - name: 🧪 Run Ingest Tests
       env:
         STAGE: ${{ matrix.STAGES }}
         GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
@@ -66,10 +66,10 @@ jobs:
       VERSION: ${{ steps.push.outputs.VERSION }}
     steps:
     - name: 👀 Checkout repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v3.0.2
 
     - name: 🔑 Setup Google Cloud Auth
-      uses: google-github-actions/setup-gcloud@v0
+      uses: google-github-actions/setup-gcloud@v0.6.0
       with:
         service_account_key: ${{ secrets.GCP_GITHUB_SERVICE_ACCOUNT_KEY }}
         export_default_credentials: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ 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.1] - 2022-04-26
+
+- 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`
+
 ## [1.3.0] - 2022-03-28
 
 - chore: update Node to `v16.14.2`

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ These ARD broadcasters are currently sending live metadata via ARD Eventhub:
 | NDR              | ✅    | ✅    |
 | Radio Bremen     | ✅    | ✅    |
 | RBB              | ⌛️    | -    |
-| SR               | -    | -    |
+| SR               | ⌛️    | -    |
 | SWR              | ✅    | ✅    |
 | WDR              | ✅    | ⌛️    |
 | Deutschlandradio | -    | -    |

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.0"
+    "version": "1.3.1"
   },
   "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.0
+  version: 1.3.1
 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.0",
+	"version": "1.3.1",
 	"description": "ARD system to distribute real-time (live) metadata for primarily radio broadcasts.",
 	"main": "./src/ingest/index.js",
 	"engines": {
@@ -26,35 +26,35 @@
 	"dependencies": {
 		"@google-cloud/datastore": "^6.6.2",
 		"@google-cloud/pubsub": "^2.19.0",
-		"@google-cloud/secret-manager": "^3.11.0",
+		"@google-cloud/secret-manager": "^3.12.0",
 		"@swrlab/utils": "swrlab/node-utils#1.0.3-beta",
 		"compression": "^1.7.4",
 		"dd-trace": "^1.7.1",
 		"dotenv": "^16.0.0",
-		"express": "4.17.3",
+		"express": "4.18.0",
 		"express-openapi-validator": "^4.13.7",
-		"firebase-admin": "^10.0.2",
+		"firebase-admin": "^10.1.0",
 		"google-auth-library": "^7.14.1",
 		"jsonwebtoken": "^8.5.1",
-		"moment": "^2.29.1",
+		"moment": "^2.29.3",
 		"node-crc": "^2.0.11",
 		"slug": "^5.3.0",
 		"swagger-ui-express": "^4.3.0",
 		"uuid": "^8.3.2",
-		"winston": "^3.6.0"
+		"winston": "^3.7.2"
 	},
 	"devDependencies": {
 		"@swrlab/eslint-plugin-swr": "^0.1.2",
 		"@swrlab/swr-prettier-config": "^0.1.2",
 		"chai": "^4.3.6",
 		"chai-http": "^4.3.0",
 		"docsify-cli": "^4.4.4",
-		"eslint": "^8.12.0",
+		"eslint": "^8.14.0",
 		"eslint-plugin-chai-friendly": "^0.7.2",
 		"license-compliance": "^1.2.3",
 		"mocha": "^9.2.2",
 		"nodemon": "^2.0.15",
-		"prettier": "^2.6.1",
+		"prettier": "^2.6.2",
 		"typescript": "^4.6.3"
 	},
 	"resolutions": {

diff --git a/src/data/coreApi.json b/src/data/coreApi.json
@@ -974,6 +974,32 @@
 			"acronym": "SR"
 		}
 	},
+	{
+		"_type": "PublisherResource",
+		"id": "urn:ard:publisher:4d296c441325a5f7",
+		"externalId": "109020",
+		"title": "UNSERDING",
+		"institution": {
+			"_type": "InstitutionResource",
+			"id": "urn:ard:institution:35b40a1e275391f3",
+			"externalId": "SR",
+			"title": "Saarländischer Rundfunk",
+			"acronym": "SR"
+		}
+	},
+	{
+		"_type": "PublisherResource",
+		"id": "urn:ard:publisher:fed6f3124e5cf27f",
+		"externalId": "109010",
+		"title": "AntenneSaar",
+		"institution": {
+			"_type": "InstitutionResource",
+			"id": "urn:ard:institution:35b40a1e275391f3",
+			"externalId": "SR",
+			"title": "Saarländischer Rundfunk",
+			"acronym": "SR"
+		}
+	},
 	{
 		"_type": "PublisherResource",
 		"id": "urn:ard:publisher:1ecd6a84c7217724",