Skip to content

Commit 8be4c86

Browse files
Revert "feat(generator): harden opaque imports and fix snake case to go casin…" (#6299)
This reverts commit 0018186.
1 parent 63cba54 commit 8be4c86

19 files changed

+195
-1772
lines changed

buf.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ lint:
1111
ignore_only:
1212
DIRECTORY_SAME_PACKAGE:
1313
- examples/internal/proto/examplepb/a_bit_of_everything.proto
14-
- examples/internal/proto/examplepb/camel_case_service.proto
1514
- examples/internal/proto/examplepb/echo_service.proto
1615
- examples/internal/proto/examplepb/enum_with_single_value.proto
1716
- examples/internal/proto/examplepb/flow_combination.proto
@@ -30,8 +29,6 @@ lint:
3029
- examples/internal/proto/examplepb/ignore_comment.proto
3130
- examples/internal/proto/examplepb/remove_internal_comment.proto
3231
- examples/internal/proto/examplepb/wrappers.proto
33-
ENUM_PASCAL_CASE:
34-
- examples/internal/proto/sub/camel_case_message.proto
3532
ENUM_VALUE_PREFIX:
3633
- examples/internal/proto/examplepb/a_bit_of_everything.proto
3734
- examples/internal/proto/examplepb/response_body_service.proto
@@ -52,12 +49,9 @@ lint:
5249
- examples/internal/proto/examplepb/non_standard_names.proto
5350
- runtime/internal/examplepb/example.proto
5451
- runtime/internal/examplepb/non_standard_names.proto
55-
MESSAGE_PASCAL_CASE:
56-
- examples/internal/proto/sub/camel_case_message.proto
5752
PACKAGE_DIRECTORY_MATCH:
5853
- examples/internal/helloworld/helloworld.proto
5954
- examples/internal/proto/examplepb/a_bit_of_everything.proto
60-
- examples/internal/proto/examplepb/camel_case_service.proto
6155
- examples/internal/proto/examplepb/echo_service.proto
6256
- examples/internal/proto/examplepb/enum_with_single_value.proto
6357
- examples/internal/proto/examplepb/flow_combination.proto
@@ -78,7 +72,6 @@ lint:
7872
- examples/internal/proto/examplepb/wrappers.proto
7973
- examples/internal/proto/oneofenum/oneof_enum.proto
8074
- examples/internal/proto/pathenum/path_enum.proto
81-
- examples/internal/proto/sub/camel_case_message.proto
8275
- examples/internal/proto/sub/message.proto
8376
- examples/internal/proto/sub2/message.proto
8477
- internal/descriptor/apiconfig/apiconfig.proto
@@ -91,7 +84,6 @@ lint:
9184
- runtime/internal/examplepb/proto3.proto
9285
PACKAGE_SAME_GO_PACKAGE:
9386
- examples/internal/proto/examplepb/a_bit_of_everything.proto
94-
- examples/internal/proto/examplepb/camel_case_service.proto
9587
- examples/internal/proto/examplepb/echo_service.proto
9688
- examples/internal/proto/examplepb/enum_with_single_value.proto
9789
- examples/internal/proto/examplepb/flow_combination.proto
@@ -115,7 +107,6 @@ lint:
115107
PACKAGE_VERSION_SUFFIX:
116108
- examples/internal/helloworld/helloworld.proto
117109
- examples/internal/proto/examplepb/a_bit_of_everything.proto
118-
- examples/internal/proto/examplepb/camel_case_service.proto
119110
- examples/internal/proto/examplepb/echo_service.proto
120111
- examples/internal/proto/examplepb/enum_with_single_value.proto
121112
- examples/internal/proto/examplepb/flow_combination.proto
@@ -136,7 +127,6 @@ lint:
136127
- examples/internal/proto/examplepb/wrappers.proto
137128
- examples/internal/proto/oneofenum/oneof_enum.proto
138129
- examples/internal/proto/pathenum/path_enum.proto
139-
- examples/internal/proto/sub/camel_case_message.proto
140130
- examples/internal/proto/sub/message.proto
141131
- examples/internal/proto/sub2/message.proto
142132
- internal/descriptor/apiconfig/apiconfig.proto
@@ -147,8 +137,6 @@ lint:
147137
- runtime/internal/examplepb/non_standard_names.proto
148138
- runtime/internal/examplepb/proto2.proto
149139
- runtime/internal/examplepb/proto3.proto
150-
RPC_PASCAL_CASE:
151-
- examples/internal/proto/examplepb/camel_case_service.proto
152140
RPC_REQUEST_RESPONSE_UNIQUE:
153141
- examples/internal/proto/examplepb/a_bit_of_everything.proto
154142
- examples/internal/proto/examplepb/echo_service.proto
@@ -202,11 +190,9 @@ lint:
202190
- runtime/internal/examplepb/non_standard_names.proto
203191
SERVICE_PASCAL_CASE:
204192
- examples/internal/proto/examplepb/a_bit_of_everything.proto
205-
- examples/internal/proto/examplepb/camel_case_service.proto
206193
SERVICE_SUFFIX:
207194
- examples/internal/helloworld/helloworld.proto
208195
- examples/internal/proto/examplepb/a_bit_of_everything.proto
209-
- examples/internal/proto/examplepb/camel_case_service.proto
210196
- examples/internal/proto/examplepb/flow_combination.proto
211197
- examples/internal/proto/examplepb/openapi_merge_a.proto
212198
- examples/internal/proto/examplepb/openapi_merge_b.proto

examples/internal/proto/examplepb/BUILD.bazel

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ package(default_visibility = ["//visibility:public"])
99

1010
# gazelle:exclude a_bit_of_everything.pb.gw.go
1111
# gazelle:exclude a_bit_of_everything_grpc.pb.go
12-
# gazelle:exclude camel_case_service.pb.gw.go
13-
# gazelle:exclude camel_case_service_grpc.pb.go
1412
# gazelle:exclude echo_service.pb.gw.go
1513
# gazelle:exclude echo_service_grpc.pb.go
1614
# gazelle:exclude enum_with_single_value.pb.gw.go
@@ -58,7 +56,6 @@ proto_library(
5856
name = "examplepb_proto",
5957
srcs = [
6058
"a_bit_of_everything.proto",
61-
"camel_case_service.proto",
6259
"echo_service.proto",
6360
"enum_with_single_value.proto",
6461
"excess_body.proto",
@@ -102,7 +99,6 @@ proto_library(
10299
"opaque.proto",
103100
],
104101
deps = [
105-
"//examples/internal/proto/sub:sub_proto",
106102
"@com_google_protobuf//:duration_proto",
107103
"@com_google_protobuf//:field_mask_proto",
108104
"@com_google_protobuf//:timestamp_proto",
@@ -162,7 +158,6 @@ go_proto_library(
162158
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/examplepb",
163159
proto = ":examplepb_opaque_proto",
164160
deps = [
165-
"//examples/internal/proto/sub",
166161
"@com_github_golang_protobuf//descriptor:go_default_library_gen",
167162
"@org_golang_google_genproto_googleapis_api//annotations",
168163
],

0 commit comments

Comments
 (0)