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": [
{
"count": 1,
"name": "WTFPL"
"id": "WTFPL",
"name": "WTFPL License",
"url": "http://www.wtfpl.net/",
"count": 1
}
],
"dependencies": [
{
"license": {
"name": "WTFPL",
"url": "http://www.wtfpl.net/"
},
"dependency": {
"name": "wtfpl_init",
"url": "https://rubygems.org/gems/wtfpl_init",
"description": "Download WTFPL license file and rename to LICENSE.md or something",
"paths": [
"."
]
}
"name": "wtfpl_init",
"licenses": [
"WTFPL"
],
"url": "https://rubygems.org/gems/wtfpl_init",
"description": "Download WTFPL license file and rename to LICENSE.md or something",
"paths": [
"."
]
}
]
}
{
"licenses": [
{
"count": 1,
"name": "WTFPL"
},
{
"count": 1,
"name": "MIT"
}
"version": "2.0",
"licenses": [{
"id": "WTFPL",
"name": "WTFPL",
"url": "http://www.wtfpl.net/",
"count": 1
},
{
"id": "MIT",
"name": "MIT License",
"url": "https://opensource.org/licenses/MIT",
"count": 1
}
],
"dependencies": [
{
"license": {
"name": "MIT",
"url": "http://opensource.org/licenses/mit-license"
},
"dependency": {
"name": "actioncable",
"url": "http://rubyonrails.org",
"description": "WebSocket framework for Rails.",
"paths": [
"."
]
}
},
{
"license": {
"name": "WTFPL",
"url": "http://www.wtfpl.net/"
},
"dependency": {
"name": "wtfpl_init",
"url": "https://rubygems.org/gems/wtfpl_init",
"description": "Download WTFPL license file and rename to LICENSE.md or something",
"paths": [
"."
]
}
}
"dependencies": [{
"name": "wtfpl_init",
"licenses": [
"WTFPL"
],
"url": "https://rubygems.org/gems/wtfpl_init",
"description": "Download WTFPL license file and rename to LICENSE.md or something",
"paths": [
"."
]
},
{
"name": "actioncable",
"licenses": [
"MIT"
],
"url": "http://rubyonrails.org",
"description": "WebSocket framework for Rails.",
"paths": [
"."
]
}
]
}
}
......@@ -3,7 +3,7 @@
require 'pathname'
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
let(:sast_vuln_count) { 5 }
let(:dependency_scan_vuln_count) { 4 }
......
......@@ -4,7 +4,7 @@ require 'pathname'
module QA
context 'Secure', :docker, :runner do
let(:approved_license_name) { "MIT" }
let(:approved_license_name) { "MIT License" }
let(:denied_license_name) { "WTFPL" }
describe 'License Compliance settings page' do
......
......@@ -3,7 +3,7 @@
require 'pathname'
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
let(:approved_license_name) { "MIT" }
let(:blacklisted_license_name) { "Zlib" }
......
......@@ -3,7 +3,7 @@
require 'pathname'
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
let(:sast_vuln_count) { 5 }
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