(FLE): Cleanup 2

nlarew · nlarew · commit 166ddc7236a4 · 2019-09-20T16:59:25.000-04:00
diff --git a/conf.py b/conf.py
@@ -70,6 +70,7 @@
     'guides': ('https://docs.mongodb.com/guides%s', ''),
     'java-docs-latest': ('http://mongodb.github.io/mongo-java-driver/3.11/%s', ''),
     'aws-docs': ('https://docs.aws.amazon.com/%s', ''),
+    'wikipedia': ('https://en.wikipedia.org/wiki/%s', ''),
 }
 
 intersphinx_mapping = {}
diff --git a/source/includes/steps-create-data-encryption-key.yaml b/source/includes/steps-create-data-encryption-key.yaml
@@ -5,106 +5,90 @@ content: |
   First, retrieve the contents of the local master key file that you generated
   in the :ref:`Create a Master Key <fle-create-a-master-key>` section:
 
-  .. tabs::
-
-     tabs:
-
-       - id: use-cases-fle-guide-java
-         name: "Java"
-         content: |
-
-           .. code-block:: java
-              :emphasize-lines: 11
-
-              String path = "master-key.txt";
-
-              byte[] fileBytes = new byte[96];
-
-              try (FileInputStream fis = new FileInputStream(path)) {
-                fileBytes = fis.readAllBytes();
-              } catch (IOException e) {
-                e.printStackTrace();
-              }
-
-              final byte[] localMasterKey = Arrays.copyOf(fileBytes, 96);
-
-
+  .. tabs-drivers::
+   
+     .. tab::
+        :tabid: java-sync
+
+        .. code-block:: java
+           :emphasize-lines: 11
+        
+           String path = "master-key.txt";
+        
+           byte[] fileBytes = new byte[96];
+        
+           try (FileInputStream fis = new FileInputStream(path)) {
+             fileBytes = fis.readAllBytes();
+           } catch (IOException e) {
+             e.printStackTrace();
+           }
+        
+           final byte[] localMasterKey = Arrays.copyOf(fileBytes, 96);
 ---
 title: Specify KMS Provider Settings
 ref: specify-kms-provider-settings
 level: 4
 content: |
-  Next, specify the KMS provider settings. The client uses these settings to 
-  discover the master key. Set the provider name to ``local`` when using a local 
+  Next, specify the KMS provider settings. The client uses these settings to
+  discover the master key. Set the provider name to ``local`` when using a local
   master key:
 
-  .. tabs::
-
-     tabs:
-
-       - id: use-cases-fle-guide-java
-         name: "Java"
-         content: |
-
-           .. code-block:: java
-              :emphasize-lines: 4,5
-
-              String kmsProvider = "local";
-
-              Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>() {{
-                put(kmsProvider, new HashMap<String, Object>() {{
-                  put("key", localMasterKey);
-                }});
-              }};
-
-
+  .. tabs-drivers::
+     
+     .. tab::
+        :tabid: java-sync
+
+        .. code-block:: java
+           :emphasize-lines: 4,5
+        
+           String kmsProvider = "local";
+        
+           Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>() {{
+             put(kmsProvider, new HashMap<String, Object>() {{
+               put("key", localMasterKey);
+             }});
+           }};
 ---
 title: Create a Data Encryption Key
 ref: create-a-data-encryption-key
 level: 4
 content: |
-  Construct a client with the MongoDB connection string and key vault 
-  namespace configuration, and create a data encryption key. The key vault in 
+  Construct a client with the MongoDB connection string and key vault
+  namespace configuration, and create a data encryption key. The key vault in
   this example uses the ``encryption`` database and ``__keyVault`` collection.
 
-  .. tabs::
-
-     tabs:
-
-       - id: use-cases-fle-guide-java
-         name: "Java"
-         content: |
-
-           .. code-block:: java
-              :emphasize-lines: 8,9,12
-
-              String connectionString = "mongodb://localhost:27017";
-              String keyVaultNamespace = "encryption.__keyVault";
-
-              ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
-                .keyVaultMongoClientSettings(MongoClientSettings.builder()
-                  .applyConnectionString(new ConnectionString(connectionString))
-                  .build())
-                .keyVaultNamespace(keyVaultNamespace)
-                .kmsProviders(kmsProviders)
-                .build();
-
-              ClientEncryption clientEncryption = ClientEncryptions.create(clientEncryptionSettings);
-
+  .. tabs-drivers::
+   
+     .. tab::
+        :tabid: java-sync
+
+        .. code-block:: java
+           :emphasize-lines: 8,9,12
+        
+           String connectionString = "mongodb://localhost:27017";
+           String keyVaultNamespace = "encryption.__keyVault";
+        
+           ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
+             .keyVaultMongoClientSettings(MongoClientSettings.builder()
+               .applyConnectionString(new ConnectionString(connectionString))
+               .build())
+             .keyVaultNamespace(keyVaultNamespace)
+             .kmsProviders(kmsProviders)
+             .build();
+        
+           ClientEncryption clientEncryption = ClientEncryptions.create(clientEncryptionSettings);
 
   .. note::
 
      Ensure that the client has `ReadWrite
      <https://docs.mongodb.com/manual/reference/built-in-roles/#readWrite>`_
      permissions on the specified key vault namespace.
-
-
 ---
 title: Verify the data encryption key was created
 ref: verify-data-key-created
 level: 4
 content: |
-  Verify that the key document was created in your MongoDB replica set in the 
+  Verify that the key document was created in your MongoDB replica set in the
   key vault collection. This document contains the following data:
   
   * Data encryption key, in encrypted form.
diff --git a/source/includes/steps-fle-configure-the-mongodb-client.yaml b/source/includes/steps-fle-configure-the-mongodb-client.yaml
@@ -5,10 +5,10 @@ content: |
   encrypt and decrypt fields. MedcoMD uses the collection
   ``encryption.__keyVault`` as the key vault.
 
-  .. tabs::
-     
-     .. tab:: Java
-        :tabid: use-cases-fle-guide-java
+  .. tabs-drivers::
+   
+     .. tab::
+        :tabid: java-sync
         
         .. code-block:: java
            
@@ -22,10 +22,10 @@ content: |
   master key, so they use the ``local`` KMS provider and specify the key
   inline.
 
-  .. tabs::
-     
-     .. tab:: Java
-        :tabid: use-cases-fle-guide-java
+  .. tabs-drivers::
+   
+     .. tab::
+        :tabid: java-sync
         
         .. code-block:: java
            :emphasize-lines: 2,3
@@ -43,10 +43,10 @@ content: |
   collection to which it applies. To assign the schema, they map it to
   the ``medicalRecords.patients`` collection namespace:
 
-  .. tabs::
-     
-     .. tab:: Java
-        :tabid: use-cases-fle-guide-java
+  .. tabs-drivers::
+   
+     .. tab::
+        :tabid: java-sync
         
         .. code-block:: java
            :emphasize-lines: 2
@@ -63,10 +63,10 @@ content: |
   ``mongocryptd`` process. To configure the client to find the binary,
   MedcoMD specifies the binary's path as an extra option:
   
-  .. tabs::
-     
-     .. tab:: Java
-        :tabid: use-cases-fle-guide-java
+  .. tabs-drivers::
+   
+     .. tab::
+        :tabid: java-sync
         
         .. code-block:: java
            :emphasize-lines: 2
@@ -96,10 +96,10 @@ content: |
   MongoDB client object with the additional automatic encryption
   settings:
 
-  .. tabs::
-     
-     .. tab:: Java
-        :tabid: use-cases-fle-guide-java
+  .. tabs-drivers::
+   
+     .. tab::
+        :tabid: java-sync
         
         .. code-block:: java
            :emphasize-lines: 3-8
diff --git a/source/includes/steps-fle-convert-to-a-remote-master-key.yaml b/source/includes/steps-fle-convert-to-a-remote-master-key.yaml
@@ -40,10 +40,10 @@ content: |
 
   Update the KMS Provider configuration in CSFLE-enabled client creation code:
   
-  .. tabs::
-     
-     .. tab:: Java
-        :tabid: use-cases-fle-guide-java
+  .. tabs-drivers::
+   
+     .. tab::
+        :tabid: java-sync
         
         .. code-block:: java
            :emphasize-lines: 5-8
@@ -72,10 +72,10 @@ content: |
   Once you have the required information, run the following code to
   generate the new data key:
 
-  .. tabs::
-     
-     .. tab:: Java
-        :tabid: use-cases-fle-guide-java
+  .. tabs-drivers::
+   
+     .. tab::
+        :tabid: java-sync
 
         .. code-block:: Java
            :emphasize-lines: 9-14, 17
diff --git a/source/use-cases/sensitive-data-encryption.txt b/source/use-cases/sensitive-data-encryption.txt

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@`
`70`	`70`	`'guides': ('https://docs.mongodb.com/guides%s', ''),`
`71`	`71`	`'java-docs-latest': ('http://mongodb.github.io/mongo-java-driver/3.11/%s', ''),`
`72`	`72`	`'aws-docs': ('https://docs.aws.amazon.com/%s', ''),`
	`73`	`+ 'wikipedia': ('https://en.wikipedia.org/wiki/%s', ''),`
`73`	`74`	`}`
`74`	`75`
`75`	`76`	`intersphinx_mapping = {}`