Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: change rust-toolchain file to toml format #2487

Merged
merged 10 commits into from
Oct 23, 2023
Merged

Conversation

hawkw
Copy link
Contributor

@hawkw hawkw commented Oct 19, 2023

The rust-toolchain file containing only a Rust version number is deprecated in favor of a TOML-formatted rust-toolchain.toml. Using the old format seems to make Dependabot unhappy --- it complains that:

only rust-toolchain files formatted as TOML are supported, the non-TOML
format was deprecated by Rust

Therefore, this branch changes the toolchain file in this repo to the TOML format.

The `rust-toolchain` file containing only a Rust version number is
deprecated in favor of a TOML-formatted `rust-toolchain.toml`. Using the
old format seems to make Dependabot unhappy --- it complains that:

```
only rust-toolchain files formatted as TOML are supported, the non-TOML
format was deprecated by Rust
```

Therefore, this branch changes the toolchain file in this repo to the
TOML format.
@hawkw hawkw requested a review from a team as a code owner October 19, 2023 01:10
hawkw added a commit that referenced this pull request Oct 19, 2023
This commit updates the proxy's dependency on `rustix` in order to
resolve a potential memory exhaustion issue when using the
`rustix::fs::Dir` iterator with the `linux-raw` backend. This issue is
described in GHSA-c827-hfw6-qwvm.

We currently depend on both `rustix` v0.36 and v0.37 as transitive deps,
so this branch updates the v0.36 dep from v0.36.14 to v0.36.16, and the
v0.37 dependency from v0.37.4 to v0.37.7.

Unfortunately, we weren't able to get Dependabot to bump these deps for
us, because it no longer supports the legacy (non-TOML) `rust-toolchain`
file (see #2487 for details). Therefore, we have to do this bump
manually.
olix0r pushed a commit that referenced this pull request Oct 19, 2023
This commit updates the proxy's dependency on `rustix` in order to
resolve a potential memory exhaustion issue when using the
`rustix::fs::Dir` iterator with the `linux-raw` backend. This issue is
described in GHSA-c827-hfw6-qwvm.

We currently depend on both `rustix` v0.36 and v0.37 as transitive deps,
so this branch updates the v0.36 dep from v0.36.14 to v0.36.16, and the
v0.37 dependency from v0.37.4 to v0.37.7.

Unfortunately, we weren't able to get Dependabot to bump these deps for
us, because it no longer supports the legacy (non-TOML) `rust-toolchain`
file (see #2487 for details). Therefore, we have to do this bump
manually.
@hawkw
Copy link
Contributor Author

hawkw commented Oct 23, 2023

okay this works now

@hawkw hawkw merged commit 986d458 into main Oct 23, 2023
7 checks passed
@hawkw hawkw deleted the eliza/rust-toolchain.toml branch October 23, 2023 17:26
olix0r added a commit to linkerd/linkerd2 that referenced this pull request Nov 2, 2023
This release includes several bugfixes. Notably, inbound proxies would
not properly reflect grpc-status in metrics by default.

Furthermore, proxies now long warnings when they receive unexpected
error responses from the control plane.

---

* chore: change `rust-toolchain` file to toml format (linkerd/linkerd2-proxy#2487)
* gate: Detect disconnected inner services in readiness (linkerd/linkerd2-proxy#2491)
* Bump ahash to v0.8.5 (linkerd/linkerd2-proxy#2498)
* gate: Fix readiness deadlock (linkerd/linkerd2-proxy#2493)
* Log a warning when the controller clients receive an error (linkerd/linkerd2-proxy#2499)
* inbound: Fix gRPC response classification (linkerd/linkerd2-proxy#2496)

Signed-off-by: Oliver Gould <[email protected]>
olix0r added a commit to linkerd/linkerd2 that referenced this pull request Nov 2, 2023
This release includes several bugfixes. Notably, inbound proxies would
not properly reflect grpc-status in metrics by default.

Furthermore, proxies now long warnings when they receive unexpected
error responses from the control plane.

---

* chore: change `rust-toolchain` file to toml format (linkerd/linkerd2-proxy#2487)
* gate: Detect disconnected inner services in readiness (linkerd/linkerd2-proxy#2491)
* Bump ahash to v0.8.5 (linkerd/linkerd2-proxy#2498)
* gate: Fix readiness deadlock (linkerd/linkerd2-proxy#2493)
* Log a warning when the controller clients receive an error (linkerd/linkerd2-proxy#2499)
* inbound: Fix gRPC response classification (linkerd/linkerd2-proxy#2496)

Signed-off-by: Oliver Gould <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants