Skip to content

Commit fbc2c89

Browse files
authored
Merge pull request #63 from blakerouse/add-notice
Add notice.txt generation.
2 parents 079207f + 9666c3a commit fbc2c89

File tree

7 files changed

+39871
-0
lines changed

7 files changed

+39871
-0
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ bin/
88
build/
99

1010
fleet-server
11+
fleet_server
1112
fleet-server.dev.yml

Makefile

+14
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ check: ## - Run all checks
5454
@$(MAKE) generate
5555
@$(MAKE) check-headers
5656
@$(MAKE) check-go
57+
@$(MAKE) notice
5758
@$(MAKE) check-no-changes
5859

5960
.PHONY: check-headers
@@ -67,6 +68,19 @@ check-go: ## - Run go fmt, go vet, go mod tidy
6768
@go vet ./...
6869
@go mod tidy
6970

71+
.PHONY: notice
72+
notice: ## - Generates the NOTICE.txt file.
73+
@echo "Generating NOTICE.txt"
74+
@go mod tidy
75+
@go mod download
76+
go list -m -json all | go run go.elastic.co/go-licence-detector \
77+
-includeIndirect \
78+
-rules dev-tools/notice/rules.json \
79+
-overrides dev-tools/notice/overrides.json \
80+
-noticeTemplate dev-tools/notice/NOTICE.txt.tmpl \
81+
-noticeOut NOTICE.txt \
82+
-depsOut ""
83+
7084
.PHONY: check-no-changes
7185
check-no-changes:
7286
@git diff | cat

NOTICE.txt

+39,788
Large diffs are not rendered by default.

dev-tools/notice/NOTICE.txt.tmpl

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{{- define "depInfo" -}}
2+
{{- range $i, $dep := . }}
3+
{{ "-" | line }}
4+
Dependency : {{ $dep.Name }}
5+
Version: {{ $dep.Version }}
6+
Licence type (autodetected): {{ $dep.LicenceType }}
7+
{{ "-" | line }}
8+
9+
{{ $dep | licenceText }}
10+
{{ end }}
11+
{{- end -}}
12+
13+
Elastic Beats
14+
Copyright 2014-{{ currentYear }} Elasticsearch BV
15+
16+
This product includes software developed by The Apache Software
17+
Foundation (http://www.apache.org/).
18+
19+
{{ "=" | line }}
20+
Third party libraries used by the Elastic Beats project:
21+
{{ "=" | line }}
22+
23+
{{ template "depInfo" .Direct }}
24+
25+
{{ if .Indirect }}
26+
{{ "=" | line }}
27+
Indirect dependencies
28+
29+
{{ template "depInfo" .Indirect }}
30+
{{ end }}

dev-tools/notice/overrides.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{"name": "github.com/chzyer/logex", "licenceType": "MIT"}
2+
{"name": "github.com/elastic/beats/v7", "licenceType": "Elastic"}
3+
{"name": "github.com/elastic/elastic-agent-client/v7", "licenceType": "Elastic"}
4+
{"name": "github.com/gorhill/cronexpr", "licenceType": "Apache-2.0"}
5+
{"name": "github.com/kr/logfmt", "licenceType": "MIT"}
6+
{"name": "github.com/miekg/dns", "licenceType": "BSD-3-Clause"}
7+
{"name": "github.com/munnerz/goautoneg", "licenceType": "BSD-3-Clause"}
8+
{"name": "github.com/samuel/go-parser", "licenceType": "BSD-3-Clause"}
9+
{"name": "github.com/urso/magetools", "licenceType": "Apache-2.0"}
10+
{"name": "github.com/xeipuuv/gojsonpointer", "licenceType": "Apache-2.0"}
11+
{"name": "github.com/xeipuuv/gojsonreference", "licenceType": "Apache-2.0"}
12+
{"name": "github.com/xeipuuv/gojsonschema", "licenceType": "Apache-2.0"}

dev-tools/notice/rules.json

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"allowlist": [
3+
"Apache-2.0",
4+
"BSD",
5+
"BSD-2-Clause",
6+
"BSD-2-Clause-FreeBSD",
7+
"BSD-3-Clause",
8+
"Elastic",
9+
"ISC",
10+
"MIT",
11+
"MPL-2.0",
12+
"Public Domain",
13+
"Zlib"
14+
],
15+
"maybelist": [
16+
"EPL-1.0",
17+
"GPL-3.0"
18+
]
19+
}

go.sum

+7
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+
107107
github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
108108
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
109109
github.com/cucumber/godog v0.8.1/go.mod h1:vSh3r/lM+psC1BPXvdkSEuNjmXfpVqrMGYAElF6hxnA=
110+
github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
110111
github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
111112
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
112113
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -197,6 +198,7 @@ github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5Nq
197198
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
198199
github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
199200
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
201+
github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI=
200202
github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
201203
github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be/go.mod h1:/oj50ZdPq/cUjA02lMZhijk5kR31SEydKyqah1OgBuo=
202204
github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
@@ -242,6 +244,7 @@ github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO
242244
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
243245
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
244246
github.com/google/gopacket v1.1.18-0.20191009163724-0ad7f2610e34/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
247+
github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0 h1:OggOMmdI0JLwg1FkOKH9S7fVHF0oEm8PX6S8kAdpOps=
245248
github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M=
246249
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
247250
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -314,6 +317,7 @@ github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4d
314317
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
315318
github.com/justinas/nosurf v1.1.0/go.mod h1:ALpWdSbuNGy2lZWtyXdjkYv4edL23oSEgfBT1gPJ5BQ=
316319
github.com/kardianos/service v1.1.0/go.mod h1:RrJI2xn5vve/r32U5suTbeaSGoMU6GbNPoj36CVYcHc=
320+
github.com/karrick/godirwalk v1.15.6 h1:Yf2mmR8TJy+8Fa0SuQVto5SYap6IF7lNVX4Jdl8G1qA=
317321
github.com/karrick/godirwalk v1.15.6/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
318322
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
319323
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
@@ -336,6 +340,7 @@ github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXq
336340
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
337341
github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
338342
github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
343+
github.com/markbates/pkger v0.17.0 h1:RFfyBPufP2V6cddUyyEVSHBpaAnM1WzaMNyqomeT+iY=
339344
github.com/markbates/pkger v0.17.0/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
340345
github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod h1:Ah2dBMoxZEqk118as2T4u4fjfXarE0pPnMJaArZQZsI=
341346
github.com/mattn/go-colorable v0.0.8/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -427,6 +432,7 @@ github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522/go.mod h1:tQTYKOQg
427432
github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHiuO9LYd+cIxzgEHCQI4=
428433
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
429434
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
435+
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
430436
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
431437
github.com/shirou/gopsutil v2.19.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
432438
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@@ -491,6 +497,7 @@ go.elastic.co/ecszap v0.3.0 h1:Zo/Y4sJLqbWDlqCHI4F4Lzeg0Fs4+n5ldVis4h9xV8w=
491497
go.elastic.co/ecszap v0.3.0/go.mod h1:HTUi+QRmr3EuZMqxPX+5fyOdMNfUu5iPebgfhgsTJYQ=
492498
go.elastic.co/fastjson v1.0.0/go.mod h1:PmeUOMMtLHQr9ZS9J9owrAVg0FkaZDRZJEFTTGHtchs=
493499
go.elastic.co/fastjson v1.1.0/go.mod h1:boNGISWMjQsUPy/t6yqt2/1Wx4YNPSe+mZjlyw9vKKI=
500+
go.elastic.co/go-licence-detector v0.4.0 h1:it5dP+6LPxLsosdhtbAqk/zJQxzS0QSSpdNkKVuwKMs=
494501
go.elastic.co/go-licence-detector v0.4.0/go.mod h1:fSJQU8au4SAgDK+UQFbgUPsXKYNBDv4E/dwWevrMpXU=
495502
go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
496503
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=

0 commit comments

Comments
 (0)