review updates

Author: abr-egn

src/client/csfle/client_encryption.rs

@@ -1,7 +1,7 @@
 //! Support for explicit encryption.
 
 use crate::{
-    bson::{Binary, Document},
+    bson::Binary,
     coll::options::CollectionOptions,
     error::{Error, Result},
     options::{ReadConcern, WriteConcern},
@@ -260,16 +260,46 @@ pub struct DataKeyOptions {
     pub key_material: Option<Vec<u8>>,
 }
 
+/// A KMS-specific key used to encrypt data keys.
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase", untagged)]
 #[non_exhaustive]
+#[allow(missing_docs)]
 pub enum MasterKey {
     Aws {
         region: String,
+        /// The Amazon Resource Name (ARN) to the AWS customer master key (CMK).
         key: String,
+        /// An alternate host identifier to send KMS requests to. May include port number. Defaults
+        /// to "kms.<region>.amazonaws.com"
         endpoint: Option<String>,
     },
+    Azure {
+        /// Host with optional port. Example: "example.vault.azure.net".
+        key_vault_endpoint: String,
+        key_name: String,
+        /// A specific version of the named key, defaults to using the key's primary version.
+        key_version: Option<String>,
+    },
+    Gcp {
+        project_id: String,
+        location: String,
+        key_ring: String,
+        key_name: String,
+        /// A specific version of the named key, defaults to using the key's primary version.
+        key_version: Option<String>,
+        /// Host with optional port. Defaults to "cloudkms.googleapis.com".
+        endpoint: Option<String>,
+    },
+    /// Master keys are not applicable to `KmsProvider::Local`.
     Local,
+    Kmip {
+        /// keyId is the KMIP Unique Identifier to a 96 byte KMIP Secret Data managed object.  If
+        /// keyId is omitted, the driver creates a random 96 byte KMIP Secret Data managed object.
+        key_id: Option<String>,
+        /// Host with optional port.
+        endpoint: Option<String>,
+    },
 }
 
 // #[non_exhaustive]
@@ -291,6 +321,10 @@ pub struct EncryptOptions {
     /// The key to use.
     pub key: EncryptKey,
     /// The encryption algorithm.
+    ///
+    /// To insert or query with an "Indexed" encrypted payload, use a `Client` configured with
+    /// `AutoEncryptionOptions`. `AutoEncryptionOptions.bypass_query_analysis may be true.
+    /// `AutoEncryptionOptions.bypass_auto_encryption` must be false.
     pub algorithm: Algorithm,
     /// The contention factor.
     #[builder(default)]

src/gridfs.rs

@@ -1,4 +1,5 @@
 #![allow(dead_code, unused_variables)]
+// TODO(RUST-1395) Remove these allows.
 
 pub mod options;