From c1bac30694ad4a566b3574244576cb1f93adcafa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Sat, 11 Mar 2023 09:37:14 +0200
Subject: [PATCH] webrtc: Update to aws 0.54/0.24

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1131>
---
 net/webrtc/Cargo.toml                   | 15 ++++++++-------
 net/webrtc/src/aws_kvs_signaller/imp.rs | 14 ++++++++------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/net/webrtc/Cargo.toml b/net/webrtc/Cargo.toml
index bc87e364..fcc9e89e 100644
--- a/net/webrtc/Cargo.toml
+++ b/net/webrtc/Cargo.toml
@@ -33,13 +33,14 @@ gst_plugin_webrtc_protocol = { path="protocol", package = "gst-plugin-webrtc-sig
 human_bytes = "0.4"
 url = "2"
 
-aws-config = "0.52.0"
-aws-types = "0.52.0"
-aws-sig-auth = "0.52.0"
-aws-smithy-http = { version = "0.52.0", features = [ "rt-tokio" ] }
-aws-smithy-types = "0.52.0"
-aws-sdk-kinesisvideo = "0.22.0"
-aws-sdk-kinesisvideosignaling = "0.22.0"
+aws-config = "0.54.0"
+aws-types = "0.54.0"
+aws-credential-types = "0.54.0"
+aws-sig-auth = "0.54.0"
+aws-smithy-http = { version = "0.54.0", features = [ "rt-tokio" ] }
+aws-smithy-types = "0.54.0"
+aws-sdk-kinesisvideo = "0.24.0"
+aws-sdk-kinesisvideosignaling = "0.24.0"
 http = "0.2.7"
 chrono = "0.4"
 data-encoding = "2.3.3"
diff --git a/net/webrtc/src/aws_kvs_signaller/imp.rs b/net/webrtc/src/aws_kvs_signaller/imp.rs
index 5c476283..04172f3b 100644
--- a/net/webrtc/src/aws_kvs_signaller/imp.rs
+++ b/net/webrtc/src/aws_kvs_signaller/imp.rs
@@ -16,16 +16,18 @@ use std::sync::Mutex;
 use tokio::task;
 
 use aws_config::default_provider::credentials::DefaultCredentialsChain;
+use aws_credential_types::{provider::ProvideCredentials, Credentials};
 use aws_sdk_kinesisvideo::{
     model::{ChannelProtocol, ChannelRole, SingleMasterChannelEndpointConfiguration},
-    Client, Endpoint,
+    Client,
 };
 use aws_sdk_kinesisvideosignaling::Client as SignalingClient;
 use aws_sig_auth::signer::{self, HttpSignatureType, OperationSigningConfig, RequestConfig};
 use aws_smithy_http::body::SdkBody;
-use aws_types::credentials::ProvideCredentials;
-use aws_types::region::{Region, SigningRegion};
-use aws_types::{Credentials, SigningService};
+use aws_types::{
+    region::{Region, SigningRegion},
+    SigningService,
+};
 use chrono::prelude::*;
 use data_encoding::BASE64;
 use http::Uri;
@@ -282,7 +284,7 @@ impl Signaller {
                         None
                     }
                 }) {
-                Some(endpoint_uri_str) => Uri::from_maybe_shared(endpoint_uri_str).unwrap(),
+                Some(endpoint_uri_str) => endpoint_uri_str,
                 None => {
                     anyhow::bail!("No HTTPS endpoint found for {channel_name}");
                 }
@@ -301,7 +303,7 @@ impl Signaller {
                 .load()
                 .await,
         )
-        .endpoint_resolver(Endpoint::immutable_uri(endpoint_https_uri.clone())?)
+        .endpoint_url(endpoint_https_uri)
         .build();
 
         let signaling_client = SignalingClient::from_conf(signaling_config);