Commit 9161bf3b authored by Will Meek's avatar Will Meek Committed by Mark Lapierre

Edit the licence scanning report to match the new format

Change gl-license-management-report.json
to gl-license-scanning-report.json
Ensure that it matches the schema
parent f0af9f07
{ {
"version": "2.0",
"licenses": [ "licenses": [
{ {
"count": 1, "id": "WTFPL",
"name": "WTFPL" "name": "WTFPL License",
"url": "http://www.wtfpl.net/",
"count": 1
} }
], ],
"dependencies": [ "dependencies": [
{ {
"license": {
"name": "WTFPL",
"url": "http://www.wtfpl.net/"
},
"dependency": {
"name": "wtfpl_init", "name": "wtfpl_init",
"licenses": [
"WTFPL"
],
"url": "https://rubygems.org/gems/wtfpl_init", "url": "https://rubygems.org/gems/wtfpl_init",
"description": "Download WTFPL license file and rename to LICENSE.md or something", "description": "Download WTFPL license file and rename to LICENSE.md or something",
"paths": [ "paths": [
"." "."
] ]
} }
}
] ]
} }
{ {
"licenses": [ "version": "2.0",
{ "licenses": [{
"count": 1, "id": "WTFPL",
"name": "WTFPL" "name": "WTFPL",
"url": "http://www.wtfpl.net/",
"count": 1
}, },
{ {
"count": 1, "id": "MIT",
"name": "MIT" "name": "MIT License",
"url": "https://opensource.org/licenses/MIT",
"count": 1
} }
], ],
"dependencies": [ "dependencies": [{
{ "name": "wtfpl_init",
"license": { "licenses": [
"name": "MIT", "WTFPL"
"url": "http://opensource.org/licenses/mit-license" ],
}, "url": "https://rubygems.org/gems/wtfpl_init",
"dependency": { "description": "Download WTFPL license file and rename to LICENSE.md or something",
"name": "actioncable",
"url": "http://rubyonrails.org",
"description": "WebSocket framework for Rails.",
"paths": [ "paths": [
"." "."
] ]
}
}, },
{ {
"license": { "name": "actioncable",
"name": "WTFPL", "licenses": [
"url": "http://www.wtfpl.net/" "MIT"
}, ],
"dependency": { "url": "http://rubyonrails.org",
"name": "wtfpl_init", "description": "WebSocket framework for Rails.",
"url": "https://rubygems.org/gems/wtfpl_init",
"description": "Download WTFPL license file and rename to LICENSE.md or something",
"paths": [ "paths": [
"." "."
] ]
} }
}
] ]
} }
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'pathname' require 'pathname'
module QA module QA
context 'Secure', :docker, :runner do context 'Secure', :docker, :runner, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/219519', type: :investigating } do
describe 'Security Reports in a Merge Request' do describe 'Security Reports in a Merge Request' do
let(:sast_vuln_count) { 5 } let(:sast_vuln_count) { 5 }
let(:dependency_scan_vuln_count) { 4 } let(:dependency_scan_vuln_count) { 4 }
......
...@@ -4,7 +4,7 @@ require 'pathname' ...@@ -4,7 +4,7 @@ require 'pathname'
module QA module QA
context 'Secure', :docker, :runner do context 'Secure', :docker, :runner do
let(:approved_license_name) { "MIT" } let(:approved_license_name) { "MIT License" }
let(:denied_license_name) { "WTFPL" } let(:denied_license_name) { "WTFPL" }
describe 'License Compliance settings page' do describe 'License Compliance settings page' do
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'pathname' require 'pathname'
module QA module QA
context 'Secure', :docker, :runner do context 'Secure', :docker, :runner, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/219519', type: :investigating } do
describe 'License merge request widget' do describe 'License merge request widget' do
let(:approved_license_name) { "MIT" } let(:approved_license_name) { "MIT" }
let(:blacklisted_license_name) { "Zlib" } let(:blacklisted_license_name) { "Zlib" }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'pathname' require 'pathname'
module QA module QA
context 'Secure', :docker, :runner do context 'Secure', :docker, :runner, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/219519', type: :investigating } do
describe 'Security Reports in a Merge Request' do describe 'Security Reports in a Merge Request' do
let(:sast_vuln_count) { 5 } let(:sast_vuln_count) { 5 }
let(:dependency_scan_vuln_count) { 4 } let(:dependency_scan_vuln_count) { 4 }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment