diff --git a/Cargo.lock b/Cargo.lock index 4b5be5fa..3bd57510 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -171,12 +171,13 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "aws-config" -version = "1.13.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "939e256cfe0ed68e96d32f194339d88210d5c10685cff0787400158f852c6819" +checksum = "16ec023cac0d0c0432e606a2d14f04eb70d09c71a739a406141e7be6b923ab95" dependencies = [ "aws-credential-types", "aws-runtime", + "aws-sdk-signin", "aws-sdk-sso", "aws-sdk-ssooidc", "aws-sdk-sts", @@ -188,15 +189,20 @@ dependencies = [ "aws-smithy-schema", "aws-smithy-types", "aws-types", + "base64-simd", "bytes", "fastrand", "hex", "http", + "p256", + "rand", "sha1 0.10.7", + "sha2 0.10.9", "time", "tokio", "tracing", "url", + "uuid", "zeroize", ] @@ -368,16 +374,16 @@ dependencies = [ "lru", "percent-encoding", "regex-lite", - "sha2", + "sha2 0.11.1", "tracing", "url", ] [[package]] -name = "aws-sdk-sso" -version = "1.119.0" +name = "aws-sdk-signin" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c414f25ec4aa9dc18f5cc8f55e18848bb509fcda4ce7c77bee6072e95806bc9" +checksum = "9a97b7a1ffefc05b86d3c809da3368f8ee7bd015b4c0da133aa456ae6922eb40" dependencies = [ "arc-swap", "aws-credential-types", @@ -399,10 +405,10 @@ dependencies = [ ] [[package]] -name = "aws-sdk-ssooidc" +name = "aws-sdk-sso" version = "1.121.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc638bb4355e6514334dcc3228cd4622f5ee54d704bd6a9010a5a91d7856d9d9" +checksum = "d8d414ba8f00c2b4b506893ded67827e63be88b5e6cce71b7c0ac8f96ce09bc5" dependencies = [ "arc-swap", "aws-credential-types", @@ -423,11 +429,34 @@ dependencies = [ "tracing", ] +[[package]] +name = "aws-sdk-ssooidc" +version = "1.123.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db26187b124bcc637641f7963d5200c5ec2409ea5b7730dd7e014ef4e0ab6f19" +dependencies = [ + "arc-swap", + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-observability", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-schema", + "aws-smithy-types", + "aws-types", + "fastrand", + "regex-lite", + "tracing", +] + [[package]] name = "aws-sdk-sts" -version = "1.124.0" +version = "1.126.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8a0dd8fbde04ba58ad722113c7addb11bf94cf549b1ea0eb9ea427fb87198a" +checksum = "c667da7839295125cfe23280f798c07ba694a9fed191af804edb4bda09ac7f10" dependencies = [ "arc-swap", "aws-credential-types", @@ -469,7 +498,7 @@ dependencies = [ "http", "p256", "percent-encoding", - "sha2", + "sha2 0.11.1", "subtle", "time", "tracing", @@ -504,7 +533,7 @@ dependencies = [ "md-5", "pin-project-lite", "sha1 0.11.0", - "sha2", + "sha2 0.11.1", "tracing", ] @@ -1021,7 +1050,7 @@ dependencies = [ "serde_ignored", "serde_json", "serde_path_to_error", - "sha2", + "sha2 0.11.1", "shlex", "strsim", "tabled", @@ -2450,7 +2479,7 @@ dependencies = [ "elliptic-curve", "primefield", "primeorder", - "sha2", + "sha2 0.11.1", ] [[package]] @@ -2573,7 +2602,7 @@ dependencies = [ "md-5", "memchr", "rand", - "sha2", + "sha2 0.11.1", "stringprep", ] @@ -3204,6 +3233,17 @@ dependencies = [ "digest 0.11.3", ] +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures 0.2.17", + "digest 0.10.7", +] + [[package]] name = "sha2" version = "0.11.1" @@ -3624,7 +3664,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c2ad44aa0ae96db89c4742212ed41645b2f597311ff6e1945542a4d9fadc2fb" dependencies = [ "rustls", - "sha2", + "sha2 0.11.1", "tokio", "tokio-postgres", "tokio-rustls", diff --git a/crates/clickhouse-cloud-api/Cargo.toml b/crates/clickhouse-cloud-api/Cargo.toml index ad813d57..834e9b2b 100644 --- a/crates/clickhouse-cloud-api/Cargo.toml +++ b/crates/clickhouse-cloud-api/Cargo.toml @@ -33,10 +33,8 @@ uuid = { version = "1", features = ["serde", "v4"] } chrono = { version = "0.4", features = ["serde"] } [dev-dependencies] -# No `credentials-login`: through aws-config 1.13.0 it pulls p256 0.13 and -# crypto-bigint 0.5.5 (RUSTSEC-2026-0387). Restore it once aws-config ships -# smithy-lang/smithy-rs#4970 (p256 0.14). -aws-config = "1.8.16" +# `credentials-login` lets the default credential chain read `aws login` sessions. +aws-config = { version = "1.13.2", features = ["credentials-login"] } aws-credential-types = "1.2.14" clickhouse-openapi-analyzer = { path = "../clickhouse-openapi-analyzer" } # Disable default features on aws-sdk-* crates to drop the legacy `rustls` feature, diff --git a/docs/development.md b/docs/development.md index 8f9d8512..4924ddb9 100644 --- a/docs/development.md +++ b/docs/development.md @@ -190,7 +190,7 @@ cargo test --test clickpipe_postgres_ec2_test -- --ignored --nocapture # per-s cargo test --test clickpipe_smoke_test -- --ignored --nocapture # create-only smoke against a shared service ``` -The suites load AWS credentials through the default provider chain: environment variables, shared profiles, SSO, or `credential_process`. `aws login` sessions are not read directly. To use one, export its credentials first with `eval "$(aws configure export-credentials --format env)"`. +The suites load AWS credentials through the default provider chain: environment variables, shared profiles, SSO, `aws login` sessions, or `credential_process`. All require `CLICKHOUSE_CLOUD_API_KEY`, `CLICKHOUSE_CLOUD_API_SECRET`, `CLICKHOUSE_CLOUD_TEST_ORG_ID`, `CLICKHOUSE_CLOUD_TEST_PROVIDER`, and `CLICKHOUSE_CLOUD_TEST_REGION` in the environment, and are wired into the scheduled `Cloud Integration` GitHub Actions workflow. The ClickPipes E2E suites additionally need AWS credentials and an `eu-west-1` region quota; `clickpipe_smoke_test` reads a pre-provisioned service ID from `CLICKHOUSE_CLOUD_TEST_CLICKPIPE_SERVICE_ID`. The Postgres suite's private endpoint phase runs only on AWS with `CLICKHOUSE_CLOUD_POSTGRES_PRIVATE_ENDPOINT` set, because private endpoints need an organization with the feature enabled; creation adds 5 to 10 minutes.