Skip to content

Commit 9b921ee

Browse files
fix(auth-callout): use canonical nv-config module (#31)
Switch auth-callout to the nv-config module from ncp/vmaas/services/pkg so the library source includes the config watcher fixes and Apache-2.0 SPDX headers. Regenerate vendor and third-party license inventory from Go tooling, and document the license refresh workflow for future dependency changes. Signed-off-by: Frank Spitulski <fspitulski@nvidia.com>
1 parent dbc450e commit 9b921ee

101 files changed

Lines changed: 2991 additions & 981 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

AGENTS.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,19 @@ Every source file requires an SPDX header:
5555

5656
CI checks this. Run `make add-license-headers` to fix.
5757

58+
## Third-party licenses
59+
60+
Regenerate `THIRD_PARTY_LICENSES.csv` when dependencies change in any Go
61+
module (`auth-callout/`, `local/mqtt-client/`, `local/mqttbs/`). Use the repo
62+
target instead of editing it by hand:
63+
64+
```bash
65+
make third-party-licenses
66+
```
67+
68+
Include the regenerated CSV in the same branch as the dependency change that
69+
made it stale.
70+
5871
## Go conventions
5972

6073
- Go modules use vendored dependencies (`-mod=vendor`).

THIRD_PARTY_LICENSES.csv

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
github.com/MicahParks/jwkset,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/MicahParks/jwkset/LICENSE,Apache-2.0
22
github.com/MicahParks/keyfunc/v3,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/MicahParks/keyfunc/v3/LICENSE,Apache-2.0
3+
github.com/VictoriaMetrics/metrics,https://github.com/VictoriaMetrics/metrics/blob/v1.40.2/LICENSE,MIT
34
github.com/beorn7/perks/quantile,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/beorn7/perks/LICENSE,MIT
45
github.com/cenkalti/backoff/v5,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/cenkalti/backoff/v5/LICENSE,MIT
56
github.com/cespare/xxhash/v2,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/cespare/xxhash/v2/LICENSE.txt,MIT
67
github.com/eclipse/paho.mqtt.golang,https://github.com/eclipse/paho.mqtt.golang/blob/v1.5.1/LICENSE,EPL-2.0
8+
github.com/fatih/structs,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/fatih/structs/LICENSE,MIT
79
github.com/felixge/httpsnoop,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/felixge/httpsnoop/LICENSE.txt,MIT
810
github.com/fsnotify/fsnotify,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/fsnotify/fsnotify/LICENSE,BSD-3-Clause
911
github.com/go-logr/logr,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/go-logr/logr/LICENSE,Apache-2.0
@@ -22,9 +24,11 @@ github.com/klauspost/compress,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/a
2224
github.com/klauspost/compress/s2,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/klauspost/compress/s2/LICENSE,BSD-3-Clause
2325
github.com/knadh/koanf/maps,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/knadh/koanf/maps/LICENSE,MIT
2426
github.com/knadh/koanf/parsers/yaml,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/knadh/koanf/parsers/yaml/LICENSE,MIT
27+
github.com/knadh/koanf/providers/confmap,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/knadh/koanf/providers/confmap/LICENSE,MIT
2528
github.com/knadh/koanf/providers/env,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/knadh/koanf/providers/env/LICENSE,MIT
2629
github.com/knadh/koanf/providers/file,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/knadh/koanf/providers/file/LICENSE,MIT
2730
github.com/knadh/koanf/providers/rawbytes,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/knadh/koanf/providers/rawbytes/LICENSE,MIT
31+
github.com/knadh/koanf/providers/structs,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/knadh/koanf/providers/structs/LICENSE,MIT
2832
github.com/knadh/koanf/v2,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/knadh/koanf/v2/LICENSE,MIT
2933
github.com/minio/highwayhash,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/minio/highwayhash/LICENSE,Apache-2.0
3034
github.com/mitchellh/copystructure,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/mitchellh/copystructure/LICENSE,MIT
@@ -48,6 +52,11 @@ github.com/spf13/pflag,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-cal
4852
github.com/synadia-io/callout.go,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/synadia-io/callout.go/LICENSE,Apache-2.0
4953
github.com/uptrace/opentelemetry-go-extra/otelutil,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/uptrace/opentelemetry-go-extra/otelutil/LICENSE,BSD-2-Clause
5054
github.com/uptrace/opentelemetry-go-extra/otelzap,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/github.com/uptrace/opentelemetry-go-extra/otelzap/LICENSE,BSD-2-Clause
55+
github.com/valyala/fastrand,https://github.com/valyala/fastrand/blob/v1.1.0/LICENSE,MIT
56+
github.com/valyala/histogram,https://github.com/valyala/histogram/blob/v1.2.0/LICENSE,MIT
57+
gitlab-master.nvidia.com/ncp/vmaas/services/pkg/nv-config,Unknown,Apache-2.0
58+
gitlab-master.nvidia.com/ncp/vmaas/services/pkg/nv-config/internal/providers,Unknown,Apache-2.0
59+
gitlab-master.nvidia.com/ncp/vmaas/services/pkg/nv-config/internal/watcher,Unknown,Apache-2.0
5160
go.opentelemetry.io/auto/sdk,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/go.opentelemetry.io/auto/sdk/LICENSE,Apache-2.0
5261
go.opentelemetry.io/otel,Unknown,BSD-3-Clause
5362
go.opentelemetry.io/otel,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/go.opentelemetry.io/otel/LICENSE,Apache-2.0
@@ -86,4 +95,4 @@ google.golang.org/genproto/googleapis/api/httpbody,https://github.com/NVIDIA/dsx
8695
google.golang.org/genproto/googleapis/rpc,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/google.golang.org/genproto/googleapis/rpc/LICENSE,Apache-2.0
8796
google.golang.org/grpc,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/google.golang.org/grpc/LICENSE,Apache-2.0
8897
google.golang.org/protobuf,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/google.golang.org/protobuf/LICENSE,BSD-3-Clause
89-
gopkg.in/yaml.v3,https://github.com/go-yaml/yaml/blob/v3.0.1/LICENSE,MIT
98+
gopkg.in/yaml.v3,https://github.com/NVIDIA/dsx-exchange/blob/HEAD/auth-callout/vendor/gopkg.in/yaml.v3/LICENSE,MIT

auth-callout/go.mod

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/NVIDIA/dsx-exchange/auth-callout
22

3-
go 1.25
3+
go 1.25.4
44

55
require (
66
github.com/MicahParks/jwkset v0.11.0
@@ -11,7 +11,7 @@ require (
1111
github.com/nats-io/jwt/v2 v2.8.0
1212
github.com/nats-io/nats.go v1.47.0
1313
github.com/nats-io/nkeys v0.4.11
14-
github.com/spf13/cobra v1.10.1
14+
github.com/spf13/cobra v1.10.2
1515
github.com/stretchr/testify v1.11.1
1616
github.com/synadia-io/callout.go v0.2.1
1717
github.com/uptrace/opentelemetry-go-extra/otelzap v0.2.4 // DO NOT UPDATE TO 0.3.x or you will not have logs in your spans
@@ -24,11 +24,11 @@ require (
2424
github.com/knadh/koanf/maps v0.1.2
2525
github.com/knadh/koanf/parsers/yaml v1.1.0
2626
github.com/knadh/koanf/providers/env v1.1.0
27-
github.com/knadh/koanf/providers/file v1.2.0
27+
github.com/knadh/koanf/providers/file v1.2.1
2828
github.com/knadh/koanf/providers/rawbytes v1.0.0
29-
github.com/knadh/koanf/v2 v2.3.0
29+
github.com/knadh/koanf/v2 v2.3.3
3030
github.com/prometheus/client_golang v1.23.2
31-
gitlab-master.nvidia.com/ncp/vmaas/libs/golang/nv-config v0.1.7
31+
gitlab-master.nvidia.com/ncp/vmaas/services/pkg/nv-config v0.0.0-20260528035807-fa56d21c6ba5
3232
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0
3333
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0
3434
go.opentelemetry.io/otel/exporters/prometheus v0.60.0
@@ -42,7 +42,8 @@ require (
4242
github.com/beorn7/perks v1.0.1 // indirect
4343
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
4444
github.com/cespare/xxhash/v2 v2.3.0 // indirect
45-
github.com/davecgh/go-spew v1.1.1 // indirect
45+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
46+
github.com/fatih/structs v1.1.0 // indirect
4647
github.com/felixge/httpsnoop v1.0.4 // indirect
4748
github.com/fsnotify/fsnotify v1.9.0 // indirect
4849
github.com/go-logr/logr v1.4.3 // indirect
@@ -55,13 +56,14 @@ require (
5556
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5657
github.com/klauspost/compress v1.18.0 // indirect
5758
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
59+
github.com/knadh/koanf/providers/structs v1.0.0 // indirect
5860
github.com/minio/highwayhash v1.0.3 // indirect
5961
github.com/mitchellh/copystructure v1.2.0 // indirect
6062
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6163
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6264
github.com/nats-io/nats-server/v2 v2.11.0 // indirect
6365
github.com/nats-io/nuid v1.0.1 // indirect
64-
github.com/pmezard/go-difflib v1.0.0 // indirect
66+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6567
github.com/prometheus/client_model v0.6.2 // indirect
6668
github.com/prometheus/common v0.66.1 // indirect
6769
github.com/prometheus/otlptranslator v0.0.2 // indirect
@@ -77,7 +79,7 @@ require (
7779
go.yaml.in/yaml/v2 v2.4.2 // indirect
7880
golang.org/x/crypto v0.41.0 // indirect
7981
golang.org/x/net v0.43.0 // indirect
80-
golang.org/x/sys v0.37.0 // indirect
82+
golang.org/x/sys v0.44.0 // indirect
8183
golang.org/x/text v0.29.0 // indirect
8284
golang.org/x/time v0.11.0 // indirect
8385
google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 // indirect

auth-callout/go.sum

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F9
1515
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
1616
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
1717
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
18-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
19-
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
18+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
19+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
20+
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
21+
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
2022
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
2123
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
2224
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
@@ -58,12 +60,14 @@ github.com/knadh/koanf/providers/confmap v1.0.0 h1:mHKLJTE7iXEys6deO5p6olAiZdG5z
5860
github.com/knadh/koanf/providers/confmap v1.0.0/go.mod h1:txHYHiI2hAtF0/0sCmcuol4IDcuQbKTybiB1nOcUo1A=
5961
github.com/knadh/koanf/providers/env v1.1.0 h1:U2VXPY0f+CsNDkvdsG8GcsnK4ah85WwWyJgef9oQMSc=
6062
github.com/knadh/koanf/providers/env v1.1.0/go.mod h1:QhHHHZ87h9JxJAn2czdEl6pdkNnDh/JS1Vtsyt65hTY=
61-
github.com/knadh/koanf/providers/file v1.2.0 h1:hrUJ6Y9YOA49aNu/RSYzOTFlqzXSCpmYIDXI7OJU6+U=
62-
github.com/knadh/koanf/providers/file v1.2.0/go.mod h1:bp1PM5f83Q+TOUu10J/0ApLBd9uIzg+n9UgthfY+nRA=
63+
github.com/knadh/koanf/providers/file v1.2.1 h1:bEWbtQwYrA+W2DtdBrQWyXqJaJSG3KrP3AESOJYp9wM=
64+
github.com/knadh/koanf/providers/file v1.2.1/go.mod h1:bp1PM5f83Q+TOUu10J/0ApLBd9uIzg+n9UgthfY+nRA=
6365
github.com/knadh/koanf/providers/rawbytes v1.0.0 h1:MrKDh/HksJlKJmaZjgs4r8aVBb/zsJyc/8qaSnzcdNI=
6466
github.com/knadh/koanf/providers/rawbytes v1.0.0/go.mod h1:KxwYJf1uezTKy6PBtfE+m725NGp4GPVA7XoNTJ/PtLo=
65-
github.com/knadh/koanf/v2 v2.3.0 h1:Qg076dDRFHvqnKG97ZEsi9TAg2/nFTa9hCdcSa1lvlM=
66-
github.com/knadh/koanf/v2 v2.3.0/go.mod h1:gRb40VRAbd4iJMYYD5IxZ6hfuopFcXBpc9bbQpZwo28=
67+
github.com/knadh/koanf/providers/structs v1.0.0 h1:DznjB7NQykhqCar2LvNug3MuxEQsZ5KvfgMbio+23u4=
68+
github.com/knadh/koanf/providers/structs v1.0.0/go.mod h1:kjo5TFtgpaZORlpoJqcbeLowM2cINodv8kX+oFAeQ1w=
69+
github.com/knadh/koanf/v2 v2.3.3 h1:jLJC8XCRfLC7n4F+ZKKdBsbq1bfXTpuFhf4L7t94D94=
70+
github.com/knadh/koanf/v2 v2.3.3/go.mod h1:gRb40VRAbd4iJMYYD5IxZ6hfuopFcXBpc9bbQpZwo28=
6771
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
6872
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
6973
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -92,8 +96,8 @@ github.com/nats-io/nsc/v2 v2.10.3-0.20250110165315-eeda721ecff6 h1:V1uh9L3rGIUeY
9296
github.com/nats-io/nsc/v2 v2.10.3-0.20250110165315-eeda721ecff6/go.mod h1:ScomAvx1cgjiXzW3WpGo9x/lLENkwELhewCcok/GTU8=
9397
github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
9498
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
95-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
96-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
99+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
100+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
97101
github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
98102
github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
99103
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
@@ -107,8 +111,8 @@ github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUO
107111
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
108112
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
109113
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
110-
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
111-
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
114+
github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
115+
github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
112116
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
113117
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
114118
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
@@ -122,8 +126,8 @@ github.com/uptrace/opentelemetry-go-extra/otelutil v0.3.2 h1:3/aHKUq7qaFMWxyQV0W
122126
github.com/uptrace/opentelemetry-go-extra/otelutil v0.3.2/go.mod h1:Zit4b8AQXaXvA68+nzmbyDzqiyFRISyw1JiD5JqUBjw=
123127
github.com/uptrace/opentelemetry-go-extra/otelzap v0.2.4 h1:/4mU8NB88+6u9JVKlkdD6HjrhRM1V1KRTsJaU8FSr8I=
124128
github.com/uptrace/opentelemetry-go-extra/otelzap v0.2.4/go.mod h1:JoL6Kg6zYo9WtK5Y715GWItSUNpWprRYj5wgO01h00g=
125-
gitlab-master.nvidia.com/ncp/vmaas/libs/golang/nv-config v0.1.7 h1:GU2CMTh5HCdPX0bwZFig9oOGtuCn0m+5zWQuICqCmrU=
126-
gitlab-master.nvidia.com/ncp/vmaas/libs/golang/nv-config v0.1.7/go.mod h1:Q0VFXFw0iM1/YM2DHyG7wROkjhCgTHU1wE8kWv/MupI=
129+
gitlab-master.nvidia.com/ncp/vmaas/services/pkg/nv-config v0.0.0-20260528035807-fa56d21c6ba5 h1:RdPbCKMWGNMR580FmY/bXkc1Xr8qItRwCU72gOAYUKg=
130+
gitlab-master.nvidia.com/ncp/vmaas/services/pkg/nv-config v0.0.0-20260528035807-fa56d21c6ba5/go.mod h1:JRY2JJOLalbCZRDJqaUglChzEudVgGdrhTpWKhnUTsk=
127131
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
128132
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
129133
go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
@@ -163,8 +167,8 @@ golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sU
163167
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
164168
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
165169
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
166-
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
167-
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
170+
golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
171+
golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
168172
golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
169173
golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
170174
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=

auth-callout/scripts/regenerate-third-party-licenses.sh

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,58 @@ if [[ -z "${GOCACHE:-}" ]]; then
2222
cache_dir="$(mktemp -d)"
2323
export GOCACHE="$cache_dir"
2424
fi
25+
raw_licenses="$(mktemp)"
2526
licenses="$(mktemp)"
2627
warnings="$(mktemp)"
27-
trap 'rm -f "$licenses" "$warnings"; if [[ -n "$cache_dir" ]]; then rm -rf "$cache_dir"; fi' EXIT
28+
trap 'rm -f "$raw_licenses" "$licenses" "$warnings"; if [[ -n "$cache_dir" ]]; then rm -rf "$cache_dir"; fi' EXIT
29+
30+
spdx_license_for_package() {
31+
local package_dir="$auth_dir/vendor/$1"
32+
if [[ ! -d "$package_dir" ]]; then
33+
return 0
34+
fi
35+
36+
local package_licenses
37+
package_licenses="$(
38+
find "$package_dir" -type f -print0 |
39+
xargs -0 awk '
40+
/SPDX-License-Identifier:/ {
41+
sub(/^.*SPDX-License-Identifier:[[:space:]]*/, "")
42+
gsub(/^[[:space:]]+|[[:space:]]+$/, "")
43+
print
44+
}
45+
' |
46+
sort -u
47+
)"
48+
49+
if [[ -z "$package_licenses" ]]; then
50+
return 0
51+
fi
52+
53+
if [[ "$(printf '%s\n' "$package_licenses" | wc -l | tr -d ' ')" != "1" ]]; then
54+
return 0
55+
fi
56+
57+
printf '%s' "$package_licenses"
58+
}
59+
60+
normalize_license_report() {
61+
local package_name
62+
local license_url
63+
local license_name
64+
local spdx_license
65+
66+
while IFS=, read -r package_name license_url license_name; do
67+
if [[ "$license_url" == "Unknown" && "$license_name" == "Unknown" ]]; then
68+
spdx_license="$(spdx_license_for_package "$package_name")"
69+
if [[ -n "$spdx_license" ]]; then
70+
license_name="$spdx_license"
71+
fi
72+
fi
73+
74+
printf '%s,%s,%s\n' "$package_name" "$license_url" "$license_name"
75+
done < "$raw_licenses" > "$licenses"
76+
}
2877

2978
report_module() {
3079
local module_dir="$1"
@@ -33,19 +82,22 @@ report_module() {
3382
if ! (
3483
cd "$module_dir"
3584
GOOS=linux GOARCH=amd64 GOFLAGS="$goflags" "$go_licenses" report ./...
36-
) 2>> "$warnings" | awk -F, '$1 !~ /^github\.com\/NVIDIA\/dsx-exchange\//' >> "$licenses"; then
85+
) 2>> "$warnings" | awk -F, '$1 !~ /^github\.com\/NVIDIA\/dsx-exchange\//' >> "$raw_licenses"; then
3786
cat "$warnings" >&2
3887
exit 1
3988
fi
4089
}
4190

4291
report_module "$auth_dir" "-mod=vendor"
4392
report_module "$repo_dir/local/mqtt-client" ""
93+
report_module "$repo_dir/local/mqttbs" ""
4494

4595
if [[ -n "${DSX_LICENSE_VERBOSE:-}" && -s "$warnings" ]]; then
4696
cat "$warnings" >&2
4797
fi
4898

99+
normalize_license_report
100+
49101
# go-licenses v1 still supports vendored module projects, but its classifier
50102
# collapses some multi-license packages to the first detected license.
51103
cat >> "$licenses" <<'LICENSE_OVERRIDES'

auth-callout/src/internal/config/permissions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/uptrace/opentelemetry-go-extra/otelzap"
1515
"go.uber.org/zap"
1616

17-
nvconfig "gitlab-master.nvidia.com/ncp/vmaas/libs/golang/nv-config"
17+
nvconfig "gitlab-master.nvidia.com/ncp/vmaas/services/pkg/nv-config"
1818
)
1919

2020
const permissionsReloadPollingInterval = 5 * time.Second

auth-callout/vendor/github.com/fatih/structs/.gitignore

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

auth-callout/vendor/github.com/fatih/structs/.travis.yml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)