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: move hyper to a newer MSRV #4983

Merged
merged 30 commits into from
Dec 23, 2024
Merged

chore: move hyper to a newer MSRV #4983

merged 30 commits into from
Dec 23, 2024

Conversation

dougch
Copy link
Contributor

@dougch dougch commented Dec 17, 2024

Release Summary:

Resolved issues:

#4971 and https://github.com/aws/s2n-tls/security/dependabot/1

Description of changes:

Due to hyper dependencies, move it out of our bindings workspace to allow for a newer Rust version and security updates.

Final directory structure, with a different MSRV for extneded, standard and rust-examples.

├── rust
│   ├── certs
│   ├── extended
│   │   ├── certs -> ../certs
│   │   ├── generate
│   │   ├── s2n-tls
│   │   ├── s2n-tls-sys
│   │   ├── s2n-tls-tokio
│   │   └── target
│   └── standard
│       ├── bench
│       ├── certs -> ../certs
│       ├── integration
│       ├── s2n-tls-hyper
│       └── target
└── rust-examples
    ├── certs
    ├── client-hello-config-resolution
    │   └── src
    ├── target
    │   └── debug
    └── tokio-server-client
        └── src

Call-outs:

This PR is going the refactor-all-the-things approach, many of the files are unchanged, but path depth is growing by one, across the board.

The regression test GHA will fail, because a path change breaks the flip back to the main branch, this will need an over-ride or a limited-time not required change.

Followups

  • Clippy for standard
  • MSRV, rustfmt, asan check for the standard workspace
  • Regression GHA

Testing:

This PR is tested by Rust bindings CI.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@github-actions github-actions bot added the s2n-core team label Dec 17, 2024
s2n-tls-hyper/Cargo.toml Outdated Show resolved Hide resolved
@dougch dougch marked this pull request as ready for review December 18, 2024 18:54
@dougch dougch requested review from goatgoose and jmayclin December 18, 2024 18:54
@boquan-fang boquan-fang self-requested a review December 18, 2024 19:11
bindings/rust/standard/s2n-tls-hyper/Cargo.toml Outdated Show resolved Hide resolved
.github/workflows/ci_rust.yml Outdated Show resolved Hide resolved
@dougch dougch requested a review from goatgoose December 18, 2024 21:37
Copy link
Contributor

@boquan-fang boquan-fang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you put the testing result in the Testing: section in the PR description? I think that part is missing. I think it's helpful to ping test results for a PR involves structure changes.

Copy link
Contributor

@boquan-fang boquan-fang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Testing has been updated.

@boquan-fang boquan-fang added this pull request to the merge queue Dec 19, 2024
@jmayclin jmayclin removed this pull request from the merge queue due to a manual request Dec 19, 2024
.github/workflows/ci_rust.yml Outdated Show resolved Hide resolved
.github/workflows/dependencies.yml Show resolved Hide resolved
bindings/README.md Outdated Show resolved Hide resolved
bindings/README.md Outdated Show resolved Hide resolved
bindings/README.md Show resolved Hide resolved
bindings/rust/extended/.gitignore Outdated Show resolved Hide resolved
bindings/rust/extended/.clippy.toml Outdated Show resolved Hide resolved
bindings/rust/standard/certs/cert.pem Outdated Show resolved Hide resolved
dougch and others added 2 commits December 20, 2024 10:45
Co-authored-by: Sam Clark <3758302+goatgoose@users.noreply.github.com>
@dougch dougch requested a review from goatgoose December 20, 2024 22:28
bindings/rust/README.md Outdated Show resolved Hide resolved
bindings/rust/README.md Outdated Show resolved Hide resolved
dougch and others added 2 commits December 20, 2024 15:45
Co-authored-by: James Mayclin <maycj@amazon.com>
Co-authored-by: James Mayclin <maycj@amazon.com>
@jmayclin jmayclin self-requested a review December 20, 2024 23:58
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the followup list: I think we'll also want rustfmt and asan running in the standard workspace.

bindings/rust/README.md Outdated Show resolved Hide resolved
bindings/rust/README.md Outdated Show resolved Hide resolved
bindings/rust/README.md Outdated Show resolved Hide resolved
dougch and others added 3 commits December 23, 2024 09:46
Co-authored-by: Sam Clark <3758302+goatgoose@users.noreply.github.com>
Co-authored-by: Sam Clark <3758302+goatgoose@users.noreply.github.com>
Co-authored-by: Sam Clark <3758302+goatgoose@users.noreply.github.com>
@dougch dougch enabled auto-merge December 23, 2024 17:47
@dougch dougch added this pull request to the merge queue Dec 23, 2024
Merged via the queue into aws:main with commit c012d98 Dec 23, 2024
39 of 40 checks passed
@dougch dougch deleted the mv_hyper branch December 23, 2024 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants