DOCSP-6987 Make Python CSFLE examples more idiomatic (#564)

Author: ShaneHarvey

source/includes/steps-fle-configure-the-mongodb-client.yaml

@@ -232,10 +232,10 @@ content: |
         .. code-block:: python
            :emphasize-lines: 2-5
 
-           fle_opts = AutoEncryptionOpts( 
-              kms_providers, 
+           fle_opts = AutoEncryptionOpts(
+              kms_providers,
               key_vault_namespace,
-              schema_map = patient_schema,
+              schema_map=patient_schema,
               **extra_options
            )
-           client = MongoClient(connection_string, auto_encryption_opts = fle_opts)
+           client = MongoClient(connection_string, auto_encryption_opts=fle_opts)

source/includes/steps-fle-convert-to-a-remote-master-key.yaml

@@ -147,8 +147,8 @@ content: |
            import pymongo
            from pymongo import MongoClient
            from pymongo.encryption_options import AutoEncryptionOpts
+           from bson.binary import STANDARD
            from bson.codec_options import CodecOptions
-           from bson.binary import (STANDARD)
 
            connection_string = "mongodb://localhost:27017"
            key_vault_namespace = "encryption.__keyVault"
@@ -160,16 +160,16 @@ content: |
 
            client_encryption = pymongo.encryption.ClientEncryption(
               {
-                 "aws": {
-                       "accessKeyId": "<IAM User Access Key ID>",
-                       "secretAccessKey": "<IAM User Secret Access Key>"
-                 }
+                "aws": {
+                  "accessKeyId": "<IAM User Access Key ID>",
+                  "secretAccessKey": "<IAM User Secret Access Key>"
+                }
               },
               key_vault_namespace,
               client,
               CodecOptions(uuid_representation=STANDARD)
            )
-           data_key = client_encryption.create_data_key("aws")
+           data_key_id = client_encryption.create_data_key("aws")
 
 ---
 title: Update the JSON Schema

source/includes/steps-fle-create-data-encryption-key.yaml

@@ -40,12 +40,11 @@ content: |
         :tabid: python
 
         .. code-block:: python
-           :emphasize-lines: 4
-
-           from bson import binary
+           :emphasize-lines: 3
 
            path = "./master-key.txt"
-           local_master_key = binary.Binary(open(path, "rb").read(96))
+           with open(path, "rb") as f:
+             local_master_key = f.read()
 
 ---
 title: Specify KMS Provider Settings
@@ -94,9 +93,9 @@ content: |
            :emphasize-lines: 2,3
 
             kms_providers = {
-                "local": {
-                    "key": local_master_key # local_master_key variable from the previous step
-                },
+              "local": {
+                "key": local_master_key # local_master_key variable from the previous step
+              },
             }
 
 ---
@@ -183,7 +182,7 @@ content: |
         :tabid: python
 
         .. code-block:: python
-           :emphasize-lines: 13,14,20,30
+           :emphasize-lines: 13,21
 
            from pymongo import MongoClient
            from pymongo.encryption_options import AutoEncryptionOpts
@@ -195,14 +194,7 @@ content: |
            connection_string = "mongodb://localhost:27017"
            key_vault_namespace = "encryption.__keyVault"
 
-           fle_opts = AutoEncryptionOpts(
-               kms_providers,  # pass in the kms_providers variable from  the previous step
-               key_vault_namespace
-           )
-           client = MongoClient(
-               connection_string,
-               auto_encryption_opts=fle_opts
-           )
+           client = MongoClient(connection_string)
            client_encryption = ClientEncryption(
                kms_providers,  # pass in the kms_providers variable from  the previous step
                key_vault_namespace,
@@ -212,16 +204,15 @@ content: |
 
 
            def create_data_encryption_key():
-
-               data_key = client_encryption.create_data_key("local")
-               uuid_data_key_id = UUID(bytes=data_key)
-               base_64_data_key_id = base64.b64encode(data_key)
+               data_key_id = client_encryption.create_data_key("local")
+               uuid_data_key_id = UUID(bytes=data_key_id)
+               base_64_data_key_id = base64.b64encode(data_key_id)
                print("DataKeyId [UUID]: ", str(uuid_data_key_id))
                print("DataKeyId [base64]: ", base_64_data_key_id)
-               return data_key
+               return data_key_id
 
 
-           data_key = create_data_encryption_key()
+           data_key_id = create_data_encryption_key()
 
 
   The ``_id`` field of the data encryption key is represented as a **UUID**
@@ -361,19 +352,19 @@ content: |
         :tabid: python
 
         .. code-block:: python
+           :emphasize-lines: 9,10
 
            from pprint import pprint
            connection_string = "mongodb://localhost:27017"
-           key_vault_namespace = "encryption.__keyVault"
-           
-           def verify_data_key_created(data_key, client, client_encryption, fle_opts):
-               db = client["encryption"]
-               collection = db["__keyVault"]
-               key = collection.find_one({"_id": data_key})
-               pprint(key)
-
-           # pass in fle_opts, client, client_encryption, data_key variables created in previous section
-           verify_data_key_created(data_key, client, client_encryption, fle_opts)
+           key_vault_db = "encryption"
+           key_vault_coll = "__keyVault"
+
+           client = MongoClient(connection_string)
+           key_vault = client[key_vault_db][key_vault_coll]
+
+           # Pass in the data_key_id created in previous section
+           key = key_vault.find_one({"_id": data_key_id})
+           pprint(key)
 
 
         This code example should print a retrieved document that resembles the

source/use-cases/client-side-field-level-encryption-guide.txt

@@ -302,10 +302,9 @@ To begin development, MedcoMD engineers generate a locally-managed master key:
         import os
 
         path = "master-key.txt"
-        file_bytes = os.urandom(96).strip()
-        f = open(path, "wb")
-        f.write(file_bytes.strip())
-        f.close()
+        file_bytes = os.urandom(96)
+        with open(path, "wb") as f:
+          f.write(file_bytes)
 
 
 .. _fle-create-a-data-encryption-key:
@@ -655,7 +654,7 @@ MedcoMD engineers write a function to create a new patient record:
            }
            doc = {
                'name': name,
-               'ssn': ssn, 
+               'ssn': ssn,
                'bloodType': blood_type,
                'medicalRecords': medical_records,
                'insurance': insurance