From 6a87fe9e17b6decab9ee1b868328f6a93468f6f1 Mon Sep 17 00:00:00 2001 From: doujiang24 Date: Wed, 13 Dec 2023 09:27:10 +0800 Subject: [PATCH 1/3] examples/grpc: remove useless go.mod also introduce the empty.go file to import the protobuf package, which will be imported from the generated kv.pb.go file. Signed-off-by: doujiang24 --- examples/grpc-bridge/server/go.mod | 6 ++---- examples/grpc-bridge/server/kv/empty.go | 8 ++++++++ examples/grpc-bridge/server/kv/go.mod | 3 --- 3 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 examples/grpc-bridge/server/kv/empty.go delete mode 100644 examples/grpc-bridge/server/kv/go.mod diff --git a/examples/grpc-bridge/server/go.mod b/examples/grpc-bridge/server/go.mod index bd7672d03387e..b4fedc2b0e21b 100644 --- a/examples/grpc-bridge/server/go.mod +++ b/examples/grpc-bridge/server/go.mod @@ -1,12 +1,10 @@ -module github.com/envoyproxy/envoy +module github.com/envoyproxy/envoy/examples/grpc-bridge/server go 1.13 require ( - github.com/envoyproxy/envoy/examples/grpc-bridge/server/kv v0.0.0-00010101000000-000000000000 + github.com/golang/protobuf v1.5.2 golang.org/x/net v0.8.0 google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect google.golang.org/grpc v1.53.0 ) - -replace github.com/envoyproxy/envoy/examples/grpc-bridge/server/kv => ./kv diff --git a/examples/grpc-bridge/server/kv/empty.go b/examples/grpc-bridge/server/kv/empty.go new file mode 100644 index 0000000000000..d0c265a0e2afe --- /dev/null +++ b/examples/grpc-bridge/server/kv/empty.go @@ -0,0 +1,8 @@ +// make the kv module is not empty, make go mod tidy happy. +// a kv.pb.go file will be generated by protoc, while running the example. +// also, introduce the empty.go file to import the protobuf package, +// which will be imported from the generated kv.pb.go file. + +package kv + +import _ "github.com/golang/protobuf/proto" diff --git a/examples/grpc-bridge/server/kv/go.mod b/examples/grpc-bridge/server/kv/go.mod deleted file mode 100644 index 957d61ca9e057..0000000000000 --- a/examples/grpc-bridge/server/kv/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module github.com/envoyproxy/envoy/examples/grpc-bridge/server/kv - -go 1.13 From 7016a224767abcae2e733be077d2215a7e337938 Mon Sep 17 00:00:00 2001 From: doujiang24 Date: Wed, 13 Dec 2023 10:27:34 +0800 Subject: [PATCH 2/3] remove dependabot Signed-off-by: doujiang24 --- .github/dependabot.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 11f18ecf9f0bf..c41a85fcaed42 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -281,12 +281,6 @@ updates: interval: daily time: "06:00" -- package-ecosystem: "gomod" - directory: "/examples/grpc-bridge/server/kv" - schedule: - interval: daily - time: "06:00" - - package-ecosystem: "gomod" directory: "/examples/golang-http/simple" schedule: From ad953227dbf57d362e222ff794a3391106e35db0 Mon Sep 17 00:00:00 2001 From: doujiang24 Date: Wed, 13 Dec 2023 16:48:06 +0800 Subject: [PATCH 3/3] remove in Dockerfile. Signed-off-by: doujiang24 --- examples/shared/golang/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/shared/golang/Dockerfile b/examples/shared/golang/Dockerfile index 9da35d434dab9..accda6beda055 100644 --- a/examples/shared/golang/Dockerfile +++ b/examples/shared/golang/Dockerfile @@ -44,7 +44,6 @@ WORKDIR /build # Resolve and build Go dependencies as Docker cache COPY go.mod /build/go.mod COPY go.sum /build/go.sum -COPY kv/go.mod /build/kv/go.mod ENV GO111MODULE=on RUN go mod download COPY service.go /build/main.go