Merge pull request #610 from jpculp/update-rust-deps

Update rust dependencies (including AWS SDK)

deny.toml

@@ -61,16 +61,22 @@ multiple-versions = "deny"
 wildcards = "deny"
 
 skip = [
-    # clap 3.x is using an old version of hermit-abi
-    { name = "hermit-abi", version = "=0.1.19" }
+    # num_cpus and clap is using old versions of hermit-abi
+    { name = "hermit-abi" },
+    # pem and using an old version of base64
+    { name = "base64", version = "=0.13.1" },
+    # globset is using an old version of aho-corasick
+    { name = "aho-corasick", version = "=0.7.20" },
+    # clap and other crates use an old version of syn
+    { name = "syn", version = "=1" },
 ]
 
 skip-tree = [
     # windows-sys is not a direct dependency. mio and schannel
     # are using different versions of windows-sys. we skip the
     # dependency tree because windows-sys has many sub-crates
     # that differ in major version.
-    { name = "windows-sys", version = "=0.42.0" },
+    { name = "windows-sys", version = "=0.42" },
 ]
 
 [sources]

tough-kms/Cargo.toml

@@ -17,15 +17,15 @@ aws-sdk-rust-rustls = ["aws-config/rustls", "aws-sdk-kms/rustls"]
 [dependencies]
 tough = { version = "0.13", path = "../tough", features = ["http"] }
 ring = { version = "0.16", features = ["std"] }
-aws-sdk-kms = "0.24"
-aws-config = "0.54"
+aws-sdk-kms = "0.28"
+aws-config = "0.55"
 snafu = { version = "0.7", features = ["backtraces-impl-backtrace-crate"] }
 tokio = { version = "1", features = ["fs", "io-util", "time", "macros", "rt-multi-thread"] }
 pem = "1"
 
 [dev-dependencies]
-aws-smithy-client = {version = "0.54", features = ["test-util"]}
-aws-smithy-http = "0.54"
+aws-smithy-client = {version = "0.55", features = ["test-util"]}
+aws-smithy-http = "0.55"
 base64 = "0.13"
 bytes = "1"
 http = "0.2"

tough-kms/src/error.rs

@@ -36,7 +36,8 @@ pub enum Error {
     KmsGetPublicKey {
         profile: Option<String>,
         key_id: String,
-        source: aws_sdk_kms::types::SdkError<aws_sdk_kms::error::GetPublicKeyError>,
+        source:
+            aws_sdk_kms::error::SdkError<aws_sdk_kms::operation::get_public_key::GetPublicKeyError>,
         backtrace: Backtrace,
     },
 
@@ -53,7 +54,7 @@ pub enum Error {
     KmsSignMessage {
         key_id: String,
         profile: Option<String>,
-        source: aws_sdk_kms::types::SdkError<aws_sdk_kms::error::SignError>,
+        source: aws_sdk_kms::error::SdkError<aws_sdk_kms::operation::sign::SignError>,
         backtrace: Backtrace,
     },
 

tough-kms/src/lib.rs

@@ -22,7 +22,7 @@
 
 mod client;
 pub mod error;
-use aws_sdk_kms::types::Blob;
+use aws_sdk_kms::primitives::Blob;
 use aws_sdk_kms::Client as KmsClient;
 use ring::digest::{digest, SHA256};
 use ring::rand::SecureRandom;
@@ -43,12 +43,12 @@ pub enum KmsSigningAlgorithm {
 }
 
 impl KmsSigningAlgorithm {
-    fn value(self) -> aws_sdk_kms::model::SigningAlgorithmSpec {
+    fn value(self) -> aws_sdk_kms::types::SigningAlgorithmSpec {
         // Currently we are supporting only single algorithm, but code stub is added to support
         // multiple algorithms in future.
         match self {
             KmsSigningAlgorithm::RsassaPssSha256 => {
-                aws_sdk_kms::model::SigningAlgorithmSpec::RsassaPssSha256
+                aws_sdk_kms::types::SigningAlgorithmSpec::RsassaPssSha256
             }
         }
     }
@@ -194,7 +194,7 @@ impl Sign for KmsRsaKey {
             .sign()
             .key_id(self.key_id.clone())
             .message(blob)
-            .message_type(aws_sdk_kms::model::MessageType::Digest)
+            .message_type(aws_sdk_kms::types::MessageType::Digest)
             .signing_algorithm(self.signing_algorithm.value())
             .send();
 

tough-kms/tests/test_utils.rs

@@ -1,7 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-use aws_sdk_kms::{Client, Config, Credentials};
+use aws_sdk_kms::config::{Credentials, Region};
+use aws_sdk_kms::{Client, Config};
 use aws_smithy_client::erase::DynConnector;
 use aws_smithy_client::test_connection::TestConnection;
 use aws_smithy_http::body::SdkBody;
@@ -50,7 +51,7 @@ pub fn mock_client(data_files: Vec<&str>) -> Client {
 
     let conf = Config::builder()
         .credentials_provider(creds)
-        .region(aws_sdk_kms::Region::new("us-east-1"))
+        .region(Region::new("us-east-1"))
         .http_connector(conn)
         .build();
 
@@ -85,7 +86,7 @@ pub fn mock_client_with_status(status: u16) -> Client {
 
     let conf = aws_sdk_kms::Config::builder()
         .credentials_provider(creds)
-        .region(aws_sdk_kms::Region::new("us-east-1"))
+        .region(Region::new("us-east-1"))
         .http_connector(conn)
         .build();
 

tough-ssm/Cargo.toml

@@ -16,8 +16,8 @@ aws-sdk-rust-rustls = ["aws-config/rustls", "aws-sdk-ssm/rustls"]
 
 [dependencies]
 tough = { version = "0.13", path = "../tough", features = ["http"] }
-aws-sdk-ssm = "0.24"
-aws-config = "0.54"
+aws-sdk-ssm = "0.28"
+aws-config = "0.55"
 serde = "1"
 serde_json = "1"
 snafu = { version = "0.7", features = ["backtraces-impl-backtrace-crate"] }

tough-ssm/src/error.rs

@@ -1,7 +1,6 @@
 // Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-use aws_sdk_ssm::error::{GetParameterError, PutParameterError};
 use snafu::{Backtrace, Snafu};
 
 pub type Result<T> = std::result::Result<T, Error>;
@@ -35,7 +34,8 @@ pub enum Error {
     SsmGetParameter {
         profile: Option<String>,
         parameter_name: String,
-        source: aws_sdk_ssm::types::SdkError<GetParameterError>,
+        source:
+            aws_sdk_ssm::error::SdkError<aws_sdk_ssm::operation::get_parameter::GetParameterError>,
         backtrace: Backtrace,
     },
 
@@ -59,7 +59,8 @@ pub enum Error {
     SsmPutParameter {
         profile: Option<String>,
         parameter_name: String,
-        source: aws_sdk_ssm::types::SdkError<PutParameterError>,
+        source:
+            aws_sdk_ssm::error::SdkError<aws_sdk_ssm::operation::put_parameter::PutParameterError>,
         backtrace: Backtrace,
     },
 }

tough-ssm/src/lib.rs

@@ -65,7 +65,7 @@ impl KeySource for SsmKeySource {
             .description(key_id_hex.to_owned())
             .set_key_id(self.key_id.as_ref().cloned())
             .overwrite(true)
-            .set_type(Some(aws_sdk_ssm::model::ParameterType::SecureString))
+            .set_type(Some(aws_sdk_ssm::types::ParameterType::SecureString))
             .value(value.to_owned())
             .send();
 

tough/Cargo.toml

@@ -30,7 +30,7 @@ url = "2"
 walkdir = "2"
 
 [dev-dependencies]
-hex-literal = "0.3"
+hex-literal = "0.4"
 httptest = "0.15"
 maplit = "1"
 

tuftool/Cargo.toml

@@ -16,9 +16,9 @@ aws-sdk-rust-native-tls = ["aws-config/native-tls", "aws-sdk-ssm/native-tls", "a
 aws-sdk-rust-rustls = ["aws-config/rustls", "aws-sdk-ssm/rustls", "aws-sdk-kms/rustls",]
 
 [dependencies]
-aws-config = "0.54"
-aws-sdk-kms = "0.24"
-aws-sdk-ssm = "0.24"
+aws-config = "0.55"
+aws-sdk-kms = "0.28"
+aws-sdk-ssm = "0.28"
 chrono = { version = "0.4", default-features = false, features = ["alloc", "std", "clock"] }
 clap = { version = "3", features = ["derive"] }
 hex = "0.4"