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

Update go and rust dependencies #3830

Merged
merged 4 commits into from
Mar 21, 2024

Conversation

jmt-lab
Copy link
Contributor

@jmt-lab jmt-lab commented Mar 18, 2024

Description of changes:

  • Updates go dependencies for host-ctr and ecs-gpu-init
  • Updates rust dependencies
  • Updates aws-sdk to 1 series in matching pattern to tough
  • Updates code to changes inherited from rust dependency updates to minimize duplicate dependency versions
  • Changed hash for ring in clarify.toml as they adjusted the copyright years for thirdparty/fiat/LICENSE

Testing done:

  • Built and launched aws-ecs-2

testsys run will be kicked off in the morning

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.

@jmt-lab jmt-lab self-assigned this Mar 18, 2024
@jmt-lab jmt-lab force-pushed the jmt/1.19.3/dependency branch 3 times, most recently from 8ccaad6 to b27e4b7 Compare March 19, 2024 17:34
@jmt-lab
Copy link
Contributor Author

jmt-lab commented Mar 19, 2024

hyper proxy fix, this should hopefully get us going

@jmt-lab jmt-lab force-pushed the jmt/1.19.3/dependency branch 2 times, most recently from 636143d to 393c0fa Compare March 19, 2024 17:42
@jmt-lab
Copy link
Contributor Author

jmt-lab commented Mar 19, 2024

Unit tests passed, good to go

@jmt-lab jmt-lab marked this pull request as ready for review March 19, 2024 17:44
@jmt-lab jmt-lab force-pushed the jmt/1.19.3/dependency branch 9 times, most recently from 15c3ea0 to f3cba92 Compare March 19, 2024 21:40
sources/host-ctr/go.mod Show resolved Hide resolved
sources/cfsignal/src/cloudformation.rs Show resolved Hide resolved
sources/clarify.toml Show resolved Hide resolved
sources/api/pluto/src/ec2.rs Outdated Show resolved Hide resolved
sources/deny.toml Outdated Show resolved Hide resolved
@jmt-lab jmt-lab force-pushed the jmt/1.19.3/dependency branch 2 times, most recently from 1b3d953 to 2e5debf Compare March 19, 2024 22:37
@jmt-lab
Copy link
Contributor Author

jmt-lab commented Mar 20, 2024

Test Report for migration testing and k8s conformance:

aarch64-aws-ecs-2-1-initial                                     Test                             passed                                                       1                              0                               0   f3cba92c                         2024-03-19T23:12:31Z
 aarch64-aws-ecs-2-2-migrate                                     Test                             passed                                                       2                              0                               0   f3cba92c                         2024-03-19T23:13:06Z
 aarch64-aws-ecs-2-3-migrated                                    Test                             passed                                                       1                              0                               0   f3cba92c                         2024-03-19T23:13:14Z
 aarch64-aws-ecs-2-4-migrate                                     Test                             passed                                                       2                              0                               0   f3cba92c                         2024-03-19T23:13:45Z
 aarch64-aws-ecs-2-5-final                                       Test                             passed                                                       1                              0                               0   f3cba92c                         2024-03-19T23:13:58Z
 aarch64-aws-k8s-129-1-initial                                   Test                             passed                                                       5                              0                            7406   f3cba92c                         2024-03-19T23:27:23Z
 aarch64-aws-k8s-129-2-migrate                                   Test                             passed                                                       2                              0                               0   f3cba92c                         2024-03-19T23:27:42Z
 aarch64-aws-k8s-129-3-migrated                                  Test                             passed                                                       5                              0                            7406   f3cba92c                         2024-03-19T23:28:43Z
 aarch64-aws-k8s-129-4-migrate                                   Test                             passed                                                       2                              0                               0   f3cba92c                         2024-03-19T23:29:02Z
 aarch64-aws-k8s-129-5-final                                     Test                             passed                                                       5                              0                            7406   f3cba92c                         2024-03-19T23:29:59Z
 aarch64-aws-k8s-129-ipv6-1-initial                              Test                             passed                                                       5                              0                            7406   f3cba92c                         2024-03-19T23:24:18Z
 aarch64-aws-k8s-129-ipv6-2-migrate                              Test                             passed                                                       2                              0                               0   f3cba92c                         2024-03-19T23:24:36Z
 aarch64-aws-k8s-129-ipv6-3-migrated                             Test                             passed                                                       5                              0                            7406   f3cba92c                         2024-03-19T23:25:38Z
 aarch64-aws-k8s-129-ipv6-4-migrate                              Test                             passed                                                       2                              0                               0   f3cba92c                         2024-03-19T23:26:09Z
 aarch64-aws-k8s-129-ipv6-5-final                                Test                             passed                                                       5                              0                            7406   f3cba92c                         2024-03-19T23:27:09Z
 aarch64-aws-k8s-129-conformance                              Test                             passed                                                     392                              0                            7019   2e5debff                         2024-03-20T05:20:16Z
 aarch64-aws-k8s-129-ipv6-conformance                         Test                             passed                                                     392                              0                            7019   2e5debff                         2024-03-20T05:16:44Z

@@ -59,7 +60,7 @@ impl Terminal {

// Get the current settings of the user's terminal so we can restore them later.
let current_termios =
tcgetattr(STDOUT_FILENO).context(error::TermAttrSnafu { op: "get" })?;
tcgetattr(io::stdout()).context(error::TermAttrSnafu { op: "get" })?;
Copy link
Contributor

Choose a reason for hiding this comment

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

note: test enter-admin-container

async fn sdk_imds_client() -> Result<imds::Client> {
fn sdk_imds_client() -> imds::Client {
Copy link
Contributor

Choose a reason for hiding this comment

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

Woah, wait a minute. The IMDS client went from async to blocking?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yerp

@@ -45,7 +46,7 @@ pub(crate) fn fetch_proxy_env() -> (Option<String>, Option<String>) {
pub(crate) fn setup_http_client(
https_proxy: String,
no_proxy: Option<String>,
) -> Result<impl Into<aws_smithy_client::http_connector::HttpConnector>> {
) -> Result<ProxyConnector<HttpsConnector<HttpConnector>>> {
Copy link
Contributor

Choose a reason for hiding this comment

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

Note: test proxy

{ name = "base64", version = "=0.13" },
# AWS SDK for rust uses an older version of fastrand
{ name = "fastrand", version = "=1.9" },
# sdk still uses 0.7.5 but everything in this repo now uses 0.8.2
Copy link
Contributor

Choose a reason for hiding this comment

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

"sdk" is ambiguous. Use "settings sdk" everywhere to be more clear.

Suggested change
# sdk still uses 0.7.5 but everything in this repo now uses 0.8.2
# settings sdk still uses 0.7.5 but everything in this repo now uses 0.8.2

@jmt-lab
Copy link
Contributor Author

jmt-lab commented Mar 21, 2024

Updated per matt's comment.

Proxy tested and passes

  • Ran squid proxy on my dev instance
  • Ensured squid proxy will forward auth headers and allow passing to amazonaws
  • Verified squid logs received and sent requests
  • Verified in CloudTrail aws actions seen from k8s instance with source ip of my dev instance (proxy host)

@jmt-lab jmt-lab merged commit 72cf840 into bottlerocket-os:develop Mar 21, 2024
50 checks passed
@jmt-lab jmt-lab deleted the jmt/1.19.3/dependency branch March 21, 2024 23:03
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