Merge branch 'main' into RUST-1529-aws-sdk-signature

Author: JamieTsai1024

Cargo.lock

@@ -41,7 +41,7 @@ dns-resolver = ["dep:hickory-resolver", "dep:hickory-proto"]
 cert-key-password = ["dep:pem", "dep:pkcs8"]
 
 # Enable support for MONGODB-AWS authentication.
-aws-auth = ["dep:reqwest", "aws-config", "aws-types", "aws-credential-types", "aws-sigv4", "http"]
+aws-auth = ["dep:reqwest", "dep:aws-config", "dep:aws-types", "dep:aws-credential-types", "dep:aws-sigv4", "dep:http"]
 
 # Enable support for on-demand Azure KMS credentials.
 azure-kms = ["dep:reqwest"]

Cargo.toml

@@ -41,7 +41,7 @@ impl Database {
     pub fn run_command(&self, command: Document) -> RunCommand {
         RunCommand {
             db: self,
-            command: RawDocumentBuf::from_document(&command),
+            command: RawDocumentBuf::try_from(&command),
             options: None,
             session: None,
         }
@@ -76,7 +76,7 @@ impl Database {
     pub fn run_cursor_command(&self, command: Document) -> RunCursorCommand {
         RunCursorCommand {
             db: self,
-            command: RawDocumentBuf::from_document(&command),
+            command: RawDocumentBuf::try_from(&command),
             options: None,
             session: ImplicitSession,
         }

src/action/run_command.rs

@@ -29,20 +29,18 @@ pub(crate) fn cstr_to_str(cs: &CStr) -> &str {
     }
 }
 
+#[cfg(feature = "bson-3")]
 pub(crate) trait RawDocumentBufExt: Sized {
-    fn append_ref_compat<'a>(
+    fn append_ref<'a>(
         &mut self,
         key: impl AsRef<CStr>,
         value: impl Into<crate::bson::raw::RawBsonRef<'a>> + 'a,
     );
-
-    #[cfg(not(feature = "bson-3"))]
-    fn decode_from_bytes(data: Vec<u8>) -> RawResult<Self>;
 }
 
 #[cfg(feature = "bson-3")]
 impl RawDocumentBufExt for crate::bson::RawDocumentBuf {
-    fn append_ref_compat<'a>(
+    fn append_ref<'a>(
         &mut self,
         key: impl AsRef<CStr>,
         value: impl Into<crate::bson::raw::RawBsonRef<'a>> + 'a,
@@ -51,45 +49,15 @@ impl RawDocumentBufExt for crate::bson::RawDocumentBuf {
     }
 }
 
-#[cfg(not(feature = "bson-3"))]
-impl RawDocumentBufExt for crate::bson::RawDocumentBuf {
-    fn append_ref_compat<'a>(
-        &mut self,
-        key: impl AsRef<CStr>,
-        value: impl Into<crate::bson::raw::RawBsonRef<'a>>,
-    ) {
-        self.append_ref(key, value)
-    }
-
-    fn decode_from_bytes(data: Vec<u8>) -> RawResult<Self> {
-        Self::from_bytes(data)
-    }
-}
-
-#[cfg(not(feature = "bson-3"))]
-pub(crate) trait RawDocumentExt {
-    fn decode_from_bytes<D: AsRef<[u8]> + ?Sized>(data: &D) -> RawResult<&Self>;
-}
-
-#[cfg(not(feature = "bson-3"))]
-impl RawDocumentExt for crate::bson::RawDocument {
-    fn decode_from_bytes<D: AsRef<[u8]> + ?Sized>(data: &D) -> RawResult<&Self> {
-        Self::from_bytes(data)
-    }
-}
-
-#[cfg(not(feature = "bson-3"))]
-#[allow(dead_code)]
-pub(crate) trait DocumentExt {
-    fn encode_to_vec(&self) -> crate::bson::ser::Result<Vec<u8>>;
+#[cfg(feature = "bson-3")]
+pub(crate) trait RawBsonRefExt {
+    fn to_raw_bson(&self) -> crate::bson::RawBson;
 }
 
-#[cfg(not(feature = "bson-3"))]
-impl DocumentExt for crate::bson::Document {
-    fn encode_to_vec(&self) -> crate::bson::ser::Result<Vec<u8>> {
-        let mut out = vec![];
-        self.to_writer(&mut out)?;
-        Ok(out)
+#[cfg(feature = "bson-3")]
+impl RawBsonRefExt for crate::bson::RawBsonRef<'_> {
+    fn to_raw_bson(&self) -> crate::bson::RawBson {
+        (*self).into()
     }
 }
 
@@ -113,6 +81,7 @@ use_either! {
     RawError                        => error::Error                     | raw::Error;
     DeError                         => error::Error                     | de::Error;
     SerError                        => error::Error                     | ser::Error;
+    Utf8Lossy                       => Utf8Lossy                        | serde_helpers::Utf8LossyDeserialization;
     serialize_to_raw_document_buf   => serialize_to_raw_document_buf    | to_raw_document_buf;
     serialize_to_document           => serialize_to_document            | to_document;
     serialize_to_bson               => serialize_to_bson                | to_bson;

src/bson_compat.rs

@@ -6,6 +6,8 @@ use std::{
 
 use serde::Serialize;
 
+#[cfg(feature = "bson-3")]
+use crate::bson_compat::{RawBsonRefExt as _, RawDocumentBufExt as _};
 use crate::{
     bson::{
         oid::ObjectId,
@@ -17,7 +19,6 @@ use crate::{
         RawBsonRef,
         RawDocumentBuf,
     },
-    bson_compat::RawDocumentBufExt as _,
     checked::Checked,
     error::{Error, ErrorKind, Result},
     runtime::SyncLittleEndianRead,
@@ -78,7 +79,7 @@ pub(crate) fn to_bson_array(docs: &[Document]) -> Bson {
 pub(crate) fn to_raw_bson_array(docs: &[Document]) -> Result<RawBson> {
     let mut array = RawArrayBuf::new();
     for doc in docs {
-        array.push(RawDocumentBuf::from_document(doc)?);
+        array.push(RawDocumentBuf::try_from(doc)?);
     }
     Ok(RawBson::Array(array))
 }
@@ -215,7 +216,7 @@ pub(crate) fn append_ser(
         value: T,
     }
     let raw_doc = crate::bson_compat::serialize_to_raw_document_buf(&Helper { value })?;
-    this.append_ref_compat(
+    this.append_ref(
         key,
         raw_doc
             .get("value")?
@@ -241,7 +242,7 @@ pub(crate) fn get_or_prepend_id_field(doc: &mut RawDocumentBuf) -> Result<Bson>
             let new_length: i32 = Checked::new(new_bytes.len()).try_into()?;
             new_bytes[0..4].copy_from_slice(&new_length.to_le_bytes());
 
-            *doc = RawDocumentBuf::decode_from_bytes(new_bytes)?;
+            *doc = RawDocumentBuf::from_bytes(new_bytes)?;
 
             Ok(id.into())
         }

src/bson_util.rs

@@ -20,6 +20,8 @@ use serde::de::DeserializeOwned;
 #[cfg(test)]
 use tokio::sync::oneshot;
 
+#[cfg(feature = "bson-3")]
+use crate::bson_compat::RawBsonRefExt as _;
 use crate::{
     change_stream::event::{ChangeStreamEvent, ResumeToken},
     cursor::{stream_poll_next, BatchValue, CursorStream, NextInBatchFuture},

src/change_stream.rs

@@ -25,9 +25,6 @@ use crate::{
     serde_util,
 };
 
-#[cfg(not(feature = "bson-3"))]
-use crate::bson_compat::DocumentExt as _;
-
 #[cfg(feature = "aws-auth")]
 use aws_config::BehaviorVersion;
 
@@ -91,7 +88,8 @@ async fn authenticate_stream_inner(
         // channel binding is not supported.
         "p": 110i32,
     };
-    let client_first_payload_bytes = client_first_payload.encode_to_vec()?;
+    let mut client_first_payload_bytes = vec![];
+    client_first_payload.to_writer(&mut client_first_payload_bytes)?;
 
     let sasl_start = SaslStart::new(
         source.into(),
@@ -417,6 +415,16 @@ impl AwsCredential {
         }
     }
 
+    // Creates AwsCredential from keys.
+    fn from_sdk_creds(creds: Credentials) -> Self {
+        Self {
+            access_key_id: creds.access_key_id().to_string(),
+            secret_access_key: creds.secret_access_key().to_string(),
+            session_token: creds.session_token().map(|s| s.to_string()),
+            expiration: None,
+        }
+    }
+
     async fn get_from_assume_role_with_web_identity_request(
         token_file: String,
         role_arn: String,