Merge branch 'heila-license-go-fix' into 'master'v3.11.1

List go modules found in `mod.sum` including modules that do not end up in vendor directory

See merge request gitlab-org/security-products/license-management!161

4 files changed, 245 insertions, 14 deletions

diff --git a/spec/fixtures/expected/go/modules/v1.0.json b/spec/fixtures/expected/go/modules/v1.0.json
index 83fdbdd..1433dbf 100644
--- a/spec/fixtures/expected/go/modules/v1.0.json
+++ b/spec/fixtures/expected/go/modules/v1.0.json
@@ -1,25 +1,42 @@
 {
   "licenses": [
     {
-      "count": 3,
+      "count": 5,
       "name": "MIT"
     },
     {
+      "count": 2,
+      "name": "unknown"
+    },
+    {
       "count": 1,
       "name": "ISC"
     },
     {
       "count": 1,
-      "name": "New BSD"
+      "name": "MIT, Apache 2.0"
     },
     {
       "count": 1,
-      "name": "unknown"
+      "name": "New BSD"
     }
   ],
   "dependencies": [
     {
       "license": {
+        "name": "MIT",
+        "url": "http://opensource.org/licenses/mit-license"
+      },
+      "dependency": {
+        "name": "github.com/astaxie/beego",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
+    },
+    {
+      "license": {
         "name": "ISC",
         "url": "http://en.wikipedia.org/wiki/ISC_license"
       },
@@ -75,6 +92,19 @@
         "url": "http://opensource.org/licenses/mit-license"
       },
       "dependency": {
+        "name": "github.com/stretchr/objx",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
+    },
+    {
+      "license": {
+        "name": "MIT",
+        "url": "http://opensource.org/licenses/mit-license"
+      },
+      "dependency": {
         "name": "github.com/stretchr/testify",
         "description": "",
         "pathes": [
@@ -94,6 +124,31 @@
           "."
         ]
       }
+    },
+    {
+      "license": {
+        "name": "unknown"
+      },
+      "dependency": {
+        "name": "gopkg.in/check.v1",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
+    },
+    {
+      "license": {
+        "name": "MIT, Apache 2.0",
+        "url": "http://opensource.org/licenses/mit-license"
+      },
+      "dependency": {
+        "name": "gopkg.in/yaml.v2",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     }
   ]
 }
\ 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 3e0b543..6316bec 100644
--- a/spec/fixtures/expected/go/modules/v1.1.json
+++ b/spec/fixtures/expected/go/modules/v1.1.json
@@ -2,26 +2,49 @@
   "version": "1.1",
   "licenses": [
     {
-      "count": 3,
+      "count": 5,
       "name": "MIT"
     },
     {
+      "count": 2,
+      "name": "unknown"
+    },
+    {
       "count": 1,
       "name": "ISC"
     },
     {
       "count": 1,
-      "name": "New BSD"
+      "name": "MIT, Apache 2.0"
     },
     {
       "count": 1,
-      "name": "unknown"
+      "name": "New BSD"
     }
   ],
   "dependencies": [
     {
       "licenses": [
         {
+          "name": "MIT",
+          "url": "http://opensource.org/licenses/mit-license"
+        }
+      ],
+      "license": {
+        "name": "MIT",
+        "url": "http://opensource.org/licenses/mit-license"
+      },
+      "dependency": {
+        "name": "github.com/astaxie/beego",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
+    },
+    {
+      "licenses": [
+        {
           "name": "ISC",
           "url": "http://en.wikipedia.org/wiki/ISC_license"
         }
@@ -106,6 +129,25 @@
         "url": "http://opensource.org/licenses/mit-license"
       },
       "dependency": {
+        "name": "github.com/stretchr/objx",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
+    },
+    {
+      "licenses": [
+        {
+          "name": "MIT",
+          "url": "http://opensource.org/licenses/mit-license"
+        }
+      ],
+      "license": {
+        "name": "MIT",
+        "url": "http://opensource.org/licenses/mit-license"
+      },
+      "dependency": {
         "name": "github.com/stretchr/testify",
         "description": "",
         "pathes": [
@@ -131,6 +173,47 @@
           "."
         ]
       }
+    },
+    {
+      "licenses": [
+        {
+          "name": "unknown",
+          "url": ""
+        }
+      ],
+      "license": {
+        "name": "unknown"
+      },
+      "dependency": {
+        "name": "gopkg.in/check.v1",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
+    },
+    {
+      "licenses": [
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
+        {
+          "name": "MIT",
+          "url": "http://opensource.org/licenses/mit-license"
+        }
+      ],
+      "license": {
+        "name": "MIT, Apache 2.0",
+        "url": "http://opensource.org/licenses/mit-license"
+      },
+      "dependency": {
+        "name": "gopkg.in/yaml.v2",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     }
   ]
 }
\ 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 b7dfe00..0e60fb8 100644
--- a/spec/fixtures/expected/go/modules/v2.0.json
+++ b/spec/fixtures/expected/go/modules/v2.0.json
@@ -5,7 +5,19 @@
       "id": "MIT",
       "name": "MIT License",
       "url": "https://opensource.org/licenses/MIT",
-      "count": 3
+      "count": 6
+    },
+    {
+      "id": "unknown",
+      "name": "unknown",
+      "url": "",
+      "count": 2
+    },
+    {
+      "id": "Apache-2.0",
+      "name": "Apache License 2.0",
+      "url": "https://opensource.org/licenses/Apache-2.0",
+      "count": 1
     },
     {
       "id": "BSD-3-Clause",
@@ -18,16 +30,21 @@
       "name": "ISC License",
       "url": "https://opensource.org/licenses/ISC",
       "count": 1
-    },
-    {
-      "id": "unknown",
-      "name": "unknown",
-      "url": "",
-      "count": 1
     }
   ],
   "dependencies": [
     {
+      "name": "github.com/astaxie/beego",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "MIT"
+      ]
+    },
+    {
       "name": "github.com/davecgh/go-spew",
       "url": "",
       "description": "",
@@ -72,6 +89,17 @@
       ]
     },
     {
+      "name": "github.com/stretchr/objx",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "MIT"
+      ]
+    },
+    {
       "name": "github.com/stretchr/testify",
       "url": "",
       "description": "",
@@ -92,6 +120,29 @@
       "licenses": [
         "BSD-3-Clause"
       ]
+    },
+    {
+      "name": "gopkg.in/check.v1",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "unknown"
+      ]
+    },
+    {
+      "name": "gopkg.in/yaml.v2",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0",
+        "MIT"
+      ]
     }
   ]
 }
\ 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 f06fbd0..1782d06 100644
--- a/spec/fixtures/expected/go/modules/v2.1.json
+++ b/spec/fixtures/expected/go/modules/v2.1.json
@@ -2,6 +2,11 @@
   "version": "2.1",
   "licenses": [
     {
+      "id": "Apache-2.0",
+      "name": "Apache License 2.0",
+      "url": "https://opensource.org/licenses/Apache-2.0"
+    },
+    {
       "id": "BSD-3-Clause",
       "name": "BSD 3-Clause \"New\" or \"Revised\" License",
       "url": "https://opensource.org/licenses/BSD-3-Clause"
@@ -24,6 +29,15 @@
   ],
   "dependencies": [
     {
+      "name": "github.com/astaxie/beego",
+      "version": "v1.10.0",
+      "package_manager": "go",
+      "path": "go.sum",
+      "licenses": [
+        "MIT"
+      ]
+    },
+    {
       "name": "github.com/davecgh/go-spew",
       "version": "v1.1.1",
       "package_manager": "go",
@@ -60,6 +74,15 @@
       ]
     },
     {
+      "name": "github.com/stretchr/objx",
+      "version": "v0.1.1",
+      "package_manager": "go",
+      "path": "go.sum",
+      "licenses": [
+        "MIT"
+      ]
+    },
+    {
       "name": "github.com/stretchr/testify",
       "version": "v1.2.2",
       "package_manager": "go",
@@ -76,6 +99,25 @@
       "licenses": [
         "BSD-3-Clause"
       ]
+    },
+    {
+      "name": "gopkg.in/check.v1",
+      "version": "v0.0.0-20161208181325-20d25e280405",
+      "package_manager": "go",
+      "path": "go.sum",
+      "licenses": [
+        "unknown"
+      ]
+    },
+    {
+      "name": "gopkg.in/yaml.v2",
+      "version": "v2.2.2",
+      "package_manager": "go",
+      "path": "go.sum",
+      "licenses": [
+        "Apache-2.0",
+        "MIT"
+      ]
     }
   ]
-}
+}
\ No newline at end of file