From 73faa899048579811e3df95d6ade48c98af844f4 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Mon, 28 Sep 2020 21:05:07 -0700 Subject: [PATCH 1/3] Adds some missing licenses to the CSV export Signed-off-by: Tyler Smalley --- tasks/licenses_csv_report.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tasks/licenses_csv_report.js b/tasks/licenses_csv_report.js index 746195038379e..f57d48f54f978 100644 --- a/tasks/licenses_csv_report.js +++ b/tasks/licenses_csv_report.js @@ -20,6 +20,7 @@ import { writeFileSync } from 'fs'; import { resolve } from 'path'; import { getInstalledPackages } from '../src/dev/npm'; +import { engines } from '../package'; import { LICENSE_OVERRIDES } from '../src/dev/license_checker'; import { isNull, isUndefined } from 'lodash'; @@ -65,6 +66,24 @@ export default function licensesCSVReport(grunt) { dev, }); + packages.unshift( + { + name: 'Node.js', + version: engines.node, + repository: 'https://nodejs.org', + licenses: ['MIT'], + }, + { + name: 'Red Hat Universal Base Image minimal', + verion: '8', + repository: + 'https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8', + licenses: [ + 'Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf', + ], + } + ); + const csv = packages .map((pkg) => { const data = { From 6d0ddc34e65694ec173e3a8d34436fb0335ab76b Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Tue, 29 Sep 2020 07:20:02 -0700 Subject: [PATCH 2/3] Adds sourceURL column, required for UBI Signed-off-by: Tyler Smalley --- tasks/licenses_csv_report.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tasks/licenses_csv_report.js b/tasks/licenses_csv_report.js index f57d48f54f978..badd037f966fe 100644 --- a/tasks/licenses_csv_report.js +++ b/tasks/licenses_csv_report.js @@ -52,7 +52,7 @@ function formatCsvValues(fields, values) { export default function licensesCSVReport(grunt) { grunt.registerTask('licenses:csv_report', 'Report of 3rd party dependencies', async function () { - const fields = ['name', 'version', 'url', 'license']; + const fields = ['name', 'version', 'url', 'license', 'sourceURL']; const done = this.async(); try { @@ -81,6 +81,7 @@ export default function licensesCSVReport(grunt) { licenses: [ 'Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf', ], + sourceURL: 'https://oss-dependencies.elastic.co/redhat/ubi/ubi-minimal-8-source.tar.gz', } ); @@ -91,6 +92,7 @@ export default function licensesCSVReport(grunt) { version: pkg.version, url: pkg.repository || `https://www.npmjs.com/package/${pkg.name}`, license: pkg.licenses.join(','), + sourceURL: pkg.sourceURL, }; return formatCsvValues(fields, data); From fe83fcc9266b9726581ba93e4ebd2145dc9b8fff Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Wed, 30 Sep 2020 08:51:03 -0700 Subject: [PATCH 3/3] Update tasks/licenses_csv_report.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Maxime Gréau --- tasks/licenses_csv_report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/licenses_csv_report.js b/tasks/licenses_csv_report.js index badd037f966fe..f504cbcaa5fc8 100644 --- a/tasks/licenses_csv_report.js +++ b/tasks/licenses_csv_report.js @@ -75,7 +75,7 @@ export default function licensesCSVReport(grunt) { }, { name: 'Red Hat Universal Base Image minimal', - verion: '8', + version: '8', repository: 'https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8', licenses: [