From 275279e7b9292035310ed9ea8f10baabf0f95f70 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 12 Mar 2023 03:37:18 +0100 Subject: [PATCH 01/22] use eslint-plugin-promise --- backend/.eslintrc.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js index b33a3e480..e10be9228 100644 --- a/backend/.eslintrc.js +++ b/backend/.eslintrc.js @@ -5,7 +5,7 @@ module.exports = { node: true, }, parser: '@typescript-eslint/parser', - plugins: ['prettier', '@typescript-eslint', 'type-graphql', 'jest', 'import', 'n'], + plugins: ['prettier', '@typescript-eslint', 'type-graphql', 'jest', 'import', 'n', 'promise'], extends: [ 'standard', 'eslint:recommended', @@ -117,6 +117,21 @@ module.exports = { 'n/prefer-global/url-search-params': 'error', 'n/prefer-promises/dns': 'error', 'n/prefer-promises/fs': 'error', + // promise + 'promise/catch-or-return': 'error', + 'promise/no-return-wrap': 'error', + 'promise/param-names': 'error', + 'promise/always-return': 'error', + 'promise/no-native': 'off', + 'promise/no-nesting': 'warn', + 'promise/no-promise-in-callback': 'warn', + 'promise/no-callback-in-promise': 'warn', + 'promise/avoid-new': 'warn', + 'promise/no-new-statics': 'error', + 'promise/no-return-in-finally': 'warn', + 'promise/valid-params': 'warn', + 'promise/prefer-await-to-callbacks': 'error', + 'promise/no-multiple-resolved': 'error', }, overrides: [ // only for ts files From 5aaf9acd987c31b0abe5273fb46208552db0096b Mon Sep 17 00:00:00 2001 From: mahula Date: Mon, 27 Mar 2023 20:18:13 +0200 Subject: [PATCH 02/22] align workflow file naming --- .../{test-admin-interface.yml => test_admin_interface.yml} | 0 .github/workflows/{e2e-test.yml => test_e2e.yml} | 0 .github/workflows/{test-nginx.yml => test_nginx.yml} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{test-admin-interface.yml => test_admin_interface.yml} (100%) rename .github/workflows/{e2e-test.yml => test_e2e.yml} (100%) rename .github/workflows/{test-nginx.yml => test_nginx.yml} (100%) diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test_admin_interface.yml similarity index 100% rename from .github/workflows/test-admin-interface.yml rename to .github/workflows/test_admin_interface.yml diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/test_e2e.yml similarity index 100% rename from .github/workflows/e2e-test.yml rename to .github/workflows/test_e2e.yml diff --git a/.github/workflows/test-nginx.yml b/.github/workflows/test_nginx.yml similarity index 100% rename from .github/workflows/test-nginx.yml rename to .github/workflows/test_nginx.yml From 2cacecdf9730656eac60ff8d5bec5857b5ff5dc4 Mon Sep 17 00:00:00 2001 From: mahula Date: Mon, 27 Mar 2023 20:18:13 +0200 Subject: [PATCH 03/22] align workflow file naming --- .github/workflows/{test_dht-node.yml => test_dht_node.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{test_dht-node.yml => test_dht_node.yml} (100%) diff --git a/.github/workflows/test_dht-node.yml b/.github/workflows/test_dht_node.yml similarity index 100% rename from .github/workflows/test_dht-node.yml rename to .github/workflows/test_dht_node.yml From d84b9872bd57c82fe6d843886fb6c9ad214f4bfd Mon Sep 17 00:00:00 2001 From: mahula Date: Mon, 27 Mar 2023 21:04:58 +0200 Subject: [PATCH 04/22] use docker-compose file filter unambiguous and only where necessary - change docker-compose file filter name - use new file filter name in workflow files - remove unnecessary docker-compose filtering from build test jobs --- .github/file-filters.yml | 2 +- .github/workflows/test_dht_node.yml | 6 +++--- .github/workflows/test_federation.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/file-filters.yml b/.github/file-filters.yml index 80b7482d9..6690cdb9d 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -33,7 +33,7 @@ admin: &admin dht_node: &dht_node - 'dht-node/**/*' -docker: &docker +docker-compose: &docker-compose - 'docker-compose.*' federation: &federation diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index a57f09399..9ee528da2 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest outputs: dht_node: ${{ steps.changes.outputs.dht_node }} - docker: ${{ steps.changes.outputs.docker }} + docker-compose: ${{ steps.changes.outputs.docker-compose }} steps: - uses: actions/checkout@v3.3.0 @@ -27,7 +27,7 @@ jobs: ############################################################################## build: name: Docker Build Test - DHT Node - if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker == 'true' + if: needs.files-changed.outputs.dht_node == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -65,7 +65,7 @@ jobs: ############################################################################## unit_test: name: Unit Tests - DHT Node - if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker == 'true' + if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker-compose == 'true' needs: [files-changed, build] runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml index fc29a1bf8..fb8a3f48b 100644 --- a/.github/workflows/test_federation.yml +++ b/.github/workflows/test_federation.yml @@ -9,7 +9,7 @@ jobs: name: Detect File Changes - Federation runs-on: ubuntu-latest outputs: - docker: ${{ steps.changes.outputs.docker }} + docker-compose: ${{ steps.changes.outputs.docker-compose }} federation: ${{ steps.changes.outputs.federation }} steps: - uses: actions/checkout@v3.3.0 @@ -27,7 +27,7 @@ jobs: ############################################################################## build: name: Docker Build Test - Federation - if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.federation == 'true' + if: needs.files-changed.outputs.federation == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -65,7 +65,7 @@ jobs: ############################################################################## unit_test: name: Unit Tests - Federation - if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.federation == 'true' + if: needs.files-changed.outputs.docker-compose == 'true' || needs.files-changed.outputs.federation == 'true' needs: [files-changed, build] runs-on: ubuntu-latest steps: From ccf5156f986d6ab6a3b5125df657e86034767e2b Mon Sep 17 00:00:00 2001 From: mahula Date: Mon, 27 Mar 2023 21:18:52 +0200 Subject: [PATCH 05/22] remove block comments fron dht node and federation workflow files --- .github/workflows/test_dht_node.yml | 13 +------------ .github/workflows/test_federation.yml | 11 ----------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index 9ee528da2..04c08e3bc 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -3,8 +3,6 @@ name: Gradido DHT Node Test CI on: push jobs: - # only (but most important) job from this workflow required for pull requests - # check results serve as run conditions for all other jobs here files-changed: name: Detect File Changes - DHT Node runs-on: ubuntu-latest @@ -22,9 +20,6 @@ jobs: filters: .github/file-filters.yml list-files: shell - ############################################################################## - # JOB: DOCKER BUILD TEST ##################################################### - ############################################################################## build: name: Docker Build Test - DHT Node if: needs.files-changed.outputs.dht_node == 'true' @@ -45,9 +40,6 @@ jobs: name: docker-dht-node-test path: /tmp/dht-node.tar - ############################################################################## - # JOB: LINT ################################################################## - ############################################################################## lint: name: Lint - DHT Node if: needs.files-changed.outputs.dht_node == 'true' @@ -60,10 +52,7 @@ jobs: - name: Lint run: cd dht-node && yarn && yarn run lint - ############################################################################## - # JOB: UNIT TEST ############################################################# - ############################################################################## - unit_test: + unit_test: name: Unit Tests - DHT Node if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker-compose == 'true' needs: [files-changed, build] diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml index fb8a3f48b..5fd714b00 100644 --- a/.github/workflows/test_federation.yml +++ b/.github/workflows/test_federation.yml @@ -3,8 +3,6 @@ name: Gradido Federation Test CI on: push jobs: - # only (but most important) job from this workflow required for pull requests - # check results serve as run conditions for all other jobs here files-changed: name: Detect File Changes - Federation runs-on: ubuntu-latest @@ -22,9 +20,6 @@ jobs: filters: .github/file-filters.yml list-files: shell - ############################################################################## - # JOB: DOCKER BUILD TEST ##################################################### - ############################################################################## build: name: Docker Build Test - Federation if: needs.files-changed.outputs.federation == 'true' @@ -45,9 +40,6 @@ jobs: name: docker-federation-test path: /tmp/federation.tar - ############################################################################## - # JOB: LINT ################################################################## - ############################################################################## lint: name: Lint - Federation if: needs.files-changed.outputs.federation == 'true' @@ -60,9 +52,6 @@ jobs: - name: Lint run: cd federation && yarn && yarn run lint - ############################################################################## - # JOB: UNIT TEST ############################################################# - ############################################################################## unit_test: name: Unit Tests - Federation if: needs.files-changed.outputs.docker-compose == 'true' || needs.files-changed.outputs.federation == 'true' From 80fa01f000dd50a8a6d2e21a2ae9fc747310abf4 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 4 Apr 2023 15:04:05 +0200 Subject: [PATCH 06/22] log stack trace included --- backend/src/server/LogError.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/server/LogError.ts b/backend/src/server/LogError.ts index b753d204e..1ee4585cd 100644 --- a/backend/src/server/LogError.ts +++ b/backend/src/server/LogError.ts @@ -4,6 +4,6 @@ export default class LogError extends Error { // eslint-disable-next-line @typescript-eslint/no-explicit-any constructor(msg: string, ...details: any[]) { super(msg) - logger.error(msg, ...details) + logger.error(this.stack, ...details) } } From 30b7501a6e217605217050647e672e53b6fb9919 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 4 Apr 2023 15:31:47 +0200 Subject: [PATCH 07/22] log stack trace --- backend/log4js-config.json | 14 +++++++------- backend/src/server/LogError.ts | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/backend/log4js-config.json b/backend/log4js-config.json index e595e7c52..81b4c174b 100644 --- a/backend/log4js-config.json +++ b/backend/log4js-config.json @@ -8,7 +8,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -21,7 +21,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -34,7 +34,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -47,7 +47,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -60,7 +60,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -77,7 +77,7 @@ "type": "stdout", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" } }, "apolloOut": @@ -85,7 +85,7 @@ "type": "stdout", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" } } }, diff --git a/backend/src/server/LogError.ts b/backend/src/server/LogError.ts index 1ee4585cd..8aa2d7d1a 100644 --- a/backend/src/server/LogError.ts +++ b/backend/src/server/LogError.ts @@ -1,9 +1,11 @@ +import { LockNotSupportedOnGivenDriverError } from '@dbTools/typeorm' import { backendLogger as logger } from './logger' export default class LogError extends Error { // eslint-disable-next-line @typescript-eslint/no-explicit-any constructor(msg: string, ...details: any[]) { super(msg) - logger.error(this.stack, ...details) + // logger.setStack(this.stack) + logger.error(msg, ...details) } } From 550e35cb784ba31c48abaab0e255ae1500918003 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 4 Apr 2023 15:33:32 +0200 Subject: [PATCH 08/22] remove unused configs --- backend/src/server/LogError.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/src/server/LogError.ts b/backend/src/server/LogError.ts index 8aa2d7d1a..b753d204e 100644 --- a/backend/src/server/LogError.ts +++ b/backend/src/server/LogError.ts @@ -1,11 +1,9 @@ -import { LockNotSupportedOnGivenDriverError } from '@dbTools/typeorm' import { backendLogger as logger } from './logger' export default class LogError extends Error { // eslint-disable-next-line @typescript-eslint/no-explicit-any constructor(msg: string, ...details: any[]) { super(msg) - // logger.setStack(this.stack) logger.error(msg, ...details) } } From aa8b9d017d31b8eaf8e27aabba3723846ae9c2c0 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 6 Apr 2023 15:11:33 +0200 Subject: [PATCH 09/22] return value on then --- backend/src/emails/sendEmailTranslated.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/emails/sendEmailTranslated.ts b/backend/src/emails/sendEmailTranslated.ts index 6d89cc257..f7f2ea40d 100644 --- a/backend/src/emails/sendEmailTranslated.ts +++ b/backend/src/emails/sendEmailTranslated.ts @@ -75,6 +75,7 @@ export const sendEmailTranslated = async (params: { resultSend = result logger.info('Send email successfully !!!') logger.info('Result: ', result) + return result }) .catch((error: unknown) => { throw new LogError('Error sending notification email', error) From d89fca8d1d58d4268ccd99735b38fb3bc0195c9e Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 6 Apr 2023 15:12:49 +0200 Subject: [PATCH 10/22] restructure axios calls to use await --- backend/src/apis/HttpRequest.ts | 56 +++++++++++++++------------------ 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/backend/src/apis/HttpRequest.ts b/backend/src/apis/HttpRequest.ts index 278e3732c..78cb4510f 100644 --- a/backend/src/apis/HttpRequest.ts +++ b/backend/src/apis/HttpRequest.ts @@ -9,39 +9,35 @@ import { backendLogger as logger } from '@/server/logger' // eslint-disable-next-line @typescript-eslint/no-explicit-any export const apiPost = async (url: string, payload: unknown): Promise => { logger.trace('POST', url, payload) - return axios - .post(url, payload) - .then((result) => { - logger.trace('POST-Response', result) - if (result.status !== 200) { - throw new LogError('HTTP Status Error', result.status) - } - if (result.data.state !== 'success') { - throw new Error(result.data.msg) - } - return { success: true, data: result.data } - }) - .catch((error) => { - return { success: false, data: error.message } - }) + try { + const result = await axios.post(url, payload) + logger.trace('POST-Response', result) + if (result.status !== 200) { + throw new LogError('HTTP Status Error', result.status) + } + if (result.data.state !== 'success') { + throw new LogError(result.data.msg) + } + return { success: true, data: result.data } + } catch (error: unknown) { + return { success: false, data: error.message } + } } // eslint-disable-next-line @typescript-eslint/no-explicit-any export const apiGet = async (url: string): Promise => { logger.trace('GET: url=' + url) - return axios - .get(url) - .then((result) => { - logger.trace('GET-Response', result) - if (result.status !== 200) { - throw new LogError('HTTP Status Error', result.status) - } - if (!['success', 'warning'].includes(result.data.state)) { - throw new Error(result.data.msg) - } - return { success: true, data: result.data } - }) - .catch((error) => { - return { success: false, data: error.message } - }) + try { + const result = await axios.get(url) + logger.trace('GET-Response', result) + if (result.status !== 200) { + throw new LogError('HTTP Status Error', result.status) + } + if (!['success', 'warning'].includes(result.data.state)) { + throw new LogError(result.data.msg) + } + return { success: true, data: result.data } + } catch (error: unknown) { + return { success: false, data: error.message } + } } From 4ca989a3daf33c657cbb76327c28413c5750ee17 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 6 Apr 2023 15:20:36 +0200 Subject: [PATCH 11/22] stack traces only for errors --- backend/log4js-config.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/log4js-config.json b/backend/log4js-config.json index 81b4c174b..9ab0cec50 100644 --- a/backend/log4js-config.json +++ b/backend/log4js-config.json @@ -8,7 +8,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -21,7 +21,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -34,7 +34,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -47,7 +47,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" }, "keepFileExt" : true, "fileNameSep" : "_", From 693338975e7a79fa2168efe4e0fe03259761bff7 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 6 Apr 2023 15:37:34 +0200 Subject: [PATCH 12/22] fix problems with compile --- backend/src/apis/HttpRequest.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/apis/HttpRequest.ts b/backend/src/apis/HttpRequest.ts index 152b48f21..f40d577bd 100644 --- a/backend/src/apis/HttpRequest.ts +++ b/backend/src/apis/HttpRequest.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-argument */ @@ -19,7 +20,7 @@ export const apiPost = async (url: string, payload: unknown): Promise => { throw new LogError(result.data.msg) } return { success: true, data: result.data } - } catch (error: unknown) { + } catch (error: any) { return { success: false, data: error.message } } } @@ -37,7 +38,7 @@ export const apiGet = async (url: string): Promise => { throw new LogError(result.data.msg) } return { success: true, data: result.data } - } catch (error: unknown) { + } catch (error: any) { return { success: false, data: error.message } } } From a1aa4fad63bf0aa83c9b3fff378f19f682a2c12a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 21 Apr 2023 09:57:50 +0200 Subject: [PATCH 13/22] stacktrace only for errorfile --- backend/log4js-config.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/log4js-config.json b/backend/log4js-config.json index 9ab0cec50..160883eb3 100644 --- a/backend/log4js-config.json +++ b/backend/log4js-config.json @@ -47,7 +47,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -60,7 +60,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -77,7 +77,7 @@ "type": "stdout", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" } }, "apolloOut": @@ -85,7 +85,7 @@ "type": "stdout", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" } } }, From b9527ae3f94dd4cc8c9b5ee6556f5456736a0606 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 2 May 2023 14:41:53 +0200 Subject: [PATCH 14/22] fix test_dht_node.yml --- .github/workflows/test_dht_node.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index 04c08e3bc..bb24f2d2f 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -52,7 +52,7 @@ jobs: - name: Lint run: cd dht-node && yarn && yarn run lint - unit_test: + unit_test: name: Unit Tests - DHT Node if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker-compose == 'true' needs: [files-changed, build] From 5eade026c1ee4f30b1137d2e4d027d6243e400fa Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 2 May 2023 17:00:35 +0200 Subject: [PATCH 15/22] move mariadb test jobs to separate workflow file --- .github/file-filters.yml | 3 +++ .github/workflows/test.yml | 26 ----------------------- .github/workflows/test_mariadb.yml | 33 ++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 .github/workflows/test_mariadb.yml diff --git a/.github/file-filters.yml b/.github/file-filters.yml index 6690cdb9d..02ea2709e 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -42,5 +42,8 @@ federation: &federation frontend: &frontend - 'frontend/**/*' +mariadb: &mariadb + - 'mariadb/**/*' + nginx: &nginx - 'nginx/**/*' \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0fcedb4ce..d2e83d8e9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -55,32 +55,6 @@ jobs: name: docker-database-test_up path: /tmp/database_up.tar - ############################################################################## - # JOB: DOCKER BUILD TEST MARIADB ############################################# - ############################################################################## - build_test_mariadb: - name: Docker Build Test - MariaDB - runs-on: ubuntu-latest - #needs: [nothing] - steps: - ########################################################################## - # CHECKOUT CODE ########################################################## - ########################################################################## - - name: Checkout code - uses: actions/checkout@v3 - ########################################################################## - # BUILD MARIADB DOCKER IMAGE ############################################# - ########################################################################## - - name: mariadb | Build `test` image - run: | - docker build --target mariadb_server -t "gradido/mariadb:test" -f ./mariadb/Dockerfile ./ - docker save "gradido/mariadb:test" > /tmp/mariadb.tar - - name: Upload Artifact - uses: actions/upload-artifact@v3 - with: - name: docker-mariadb-test - path: /tmp/mariadb.tar - ############################################################################## # JOB: LINT BACKEND ########################################################## ############################################################################## diff --git a/.github/workflows/test_mariadb.yml b/.github/workflows/test_mariadb.yml new file mode 100644 index 000000000..ea260e5db --- /dev/null +++ b/.github/workflows/test_mariadb.yml @@ -0,0 +1,33 @@ +name: Gradido MariaDB Test CI + +on: push + +jobs: + files-changed: + name: Detect File Changes - MariaDB + runs-on: ubuntu-latest + outputs: + docker-compose: ${{ steps.changes.outputs.docker-compose }} + mariadb: ${{ steps.changes.outputs.mariadb }} + steps: + - uses: actions/checkout@v3.3.0 + + - name: Check for frontend file changes + uses: dorny/paths-filter@v2.11.1 + id: changes + with: + token: ${{ github.token }} + filters: .github/file-filters.yml + list-files: shell + + build_test: + if: needs.files-changed.outputs.mariadb == 'true' + name: Docker Build Test - MariaDB + needs: files-changed + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + - name: MariaDB | Build 'test' image + run: | + docker build --target mariadb_server -t "gradido/mariadb:test" -f ./mariadb/Dockerfile ./ From 583b2f5d8f3be067e7e2674904359c886e0a8ba0 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 2 May 2023 17:00:35 +0200 Subject: [PATCH 16/22] move mariadb test jobs to separate workflow file --- .github/workflows/test_mariadb.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test_mariadb.yml b/.github/workflows/test_mariadb.yml index ea260e5db..585ede680 100644 --- a/.github/workflows/test_mariadb.yml +++ b/.github/workflows/test_mariadb.yml @@ -7,7 +7,6 @@ jobs: name: Detect File Changes - MariaDB runs-on: ubuntu-latest outputs: - docker-compose: ${{ steps.changes.outputs.docker-compose }} mariadb: ${{ steps.changes.outputs.mariadb }} steps: - uses: actions/checkout@v3.3.0 From 5c7a0df7ff3caf08cb45736c46682bcf98479f85 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 2 May 2023 17:00:35 +0200 Subject: [PATCH 17/22] move mariadb test jobs to separate workflow file --- .github/workflows/test_mariadb.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_mariadb.yml b/.github/workflows/test_mariadb.yml index 585ede680..925884cf5 100644 --- a/.github/workflows/test_mariadb.yml +++ b/.github/workflows/test_mariadb.yml @@ -27,6 +27,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 + - name: MariaDB | Build 'test' image run: | docker build --target mariadb_server -t "gradido/mariadb:test" -f ./mariadb/Dockerfile ./ From 069215adf59f0e55e7098655b34510ad2c393c00 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 2 May 2023 17:43:05 +0200 Subject: [PATCH 18/22] move database test jobs to separate workflow file --- .github/workflows/test.yml | 66 +---------------------------- .github/workflows/test_database.yml | 65 ++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 65 deletions(-) create mode 100644 .github/workflows/test_database.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d2e83d8e9..1b245fa2b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,32 +29,6 @@ jobs: name: docker-backend-test path: /tmp/backend.tar - ############################################################################## - # JOB: DOCKER BUILD TEST DATABASE UP ######################################### - ############################################################################## - build_test_database_up: - name: Docker Build Test - Database up - runs-on: ubuntu-latest - #needs: [nothing] - steps: - ########################################################################## - # CHECKOUT CODE ########################################################## - ########################################################################## - - name: Checkout code - uses: actions/checkout@v3 - ########################################################################## - # DATABASE UP ############################################################ - ########################################################################## - - name: Database | Build `test_up` image - run: | - docker build --target test_up -t "gradido/database:test_up" database/ - docker save "gradido/database:test_up" > /tmp/database_up.tar - - name: Upload Artifact - uses: actions/upload-artifact@v3 - with: - name: docker-database-test_up - path: /tmp/database_up.tar - ############################################################################## # JOB: LINT BACKEND ########################################################## ############################################################################## @@ -91,23 +65,7 @@ jobs: - name: Backend | Locales run: cd backend && yarn && yarn locales - ############################################################################## - # JOB: LINT DATABASE UP ###################################################### - ############################################################################## - lint_database_up: - name: Lint - Database Up - runs-on: ubuntu-latest - steps: - ########################################################################## - # CHECKOUT CODE ########################################################## - ########################################################################## - - name: Checkout code - uses: actions/checkout@v3 - ########################################################################## - # LINT DATABASE ########################################################## - ########################################################################## - - name: Database | Lint - run: cd database && yarn && yarn run lint + ############################################################################## # JOB: UNIT TEST BACKEND #################################################### @@ -145,25 +103,3 @@ jobs: - name: backend Unit tests | test run: cd database && yarn && yarn build && cd ../backend && yarn && yarn test - ########################################################################## - # DATABASE MIGRATION TEST UP + RESET ##################################### - ########################################################################## - database_migration_test: - name: Database Migration Test - Up + Reset - runs-on: ubuntu-latest - #needs: [nothing] - steps: - ########################################################################## - # CHECKOUT CODE ########################################################## - ########################################################################## - - name: Checkout code - uses: actions/checkout@v3 - ########################################################################## - # DOCKER COMPOSE DATABASE UP + RESET ##################################### - ########################################################################## - - name: database | docker-compose - run: docker-compose -f docker-compose.yml up --detach mariadb - - name: database | up - run: docker-compose -f docker-compose.yml run -T database yarn up - - name: database | reset - run: docker-compose -f docker-compose.yml run -T database yarn reset diff --git a/.github/workflows/test_database.yml b/.github/workflows/test_database.yml new file mode 100644 index 000000000..d39fe5972 --- /dev/null +++ b/.github/workflows/test_database.yml @@ -0,0 +1,65 @@ +name: Gradido Database Test CI + +on: push + +jobs: + files-changed: + name: Detect File Changes - Database + runs-on: ubuntu-latest + outputs: + database: ${{ steps.changes.outputs.database }} + docker-compose: ${{ steps.changes.outputs.docker-compose }} + mariadb: ${{ steps.changes.outputs.mariadb }} + steps: + - uses: actions/checkout@v3.3.0 + + - name: Check for frontend file changes + uses: dorny/paths-filter@v2.11.1 + id: changes + with: + token: ${{ github.token }} + filters: .github/file-filters.yml + list-files: shell + + build: + if: needs.files-changed.outputs.database == 'true' + name: Docker Build Test - Database up + needs: files-changed + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Database | Build 'test_up' image + run: | + docker build --target test_up -t "gradido/database:test_up" database/ + + database_migration_test: + if: needs.files-changed.outputs.database == 'true' || needs.files-changed.outputs.docker-compose == 'true' || needs.files-changed.outputs.mariadb == 'true' + name: Database Migration Test - Up + Reset + needs: files-changed + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Database | docker-compose + run: docker-compose -f docker-compose.yml up --detach mariadb + + - name: Database | up + run: docker-compose -f docker-compose.yml run -T database yarn up + + - name: Database | reset + run: docker-compose -f docker-compose.yml run -T database yarn reset + + lint: + if: needs.files-changed.outputs.database == 'true' + name: Lint - Database Up + needs: files-changed + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Database | Lint + run: cd database && yarn && yarn run lint \ No newline at end of file From 98a02de50acc90c021d49548e333ffe09916f663 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 2 May 2023 20:31:49 +0200 Subject: [PATCH 19/22] move backend test jobs to separate workflow file --- .github/file-filters.yml | 3 + .github/workflows/test.yml | 105 ----------------------------- .github/workflows/test_backend.yml | 81 ++++++++++++++++++++++ 3 files changed, 84 insertions(+), 105 deletions(-) delete mode 100644 .github/workflows/test.yml create mode 100644 .github/workflows/test_backend.yml diff --git a/.github/file-filters.yml b/.github/file-filters.yml index 02ea2709e..f0d38b75b 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -30,6 +30,9 @@ admin: &admin - 'admin/**/*' +backend: &backend + - 'backend/**/*' + dht_node: &dht_node - 'dht-node/**/*' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 1b245fa2b..000000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,105 +0,0 @@ -name: gradido test CI - -on: push - -jobs: - ############################################################################## - # JOB: DOCKER BUILD TEST BACKEND ############################################# - ############################################################################## - build_test_backend: - name: Docker Build Test - Backend - runs-on: ubuntu-latest - #needs: [nothing] - steps: - ########################################################################## - # CHECKOUT CODE ########################################################## - ########################################################################## - - name: Checkout code - uses: actions/checkout@v3 - ########################################################################## - # BACKEND ################################################################ - ########################################################################## - - name: Backend | Build `test` image - run: | - docker build -f ./backend/Dockerfile --target test -t "gradido/backend:test" . - docker save "gradido/backend:test" > /tmp/backend.tar - - name: Upload Artifact - uses: actions/upload-artifact@v3 - with: - name: docker-backend-test - path: /tmp/backend.tar - - ############################################################################## - # JOB: LINT BACKEND ########################################################## - ############################################################################## - lint_backend: - name: Lint - Backend - runs-on: ubuntu-latest - steps: - ########################################################################## - # CHECKOUT CODE ########################################################## - ########################################################################## - - name: Checkout code - uses: actions/checkout@v3 - ########################################################################## - # LINT BACKEND ########################################################### - ########################################################################## - - name: backend | Lint - run: cd database && yarn && cd ../backend && yarn && yarn run lint - - ############################################################################## - # JOB: LOCALES BACKEND ####################################################### - ############################################################################## - locales_backend: - name: Locales - Backend - runs-on: ubuntu-latest - steps: - ########################################################################## - # CHECKOUT CODE ########################################################## - ########################################################################## - - name: Checkout code - uses: actions/checkout@v3 - ########################################################################## - # LOCALES BACKEND ##################################################### - ########################################################################## - - name: Backend | Locales - run: cd backend && yarn && yarn locales - - - - ############################################################################## - # JOB: UNIT TEST BACKEND #################################################### - ############################################################################## - unit_test_backend: - name: Unit tests - Backend - runs-on: ubuntu-latest - needs: [build_test_mariadb] - steps: - ########################################################################## - # CHECKOUT CODE ########################################################## - ########################################################################## - - name: Checkout code - uses: actions/checkout@v3 - ########################################################################## - # DOWNLOAD DOCKER IMAGES ################################################# - ########################################################################## - - name: Download Docker Image (Mariadb) - uses: actions/download-artifact@v3 - with: - name: docker-mariadb-test - path: /tmp - - name: Load Docker Image - run: docker load < /tmp/mariadb.tar - ########################################################################## - # UNIT TESTS BACKEND ##################################################### - ########################################################################## - - name: backend | docker-compose mariadb - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb - - name: Sleep for 30 seconds - run: sleep 30s - shell: bash - - name: backend | docker-compose database - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database - - name: backend Unit tests | test - run: cd database && yarn && yarn build && cd ../backend && yarn && yarn test - diff --git a/.github/workflows/test_backend.yml b/.github/workflows/test_backend.yml new file mode 100644 index 000000000..b517c5186 --- /dev/null +++ b/.github/workflows/test_backend.yml @@ -0,0 +1,81 @@ +name: Gradido Backend Test CI + +on: push + +jobs: + files-changed: + name: Detect File Changes - Backend + runs-on: ubuntu-latest + outputs: + backend: ${{ steps.changes.outputs.backend }} + database: ${{ steps.changes.outputs.database }} + docker-compose: ${{ steps.changes.outputs.docker-compose }} + mariadb: ${{ steps.changes.outputs.mariadb }} + steps: + - uses: actions/checkout@v3.3.0 + + - name: Check for frontend file changes + uses: dorny/paths-filter@v2.11.1 + id: changes + with: + token: ${{ github.token }} + filters: .github/file-filters.yml + list-files: shell + + build_test: + if: needs.files-changed.outputs.backend == 'true' + name: Docker Build Test - Backend + needs: files-changed + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Backend | Build 'test' image + run: docker build -f ./backend/Dockerfile --target test -t "gradido/backend:test" . + + unit_test: + if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.database == 'true' || needs.files-changed.outputs.docker-compose == 'true' || needs.files-changed.outputs.mariadb == 'true' + name: Unit tests - Backend + needs: files-changed + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Backend | docker-compose mariadb + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb + + - name: Sleep for 30 seconds + run: sleep 30s + shell: bash + + - name: Backend | docker-compose database + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database + + - name: Backend | Unit tests + run: cd database && yarn && yarn build && cd ../backend && yarn && yarn test + + lint: + if: needs.files-changed.outputs.backend == 'true' + name: Lint - Backend + needs: files-changed + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Backend | Lint + run: cd database && yarn && cd ../backend && yarn && yarn run lint + + locales: + if: needs.files-changed.outputs.backend == 'true' + name: Locales - Backend + needs: files-changed + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Backend | Locales + run: cd backend && yarn && yarn locales \ No newline at end of file From bd4ea0bade627df51f206e6e3e9fecaa4140cc75 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 2 May 2023 20:41:44 +0200 Subject: [PATCH 20/22] clean up --- .github/workflows/test_database.yml | 3 +-- .github/workflows/test_mariadb.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_database.yml b/.github/workflows/test_database.yml index d39fe5972..0444a0538 100644 --- a/.github/workflows/test_database.yml +++ b/.github/workflows/test_database.yml @@ -31,8 +31,7 @@ jobs: uses: actions/checkout@v3 - name: Database | Build 'test_up' image - run: | - docker build --target test_up -t "gradido/database:test_up" database/ + run: docker build --target test_up -t "gradido/database:test_up" database/ database_migration_test: if: needs.files-changed.outputs.database == 'true' || needs.files-changed.outputs.docker-compose == 'true' || needs.files-changed.outputs.mariadb == 'true' diff --git a/.github/workflows/test_mariadb.yml b/.github/workflows/test_mariadb.yml index 925884cf5..fe101bc48 100644 --- a/.github/workflows/test_mariadb.yml +++ b/.github/workflows/test_mariadb.yml @@ -29,5 +29,4 @@ jobs: uses: actions/checkout@v3 - name: MariaDB | Build 'test' image - run: | - docker build --target mariadb_server -t "gradido/mariadb:test" -f ./mariadb/Dockerfile ./ + run: docker build --target mariadb_server -t "gradido/mariadb:test" -f ./mariadb/Dockerfile ./ From fd61eb84fed8ee78133ac267ec8c6108aeadd16b Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 2 May 2023 21:38:44 +0200 Subject: [PATCH 21/22] add check for mariadb and database changes to dht node and federation workflow --- .github/workflows/test_dht_node.yml | 3 ++- .github/workflows/test_federation.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index bb24f2d2f..b63d1fc0d 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -7,6 +7,7 @@ jobs: name: Detect File Changes - DHT Node runs-on: ubuntu-latest outputs: + database: ${{ steps.changes.outputs.database }} dht_node: ${{ steps.changes.outputs.dht_node }} docker-compose: ${{ steps.changes.outputs.docker-compose }} steps: @@ -54,7 +55,7 @@ jobs: unit_test: name: Unit Tests - DHT Node - if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker-compose == 'true' + if: needs.files-changed.outputs.database == 'true' || needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker-compose == 'true' || needs.files-changed.outputs.mariadb == 'true' needs: [files-changed, build] runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml index 5fd714b00..92ccd95d2 100644 --- a/.github/workflows/test_federation.yml +++ b/.github/workflows/test_federation.yml @@ -54,7 +54,7 @@ jobs: unit_test: name: Unit Tests - Federation - if: needs.files-changed.outputs.docker-compose == 'true' || needs.files-changed.outputs.federation == 'true' + if: needs.files-changed.outputs.database == 'true' || needs.files-changed.outputs.docker-compose == 'true' || needs.files-changed.outputs.federation == 'true' || needs.files-changed.outputs.mariadb == 'true' needs: [files-changed, build] runs-on: ubuntu-latest steps: From 0c820fb53bef2098cd39c08fc668d74f6abb3ab1 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 2 May 2023 21:55:41 +0200 Subject: [PATCH 22/22] clean up mariadb Dockerfile fo check workflow changes --- mariadb/Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile index 07d2ba368..d3d5937d0 100644 --- a/mariadb/Dockerfile +++ b/mariadb/Dockerfile @@ -2,8 +2,3 @@ # mariadb server ######################################################################################################### FROM mariadb/server:10.5 as mariadb_server - -# ENV DOCKER_WORKDIR="/docker-entrypoint-initdb.d" - -# RUN mkdir -p ${DOCKER_WORKDIR} -# WORKDIR ${DOCKER_WORKDIR}