Skip to content

Commit

Permalink
ZING-33945: Update deps (#26)
Browse files Browse the repository at this point in the history
* Generate mocks

* Update go dependencies

* Format

* Update generators versions

* Update zenkit build

* Format

* Update java deps

* Generate protos

* Update version

* Add gitattributes

* Update buf mod
  • Loading branch information
knightpp authored May 10, 2024
1 parent 7a6faa1 commit eca0cbc
Show file tree
Hide file tree
Showing 152 changed files with 3,722 additions and 4,111 deletions.
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/go.sum -diff linguist-generated
/python/zenoss/** -diff linguist-generated
/java/src/** -diff linguist-generated
/go/** -diff linguist-generated
/descriptors/** -diff linguist-generated binary
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ PROTOFILES := $(shell find protobufs -name "*.proto")
PYTHON_FILES := $(subst $(PROTODIR), $(PYTHONDIR),$(subst .proto,_pb2.py,$(PROTOFILES)))
LOCAL_USER_ID := $(shell id -u)
CONTAINER_DIR := /tmp/working
ZENKIT_BUILD_VERSION := 1.14.3
ZENKIT_BUILD_VERSION := 1.18.0
BUILD_IMG := zenoss/zenkit-build:$(ZENKIT_BUILD_VERSION)
DOCKER_NETWORK = host
DOCKER_PARAMS := --rm -v $(ROOTDIR):$(CONTAINER_DIR):rw \
Expand Down
2 changes: 1 addition & 1 deletion descriptors/image.json

Large diffs are not rendered by default.

25 changes: 13 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
module github.com/zenoss/zenoss-protobufs

go 1.19
go 1.22

require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.2
github.com/stretchr/testify v1.7.0
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f
google.golang.org/grpc v1.53.0
google.golang.org/protobuf v1.28.1
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
github.com/stretchr/testify v1.9.0
google.golang.org/genproto/googleapis/api v0.0.0-20240429193739-8cf5692501f6
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.34.1
)

require (
github.com/davecgh/go-spew v1.1.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.1.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
62 changes: 30 additions & 32 deletions go.sum

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

2 changes: 1 addition & 1 deletion go/cloud/collection/collection_cfg.pb.go

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

11 changes: 8 additions & 3 deletions go/cloud/collection/collection_cfg_grpc.pb.go

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

47 changes: 35 additions & 12 deletions go/cloud/collection/mock_CollectionConfigServiceClient.go

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

38 changes: 30 additions & 8 deletions go/cloud/collection/mock_CollectionConfigServiceServer.go

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

Loading

0 comments on commit eca0cbc

Please sign in to comment.