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

Portback apiclient feature flags #4272

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from

Conversation

arnaldo2792
Copy link
Contributor

Issue number:
N / A

Description of changes:

In bottlerocket-os/bottlerocket-core-kit#173, two feature flags were added to apiclient in order to support FIPS binaries. Lets port them back to this repo to make keep both repos in sync. I cherry-picked the commit and adjusted as necessary.

Testing done:

  • Launched aws-ecs-2 and confirmed the host joins a cluster and tasks run

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Comment on lines 68 to 69
# reqwest brings a set of new dependencies
{ name = "reqwest", version = "=0.12" },
Copy link
Contributor

Choose a reason for hiding this comment

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

this is a pretty unhelpful comment - why are we skipping all of reqwest's dependencies?

Generally we should only do this if we're including multiple versions of a crate, and we would do this to the older one which is presumably less likely to change in a significant way. But here we still only have one copy of reqwest.

Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
Add `tls` feature flag to allow consumers of the crate opt-in to TLS
connections when required. Additionally, add `fips` feature flag to
constrain any TLS connection to FIPS ciphers.

Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
Signed-off-by: Ben Cressey <[email protected]>
(cherry picked from commit d56cc898dd6b03702ef3ec49e1c64b1ec4274718)
Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
@arnaldo2792
Copy link
Contributor Author

Forced push fixes:

  • Bump reqwest to newly released 0.12.9 since it moved to a newer version of rustls-native-certs and it saves us the extra skip line in deny.toml
  • Skip hyper 0.X, untrusted and libloading, instead of reqwest in deny.toml.

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.

4 participants