Skip to content
This repository was archived by the owner on Nov 7, 2025. It is now read-only.

Commit baf5e6a

Browse files
authored
Licenses fix (#1515)
Our internal dependency (`github.com/QuesmaOrg/quesma/platform`) has been failing the `NOTICE.MD` generation job after we dissected `cmd` and `platform` modules. Since it's our internal dependency (separate module) under Elastic 2.0 license and `go-license-detector` was not able to figure out license type based on license file in the module directory, I had to work this around by creating "phantom" license type of `QUESMA_CODEBASE_UNDER_ELASTIC_2.0_LICENSE` and put it in license allowlist. We did not wanted to have SPDX-compliant `Elastic-2.0` license name in our allowlist as we don't want any of the dependencies using this type of license.
1 parent 4438739 commit baf5e6a

File tree

11 files changed

+8442
-3124
lines changed

11 files changed

+8442
-3124
lines changed

.github/notice-generator/go-licence-detector/overrides.ndjson

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
{"name": "github.com/mrjones/oauth", "licenceFile": "MIT-LICENSE.txt"}
44
{"name": "github.com/xeipuuv/gojsonpointer", "licenceFile": "LICENSE-APACHE-2.0.txt"}
55
{"name": "github.com/xeipuuv/gojsonreference", "licenceFile": "LICENSE-APACHE-2.0.txt"}
6-
{"name": "github.com/xeipuuv/gojsonschema", "licenceFile": "LICENSE-APACHE-2.0.txt"}
6+
{"name": "github.com/xeipuuv/gojsonschema", "licenceFile": "LICENSE-APACHE-2.0.txt"}
7+
{"name": "github.com/QuesmaOrg/quesma/platform", "licenceType": "QUESMA_CODEBASE_UNDER_ELASTIC_2.0_LICENSE"}
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"_comment": "This is the stock rules.json file (https://github.com/elastic/go-licence-detector/blob/master/assets/rules.json) but with added Unlicense",
2+
"_comment": "This is the stock rules.json file (https://github.com/elastic/go-licence-detector/blob/master/assets/rules.json) but with added Unlicense. Additionally, we had to add `QUESMA_CODEBASE_UNDER_ELASTIC_2.0_LICENSE` license type for our internal dependency as go-license-detector failed to detect it correctly, more in https://github.com/QuesmaOrg/quesma/pull/1515",
33
"allowlist": [
44
"Apache-2.0",
55
"BSD-2-Clause",
@@ -9,7 +9,9 @@
99
"MPL-2.0",
1010
"Public Domain",
1111
"CC0-1.0",
12-
12+
13+
"QUESMA_CODEBASE_UNDER_ELASTIC_2.0_LICENSE",
14+
1315
"Unlicense"
1416
]
1517
}

NOTICE.MD

Lines changed: 6840 additions & 3116 deletions
Large diffs are not rendered by default.

bin/unjson-dashboards/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ go 1.23.2
44

55
require (
66
github.com/brianvoe/gofakeit/v7 v7.1.2
7-
github.com/gorilla/websocket v1.5.3
7+
github.com/chromedp/chromedp v0.12.1
88
github.com/k0kubun/pp v3.0.1+incompatible
99
)
1010

1111
require (
1212
github.com/chromedp/cdproto v0.0.0-20250120090109-d38428e4d9c8 // indirect
13-
github.com/chromedp/chromedp v0.12.1 // indirect
1413
github.com/chromedp/sysutil v1.1.0 // indirect
1514
github.com/gobwas/httphead v0.1.0 // indirect
1615
github.com/gobwas/pool v0.2.1 // indirect

bin/unjson-dashboards/go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,22 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
1212
github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
1313
github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
1414
github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
15-
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
16-
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
1715
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
1816
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
1917
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM=
2018
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
2119
github.com/k0kubun/pp v3.0.1+incompatible h1:3tqvf7QgUnZ5tXO6pNAZlrvHgl6DvifjDrd9g2S9Z40=
2220
github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg=
21+
github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=
22+
github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
2323
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
2424
github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
2525
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
2626
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
2727
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
2828
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
29+
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde h1:x0TT0RDC7UhAVbbWWBzr41ElhJx5tXPWkIHA2HWPRuw=
30+
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
2931
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3032
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
3133
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

ci/it/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ go 1.24.0
55
require (
66
github.com/ClickHouse/clickhouse-go/v2 v2.20.0
77
github.com/docker/docker v27.1.1+incompatible
8+
github.com/docker/go-connections v0.5.0
89
github.com/stretchr/testify v1.9.0
910
github.com/testcontainers/testcontainers-go v0.33.0
1011
)
@@ -22,7 +23,6 @@ require (
2223
github.com/cpuguy83/dockercfg v0.3.1 // indirect
2324
github.com/davecgh/go-spew v1.1.1 // indirect
2425
github.com/distribution/reference v0.6.0 // indirect
25-
github.com/docker/go-connections v0.5.0 // indirect
2626
github.com/docker/go-units v0.5.0 // indirect
2727
github.com/felixge/httpsnoop v1.0.4 // indirect
2828
github.com/go-faster/city v1.0.1 // indirect

0 commit comments

Comments
 (0)