Skip to content

Commit e6aad7e

Browse files
arjan-balpurnesh42H
arjan-bal
authored and
purnesh42H
committed
status: Fix status incompatibility introduced by #6919 and move non-regeneratable proto code into /testdata (#7724)
1 parent 54841ef commit e6aad7e

File tree

21 files changed

+236
-52
lines changed

21 files changed

+236
-52
lines changed

‎go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ require (
77
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78
88
github.com/envoyproxy/go-control-plane v0.13.0
99
github.com/golang/glog v1.2.2
10+
github.com/golang/protobuf v1.5.4
1011
github.com/google/go-cmp v0.6.0
1112
github.com/google/uuid v1.6.0
1213
golang.org/x/net v0.29.0

‎go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6
1616
github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4=
1717
github.com/golang/glog v1.2.2 h1:1+mZ9upx1Dh6FmUTFR1naJ77miKiXgALjWOZ3NVFPmY=
1818
github.com/golang/glog v1.2.2/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
19+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
20+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
1921
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
2022
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
2123
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=

‎internal/status/status.go

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ func (s *Status) WithDetails(details ...protoadapt.MessageV1) (*Status, error) {
149149

150150
// Details returns a slice of details messages attached to the status.
151151
// If a detail cannot be decoded, the error is returned in place of the detail.
152+
// If the detail can be decoded, the proto message returned is of the same
153+
// type that was given to WithDetails().
152154
func (s *Status) Details() []any {
153155
if s == nil || s.s == nil {
154156
return nil
@@ -160,7 +162,38 @@ func (s *Status) Details() []any {
160162
details = append(details, err)
161163
continue
162164
}
163-
details = append(details, detail)
165+
// The call to MessageV1Of is required to unwrap the proto message if
166+
// it implemented only the MessageV1 API. The proto message would have
167+
// been wrapped in a V2 wrapper in Status.WithDetails. V2 messages are
168+
// added to a global registry used by any.UnmarshalNew().
169+
// MessageV1Of has the following behaviour:
170+
// 1. If the given message is a wrapped MessageV1, it returns the
171+
// unwrapped value.
172+
// 2. If the given message already implements MessageV1, it returns it
173+
// as is.
174+
// 3. Else, it wraps the MessageV2 in a MessageV1 wrapper.
175+
//
176+
// Since the Status.WithDetails() API only accepts MessageV1, calling
177+
// MessageV1Of ensures we return the same type that was given to
178+
// WithDetails:
179+
// * If the give type implemented only MessageV1, the unwrapping from
180+
// point 1 above will restore the type.
181+
// * If the given type implemented both MessageV1 and MessageV2, point 2
182+
// above will ensure no wrapping is performed.
183+
// * If the given type implemented only MessageV2 and was wrapped using
184+
// MessageV1Of before passing to WithDetails(), it would be unwrapped
185+
// in WithDetails by calling MessageV2Of(). Point 3 above will ensure
186+
// that the type is wrapped in a MessageV1 wrapper again before
187+
// returning. Note that protoc-gen-go doesn't generate code which
188+
// implements ONLY MessageV2 at the time of writing.
189+
//
190+
// NOTE: Status details can also be added using the FromProto method.
191+
// This could theoretically allow passing a Detail message that only
192+
// implements the V2 API. In such a case the message will be wrapped in
193+
// a MessageV1 wrapper when fetched using Details().
194+
// Since protoc-gen-go generates only code that implements both V1 and
195+
// V2 APIs for backward compatibility, this is not a concern.
196+
details = append(details, protoadapt.MessageV1Of(detail))
164197
}
165198
return details
166199
}

‎interop/xds/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
2323
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
2424
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
2525
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
26+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
27+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
2628
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
2729
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
2830
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=

‎reflection/test/go.mod

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

‎reflection/test/go.sum

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

‎reflection/test/serverreflection_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343
v1reflectionpb "google.golang.org/grpc/reflection/grpc_reflection_v1"
4444
v1alphareflectiongrpc "google.golang.org/grpc/reflection/grpc_reflection_v1alpha"
4545
pb "google.golang.org/grpc/reflection/grpc_testing"
46-
pbv3 "google.golang.org/grpc/reflection/test/grpc_testing_not_regenerate"
46+
pbv3 "google.golang.org/grpc/testdata/grpc_testing_not_regenerated"
4747
)
4848

4949
var (

‎scripts/regenerate.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ export PATH="${GOBIN}:${PATH}"
2626
mkdir -p "${GOBIN}"
2727

2828
echo "removing existing generated files..."
29-
# grpc_testing_not_regenerate/*.pb.go is not re-generated,
30-
# see grpc_testing_not_regenerate/README.md for details.
31-
find . -name '*.pb.go' | grep -v 'grpc_testing_not_regenerate' | xargs rm -f || true
29+
# grpc_testing_not_regenerated/*.pb.go is not re-generated,
30+
# see grpc_testing_not_regenerated/README.md for details.
31+
find . -name '*.pb.go' | grep -v 'grpc_testing_not_regenerated' | xargs rm -f || true
3232

3333
echo "Executing: go install google.golang.org/protobuf/cmd/protoc-gen-go..."
3434
(cd test/tools && go install google.golang.org/protobuf/cmd/protoc-gen-go)
@@ -124,8 +124,8 @@ done
124124
mkdir -p "${WORKDIR}/out/google.golang.org/grpc/internal/proto/grpc_lookup_v1"
125125
mv "${WORKDIR}"/out/google.golang.org/grpc/lookup/grpc_lookup_v1/* "${WORKDIR}/out/google.golang.org/grpc/internal/proto/grpc_lookup_v1"
126126

127-
# grpc_testing_not_regenerate/*.pb.go are not re-generated,
128-
# see grpc_testing_not_regenerate/README.md for details.
129-
rm "${WORKDIR}"/out/google.golang.org/grpc/reflection/test/grpc_testing_not_regenerate/*.pb.go
127+
# grpc_testing_not_regenerated/*.pb.go are not re-generated,
128+
# see grpc_testing_not_regenerated/README.md for details.
129+
rm "${WORKDIR}"/out/google.golang.org/grpc/testdata/grpc_testing_not_regenerated/*.pb.go
130130

131131
cp -R "${WORKDIR}"/out/google.golang.org/grpc/* .

‎scripts/vet.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ git grep 'func [A-Z]' -- "*_test.go" | not grep -v 'func Test\|Benchmark\|Exampl
5656
git grep -l 'time.After(' -- "*.go" | not grep -v '_test.go\|test_utils\|testutils'
5757

5858
# - Do not use "interface{}"; use "any" instead.
59-
git grep -l 'interface{}' -- "*.go" 2>&1 | not grep -v '\.pb\.go\|protoc-gen-go-grpc\|grpc_testing_not_regenerate'
59+
git grep -l 'interface{}' -- "*.go" 2>&1 | not grep -v '\.pb\.go\|protoc-gen-go-grpc\|grpc_testing_not_regenerated'
6060

6161
# - Do not call grpclog directly. Use grpclog.Component instead.
6262
git grep -l -e 'grpclog.I' --or -e 'grpclog.W' --or -e 'grpclog.E' --or -e 'grpclog.F' --or -e 'grpclog.V' -- "*.go" | not grep -v '^grpclog/component.go\|^internal/grpctest/tlogger_test.go\|^internal/grpclog/prefix_logger.go'
6363

6464
# - Ensure that the deprecated protobuf dependency is not used.
65-
not git grep "\"github.com/golang/protobuf/*" -- "*.go" ':(exclude)reflection/test/grpc_testing_not_regenerate/*'
65+
not git grep "\"github.com/golang/protobuf/*" -- "*.go" ':(exclude)testdata/grpc_testing_not_regenerated/*'
6666

6767
# - Ensure all usages of grpc_testing package are renamed when importing.
6868
not git grep "\(import \|^\s*\)\"google.golang.org/grpc/interop/grpc_testing" -- "*.go"
@@ -109,7 +109,7 @@ for MOD_FILE in $(find . -name 'go.mod'); do
109109
noret_grep -v "(ST1000)" "${SC_OUT}" | noret_grep -v "(SA1019)" | noret_grep -v "(ST1003)" | noret_grep -v "(ST1019)\|\(other import of\)" | not grep -v "(SA4000)"
110110

111111
# Exclude underscore checks for generated code.
112-
noret_grep "(ST1003)" "${SC_OUT}" | not grep -v '\(.pb.go:\)\|\(code_string_test.go:\)\|\(grpc_testing_not_regenerate\)'
112+
noret_grep "(ST1003)" "${SC_OUT}" | not grep -v '\(.pb.go:\)\|\(code_string_test.go:\)\|\(grpc_testing_not_regenerated\)'
113113

114114
# Error for duplicate imports not including grpc protos.
115115
noret_grep "(ST1019)\|\(other import of\)" "${SC_OUT}" | not grep -Fv 'XXXXX PleaseIgnoreUnused
@@ -146,7 +146,7 @@ XXXXX PleaseIgnoreUnused'
146146
XXXXX Protobuf related deprecation errors:
147147
"github.com/golang/protobuf
148148
.pb.go:
149-
grpc_testing_not_regenerate
149+
grpc_testing_not_regenerated
150150
: ptypes.
151151
proto.RegisterType
152152
XXXXX gRPC internal usage deprecation errors:
@@ -188,7 +188,7 @@ done
188188
# Error for violation of enabled lint rules in config excluding generated code.
189189
revive \
190190
-set_exit_status=1 \
191-
-exclude "reflection/test/grpc_testing_not_regenerate/" \
191+
-exclude "testdata/grpc_testing_not_regenerated/" \
192192
-exclude "**/*.pb.go" \
193193
-formatter plain \
194194
-config "$(dirname "$0")/revive.toml" \

‎security/advancedtls/examples/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
2+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
13
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
24
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
35
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=

‎security/advancedtls/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
2+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
13
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
24
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
35
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=

‎stats/opencensus/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,8 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
859859
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
860860
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
861861
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
862+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
863+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
862864
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
863865
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
864866
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=

‎stats/opentelemetry/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
2121
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
2222
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
2323
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
24+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
25+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
2426
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
2527
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
2628
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=

‎status/status_ext_test.go

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ package status_test
2121
import (
2222
"context"
2323
"errors"
24+
"reflect"
2425
"strings"
2526
"testing"
2627
"time"
@@ -35,8 +36,10 @@ import (
3536
"google.golang.org/grpc/status"
3637
"google.golang.org/protobuf/proto"
3738
"google.golang.org/protobuf/protoadapt"
39+
"google.golang.org/protobuf/testing/protocmp"
3840

3941
testpb "google.golang.org/grpc/interop/grpc_testing"
42+
tpb "google.golang.org/grpc/testdata/grpc_testing_not_regenerated"
4043
)
4144

4245
const defaultTestTimeout = 10 * time.Second
@@ -203,3 +206,56 @@ func (s) TestStatusDetails(t *testing.T) {
203206
})
204207
}
205208
}
209+
210+
// TestStatus_ErrorDetailsMessageV1 verifies backward compatibility of the
211+
// status.Details() method when using protobuf code generated with only the
212+
// MessageV1 API implementation.
213+
func (s) TestStatus_ErrorDetailsMessageV1(t *testing.T) {
214+
details := []protoadapt.MessageV1{
215+
&tpb.SimpleMessage{Data: "abc"},
216+
}
217+
s, err := status.New(codes.Aborted, "").WithDetails(details...)
218+
if err != nil {
219+
t.Fatalf("(%v).WithDetails(%+v) failed: %v", s, details, err)
220+
}
221+
gotDetails := s.Details()
222+
for i, msg := range gotDetails {
223+
if got, want := reflect.TypeOf(msg), reflect.TypeOf(details[i]); got != want {
224+
t.Errorf("reflect.Typeof(%v) = %v, want = %v", msg, got, want)
225+
}
226+
if _, ok := msg.(protoadapt.MessageV1); !ok {
227+
t.Errorf("(%v).Details() returned message that doesn't implement protoadapt.MessageV1: %v", s, msg)
228+
}
229+
if diff := cmp.Diff(msg, details[i], protocmp.Transform()); diff != "" {
230+
t.Errorf("(%v).Details got unexpected output, diff (-got +want):\n%s", s, diff)
231+
}
232+
}
233+
}
234+
235+
// TestStatus_ErrorDetailsMessageV1AndV2 verifies that status.Details() method
236+
// returns the same message types when using protobuf code generated with both the
237+
// MessageV1 and MessageV2 API implementations.
238+
func (s) TestStatus_ErrorDetailsMessageV1AndV2(t *testing.T) {
239+
details := []protoadapt.MessageV1{
240+
&testpb.Empty{},
241+
}
242+
s, err := status.New(codes.Aborted, "").WithDetails(details...)
243+
if err != nil {
244+
t.Fatalf("(%v).WithDetails(%+v) failed: %v", s, details, err)
245+
}
246+
gotDetails := s.Details()
247+
for i, msg := range gotDetails {
248+
if got, want := reflect.TypeOf(msg), reflect.TypeOf(details[i]); got != want {
249+
t.Errorf("reflect.Typeof(%v) = %v, want = %v", msg, got, want)
250+
}
251+
if _, ok := msg.(protoadapt.MessageV1); !ok {
252+
t.Errorf("(%v).Details() returned message that doesn't implement protoadapt.MessageV1: %v", s, msg)
253+
}
254+
if _, ok := msg.(protoadapt.MessageV2); !ok {
255+
t.Errorf("(%v).Details() returned message that doesn't implement protoadapt.MessageV2: %v", s, msg)
256+
}
257+
if diff := cmp.Diff(msg, details[i], protocmp.Transform()); diff != "" {
258+
t.Errorf("(%v).Details got unexpected output, diff (-got +want):\n%s", s, diff)
259+
}
260+
}
261+
}

‎reflection/test/grpc_testing_not_regenerate/README.md renamed to ‎testdata/grpc_testing_not_regenerated/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ with `"context"`.
66

77
`dynamic.go` was generated with a newer protoc and manually edited to remove
88
everything except the descriptor bytes var, which is renamed and exported.
9+
10+
`simple_message_v1.go` was generated using protoc-gen-go v1.3.5 which doesn't
11+
support the MesssageV2 API. As a result the generated code implements only the
12+
old MessageV1 API.

‎reflection/test/grpc_testing_not_regenerate/dynamic.go renamed to ‎testdata/grpc_testing_not_regenerated/dynamic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
package grpc_testing_not_regenerate
18+
package grpc_testing_not_regenerated
1919

2020
// FileDynamicProtoRawDesc is the descriptor for dynamic.proto, see README.md.
2121
var FileDynamicProtoRawDesc = []byte{

‎reflection/test/grpc_testing_not_regenerate/dynamic.proto renamed to ‎testdata/grpc_testing_not_regenerated/dynamic.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
syntax = "proto3";
1919

20-
option go_package = "google.golang.org/grpc/reflection/test/grpc_testing_not_regenerate";
21-
2220
package grpc.testing;
2321

22+
option go_package = "google.golang.org/grpc/testdata/grpc_testing_not_regenerated";
23+
2424
message DynamicRes {}
2525

2626
message DynamicReq {}

‎testdata/grpc_testing_not_regenerated/simple.proto

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Copyright 2024 gRPC authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*
16+
*/
17+
18+
syntax = "proto3";
19+
20+
package grpc.testdata.grpc_testing_not_regenerated;
21+
22+
option go_package = "google.golang.org/grpc/testdata/grpc_testing_not_regenerated";
23+
24+
// SimpleMessage is used to hold string data.
25+
message SimpleMessage {
26+
string data = 1;
27+
}

0 commit comments

Comments
 (0)