From 655566e9e330b2cd510b57f1120c22729a27f771 Mon Sep 17 00:00:00 2001 From: "L. E. Segovia" Date: Wed, 23 Apr 2025 11:55:27 -0300 Subject: [PATCH] ci: Further deny AWS-related updates and fix related checks, part 2 - Add constraint on aws-smithy-runtime on aws and webrtc - Downgrade aws-sdk-s3 - Drop aws-smithy-http 0.62 - Update cargo-outdated ignores - Update Cargo.lock Part-of: --- .gitlab-ci.yml | 4 ++-- Cargo.lock | 17 ++++++++++------- net/aws/Cargo.toml | 4 +++- net/webrtc/Cargo.toml | 4 +++- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 700504db5..5dc30b11b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -385,9 +385,9 @@ outdated: - cargo update --color=always # libwebp-sys 0.2 requires Rust 1.85 or newer # aws-smithy-http 0.62 requires Rust 1.85 or newer - # aws-config, aws-sigv4 and aws-sdk-s3 need the above crate + # aws-config, aws-sigv4, aws-sdk-s3 and aws-smithy-runtime need the above crate # remaining aws crates need fix for https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2199#note_2870463 (unpin all aws related version ranges) - - cargo outdated --color=always --root-deps-only --ignore libwebp-sys2 --ignore aws-smithy-http,aws-config,aws-sdk-polly,aws-sdk-s3,aws-sdk-transcribestreaming,aws-sdk-translate,aws-sigv4,aws-sdk-kinesisvideo,aws-sdk-kinesisvideosignaling --exit-code 1 -v + - cargo outdated --color=always --root-deps-only --ignore libwebp-sys2 --ignore aws-smithy-http,aws-config,aws-sdk-polly,aws-sdk-s3,aws-sdk-transcribestreaming,aws-sdk-translate,aws-sigv4,aws-sdk-kinesisvideo,aws-sdk-kinesisvideosignaling,aws-smithy-runtime --exit-code 1 -v coverage: allow_failure: true diff --git a/Cargo.lock b/Cargo.lock index be30c3fac..0c41c5558 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -442,9 +442,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.78.0" +version = "1.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3038614b6cf7dd68d9a7b5b39563d04337eb3678d1d4173e356e927b0356158a" +checksum = "66e83401ad7287ad15244d557e35502c2a94105ca5b41d656c391f1a4fc04ca2" dependencies = [ "aws-credential-types", "aws-runtime", @@ -452,7 +452,7 @@ dependencies = [ "aws-smithy-async", "aws-smithy-checksums", "aws-smithy-eventstream", - "aws-smithy-http 0.61.1", + "aws-smithy-http 0.60.12", "aws-smithy-json", "aws-smithy-runtime", "aws-smithy-runtime-api", @@ -631,9 +631,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.63.0" +version = "0.62.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2dc8d842d872529355c72632de49ef8c5a2949a4472f10e802f28cf925770c" +checksum = "f2f45a1c384d7a393026bc5f5c177105aa9fa68e4749653b985707ac27d77295" dependencies = [ "aws-smithy-http 0.60.12", "aws-smithy-types", @@ -668,6 +668,7 @@ version = "0.60.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7809c27ad8da6a6a68c454e651d4962479e81472aa19ae99e59f9aba1f9713cc" dependencies = [ + "aws-smithy-eventstream", "aws-smithy-runtime-api", "aws-smithy-types", "bytes", @@ -2574,6 +2575,7 @@ dependencies = [ "aws-sdk-s3", "aws-sdk-transcribestreaming", "aws-sdk-translate", + "aws-smithy-runtime", "aws-types", "base32", "bytes", @@ -3407,6 +3409,7 @@ dependencies = [ "aws-sdk-kinesisvideosignaling", "aws-sigv4", "aws-smithy-http 0.60.12", + "aws-smithy-runtime", "aws-smithy-types", "aws-types", "chrono", @@ -7933,9 +7936,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034" +checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" dependencies = [ "bytes", "futures-core", diff --git a/net/aws/Cargo.toml b/net/aws/Cargo.toml index 93e7b1886..0eb5bafd6 100644 --- a/net/aws/Cargo.toml +++ b/net/aws/Cargo.toml @@ -14,7 +14,9 @@ rust-version.workspace = true async-stream = "0.3.4" base32 = "0.5" aws-config = "~1.5.18" -aws-sdk-s3 = "~1.78.0" +# needs this constraint to prevent adding aws-smithy-http 0.62 too +aws-smithy-runtime = "~1.7.8" +aws-sdk-s3 = "~1.76.0" aws-sdk-transcribestreaming = "~1.63.0" aws-sdk-translate = "~1.61.0" aws-types = "1.0" diff --git a/net/webrtc/Cargo.toml b/net/webrtc/Cargo.toml index 1bfb9cb1c..52d628611 100644 --- a/net/webrtc/Cargo.toml +++ b/net/webrtc/Cargo.toml @@ -40,6 +40,8 @@ rand = "0.9" url = "2" aws-config = { version = "~1.5.18", optional = true } +# needs this constraint to prevent adding aws-smithy-http 0.62 too +aws-smithy-runtime = { version = "~1.7.8", optional = true } aws-types = { version = "1.0", optional = true } aws-credential-types = { version = "1.0", optional = true } aws-sigv4 = { version = "~1.2.9", optional = true } @@ -85,7 +87,7 @@ capi = [] v1_22 = ["gst/v1_22", "gst-app/v1_22", "gst-video/v1_22", "gst-webrtc/v1_22", "gst-sdp/v1_22", "gst-rtp/v1_22"] doc = [] -aws = ["dep:aws-config", "dep:aws-types", "dep:aws-credential-types", "dep:aws-sigv4", +aws = ["dep:aws-config", "dep:aws-smithy-runtime", "dep:aws-types", "dep:aws-credential-types", "dep:aws-sigv4", "dep:aws-smithy-http", "dep:aws-smithy-types", "dep:aws-sdk-kinesisvideo", "dep:aws-sdk-kinesisvideosignaling", "dep:data-encoding", "dep:http", "dep:url-escape"] janus = ["dep:http"]