Skip to content

Commit 1bcf81d

Browse files
committed
merge main
2 parents 501a47d + 192b9cd commit 1bcf81d

File tree

931 files changed

+46732
-52466
lines changed

Some content is hidden

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

931 files changed

+46732
-52466
lines changed

.github/workflows/docs-build-push.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

Makefile.tools

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ OAPI_CODEGEN = "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@v2.0.0
55
LEFTHOOK = "github.com/evilmartians/lefthook@v1.5.5"
66
GO_SWAGGER = "github.com/go-swagger/go-swagger/cmd/swagger@abb53530bfcf49c470e5f4c7071ee43f37ec7437" # v0.30.5 currently broken. Update expected shortly. Ref: https://github.com/go-swagger/go-swagger/issues/3070
77
PROTOBUF = "github.com/gogo/protobuf/protoc-gen-gogo@v1.3.2"
8+
GOGOFAST = "github.com/gogo/protobuf/protoc-gen-gogofast@v1.3.2"
89
GOLANGCI_LINT = "github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0"
910
PROTOC_GENGO = "google.golang.org/protobuf/cmd/protoc-gen-go@v1.32.0"
1011
PROTOC_VALIDATORS = "github.com/mwitkow/go-proto-validators/protoc-gen-govalidators@v0.3.2"
@@ -22,6 +23,7 @@ install-tools: ## Install tool dependencies
2223
@$(GOGET) $(LEFTHOOK)
2324
@$(GOGET) $(GO_SWAGGER)
2425
@$(GOGET) $(PROTOBUF)
26+
@$(GOGET) $(GOGOFAST)
2527
@$(GOGET) $(GOLANGCI_LINT)
2628
@$(GOGET) $(PROTOC_GENGO)
2729
@$(GOGET) $(PROTOC_VALIDATORS)
@@ -33,5 +35,7 @@ install-tools: ## Install tool dependencies
3335
@$(GOGET) $(COUNTERFEITER)
3436
@$(GOGET) ./...
3537
@${GOTIDY}
38+
@$(GOINST) $(GOGOFAST)
39+
@$(GOINST) $(PROTOC_GEN_DOC)
3640
@echo "Setting up git hooks"
3741
@$(GORUN) $(LEFTHOOK) install pre-push

go.mod

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,39 @@ require (
1010
github.com/gogo/protobuf v1.3.2
1111
github.com/golang/protobuf v1.5.4
1212
github.com/google/go-cmp v0.6.0
13-
github.com/google/uuid v1.5.0
13+
github.com/google/uuid v1.6.0
1414
github.com/klauspost/cpuid/v2 v2.2.5
15-
github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2 // indirect
15+
github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 // indirect
1616
github.com/mitchellh/mapstructure v1.5.0
1717
github.com/nginxinc/nginx-prometheus-exporter v1.2.0
1818
github.com/nxadm/tail v1.4.11
1919
github.com/orcaman/concurrent-map v1.0.0
2020
github.com/shirou/gopsutil v3.21.11+incompatible
21-
github.com/shirou/gopsutil/v3 v3.23.10
21+
github.com/shirou/gopsutil/v3 v3.24.5
2222
github.com/sirupsen/logrus v1.9.3
23-
github.com/spf13/cobra v1.8.0
23+
github.com/spf13/cobra v1.8.1
2424
github.com/spf13/pflag v1.0.5
2525
github.com/spf13/viper v1.18.2
26-
github.com/stretchr/testify v1.10.0
26+
github.com/stretchr/testify v1.9.0
2727
github.com/trivago/grok v1.0.0
2828
github.com/vardius/message-bus v1.1.5
2929
go.uber.org/atomic v1.11.0
3030
golang.org/x/sync v0.10.0
31-
google.golang.org/grpc v1.60.1
31+
google.golang.org/grpc v1.62.2
3232
google.golang.org/protobuf v1.34.2 // indirect
3333
gopkg.in/mcuadros/go-syslog.v2 v2.3.0
3434
gopkg.in/yaml.v3 v3.0.1
3535
)
3636

3737
require (
3838
github.com/go-resty/resty/v2 v2.11.0
39-
github.com/nginx/agent/sdk/v2 v2.38.0
39+
github.com/nginx/agent/sdk/v2 v2.0.0-00010101000000-000000000000
4040
github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1
4141
github.com/prometheus/client_golang v1.19.1
4242
github.com/rs/cors v1.11.0
4343
go.uber.org/goleak v1.3.0
4444
go.uber.org/mock v0.4.0
45-
golang.org/x/sys v0.29.0
45+
golang.org/x/sys v0.28.0
4646
golang.org/x/text v0.21.0
4747
gopkg.in/yaml.v2 v2.4.0
4848
)
@@ -59,8 +59,8 @@ require (
5959
github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed // indirect
6060
github.com/magiconair/properties v1.8.7 // indirect
6161
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
62-
github.com/nginxinc/nginx-go-crossplane v0.4.70 // indirect
63-
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
62+
github.com/nginxinc/nginx-go-crossplane v0.4.48 // indirect
63+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
6464
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6565
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
6666
github.com/prometheus/client_model v0.6.1 // indirect
@@ -77,13 +77,13 @@ require (
7777
github.com/tklauser/go-sysconf v0.3.12 // indirect
7878
github.com/tklauser/numcpus v0.6.1 // indirect
7979
github.com/trivago/tgo v1.0.7 // indirect
80-
github.com/yusufpapurcu/wmi v1.2.3 // indirect
80+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
8181
go.uber.org/multierr v1.11.0 // indirect
8282
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
83-
golang.org/x/mod v0.22.0 // indirect
84-
golang.org/x/net v0.34.0 // indirect
85-
golang.org/x/tools v0.29.0 // indirect
86-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
83+
golang.org/x/mod v0.21.0 // indirect
84+
golang.org/x/net v0.33.0 // indirect
85+
golang.org/x/tools v0.25.0 // indirect
86+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
8787
gopkg.in/ini.v1 v1.67.0 // indirect
8888
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8989
)

0 commit comments

Comments
 (0)