Merge pull request #44 from ccho-mongodb/DOCSP-13488-mongodb-aws-updates

DOCSP-13488: mongodb aws updates

Author: Chris Cho

source/fundamentals/auth.txt

@@ -281,12 +281,38 @@ mechanism:
 
       .. include:: /includes/fundamentals/code-snippets/auth-credentials-aws.rst
 
-      If you need to specify an AWS session token, use the
-      :java-docs:`applyConnectionString() </apidocs/mongodb-driver-core/com/mongodb/MongoClientSettings.Builder.html#applyConnectionString(com.mongodb.ConnectionString)>`
-      method to specify a connection string that specifies the
-      ``authMechanism`` and ``AWS_SESSION_TOKEN`` parameter values.
+      If you need to specify an AWS session token, you can add it using
+      one of the following choices:
 
-      .. include:: /includes/fundamentals/code-snippets/auth-credentials-aws-session.rst
+      - **Specify your AWS session token in a connection string.**
+
+        If you prefer to pass the AWS session token in the connection string
+        alongside your MongoCredential specify your authentication mechanism 
+        in the ``authMechanism`` parameter and your session token in the 
+        ``authMechanismProperties`` parameter. Then, add it to your
+        ``MongoClientSettings`` by calling the 
+        :java-docs:`applyConnectionString() </apidocs/mongodb-driver-core/com/mongodb/MongoClientSettings.Builder.html#applyConnectionString(com.mongodb.ConnectionString)>`
+        method as follows:
+
+        .. include:: /includes/fundamentals/code-snippets/auth-credentials-aws-session.rst
+
+      - **Specify your AWS session token in a MongoCredential.**
+
+        You can include your AWS session token in your ``MongoCredential``
+        instance by specifying it in a call to the
+        :java-docs:`withMechanismProperty() </apidocs/mongodb-driver-core/com/mongodb/MongoCredential.html#withMechanismProperty(java.lang.String,T)>`
+        method as shown below:
+
+        .. code-block:: java
+
+           MongoCredential.createAwsCredential("<username>", "<password>".toCharArray()) .withMechanismProperty("AWS_SESSION_TOKEN", "<awsSessionToken>");
+
+      - **Specify your AWS session token in an environment variable.**
+
+        In your client execution environment, set an environment variable
+        called ``AWS_SESSION_TOKEN`` and assign your token to it. The value is
+        automatically picked up by your MongoClient when you specify the
+        ``MONGODB-AWS`` authentication mechanism.
 
 .. _x509-auth-mechanism:
 

source/includes/fundamentals/code-snippets/auth-credentials-aws-session.rst

@@ -1,7 +1,7 @@
 .. code-block:: java
 
    MongoCredential credential = MongoCredential.createAwsCredential("<username>", "<password>");
-   String connectionString = "mongodb://<hostname>:<port>/?authSource=<authenticationDb>&authMechanism=MONGODB-AWS&AWS_SESSION_TOKEN:<awsSessionToken>");
+   String connectionString = "mongodb://<hostname>:<port>/?authSource=<authenticationDb>&authMechanism=MONGODB-AWS&authMechanismProperties=AWS_SESSION_TOKEN:<awsSessionToken>");
 
    MongoClient mongoClient = MongoClients.create(
        MongoClientSettings.builder()