From cc64ce449865e8a460cc9a175141296586da5b09 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 30 Dec 2020 21:17:09 +0100 Subject: [PATCH 1/5] Revert "Added test pipeline for automatic license export" This reverts commit c9378e6cae06dcb355bc05cae4370d70477b94be. --- .drone.yml | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/.drone.yml b/.drone.yml index 52d8daa..d8acb3c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -42,7 +42,7 @@ steps: depends_on: [clone] commands: - yarn - - yarn licenses:full + - yarn licenses:export - name: push new licenses file to repo image: appleboy/drone-git-push settings: @@ -117,27 +117,4 @@ steps: from_secret: BOT_DRONE_KEY trigger: event: - - tag - ---- -kind: pipeline -type: docker -name: export:licenses - -steps: - - name: run full license export - image: node:alpine - depends_on: [clone] - commands: - - yarn - - yarn licenses:full - - name: push new licenses file to repo - image: appleboy/drone-git-push - settings: - branch: dev - commit: true - commit_message: new license file version [CI SKIP] - author_email: bot@odit.services - remote: git@git.odit.services:lfk/backend.git - ssh_key: - from_secret: GITLAB_SSHKEY + - tag \ No newline at end of file From a501625dd65c05fc96155a0c9f315958aa963ad7 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 30 Dec 2020 21:17:13 +0100 Subject: [PATCH 2/5] Revert "Added --full option for the license exporter to export the license path and text as well" This reverts commit 62c7f26540905b0f73c09b8047da7718a67cfaf8. --- package.json | 5 ++-- scripts/license_exporter.js | 52 ++++++++++--------------------------- 2 files changed, 16 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index bea4919..2d9f3c4 100644 --- a/package.json +++ b/package.json @@ -75,9 +75,8 @@ "test:watch": "jest --watchAll", "test:ci": "start-server-and-test dev http://localhost:4010/api/docs/openapi.json test", "seed": "ts-node ./node_modules/typeorm/cli.js schema:sync && ts-node ./node_modules/typeorm-seeding/dist/cli.js seed", - "openapi:export": "node scripts/openapi_export.js", - "licenses:export": "node scripts/license_exporter.js", - "licenses:full": "node scripts/license_exporter.js --full" + "openapi:export": "ts-node scripts/openapi_export.ts", + "licenses:export": "node scripts/license_exporter.js" }, "nodemonConfig": { "ignore": [ diff --git a/scripts/license_exporter.js b/scripts/license_exporter.js index 1688f35..339d4c9 100644 --- a/scripts/license_exporter.js +++ b/scripts/license_exporter.js @@ -2,52 +2,28 @@ var checker = require('license-checker'); var consola = require('consola'); var fs = require('fs'); -var args = process.argv.slice(2); checker.init({ start: './', - relativeLicensePath: true, - customFormat: { - licenseText: "", - licenseFile: "", - description: "", - version: "", - } -}, function (err, packages) { +}, function(err, packages) { if (err) { consola.error("Couldn't load the licenses.") } else { let licenses = new Array(); - if (args.includes("--full")) { - Object.keys(packages).forEach(function (key) { - licenses.push({ - "name": packages[key].name, - "licenses": packages[key].licenses, - "repository": packages[key].repository || null, - "publisher": packages[key].publisher || null, - "email": packages[key].email || null, - "version": packages[key].version || null, - "description": packages[key].description || null, - "copyright": packages[key].copyright || null, - "text": packages[key].licenseText || null, - "license_path": packages[key].licenseFile || null, - }); + Object.keys(packages).forEach(function(key) { + licenses.push({ + "name": packages[key].name, + "licenses": packages[key].licenses || null, + "repository": packages[key].repository || null, + "publisher": packages[key].publisher || null, + "email": packages[key].email || null, + "version": packages[key].version || null, + "description": packages[key].description || null, + "copyright": packages[key].copyright || null, + "url": packages[key].url || null, }); - } - else { - Object.keys(packages).forEach(function (key) { - licenses.push({ - "name": packages[key].name, - "licenses": packages[key].licenses, - "repository": packages[key].repository || null, - "publisher": packages[key].publisher || null, - "email": packages[key].email || null, - "version": packages[key].version || null, - "description": packages[key].description || null, - "copyright": packages[key].copyright || null, - }); - }); - } + }); + try { fs.writeFileSync("./licenses.json", JSON.stringify(licenses), { encoding: "utf-8" }); consola.success("Exported licenses to ./licenses.json"); From 2924ac290027acb16d08a6b2f79510552abee053 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 30 Dec 2020 21:17:18 +0100 Subject: [PATCH 3/5] Revert "Added automatic license export on dev push/merge" This reverts commit 18e3ef9a7954f4102a26f050e5b82ace69e9a17b. --- .drone.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.drone.yml b/.drone.yml index d8acb3c..fd172ac 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,22 +37,11 @@ steps: tags: - dev registry: registry.odit.services - - name: run full license export - image: node:alpine - depends_on: [clone] - commands: - - yarn - - yarn licenses:export - - name: push new licenses file to repo - image: appleboy/drone-git-push - settings: - branch: dev - commit: true - commit_message: new license file version [CI SKIP] - author_email: bot@odit.services - remote: git@git.odit.services:lfk/backend.git - ssh_key: - from_secret: GITLAB_SSHKEY + when: + branch: + - dev + event: + - push trigger: branch: From 6c7b31d76c2b93078cab53e81242e7d4a5dc7447 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 30 Dec 2020 21:17:23 +0100 Subject: [PATCH 4/5] Revert "Moved package script related files to their own folder" This reverts commit 395b0101a8a8684566b4c56e36c1f1f34dc87a4c. --- scripts/license_exporter.js => license_exporter.js | 0 package.json | 4 ++-- {scripts => src}/openapi_export.ts | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename scripts/license_exporter.js => license_exporter.js (100%) rename {scripts => src}/openapi_export.ts (93%) diff --git a/scripts/license_exporter.js b/license_exporter.js similarity index 100% rename from scripts/license_exporter.js rename to license_exporter.js diff --git a/package.json b/package.json index 2d9f3c4..cad0f36 100644 --- a/package.json +++ b/package.json @@ -75,8 +75,8 @@ "test:watch": "jest --watchAll", "test:ci": "start-server-and-test dev http://localhost:4010/api/docs/openapi.json test", "seed": "ts-node ./node_modules/typeorm/cli.js schema:sync && ts-node ./node_modules/typeorm-seeding/dist/cli.js seed", - "openapi:export": "ts-node scripts/openapi_export.ts", - "licenses:export": "node scripts/license_exporter.js" + "openapi:export": "ts-node src/openapi_export.ts", + "licenses:export": "node license_exporter.js" }, "nodemonConfig": { "ignore": [ diff --git a/scripts/openapi_export.ts b/src/openapi_export.ts similarity index 93% rename from scripts/openapi_export.ts rename to src/openapi_export.ts index aec2c69..49647b5 100644 --- a/scripts/openapi_export.ts +++ b/src/openapi_export.ts @@ -4,9 +4,9 @@ import fs from "fs"; import "reflect-metadata"; import { createExpressServer, getMetadataArgsStorage } from "routing-controllers"; import { routingControllersToSpec } from 'routing-controllers-openapi'; -import { config } from '../src/config'; -import authchecker from "../src/middlewares/authchecker"; -import { ErrorHandler } from '../src/middlewares/ErrorHandler'; +import { config } from './config'; +import authchecker from "./middlewares/authchecker"; +import { ErrorHandler } from './middlewares/ErrorHandler'; const CONTROLLERS_FILE_EXTENSION = process.env.NODE_ENV === 'production' ? 'js' : 'ts'; createExpressServer({ From 5cfd2c9a526b17c3c8cdfa687fa90235426283bc Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 30 Dec 2020 21:17:27 +0100 Subject: [PATCH 5/5] Revert "Added license exporter (to json)" This reverts commit 84a0bd2cd90509eb843d3f7db569f0a96685acc2. --- license_exporter.js | 34 ---------------------------------- package.json | 4 +--- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 license_exporter.js diff --git a/license_exporter.js b/license_exporter.js deleted file mode 100644 index 339d4c9..0000000 --- a/license_exporter.js +++ /dev/null @@ -1,34 +0,0 @@ -var checker = require('license-checker'); -var consola = require('consola'); -var fs = require('fs'); - - -checker.init({ - start: './', -}, function(err, packages) { - if (err) { - consola.error("Couldn't load the licenses.") - } else { - let licenses = new Array(); - Object.keys(packages).forEach(function(key) { - licenses.push({ - "name": packages[key].name, - "licenses": packages[key].licenses || null, - "repository": packages[key].repository || null, - "publisher": packages[key].publisher || null, - "email": packages[key].email || null, - "version": packages[key].version || null, - "description": packages[key].description || null, - "copyright": packages[key].copyright || null, - "url": packages[key].url || null, - }); - }); - - try { - fs.writeFileSync("./licenses.json", JSON.stringify(licenses), { encoding: "utf-8" }); - consola.success("Exported licenses to ./licenses.json"); - } catch (error) { - consola.error("Couldn't export the licenses"); - } - } -}); \ No newline at end of file diff --git a/package.json b/package.json index cad0f36..b277aab 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,6 @@ "cp-cli": "^2.0.0", "jest": "^26.6.3", "nodemon": "^2.0.6", - "license-checker": "^25.0.1", "rimraf": "^2.7.1", "start-server-and-test": "^1.11.6", "ts-jest": "^26.4.4", @@ -75,8 +74,7 @@ "test:watch": "jest --watchAll", "test:ci": "start-server-and-test dev http://localhost:4010/api/docs/openapi.json test", "seed": "ts-node ./node_modules/typeorm/cli.js schema:sync && ts-node ./node_modules/typeorm-seeding/dist/cli.js seed", - "openapi:export": "ts-node src/openapi_export.ts", - "licenses:export": "node license_exporter.js" + "openapi:export": "ts-node src/openapi_export.ts" }, "nodemonConfig": { "ignore": [