Backport to v6.0 (#7881)

* (DOCSP-32333) Revamps database reference page to include Atlas UI steps (#4842) (#4911)

* (DOCSP-32333) Revamps database reference page to include Atlas UI steps

* Includes changes from copy review

* Fixes copy review issues

* DOCSP-25496 - Fix Comments (#7864)

* fix comments

* Apply suggestions from code review

* specify data EK

* fix formatting

* test formatting

* formatting

* formatting

* formatting

* formatting

* formatting

* formatting

* remove makedatakey

(cherry picked from commit 284e11e)

---------

Co-authored-by: Sarah Simpers <82042374+sarahsimpers@users.noreply.github.com>

Author: mongoKart

source/includes/fundamentals/manual-encryption/manual-enc.java

@@ -38,10 +38,9 @@
 import com.mongodb.client.vault.ClientEncryptions;
 import org.bson.types.Binary;
 
-
 /*
- * - Reads master key from file "master-key.txt" in root directory of project, or creates one on a KMS
- * - Locates existing local encryption key from encryption.__keyVault collection, or from a KMS
+ * - Reads master key from AWS KMS
+ * - Locates existing data encryption key in AWS KMS
  * - Prints base 64-encoded value of the data encryption key
  */
 public class makeDataKey {

source/includes/generated/in-use-encryption/csfle/java/aws/reader/src/main/java/com/mongodb/csfle/InsertEncryptedDocument.java

@@ -16,7 +16,6 @@
  *
  */
 
-
 import java.util.*;
 
 import static com.mongodb.client.model.Filters.eq;
@@ -31,10 +30,8 @@
 import com.mongodb.MongoClientSettings;
 import org.bson.Document;
 
-
-
 /*
- * - Reads master key from file "master-key.txt" in root directory of project
+ * - Reads master key from AWS KMS
  * - Creates a JSON schema for a specified collection to enable automatic encryption
  * - Creates an encrypted client and upserts a single document
  * - Finds the upserted document with the encrypted client using an encrypted field

source/includes/generated/in-use-encryption/csfle/java/aws/reader/src/main/java/com/mongodb/csfle/MakeDataKey.java

@@ -39,10 +39,9 @@
 import com.mongodb.client.vault.ClientEncryptions;
 import com.mongodb.client.model.IndexOptions;
 
-
 /*
- * - Reads master key from file "master-key.txt" in root directory of project, or creates one on a KMS
- * - Locates existing local encryption key from encryption.__keyVault collection, or from a KMS
+ * - Gets customer master key from the AWS KMS by using environment variables
+ * - Locates existing data encryption key in AWS KMS
  * - Prints base 64-encoded value of the data encryption key
  */
 public class MakeDataKey {
@@ -103,4 +102,4 @@ public static void main(String[] args) throws Exception {
         clientEncryption.close();
         // end-create-dek
     }
-}
+}

source/includes/generated/in-use-encryption/csfle/java/azure/reader/src/main/java/com/mongodb/csfle/InsertEncryptedDocument.java

@@ -16,7 +16,6 @@
  *
  */
 
-
 import java.util.*;
 
 import static com.mongodb.client.model.Filters.eq;
@@ -31,10 +30,8 @@
 import com.mongodb.MongoClientSettings;
 import org.bson.Document;
 
-
-
 /*
- * - Reads master key from file "master-key.txt" in root directory of project
+ * - Reads master key from Azure KMS
  * - Creates a JSON schema for a specified collection to enable automatic encryption
  * - Creates an encrypted client and upserts a single document
  * - Finds the upserted document with the encrypted client using an encrypted field

source/includes/generated/in-use-encryption/csfle/java/azure/reader/src/main/java/com/mongodb/csfle/MakeDataKey.java

@@ -39,10 +39,9 @@
 import com.mongodb.client.vault.ClientEncryptions;
 import com.mongodb.client.model.IndexOptions;
 
-
 /*
- * - Reads master key from file "master-key.txt" in root directory of project, or creates one on a KMS
- * - Locates existing local encryption key from encryption.__keyVault collection, or from a KMS
+ * - Reads master key from Azure KMS
+ * - Locates existing data encryption key in Azure KMS
  * - Prints base 64-encoded value of the data encryption key
  */
 public class MakeDataKey {
@@ -105,4 +104,4 @@ public static void main(String[] args) throws Exception {
         clientEncryption.close();
         // end-create-dek
     }
-}
+}

source/includes/generated/in-use-encryption/csfle/java/gcp/reader/src/main/java/com/mongodb/csfle/InsertEncryptedDocument.java

@@ -16,7 +16,6 @@
  *
  */
 
-
 import java.util.*;
 
 import static com.mongodb.client.model.Filters.eq;
@@ -31,10 +30,8 @@
 import com.mongodb.MongoClientSettings;
 import org.bson.Document;
 
-
-
 /*
- * - Reads master key from file "master-key.txt" in root directory of project
+ * - Reads master key from GCP KMS
  * - Creates a JSON schema for a specified collection to enable automatic encryption
  * - Creates an encrypted client and upserts a single document
  * - Finds the upserted document with the encrypted client using an encrypted field

source/includes/generated/in-use-encryption/csfle/java/gcp/reader/src/main/java/com/mongodb/csfle/MakeDataKey.java

@@ -39,10 +39,9 @@
 import com.mongodb.client.vault.ClientEncryptions;
 import com.mongodb.client.model.IndexOptions;
 
-
 /*
- * - Reads master key from file "master-key.txt" in root directory of project, or creates one on a KMS
- * - Locates existing local encryption key from encryption.__keyVault collection, or from a KMS
+ * - Gets customer master key from the GCP KMS by using environment variables 
+ * - Locates existing data encryption key in GCP KMS
  * - Prints base 64-encoded value of the data encryption key
  */
 public class MakeDataKey {
@@ -106,4 +105,4 @@ public static void main(String[] args) throws Exception {
         clientEncryption.close();
         // end-create-dek
     }
-}
+}

source/includes/generated/in-use-encryption/csfle/java/kmip/reader/src/main/java/com/mongodb/csfle/InsertEncryptedDocument.java

@@ -16,7 +16,6 @@
  *
  */
 
-
 import java.util.*;
 
 import static com.mongodb.client.model.Filters.eq;
@@ -31,10 +30,8 @@
 import com.mongodb.MongoClientSettings;
 import org.bson.Document;
 
-
-
 /*
- * - Reads master key from file "master-key.txt" in root directory of project
+ * - Reads master key from KMIP KMS
  * - Creates a JSON schema for a specified collection to enable automatic encryption
  * - Creates an encrypted client and upserts a single document
  * - Finds the upserted document with the encrypted client using an encrypted field

source/includes/generated/in-use-encryption/csfle/java/kmip/reader/src/main/java/com/mongodb/csfle/MakeDataKey.java

@@ -39,10 +39,9 @@
 import com.mongodb.client.vault.ClientEncryptions;
 import com.mongodb.client.model.IndexOptions;
 
-
 /*
- * - Reads master key from file "master-key.txt" in root directory of project, or creates one on a KMS
- * - Locates existing local encryption key from encryption.__keyVault collection, or from a KMS
+ * - Creates master key in KMIP KMS
+ * - Locates existing data encryption key in KMIP KMS
  * - Prints base 64-encoded value of the data encryption key
  */
 public class MakeDataKey {
@@ -100,4 +99,4 @@ public static void main(String[] args) throws Exception {
         clientEncryption.close();
         // end-create-dek
     }
-}
+}

source/includes/generated/in-use-encryption/csfle/java/local/reader/src/main/java/com/mongodb/csfle/MakeDataKey.java

@@ -45,8 +45,8 @@
 import java.security.SecureRandom;
 
 /*
- * - Reads master key from file "master-key.txt" in root directory of project, or creates one on a KMS
- * - Locates existing local encryption key from encryption.__keyVault collection, or from a KMS
+ * - Reads master key from file "master-key.txt" in root directory of project 
+ * - Locates existing local data encryption key from encryption.__keyVault collection
  * - Prints base 64-encoded value of the data encryption key
  */
 public class MakeDataKey {
@@ -117,4 +117,4 @@ public static void main(String[] args) throws Exception {
         clientEncryption.close();
         // end-create-dek
     }
-}
+}