From 6ae2146a755c1410a1d7955bc284406f674fb935 Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Mon, 21 Jun 2021 16:06:10 +0200 Subject: [PATCH] Fix UBI source URL (#13008) This commit fix the source URL for UBI image to ensure that it stays consistent with the URL generated in https://artifacts.elastic.co/reports/dependencies/dependencies-current.html --- logstash-core/lib/logstash/dependency_report.rb | 2 +- .../dependencies-report/src/main/resources/licenseMapping.csv | 2 +- .../dependencies-report/src/test/resources/expectedOutput.txt | 2 +- .../src/test/resources/licenseMapping-conflicting.csv | 2 +- .../src/test/resources/licenseMapping-good.csv | 2 +- .../src/test/resources/licenseMapping-missing.csv | 2 +- .../src/test/resources/licenseMapping-missingNotices.csv | 3 +-- .../src/test/resources/licenseMapping-missingUrls.csv | 2 +- .../src/test/resources/licenseMapping-unacceptable.csv | 2 +- .../src/test/resources/rubyDependencies.csv | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/logstash-core/lib/logstash/dependency_report.rb b/logstash-core/lib/logstash/dependency_report.rb index 5077d2b167a..3dfdcdfca00 100644 --- a/logstash-core/lib/logstash/dependency_report.rb +++ b/logstash-core/lib/logstash/dependency_report.rb @@ -31,7 +31,7 @@ class LogStash::DependencyReport < Clamp::Command OTHER_DEPENDENCIES = [ ["jruby", "", "http://jruby.org", "EPL-2.0"], - ["Red Hat Universal Base Image minimal","8","https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8","Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf","","https://oss-dependencies.elastic.co/redhat/ubi/ubi-minimal-8-source.tar.gz"] + ["Red Hat Universal Base Image minimal","8","https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8","Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf","","https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz"] ] def execute diff --git a/tools/dependencies-report/src/main/resources/licenseMapping.csv b/tools/dependencies-report/src/main/resources/licenseMapping.csv index cc0510dab08..ac577a9316b 100644 --- a/tools/dependencies-report/src/main/resources/licenseMapping.csv +++ b/tools/dependencies-report/src/main/resources/licenseMapping.csv @@ -121,7 +121,7 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL "rack-protection:",http://github.com/rkh/rack-protection,MIT "rack:",http://rack.github.io/,MIT "rake:",https://github.com/ruby/rake,MIT -"Red Hat Universal Base Image minimal:",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/redhat/ubi/ubi-minimal-8-source.tar.gz +"Red Hat Universal Base Image minimal:",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz "redis:",https://github.com/redis/redis-rb,MIT "ruby-progressbar:",https://github.com/jfelchner/ruby-progressbar,MIT "rubyzip:",https://github.com/rubyzip/rubyzip,BSD-2-Clause-FreeBSD diff --git a/tools/dependencies-report/src/test/resources/expectedOutput.txt b/tools/dependencies-report/src/test/resources/expectedOutput.txt index 24bf61b018c..f01eaa82193 100644 --- a/tools/dependencies-report/src/test/resources/expectedOutput.txt +++ b/tools/dependencies-report/src/test/resources/expectedOutput.txt @@ -1,5 +1,5 @@ name,version,revision,url,license,copyright,sourceURL -Red Hat Universal Base Image minimal,8,,https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/redhat/ubi/ubi-minimal-8-source.tar.gz +Red Hat Universal Base Image minimal,8,,https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz bundler,1.16.1,,https://rubygems.org/gems/bundler/versions/1.16.0,UnacceptableLicense|MIT,, com.fasterxml.jackson.core:jackson-core,2.7.3,,https://github.com/FasterXML/jackson-core/tree/jackson-core-2.7.3,Apache-2.0,, com.google.errorprone:javac-shaded,9-dev-r4023-3,,http://repo1.maven.org/maven2/com/google/errorprone/javac-shaded/9-dev-r4023-3/,EPL-1.0,, diff --git a/tools/dependencies-report/src/test/resources/licenseMapping-conflicting.csv b/tools/dependencies-report/src/test/resources/licenseMapping-conflicting.csv index c1d9ef94993..b14501f4819 100644 --- a/tools/dependencies-report/src/test/resources/licenseMapping-conflicting.csv +++ b/tools/dependencies-report/src/test/resources/licenseMapping-conflicting.csv @@ -61,4 +61,4 @@ dependency,dependencyUrl,licenseOverride "junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0 "json-generator",https://github.com/flori/json,Ruby "tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross -"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/redhat/ubi/ubi-minimal-8-source.tar.gz +"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz diff --git a/tools/dependencies-report/src/test/resources/licenseMapping-good.csv b/tools/dependencies-report/src/test/resources/licenseMapping-good.csv index bffbd8b09ed..db850b7d307 100644 --- a/tools/dependencies-report/src/test/resources/licenseMapping-good.csv +++ b/tools/dependencies-report/src/test/resources/licenseMapping-good.csv @@ -59,4 +59,4 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL "junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0 "json-generator",https://github.com/flori/json,Ruby "tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross -"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/redhat/ubi/ubi-minimal-8-source.tar.gz +"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz diff --git a/tools/dependencies-report/src/test/resources/licenseMapping-missing.csv b/tools/dependencies-report/src/test/resources/licenseMapping-missing.csv index 6a4e5cdbc9a..7f6814cc7c9 100644 --- a/tools/dependencies-report/src/test/resources/licenseMapping-missing.csv +++ b/tools/dependencies-report/src/test/resources/licenseMapping-missing.csv @@ -60,4 +60,4 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL "junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0 "json-generator",https://github.com/flori/json,Ruby "tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross -"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/redhat/ubi/ubi-minimal-8-source.tar.gz +"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz diff --git a/tools/dependencies-report/src/test/resources/licenseMapping-missingNotices.csv b/tools/dependencies-report/src/test/resources/licenseMapping-missingNotices.csv index 138517a882b..cf20fe889c2 100644 --- a/tools/dependencies-report/src/test/resources/licenseMapping-missingNotices.csv +++ b/tools/dependencies-report/src/test/resources/licenseMapping-missingNotices.csv @@ -62,5 +62,4 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL "junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0 "json-generator",https://github.com/flori/json,Ruby "tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross -"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/redhat/ubi/ubi-minimal-8-source.tar.gz - +"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz diff --git a/tools/dependencies-report/src/test/resources/licenseMapping-missingUrls.csv b/tools/dependencies-report/src/test/resources/licenseMapping-missingUrls.csv index a08d135dfcd..78c2be4b2c2 100644 --- a/tools/dependencies-report/src/test/resources/licenseMapping-missingUrls.csv +++ b/tools/dependencies-report/src/test/resources/licenseMapping-missingUrls.csv @@ -60,4 +60,4 @@ dependency,dependencyUrl,licenseOverride "junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0 "json-generator",https://github.com/flori/json,Ruby "tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross -"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/redhat/ubi/ubi-minimal-8-source.tar.gz +"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz diff --git a/tools/dependencies-report/src/test/resources/licenseMapping-unacceptable.csv b/tools/dependencies-report/src/test/resources/licenseMapping-unacceptable.csv index 495d3b83023..7688b3dd0db 100644 --- a/tools/dependencies-report/src/test/resources/licenseMapping-unacceptable.csv +++ b/tools/dependencies-report/src/test/resources/licenseMapping-unacceptable.csv @@ -57,4 +57,4 @@ dependency,dependencyUrl,licenseOverride "junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0 "json-generator",https://github.com/flori/json,Ruby "tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross -"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/redhat/ubi/ubi-minimal-8-source.tar.gz +"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz diff --git a/tools/dependencies-report/src/test/resources/rubyDependencies.csv b/tools/dependencies-report/src/test/resources/rubyDependencies.csv index 4ac926f7be9..5678d1bddfd 100644 --- a/tools/dependencies-report/src/test/resources/rubyDependencies.csv +++ b/tools/dependencies-report/src/test/resources/rubyDependencies.csv @@ -14,4 +14,4 @@ control.js,,,MIT,, json-generator,,https://github.com/flori/json,Ruby,, json-parser,,https://github.com/flori/json,Ruby,, tzinfo,,https://github.com/tzinfo/tzinfo,MIT,Philip Ross, -Red Hat Universal Base Image minimal,8,https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/redhat/ubi/ubi-minimal-8-source.tar.gz \ No newline at end of file +Red Hat Universal Base Image minimal,8,https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz