Skip to content

Commit 289fbe9

Browse files
glbrnttglbrntt
authored
Regenerate protos after update (#16)
Motivation: swift-protobuf released a new version which modified generated code slightly. Our CI job for checking up-to-date generated code now fails. Modifications: - Update generated code Result: CI passes
1 parent 15ee677 commit 289fbe9

File tree

5 files changed

+51
-311
lines changed

5 files changed

+51
-311
lines changed

‎Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ let dependencies: [Package.Dependency] = [
4242
// Test-only dependencies:
4343
.package(
4444
url: "https://github.com/apple/swift-protobuf.git",
45-
from: "1.28.1"
45+
from: "1.31.0"
4646
),
4747
]
4848

‎Tests/GRPCCoreTests/Configuration/Generated/code.pb.swift‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -275,23 +275,5 @@ enum Google_Rpc_Code: SwiftProtobuf.Enum, Swift.CaseIterable {
275275
// MARK: - Code below here is support for the SwiftProtobuf runtime.
276276

277277
extension Google_Rpc_Code: SwiftProtobuf._ProtoNameProviding {
278-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
279-
0: .same(proto: "OK"),
280-
1: .same(proto: "CANCELLED"),
281-
2: .same(proto: "UNKNOWN"),
282-
3: .same(proto: "INVALID_ARGUMENT"),
283-
4: .same(proto: "DEADLINE_EXCEEDED"),
284-
5: .same(proto: "NOT_FOUND"),
285-
6: .same(proto: "ALREADY_EXISTS"),
286-
7: .same(proto: "PERMISSION_DENIED"),
287-
8: .same(proto: "RESOURCE_EXHAUSTED"),
288-
9: .same(proto: "FAILED_PRECONDITION"),
289-
10: .same(proto: "ABORTED"),
290-
11: .same(proto: "OUT_OF_RANGE"),
291-
12: .same(proto: "UNIMPLEMENTED"),
292-
13: .same(proto: "INTERNAL"),
293-
14: .same(proto: "UNAVAILABLE"),
294-
15: .same(proto: "DATA_LOSS"),
295-
16: .same(proto: "UNAUTHENTICATED"),
296-
]
278+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\0OK\0\u{1}CANCELLED\0\u{1}UNKNOWN\0\u{1}INVALID_ARGUMENT\0\u{1}DEADLINE_EXCEEDED\0\u{1}NOT_FOUND\0\u{1}ALREADY_EXISTS\0\u{1}PERMISSION_DENIED\0\u{1}RESOURCE_EXHAUSTED\0\u{1}FAILED_PRECONDITION\0\u{1}ABORTED\0\u{1}OUT_OF_RANGE\0\u{1}UNIMPLEMENTED\0\u{1}INTERNAL\0\u{1}UNAVAILABLE\0\u{1}DATA_LOSS\0\u{1}UNAUTHENTICATED\0")
297279
}

‎Tests/GRPCCoreTests/Configuration/Generated/rls.pb.swift‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,7 @@ fileprivate let _protobuf_package = "grpc.lookup.v1"
134134

135135
extension Grpc_Lookup_V1_RouteLookupRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
136136
static let protoMessageName: String = _protobuf_package + ".RouteLookupRequest"
137-
static let _protobuf_nameMap = SwiftProtobuf._NameMap(
138-
reservedNames: ["server", "path"],
139-
reservedRanges: [1..<3],
140-
numberNameMappings: [
141-
3: .standard(proto: "target_type"),
142-
5: .same(proto: "reason"),
143-
6: .standard(proto: "stale_header_data"),
144-
4: .standard(proto: "key_map"),
145-
7: .same(proto: "extensions"),
146-
])
137+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{4}\u{3}target_type\0\u{3}key_map\0\u{1}reason\0\u{3}stale_header_data\0\u{1}extensions\0\u{b}server\0\u{b}path\0\u{c}\u{1}\u{1}\u{c}\u{2}\u{1}")
147138

148139
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
149140
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -192,23 +183,12 @@ extension Grpc_Lookup_V1_RouteLookupRequest: SwiftProtobuf.Message, SwiftProtobu
192183
}
193184

194185
extension Grpc_Lookup_V1_RouteLookupRequest.Reason: SwiftProtobuf._ProtoNameProviding {
195-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
196-
0: .same(proto: "REASON_UNKNOWN"),
197-
1: .same(proto: "REASON_MISS"),
198-
2: .same(proto: "REASON_STALE"),
199-
]
186+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\0REASON_UNKNOWN\0\u{1}REASON_MISS\0\u{1}REASON_STALE\0")
200187
}
201188

202189
extension Grpc_Lookup_V1_RouteLookupResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
203190
static let protoMessageName: String = _protobuf_package + ".RouteLookupResponse"
204-
static let _protobuf_nameMap = SwiftProtobuf._NameMap(
205-
reservedNames: ["target"],
206-
reservedRanges: [1..<2],
207-
numberNameMappings: [
208-
3: .same(proto: "targets"),
209-
2: .standard(proto: "header_data"),
210-
4: .same(proto: "extensions"),
211-
])
191+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{4}\u{2}header_data\0\u{1}targets\0\u{1}extensions\0\u{b}target\0\u{c}\u{1}\u{1}")
212192

213193
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
214194
while let fieldNumber = try decoder.nextFieldNumber() {

‎Tests/GRPCCoreTests/Configuration/Generated/rls_config.pb.swift‎

Lines changed: 7 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -345,11 +345,7 @@ fileprivate let _protobuf_package = "grpc.lookup.v1"
345345

346346
extension Grpc_Lookup_V1_NameMatcher: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
347347
static let protoMessageName: String = _protobuf_package + ".NameMatcher"
348-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
349-
1: .same(proto: "key"),
350-
2: .same(proto: "names"),
351-
3: .standard(proto: "required_match"),
352-
]
348+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}key\0\u{1}names\0\u{3}required_match\0")
353349

354350
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
355351
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -389,12 +385,7 @@ extension Grpc_Lookup_V1_NameMatcher: SwiftProtobuf.Message, SwiftProtobuf._Mess
389385

390386
extension Grpc_Lookup_V1_GrpcKeyBuilder: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
391387
static let protoMessageName: String = _protobuf_package + ".GrpcKeyBuilder"
392-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
393-
1: .same(proto: "names"),
394-
3: .standard(proto: "extra_keys"),
395-
2: .same(proto: "headers"),
396-
4: .standard(proto: "constant_keys"),
397-
]
388+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}names\0\u{1}headers\0\u{3}extra_keys\0\u{3}constant_keys\0")
398389

399390
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
400391
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -443,10 +434,7 @@ extension Grpc_Lookup_V1_GrpcKeyBuilder: SwiftProtobuf.Message, SwiftProtobuf._M
443434

444435
extension Grpc_Lookup_V1_GrpcKeyBuilder.Name: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
445436
static let protoMessageName: String = Grpc_Lookup_V1_GrpcKeyBuilder.protoMessageName + ".Name"
446-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
447-
1: .same(proto: "service"),
448-
2: .same(proto: "method"),
449-
]
437+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}service\0\u{1}method\0")
450438

451439
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
452440
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -481,11 +469,7 @@ extension Grpc_Lookup_V1_GrpcKeyBuilder.Name: SwiftProtobuf.Message, SwiftProtob
481469

482470
extension Grpc_Lookup_V1_GrpcKeyBuilder.ExtraKeys: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
483471
static let protoMessageName: String = Grpc_Lookup_V1_GrpcKeyBuilder.protoMessageName + ".ExtraKeys"
484-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
485-
1: .same(proto: "host"),
486-
2: .same(proto: "service"),
487-
3: .same(proto: "method"),
488-
]
472+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}host\0\u{1}service\0\u{1}method\0")
489473

490474
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
491475
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -525,14 +509,7 @@ extension Grpc_Lookup_V1_GrpcKeyBuilder.ExtraKeys: SwiftProtobuf.Message, SwiftP
525509

526510
extension Grpc_Lookup_V1_HttpKeyBuilder: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
527511
static let protoMessageName: String = _protobuf_package + ".HttpKeyBuilder"
528-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
529-
1: .standard(proto: "host_patterns"),
530-
2: .standard(proto: "path_patterns"),
531-
3: .standard(proto: "query_parameters"),
532-
4: .same(proto: "headers"),
533-
5: .standard(proto: "constant_keys"),
534-
6: .same(proto: "method"),
535-
]
512+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}host_patterns\0\u{3}path_patterns\0\u{3}query_parameters\0\u{1}headers\0\u{3}constant_keys\0\u{1}method\0")
536513

537514
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
538515
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -587,20 +564,7 @@ extension Grpc_Lookup_V1_HttpKeyBuilder: SwiftProtobuf.Message, SwiftProtobuf._M
587564

588565
extension Grpc_Lookup_V1_RouteLookupConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
589566
static let protoMessageName: String = _protobuf_package + ".RouteLookupConfig"
590-
static let _protobuf_nameMap = SwiftProtobuf._NameMap(
591-
reservedNames: ["request_processing_strategy"],
592-
reservedRanges: [10..<11],
593-
numberNameMappings: [
594-
1: .standard(proto: "http_keybuilders"),
595-
2: .standard(proto: "grpc_keybuilders"),
596-
3: .standard(proto: "lookup_service"),
597-
4: .standard(proto: "lookup_service_timeout"),
598-
5: .standard(proto: "max_age"),
599-
6: .standard(proto: "stale_age"),
600-
7: .standard(proto: "cache_size_bytes"),
601-
8: .standard(proto: "valid_targets"),
602-
9: .standard(proto: "default_target"),
603-
])
567+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}http_keybuilders\0\u{3}grpc_keybuilders\0\u{3}lookup_service\0\u{3}lookup_service_timeout\0\u{3}max_age\0\u{3}stale_age\0\u{3}cache_size_bytes\0\u{3}valid_targets\0\u{3}default_target\0\u{b}request_processing_strategy\0\u{c}\u{a}\u{1}")
604568

605569
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
606570
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -674,9 +638,7 @@ extension Grpc_Lookup_V1_RouteLookupConfig: SwiftProtobuf.Message, SwiftProtobuf
674638

675639
extension Grpc_Lookup_V1_RouteLookupClusterSpecifier: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
676640
static let protoMessageName: String = _protobuf_package + ".RouteLookupClusterSpecifier"
677-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
678-
1: .standard(proto: "route_lookup_config"),
679-
]
641+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}route_lookup_config\0")
680642

681643
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
682644
while let fieldNumber = try decoder.nextFieldNumber() {

0 commit comments

Comments
 (0)