reflection: rename non-regenerated pb.go files to not be called '.pb.…

…go' (#6885)
grpc · Dec 19, 2023 · e20d5ce · e20d5ce
1 parent adc7685
commit e20d5ce
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/reflection/grpc_testing_not_regenerate/README.md b/reflection/grpc_testing_not_regenerate/README.md
@@ -1,5 +1,8 @@
-testv3.pb.go is generated with an older version of codegen, to test reflection behavior with `grpc.SupportPackageIsVersion3`. DO NOT REGENERATE!
+`testv3.go` was generated with an older version of codegen, to test reflection
+behavior with `grpc.SupportPackageIsVersion3`. DO NOT REGENERATE!
 
-testv3.pb.go is manually edited to replace `"golang.org/x/net/context"` with `"context"`.
+`testv3.go` was then manually edited to replace `"golang.org/x/net/context"`
+with `"context"`.
 
-dynamic.pb.go is generated with the latest protoc and manually edited to remove everything except the descriptor bytes var, which is renamed and exported.
+`dynamic.go` was generated with a newer protoc and manually edited to remove
+everything except the descriptor bytes var, which is renamed and exported.
diff --git a/...grpc_testing_not_regenerate/dynamic.pb.go → ...on/grpc_testing_not_regenerate/dynamic.go b/...grpc_testing_not_regenerate/dynamic.pb.go → ...on/grpc_testing_not_regenerate/dynamic.go
diff --git a/.../grpc_testing_not_regenerate/testv3.pb.go → ...ion/grpc_testing_not_regenerate/testv3.go b/.../grpc_testing_not_regenerate/testv3.pb.go → ...ion/grpc_testing_not_regenerate/testv3.go
diff --git a/vet.sh b/vet.sh
@@ -88,7 +88,7 @@ not git grep -l 'x/net/context' -- "*.go"
 git grep -l '"math/rand"' -- "*.go" 2>&1 | not grep -v '^examples\|^interop/stress\|grpcrand\|^benchmark\|wrr_test'
 
 # - Do not use "interface{}"; use "any" instead.
-git grep -l 'interface{}' -- "*.go" 2>&1 | not grep -v '\.pb\.go\|protoc-gen-go-grpc'
+git grep -l 'interface{}' -- "*.go" 2>&1 | not grep -v '\.pb\.go\|protoc-gen-go-grpc\|grpc_testing_not_regenerate'
 
 # - Do not call grpclog directly. Use grpclog.Component instead.
 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'
@@ -127,7 +127,7 @@ staticcheck -go 1.19 -checks 'all' ./... > "${SC_OUT}" || true
 grep -v "(ST1000)" "${SC_OUT}" | grep -v "(SA1019)" | grep -v "(ST1003)" | not grep -v "(ST1019)\|\(other import of\)"
 
 # Exclude underscore checks for generated code.
-grep "(ST1003)" "${SC_OUT}" | not grep -v '\(.pb.go:\)\|\(code_string_test.go:\)'
+grep "(ST1003)" "${SC_OUT}" | not grep -v '\(.pb.go:\)\|\(code_string_test.go:\)\|\(grpc_testing_not_regenerate\)'
 
 # Error for duplicate imports not including grpc protos.
 grep "(ST1019)\|\(other import of\)" "${SC_OUT}" | not grep -Fv 'XXXXX PleaseIgnoreUnused
@@ -152,6 +152,7 @@ grep "(SA1019)" "${SC_OUT}" | not grep -Fv 'XXXXX PleaseIgnoreUnused
 XXXXX Protobuf related deprecation errors:
 "github.com/golang/protobuf
 .pb.go:
+grpc_testing_not_regenerate
 : ptypes.
 proto.RegisterType
 XXXXX gRPC internal usage deprecation errors: