From ac29038281aaa0a4cc3956fed41dba024d874792 Mon Sep 17 00:00:00 2001 From: mo khan Date: Wed, 21 Oct 2020 11:40:51 -0600 Subject: Update go modules fixture files Caused by: * https://gitlab.com/gitlab-org/security-products/tests/go-modules/-/merge_requests/59 --- spec/fixtures/expected/go/modules/v1.0.json | 45 ++++++++++++++++++++- spec/fixtures/expected/go/modules/v1.1.json | 63 ++++++++++++++++++++++++++++- spec/fixtures/expected/go/modules/v2.0.json | 47 +++++++++++++++++---- spec/fixtures/expected/go/modules/v2.1.json | 31 +++++++++++++- 4 files changed, 175 insertions(+), 11 deletions(-) diff --git a/spec/fixtures/expected/go/modules/v1.0.json b/spec/fixtures/expected/go/modules/v1.0.json index 4902d39..6efbe72 100644 --- a/spec/fixtures/expected/go/modules/v1.0.json +++ b/spec/fixtures/expected/go/modules/v1.0.json @@ -4,6 +4,10 @@ "count": 5, "name": "MIT" }, + { + "count": 3, + "name": "Apache 2.0" + }, { "count": 2, "name": "New BSD" @@ -61,6 +65,45 @@ ] } }, + { + "license": { + "name": "Apache 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" + }, + "dependency": { + "name": "github.com/minio/minio", + "description": "", + "pathes": [ + "." + ] + } + }, + { + "license": { + "name": "Apache 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" + }, + "dependency": { + "name": "github.com/minio/minio-go", + "description": "", + "pathes": [ + "." + ] + } + }, + { + "license": { + "name": "Apache 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" + }, + "dependency": { + "name": "github.com/minio/sha256-simd", + "description": "", + "pathes": [ + "." + ] + } + }, { "license": { "name": "New BSD", @@ -153,4 +196,4 @@ } } ] -} +} \ No newline at end of file diff --git a/spec/fixtures/expected/go/modules/v1.1.json b/spec/fixtures/expected/go/modules/v1.1.json index f0b9112..cf53d87 100644 --- a/spec/fixtures/expected/go/modules/v1.1.json +++ b/spec/fixtures/expected/go/modules/v1.1.json @@ -5,6 +5,10 @@ "count": 5, "name": "MIT" }, + { + "count": 3, + "name": "Apache 2.0" + }, { "count": 2, "name": "New BSD" @@ -80,6 +84,63 @@ ] } }, + { + "licenses": [ + { + "name": "Apache 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" + } + ], + "license": { + "name": "Apache 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" + }, + "dependency": { + "name": "github.com/minio/minio", + "description": "", + "pathes": [ + "." + ] + } + }, + { + "licenses": [ + { + "name": "Apache 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" + } + ], + "license": { + "name": "Apache 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" + }, + "dependency": { + "name": "github.com/minio/minio-go", + "description": "", + "pathes": [ + "." + ] + } + }, + { + "licenses": [ + { + "name": "Apache 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" + } + ], + "license": { + "name": "Apache 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" + }, + "dependency": { + "name": "github.com/minio/sha256-simd", + "description": "", + "pathes": [ + "." + ] + } + }, { "licenses": [ { @@ -218,4 +279,4 @@ } } ] -} +} \ No newline at end of file diff --git a/spec/fixtures/expected/go/modules/v2.0.json b/spec/fixtures/expected/go/modules/v2.0.json index 49289a8..a4fc766 100644 --- a/spec/fixtures/expected/go/modules/v2.0.json +++ b/spec/fixtures/expected/go/modules/v2.0.json @@ -7,18 +7,18 @@ "url": "https://opensource.org/licenses/MIT", "count": 6 }, + { + "id": "Apache-2.0", + "name": "Apache License 2.0", + "url": "https://opensource.org/licenses/Apache-2.0", + "count": 4 + }, { "id": "BSD-3-Clause", "name": "BSD 3-Clause \"New\" or \"Revised\" License", "url": "https://opensource.org/licenses/BSD-3-Clause", "count": 2 }, - { - "id": "Apache-2.0", - "name": "Apache License 2.0", - "url": "https://opensource.org/licenses/Apache-2.0", - "count": 1 - }, { "id": "BSD-2-Clause", "name": "BSD 2-Clause \"Simplified\" License", @@ -66,6 +66,39 @@ "MIT" ] }, + { + "name": "github.com/minio/minio", + "url": "", + "description": "", + "paths": [ + "." + ], + "licenses": [ + "Apache-2.0" + ] + }, + { + "name": "github.com/minio/minio-go", + "url": "", + "description": "", + "paths": [ + "." + ], + "licenses": [ + "Apache-2.0" + ] + }, + { + "name": "github.com/minio/sha256-simd", + "url": "", + "description": "", + "paths": [ + "." + ], + "licenses": [ + "Apache-2.0" + ] + }, { "name": "github.com/pmezard/go-difflib", "url": "", @@ -145,4 +178,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/spec/fixtures/expected/go/modules/v2.1.json b/spec/fixtures/expected/go/modules/v2.1.json index c86fe8e..e4119cb 100644 --- a/spec/fixtures/expected/go/modules/v2.1.json +++ b/spec/fixtures/expected/go/modules/v2.1.json @@ -55,6 +55,33 @@ "MIT" ] }, + { + "name": "github.com/minio/minio", + "version": "v0.0.0-20180419184637-5a16671f721f", + "package_manager": "go", + "path": "go.sum", + "licenses": [ + "Apache-2.0" + ] + }, + { + "name": "github.com/minio/minio-go", + "version": "v6.0.14+incompatible", + "package_manager": "go", + "path": "go.sum", + "licenses": [ + "Apache-2.0" + ] + }, + { + "name": "github.com/minio/sha256-simd", + "version": "v0.1.1", + "package_manager": "go", + "path": "go.sum", + "licenses": [ + "Apache-2.0" + ] + }, { "name": "github.com/pmezard/go-difflib", "version": "v1.0.0", @@ -93,7 +120,7 @@ }, { "name": "golang.org/x/sys", - "version": "v0.0.0-20190422165155-953cdadca894", + "version": "v0.0.0-20191026070338-33540a1f6037", "package_manager": "go", "path": "go.sum", "licenses": [ @@ -120,4 +147,4 @@ ] } ] -} +} \ No newline at end of file -- cgit v1.2.3