Skip to content

Commit 9d5aca3

Browse files
committed
Build some GRPC tools
Build the protobuf generators for go and go-grpc, and the grpcurl tool for poking at servers. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
1 parent a372654 commit 9d5aca3

File tree

1,458 files changed

+609437
-17604
lines changed

Some content is hidden

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

1,458 files changed

+609437
-17604
lines changed

Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,15 +711,17 @@ localmachine:
711711
$(MAKE) ginkgo-run GINKGO_PARALLEL=n TAGS="$(REMOTETAGS)" GINKGO_FLAKE_ATTEMPTS=0 FOCUS_FILE=$(FOCUS_FILE) GINKGOWHAT=pkg/machine/e2e/.
712712

713713
.PHONY: localsystem
714-
localsystem:
714+
localsystem: PATH := $(PATH):$(CURDIR)/test/tools/build
715+
localsystem: .install.grpcurl
715716
# Wipe existing config, database, and cache: start with clean slate.
716717
$(RM) -rf ${HOME}/.local/share/containers ${HOME}/.config/containers
717718
PODMAN=$(CURDIR)/bin/podman QUADLET=$(CURDIR)/bin/quadlet bats -T --filter-tags '!ci:parallel' test/system/
718719
PODMAN=$(CURDIR)/bin/podman QUADLET=$(CURDIR)/bin/quadlet bats -T --filter-tags ci:parallel -j $$(nproc) test/system/
719720

720721

721722
.PHONY: remotesystem
722-
remotesystem:
723+
remotesystem: PATH := $(PATH):$(CURDIR)/test/tools/build
724+
remotesystem: .install.grpcurl
723725
# Wipe existing config, database, and cache: start with clean slate.
724726
$(RM) -rf ${HOME}/.local/share/containers ${HOME}/.config/containers
725727
PODMAN=$(CURDIR)/bin/podman-remote QUADLET=$(CURDIR)/bin/quadlet \
@@ -1009,6 +1011,10 @@ install.tools: .install.golangci-lint ## Install needed tools
10091011
.install.golangci-lint:
10101012
VERSION=$(GOLANGCI_LINT_VERSION) ./hack/install_golangci.sh
10111013

1014+
.PHONY: .install.grpcurl
1015+
.install.grpcurl:
1016+
$(MAKE) -C test/tools build/grpcurl
1017+
10121018
.PHONY: .install.swagger
10131019
.install.swagger:
10141020
$(MAKE) -C test/tools build/swagger

test/tools/Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ clean:
2222
$(BUILDDIR): \
2323
$(BUILDDIR)/go-md2man \
2424
$(BUILDDIR)/git-validation \
25+
$(BUILDDIR)/grpcurl \
26+
$(BUILDDIR)/protoc-gen-go \
27+
$(BUILDDIR)/protoc-gen-go-grpc \
2528
$(BUILDDIR)/swagger
2629

2730
$(BUILDDIR)/go-md2man: $(SOURCES)
@@ -32,3 +35,12 @@ $(BUILDDIR)/git-validation: $(SOURCES)
3235

3336
$(BUILDDIR)/swagger: $(SOURCES)
3437
$(GO_BUILD) -o $@ ./vendor/github.com/go-swagger/go-swagger/cmd/swagger
38+
39+
$(BUILDDIR)/grpcurl: $(SOURCES)
40+
$(GO_BUILD) -o $@ ./vendor/github.com/fullstorydev/grpcurl/cmd/grpcurl
41+
42+
$(BUILDDIR)/protoc-gen-go: $(SOURCES)
43+
$(GO_BUILD) -o $@ ./vendor/google.golang.org/protobuf/cmd/protoc-gen-go
44+
45+
$(BUILDDIR)/protoc-gen-go-grpc: $(SOURCES)
46+
$(GO_BUILD) -o $@ ./vendor/google.golang.org/grpc/cmd/protoc-gen-go-grpc

test/tools/go.mod

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,33 @@ module github.com/containers/podman/test/tools
33
// Warning: if there is a "toolchain" directive anywhere in this file (and most of the
44
// time there shouldn't be), its version must be an exact match to the "go" directive.
55

6-
go 1.22.0
6+
go 1.24.0
77

88
require (
99
github.com/cpuguy83/go-md2man/v2 v2.0.7
10+
github.com/fullstorydev/grpcurl v1.9.3
1011
github.com/go-swagger/go-swagger v0.32.3
1112
github.com/vbatts/git-validation v1.2.2
13+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
14+
google.golang.org/protobuf v1.36.10
1215
)
1316

1417
require (
18+
cel.dev/expr v0.24.0 // indirect
19+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
1520
github.com/Masterminds/goutils v1.1.1 // indirect
1621
github.com/Masterminds/semver/v3 v3.2.1 // indirect
1722
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
1823
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
24+
github.com/bufbuild/protocompile v0.14.1 // indirect
25+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
26+
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
27+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
28+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
1929
github.com/fatih/color v1.15.0 // indirect
2030
github.com/felixge/httpsnoop v1.0.4 // indirect
2131
github.com/fsnotify/fsnotify v1.7.0 // indirect
32+
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
2233
github.com/go-openapi/analysis v0.23.0 // indirect
2334
github.com/go-openapi/errors v0.22.0 // indirect
2435
github.com/go-openapi/inflect v0.21.0 // indirect
@@ -31,13 +42,15 @@ require (
3142
github.com/go-openapi/swag v0.23.0 // indirect
3243
github.com/go-openapi/validate v0.24.0 // indirect
3344
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
45+
github.com/golang/protobuf v1.5.4 // indirect
3446
github.com/google/uuid v1.6.0 // indirect
3547
github.com/gorilla/handlers v1.5.2 // indirect
3648
github.com/hashicorp/go-version v1.6.0 // indirect
3749
github.com/hashicorp/hcl v1.0.0 // indirect
3850
github.com/huandu/xstrings v1.4.0 // indirect
3951
github.com/imdario/mergo v0.3.16 // indirect
4052
github.com/jessevdk/go-flags v1.5.0 // indirect
53+
github.com/jhump/protoreflect v1.17.0 // indirect
4154
github.com/josharian/intern v1.0.0 // indirect
4255
github.com/kr/pretty v0.3.1 // indirect
4356
github.com/kr/text v0.2.0 // indirect
@@ -51,6 +64,7 @@ require (
5164
github.com/mitchellh/reflectwalk v1.0.2 // indirect
5265
github.com/oklog/ulid v1.3.1 // indirect
5366
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
67+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
5468
github.com/rogpeppe/go-internal v1.12.0 // indirect
5569
github.com/russross/blackfriday/v2 v2.1.0 // indirect
5670
github.com/sagikazarmark/locafero v0.4.0 // indirect
@@ -62,17 +76,24 @@ require (
6276
github.com/spf13/cast v1.6.0 // indirect
6377
github.com/spf13/pflag v1.0.5 // indirect
6478
github.com/spf13/viper v1.18.2 // indirect
79+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
6580
github.com/subosito/gotenv v1.6.0 // indirect
6681
github.com/toqueteos/webbrowser v1.2.0 // indirect
82+
github.com/zeebo/errs v1.4.0 // indirect
6783
go.mongodb.org/mongo-driver v1.14.0 // indirect
6884
go.uber.org/multierr v1.11.0 // indirect
69-
golang.org/x/crypto v0.31.0 // indirect
85+
golang.org/x/crypto v0.40.0 // indirect
7086
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
71-
golang.org/x/mod v0.23.0 // indirect
72-
golang.org/x/sync v0.11.0 // indirect
73-
golang.org/x/sys v0.30.0 // indirect
74-
golang.org/x/text v0.21.0 // indirect
75-
golang.org/x/tools v0.30.0 // indirect
87+
golang.org/x/mod v0.25.0 // indirect
88+
golang.org/x/net v0.42.0 // indirect
89+
golang.org/x/oauth2 v0.30.0 // indirect
90+
golang.org/x/sync v0.16.0 // indirect
91+
golang.org/x/sys v0.34.0 // indirect
92+
golang.org/x/text v0.27.0 // indirect
93+
golang.org/x/tools v0.34.0 // indirect
94+
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
95+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
96+
google.golang.org/grpc v1.76.0 // indirect
7697
gopkg.in/ini.v1 v1.67.0 // indirect
7798
gopkg.in/yaml.v2 v2.4.0 // indirect
7899
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)