Skip to content

Commit b797df5

Browse files
committed
autogen: update license overview
1 parent 33792b0 commit b797df5

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

.bin/license-engine.sh

+7
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ALLOWED_LICENSES=(
2424
'BSD-3-Clause'
2525
'(BSD-3-Clause OR GPL-2.0)'
2626
'BSD-3-Clause OR MIT'
27+
'(BSD-3-Clause AND Apache-2.0)'
2728
'CC0-1.0'
2829
'CC-BY-3.0'
2930
'CC-BY-4.0'
@@ -73,6 +74,12 @@ APPROVED_MODULES=(
7374
'github.com/jmespath/go-jmespath' # Apache-2.0 https://github.com/jmespath/go-jmespath/blob/master/LICENSE
7475
'github.com/ory/keto/proto/ory/keto/opl/v1alpha1' # Apache-2.0 - submodule of keto
7576
'github.com/ory/keto/proto/ory/keto/relation_tuples/v1alpha2' # Apache-2.0 - submodule of keto
77+
'@ory-corp/.*' # Ory IP
78+
'github.com/apache/arrow/.*' # Apache-2.0 https://github.com/apache/arrow/blob/main/LICENSE.txt
79+
'github.com/ory-corp/webhook-target' # Ory IP
80+
'@ory/keto-grpc-client.*' # Apache-2.0 - submodule of keto
81+
'[email protected]' # MIT: https://github.com/Rich-Harris/golden-fleece/blob/master/LICENSE
82+
'github.com/gogo/googleapis/.*' # Apache-2.0 https://github.com/gogo/googleapis/blob/master/LICENSE
7683
)
7784

7885
# These lines in the output should be ignored (plain text, no regex).

.bin/list-licenses

+5-7
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ bin_dir="$(cd "$(dirname "$0")" && pwd)"
66
# list Node licenses
77
if [ -f package.json ]; then
88
if jq -e '.dependencies and (.dependencies | keys | length > 0)' package.json >/dev/null; then
9-
npm install >/dev/null 2>&1
10-
npm exec --yes license-checker -- --production --csv --excludePrivatePackages --customPath "${bin_dir}"/license-template-node.json | grep -v '^$'
11-
{ echo; } 2>/dev/null
9+
npx --yes license-checker --production --csv --excludePrivatePackages --customPath "${bin_dir}"/license-template-node.json | grep -v '^$'
10+
echo
1211
else
1312
echo "No dependencies found in package.json" >&2
14-
{ echo; } 2>/dev/null
13+
echo
1514
fi
1615
fi
1716

@@ -26,15 +25,14 @@ if [ -f go.mod ]; then
2625
sort -u |
2726
awk -F/ '{ if ($1 == "github.com" && NF >= 3) { print $1"/"$2"/"$3 } else { print } }' |
2827
sort -u
29-
{ echo; } 2>/dev/null
3028
)
3129
if [ -z "$go_modules" ]; then
3230
echo "No Go modules found" >&2
3331
else
3432
# Workaround until https://github.com/google/go-licenses/issues/307 is fixed
3533
# .bin/go-licenses report "$module_name" --template .bin/license-template-go.tpl 2>/dev/null
3634
#
37-
echo "$go_modules" | xargs -I {} sh -c '.bin/go-licenses report --template .bin/license-template-go.tpl {}' 2>/dev/null | grep -v '^$'
38-
{ echo; } 2>/dev/null
35+
echo "$go_modules" | xargs -I {} sh -c '.bin/go-licenses report --template .bin/license-template-go.tpl {}' | grep -v '^$'
36+
echo
3937
fi
4038
fi

0 commit comments

Comments
 (0)