Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions build/scripts/clear-defined-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ declare -A replaced_modules=(
["go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0"]="github.com/open-telemetry/opentelemetry-go-contrib v1.35.0"
# https://github.com/census-instrumentation/opencensus-go/commits/v0.23.0/
["go.opencensus.io v0.23.0"]="census-instrumentation/opencensus-go 49838f207d61097fc0ebb8aeef306913388376ca"
# https://github.com/census-instrumentation/opencensus-go/commits/v0.24.0/
["go.opencensus.io v0.24.0"]="census-instrumentation/opencensus-go b1a01ee95db0e690d91d7193d037447816fae4c5"
# https://github.com/sean-/seed/tree/e2103e2c35297fb7e17febb81e49b312087a2372
["github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"]="sean-/seed e2103e2c35297fb7e17febb81e49b312087a2372"
)
Expand All @@ -90,6 +92,7 @@ declare -A replaced_modules=(
declare -A replaced_paths=(
["go.starlark.net"]="github.com/google/starlark-go"
["gotest.tools"]="github.com/gotestyourself/gotest.tools"
["gioui.org"]="github.com/gioui/gio"
)

# replaces to have a correct link for clearlydefined.io api request
Expand All @@ -101,15 +104,11 @@ declare -A replaced_api_suffix=(
# Exceptions for dependencies that are not yet harvested in clearlydefined.io
# License must be checked manually
declare -A ignored_paths=(
["github.com/devfile/devworkspace-operator"]="Harvesting in progress"
["go.etcd.io/etcd/pkg/v3"]="Harvesting in progress"
["go.etcd.io/etcd/server/v3"]="Harvesting in progress"
["github.com/decred/dcrd/dcrec/secp256k1/v4"]="Harvesting is in progress"
)

declare -A ignored_paths_license=(
["github.com/devfile/devworkspace-operator"]="Apache-2.0"
["go.etcd.io/etcd/pkg/v3"]="Apache-2.0"
["go.etcd.io/etcd/server/v3"]="Apache-2.0"
["github.com/decred/dcrd/dcrec/secp256k1/v4"]="ISC"
)

retryUrl() {
Expand Down Expand Up @@ -210,12 +209,16 @@ go list -m -mod=mod all | while read -r module; do
license=$(curl -s "$url" | jq -r '.licensed.declared')
license="${license%% AND*}"

# Handle OR licenses - split and check each one
IFS=' OR ' read -ra license_parts <<< "$license"
license_approved=false
for allowed_license in "${allowed_licenses[@]}"; do
if [[ "$allowed_license" == "$license" ]]; then
license_approved=true
break
fi
for license_part in "${license_parts[@]}"; do
for allowed_license in "${allowed_licenses[@]}"; do
if [[ "${allowed_license^^}" == "${license_part^^}" ]]; then
license_approved=true
break 2
fi
done
done

if [[ $license_approved == "false" ]]; then
Expand Down
5 changes: 3 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/sys v0.38.0 // indirect
golang.org/x/term v0.37.0 // indirect
golang.org/x/text v0.31.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/time v0.12.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect
google.golang.org/grpc v1.72.1 // indirect
Expand All @@ -89,6 +89,7 @@ require (
)

replace (
github.com/containerd/containerd => github.com/containerd/containerd v1.7.29
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0
)
3,033 changes: 2,996 additions & 37 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/golang.org/x/oauth2/internal/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/golang.org/x/oauth2/internal/oauth2.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 27 additions & 23 deletions vendor/golang.org/x/oauth2/internal/token.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/golang.org/x/oauth2/internal/transport.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading