Skip to content

Commit 7c82fb1

Browse files
authoredDec 4, 2023
rust: Update to tonic v0.10 and prost v0.12 (#269)
1 parent a8e337a commit 7c82fb1

11 files changed

+479
-153
lines changed
 

‎Cargo.lock

+73-71
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,19 @@
33
version = 3
44

55
[[package]]
6-
name = "anyhow"
7-
version = "1.0.69"
8-
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
10-
11-
[[package]]
12-
name = "async-stream"
13-
version = "0.3.4"
6+
name = "aho-corasick"
7+
version = "1.1.2"
148
source = "registry+https://github.com/rust-lang/crates.io-index"
15-
checksum = "ad445822218ce64be7a341abfb0b1ea43b5c23aa83902542a4542e78309d8e5e"
9+
checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
1610
dependencies = [
17-
"async-stream-impl",
18-
"futures-core",
19-
"pin-project-lite",
11+
"memchr",
2012
]
2113

2214
[[package]]
23-
name = "async-stream-impl"
24-
version = "0.3.4"
15+
name = "anyhow"
16+
version = "1.0.69"
2517
source = "registry+https://github.com/rust-lang/crates.io-index"
26-
checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965"
27-
dependencies = [
28-
"proc-macro2",
29-
"quote",
30-
"syn",
31-
]
18+
checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
3219

3320
[[package]]
3421
name = "async-trait"
@@ -38,7 +25,7 @@ checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc"
3825
dependencies = [
3926
"proc-macro2",
4027
"quote",
41-
"syn",
28+
"syn 1.0.109",
4229
]
4330

4431
[[package]]
@@ -49,9 +36,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
4936

5037
[[package]]
5138
name = "base64"
52-
version = "0.13.1"
39+
version = "0.21.5"
5340
source = "registry+https://github.com/rust-lang/crates.io-index"
54-
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
41+
checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
5542

5643
[[package]]
5744
name = "bitflags"
@@ -252,12 +239,6 @@ version = "1.0.6"
252239
source = "registry+https://github.com/rust-lang/crates.io-index"
253240
checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
254241

255-
[[package]]
256-
name = "lazy_static"
257-
version = "1.4.0"
258-
source = "registry+https://github.com/rust-lang/crates.io-index"
259-
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
260-
261242
[[package]]
262243
name = "libc"
263244
version = "0.2.139"
@@ -266,7 +247,7 @@ checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
266247

267248
[[package]]
268249
name = "linkerd2-proxy-api"
269-
version = "0.11.0"
250+
version = "0.12.0"
270251
dependencies = [
271252
"h2",
272253
"http",
@@ -296,9 +277,9 @@ dependencies = [
296277

297278
[[package]]
298279
name = "memchr"
299-
version = "2.5.0"
280+
version = "2.6.4"
300281
source = "registry+https://github.com/rust-lang/crates.io-index"
301-
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
282+
checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
302283

303284
[[package]]
304285
name = "multimap"
@@ -345,7 +326,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
345326
dependencies = [
346327
"proc-macro2",
347328
"quote",
348-
"syn",
329+
"syn 1.0.109",
349330
]
350331

351332
[[package]]
@@ -362,73 +343,73 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
362343

363344
[[package]]
364345
name = "prettyplease"
365-
version = "0.1.24"
346+
version = "0.2.15"
366347
source = "registry+https://github.com/rust-lang/crates.io-index"
367-
checksum = "4ebcd279d20a4a0a2404a33056388e950504d891c855c7975b9a8fef75f3bf04"
348+
checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
368349
dependencies = [
369350
"proc-macro2",
370-
"syn",
351+
"syn 2.0.39",
371352
]
372353

373354
[[package]]
374355
name = "proc-macro2"
375-
version = "1.0.51"
356+
version = "1.0.70"
376357
source = "registry+https://github.com/rust-lang/crates.io-index"
377-
checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
358+
checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
378359
dependencies = [
379360
"unicode-ident",
380361
]
381362

382363
[[package]]
383364
name = "prost"
384-
version = "0.11.9"
365+
version = "0.12.3"
385366
source = "registry+https://github.com/rust-lang/crates.io-index"
386-
checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
367+
checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
387368
dependencies = [
388369
"bytes",
389370
"prost-derive",
390371
]
391372

392373
[[package]]
393374
name = "prost-build"
394-
version = "0.11.8"
375+
version = "0.12.3"
395376
source = "registry+https://github.com/rust-lang/crates.io-index"
396-
checksum = "2c828f93f5ca4826f97fedcbd3f9a536c16b12cff3dbbb4a007f932bbad95b12"
377+
checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2"
397378
dependencies = [
398379
"bytes",
399380
"heck",
400381
"itertools",
401-
"lazy_static",
402382
"log",
403383
"multimap",
384+
"once_cell",
404385
"petgraph",
405386
"prettyplease",
406387
"prost",
407388
"prost-types",
408389
"regex",
409-
"syn",
390+
"syn 2.0.39",
410391
"tempfile",
411392
"which",
412393
]
413394

414395
[[package]]
415396
name = "prost-derive"
416-
version = "0.11.9"
397+
version = "0.12.3"
417398
source = "registry+https://github.com/rust-lang/crates.io-index"
418-
checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
399+
checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
419400
dependencies = [
420401
"anyhow",
421402
"itertools",
422403
"proc-macro2",
423404
"quote",
424-
"syn",
405+
"syn 2.0.39",
425406
]
426407

427408
[[package]]
428409
name = "prost-types"
429-
version = "0.11.8"
410+
version = "0.12.3"
430411
source = "registry+https://github.com/rust-lang/crates.io-index"
431-
checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88"
412+
checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"
432413
dependencies = [
433414
"prost",
434415
]
@@ -444,9 +425,9 @@ dependencies = [
444425

445426
[[package]]
446427
name = "quote"
447-
version = "1.0.23"
428+
version = "1.0.33"
448429
source = "registry+https://github.com/rust-lang/crates.io-index"
449-
checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
430+
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
450431
dependencies = [
451432
"proc-macro2",
452433
]
@@ -480,18 +461,32 @@ dependencies = [
480461

481462
[[package]]
482463
name = "regex"
483-
version = "1.7.1"
464+
version = "1.10.2"
465+
source = "registry+https://github.com/rust-lang/crates.io-index"
466+
checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
467+
dependencies = [
468+
"aho-corasick",
469+
"memchr",
470+
"regex-automata",
471+
"regex-syntax",
472+
]
473+
474+
[[package]]
475+
name = "regex-automata"
476+
version = "0.4.3"
484477
source = "registry+https://github.com/rust-lang/crates.io-index"
485-
checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
478+
checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
486479
dependencies = [
480+
"aho-corasick",
481+
"memchr",
487482
"regex-syntax",
488483
]
489484

490485
[[package]]
491486
name = "regex-syntax"
492-
version = "0.6.28"
487+
version = "0.8.2"
493488
source = "registry+https://github.com/rust-lang/crates.io-index"
494-
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
489+
checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
495490

496491
[[package]]
497492
name = "rustix"
@@ -527,6 +522,17 @@ dependencies = [
527522
"unicode-ident",
528523
]
529524

525+
[[package]]
526+
name = "syn"
527+
version = "2.0.39"
528+
source = "registry+https://github.com/rust-lang/crates.io-index"
529+
checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
530+
dependencies = [
531+
"proc-macro2",
532+
"quote",
533+
"unicode-ident",
534+
]
535+
530536
[[package]]
531537
name = "tempfile"
532538
version = "3.4.0"
@@ -542,22 +548,22 @@ dependencies = [
542548

543549
[[package]]
544550
name = "thiserror"
545-
version = "1.0.39"
551+
version = "1.0.50"
546552
source = "registry+https://github.com/rust-lang/crates.io-index"
547-
checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c"
553+
checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
548554
dependencies = [
549555
"thiserror-impl",
550556
]
551557

552558
[[package]]
553559
name = "thiserror-impl"
554-
version = "1.0.39"
560+
version = "1.0.50"
555561
source = "registry+https://github.com/rust-lang/crates.io-index"
556-
checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e"
562+
checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
557563
dependencies = [
558564
"proc-macro2",
559565
"quote",
560-
"syn",
566+
"syn 2.0.39",
561567
]
562568

563569
[[package]]
@@ -600,40 +606,36 @@ dependencies = [
600606

601607
[[package]]
602608
name = "tonic"
603-
version = "0.8.3"
609+
version = "0.10.2"
604610
source = "registry+https://github.com/rust-lang/crates.io-index"
605-
checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb"
611+
checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
606612
dependencies = [
607-
"async-stream",
608613
"async-trait",
609614
"base64",
610615
"bytes",
611-
"futures-core",
612-
"futures-util",
613616
"http",
614617
"http-body",
615618
"percent-encoding",
616619
"pin-project",
617620
"prost",
618-
"prost-derive",
621+
"tokio",
619622
"tokio-stream",
620-
"tokio-util",
621623
"tower-layer",
622624
"tower-service",
623625
"tracing",
624626
]
625627

626628
[[package]]
627629
name = "tonic-build"
628-
version = "0.8.4"
630+
version = "0.10.2"
629631
source = "registry+https://github.com/rust-lang/crates.io-index"
630-
checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4"
632+
checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889"
631633
dependencies = [
632634
"prettyplease",
633635
"proc-macro2",
634636
"prost-build",
635637
"quote",
636-
"syn",
638+
"syn 2.0.39",
637639
]
638640

639641
[[package]]
@@ -668,7 +670,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
668670
dependencies = [
669671
"proc-macro2",
670672
"quote",
671-
"syn",
673+
"syn 1.0.109",
672674
]
673675

674676
[[package]]

‎Cargo.toml

+22-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "linkerd2-proxy-api"
3-
version = "0.11.0"
3+
version = "0.12.0"
44
authors = ["Linkerd Developers <cncf-linkerd-dev@lists.cncf.io>"]
55
license = "Apache-2.0"
66
edition = "2021"
@@ -19,8 +19,23 @@ grpc-route = ["http-route"]
1919
http-route = ["http-types"]
2020
http-types = ["http", "thiserror"]
2121
identity = ["prost-types", "tonic/codegen"]
22-
inbound = ["grpc-route", "http-route", "meta", "net", "prost-types", "tonic/codegen"]
23-
outbound = ["grpc-route", "destination", "http-route", "meta", "net", "prost-types", "tonic/codegen"]
22+
inbound = [
23+
"grpc-route",
24+
"http-route",
25+
"meta",
26+
"net",
27+
"prost-types",
28+
"tonic/codegen",
29+
]
30+
outbound = [
31+
"grpc-route",
32+
"destination",
33+
"http-route",
34+
"meta",
35+
"net",
36+
"prost-types",
37+
"tonic/codegen",
38+
]
2439
meta = []
2540
net = ["ipnet", "thiserror"]
2641
tap = ["h2", "http-types", "net", "prost-types", "tonic/codegen"]
@@ -33,17 +48,17 @@ all-features = true
3348
h2 = { version = "0.3", optional = true }
3449
http = { version = "0.2", optional = true }
3550
ipnet = { version = "2", optional = true }
36-
prost = "0.11"
37-
prost-types = { version = "0.11", optional = true }
51+
prost = "0.12"
52+
prost-types = { version = "0.12", optional = true }
3853
quickcheck = { version = "1", default-features = false, optional = true }
3954
thiserror = { version = "1", optional = true }
4055

4156
[dependencies.tonic]
42-
version = "0.8"
57+
version = "0.10"
4358
default-features = false
4459
features = ["prost"]
4560

4661
[dev-dependencies.tonic-build]
47-
version = "0.8"
62+
version = "0.10"
4863
default-features = false
4964
features = ["prost"]

‎deny.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ multiple-versions = "deny"
4343
wildcards = "allow"
4444
highlight = "all"
4545
deny = []
46-
skip = []
46+
skip = [
47+
{ name = "syn" },
48+
]
4749
skip-tree = []
4850

4951
[sources]

‎proto/inbound.proto

+2-3
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,8 @@ message Identity { string name = 1; }
178178
// "bar"]` is equivalent to "foo.bar." (matching `*.foo.bar`), etc.
179179
message IdentitySuffix { repeated string parts = 1; }
180180

181-
// Inbound-specific HTTP route configuration (based on the [Gateway API][api]).
182-
//
183-
// [api]: https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRoute
181+
// Inbound-specific HTTP route configuration (based on the
182+
// [Gateway API](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRoute)).
184183
message HttpRoute {
185184
io.linkerd.proxy.meta.Metadata metadata = 1;
186185

‎proto/outbound.proto

+2-3
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,8 @@ message ProxyProtocol {
9595
}
9696
}
9797

98-
// Outbound-specific HTTP route configuration (based on the [Gateway API][api]).
99-
//
100-
// [api]: https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRoute
98+
// Outbound-specific HTTP route configuration (based on the
99+
// [Gateway API](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRoute)).
101100
message HttpRoute {
102101
io.linkerd.proxy.meta.Metadata metadata = 1;
103102

‎src/gen/io.linkerd.proxy.destination.rs

+84-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/gen/io.linkerd.proxy.http_route.rs

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/gen/io.linkerd.proxy.identity.rs

+61-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/gen/io.linkerd.proxy.inbound.rs

+89-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/gen/io.linkerd.proxy.outbound.rs

+83-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/gen/io.linkerd.proxy.tap.rs

+58-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.