(DOCSP-11094, DOCSP-11068): Update mongocli config output and default profile behavior (#178)

* (DOCSP-11094): List project by name on config

* (DOCSP-11068): Improve use of defaut profile

* tech review

* copy review

* tech review 2

Author: melissamahoney-mongodb

source/configure/autocomplete.txt

@@ -77,18 +77,18 @@ Use ``Tab`` to Autocomplete Commands
 ------------------------------------
 
 Once you have autocomplete configured, you can autocomplete commands by
-typing ``mongocli`` in your shell and pressing the ``Tab`` key. Press
-``Tab`` multiple times to cycle through available autocompletion
+typing ``mongocli`` in your shell and pressing the :kbd:`Tab` key. Press
+:kbd:`Tab` multiple times to cycle through available autocompletion
 options.
 
-You can press ``Tab`` at any stage of writing your command to see
+You can press :kbd:`Tab` at any stage of writing your command to see
 available autocomplete options.
 
 Examples
 ~~~~~~~~
 
-When you type ``mongocli`` in your shell and press ``Tab``, the output
-resembles the following:
+When you type ``mongocli`` in your shell and press :kbd:`Tab`, the
+output resembles the following:
 
 .. code-block:: none
    :copyable: false
@@ -106,7 +106,7 @@ command, you can see autocompletion options for your selected
 property.
 
 For example, when you type ``mongocli atlas`` in your shell and press
-``Tab``, the output resembles the following:
+:kbd:`Tab`, the output resembles the following:
 
 .. code-block:: none
    :copyable: false

source/configure/configuration-file.txt

@@ -37,22 +37,40 @@ Profiles
 --------
 
 The {+mcli+} configuration file stores related settings and
-|api| keys in groups called *profiles*. You can create or define
+|api| keys in groups called *profiles*. You can :ref:`create
+<mcli-config-command>` or :ref:`define <mcli-config-set-command>`
 multiple profiles so that you can use the {+mcli+} to access different
 MongoDB services or projects from the same terminal.
 
+.. note:: 
+
+   Any settings stored in :ref:`envronment variables <mcli-env-var>`
+   take precedence over settings stored in profiles.
+
 To run {+mcli+} with a specific profile, append the ``--profile
-<profileName>`` option to the command. If you omit the ``--profile``
-parameter, {+mcli+} looks for a profile named ``default`` in the
-configuration file.
+<profileName>`` option to the command. 
+
+Default Profile
+~~~~~~~~~~~~~~~
+
+If you run a command without the ``--profile`` option, the {+mcli+} uses
+the settings in the default profile. The {+mcli+} determines the default
+profile by the number of profiles you have configured:
+
+- If you have only one profile, the {+mcli+} uses that profile as the 
+  default. 
+- If you have multiple profiles, the {+mcli+} uses the profile named 
+  ``default`` as the default. If you don't have a profile named
+  ``default`` and run a command that requires certain settings, the 
+  {+mcli+} returns an error for the missing settings.
 
 Example
 -------
 
 The following example configuration file contains two profiles,
 ``default`` and ``myOpsManager``. 
 
-The ``default`` profile connects to a |service| deployment and contains
+The ``default`` profile connects to an |service| deployment and contains
 the following settings:
 
 - An organization ID

source/includes/steps-configure-mcli-atlas.yaml

@@ -11,14 +11,24 @@ source:
   ref: enter-api-key
 replacement:
   apiKeys: ":atlas:`Programmatic API Key </configure-api-access>`"
-  projectId: ":atlas:`Project ID </tutorial/manage-project-settings/>`"
   service: "|service|"
 ---
 stepnum: 3
+source:
+  file: steps-configure-mcli.yaml
+  ref: enter-orgid
+---
+stepnum: 4
+source:
+  file: steps-configure-mcli.yaml
+  ref: enter-projectid
+---
+stepnum: 5
 source:
   file: steps-configure-mcli.yaml
   ref: verify-profile
 replacement:
   service: "|service|"
   serviceName: "cloud"
+  opsMgrUrl: ""
 ...

source/includes/steps-configure-mcli-cm.yaml

@@ -10,15 +10,25 @@ source:
   file: steps-configure-mcli.yaml
   ref: enter-api-key
 replacement:
-  apiKeys: ":cloudmgr:`Cloud Manager API Access </tutorial/configure-public-api-access>`"
-  projectId: ":cloudmgr:`Project ID </tutorial/manage-project-settings/>`"
+  apiKeys: ":cloudmgr:`API keys </tutorial/configure-public-api-access>`"
   service: "|cloud|"
 ---
 stepnum: 3
+source:
+  file: steps-configure-mcli.yaml
+  ref: enter-orgid
+---
+stepnum: 4
+source:
+  file: steps-configure-mcli.yaml
+  ref: enter-projectid
+---
+stepnum: 5
 source:
   file: steps-configure-mcli.yaml
   ref: verify-profile
 replacement:
   service: "|cloud|"
   serviceName: "cloud-manager"
+  opsMgrUrl: ""
 ...

source/includes/steps-configure-mcli-om.yaml

@@ -15,15 +15,25 @@ source:
   file: steps-configure-mcli.yaml
   ref: enter-api-key
 replacement:
-  apiKeys: ":opsmgr:`Ops Manager API Acess </tutorial/configure-public-api-access>`"
-  projectId: ":opsmgr:`Project ID </tutorial/manage-project-settings/>`"
+  apiKeys: ":opsmgr:`API keys </tutorial/configure-public-api-access>`"
   service: "|onprem|"
 ---
 stepnum: 4
+source:
+  file: steps-configure-mcli.yaml
+  ref: enter-orgid
+---
+stepnum: 5
+source:
+  file: steps-configure-mcli.yaml
+  ref: enter-projectid
+---
+stepnum: 6
 source:
   file: steps-configure-mcli.yaml
   ref: verify-profile
 replacement:
   service: "|onprem|"
   serviceName: "ops-manager"
+  opsMgrUrl: "ops_manager_url = https://mms.example.com:8080/"
 ...

source/includes/steps-configure-mcli.yaml

@@ -9,9 +9,8 @@ content: |
      .. tab:: Default Profile
         :tabid: default-profile
 
-        This command creates a profile called ``default`` in the
-        :ref:`mcli-config-file`. The {+mcli+} uses this profile by
-        default.
+        This command creates a :ref:`profile <mcli-profiles>` called
+        ``default`` in the :ref:`mcli-config-file`.
 
         Run the :ref:`mcli-config-command` command:
 
@@ -22,48 +21,117 @@ content: |
      .. tab:: Named Profile
         :tabid: named-profile
 
-        This command creates a profile with a custom name in the
-        :ref:`mcli-config-file`. To use this profile, you must specify
-        it with the ``--profile`` flag in every {+mcli+} command.
+        This command creates a :ref:`profile <mcli-profiles>` with a
+        custom name in the :ref:`mcli-config-file`. To use this profile
+        in a command, you must specify the profile with the
+        ``--profile`` flag.
 
         Run the :ref:`mcli-config-command` command:
 
         .. code-block:: sh
               
           mongocli config {{serviceOption}} --profile <profile-name>
-  
+
 ---
-title: "Enter your |onprem| Base |url|"
+title: "Create a profile for the {{service}} project."
+stepnum: 0
+level: 4
+ref: quick-create-profile
+content: |
+  Run the following :ref:`command <mcli-config-command>` to create a
+  :ref:`profile <mcli-profiles>` called ``default``.
+
+  .. code-block:: sh 
+
+     mongocli config {{serviceOption}}
+
+---
+title: "Enter the :opsmgr:`URL you use to access Ops Manager </reference/config/ui-settings/#URL-to-Access-Ops-Manager>`."
 stepnum: 0
 level: 4
 ref: enter-base-url
 content: |
-  The |onprem| Base |url| is the :opsmgr:`URL you use to access Ops
-  Manager </reference/config/ui-settings/#URL-to-Access-Ops-Manager>`.
 
   .. code-block:: sh
+     :copyable: false
 
-     ? Ops Manager Base URL: http://mms.example.com:8080
+     ? URL to Access Ops Manager: http://mms.example.com:8080
 
 ---
-title: "Enter your {{apiKeys}} and {{projectId}}."
+title: "Enter your {{apiKeys}}."
 stepnum: 0
 level: 4
+optional: true
 ref: enter-api-key
 content: |
 
-  When prompted, enter the ``Public API Key``, ``Private API Key``, and
-  ``Project ID`` for your {{service}} deployment.
+  When prompted, enter the ``Public API Key`` and ``Private API Key``
+  for your {{service}} deployment.
 
   .. code-block:: sh
      :copyable: false
                
      ? Public API Key: abcdef
-     ? Private API Key: [? for help] ************************************
-     ? Project ID [optional]: 7ehf04abc10defb66c7d1234c
+     ? Private API Key: [? for help]
+     ************************************
+
+---
+title: "Choose your default organization."
+stepnum: 0
+level: 4
+ref: enter-orgid
+content: | 
+
+  If you entered |api| keys, the command displays the name and ID of organizations that your |api| key can access.
+
+  a. Select your organization:
+      
+     - Press the :kbd:`Down Arrow` and :kbd:`Up Arrow` 
+       keys to highlight the desired organization, or
+     - Type the organization name to filter the available 
+       organizations.
+    
+     .. code-block:: sh
+        :copyable: false
+
+        ? Choose a default organization:  [Use arrows to move, type to filter]
+        > Org1 (5e39bf1212121e685774c81c)
 
-  If you don't save your project ID in your profile, you must specify
-  the ``--projectId`` option every time you run a {+mcli+} command.
+  #. Press :kbd:`Enter`.
+
+  If you didn't enter |api| keys, the command prompts you to enter your
+  ``Default Project ID``.
+
+---
+title: "Choose your default project."
+stepnum: 0
+level: 4
+ref: enter-projectid
+content: |
+
+  If you entered |api| keys, the command displays the name and ID of
+  projects that your |api| key can access.
+
+  a. Select your project:
+      
+     - Press the :kbd:`Down Arrow` and :kbd:`Up Arrow`  
+       keys to highlight the desired project, or
+     - Type the project name to filter the available 
+       projects.
+
+     .. code-block:: sh
+        :copyable: false
+
+        ? Choose a default project:  [Use arrows to move, type to filter]
+          Project1 (5e5ebffd0c04a97009061234)
+          Project2 (5cfacee6014b761b07f15678)
+        > Project3 (5e39bf4979358e6857741212)
+          Project4 (5c815cc7014b768fb67e3434)
+
+  #. Press :kbd:`Enter`.
+
+  If you didn't enter |api| keys, the command prompts you to enter your
+  ``Default Organization ID``.
 
 ---
 title: "Verify your profile."
@@ -85,49 +153,51 @@ content: |
 
         .. example::
 
-           In this example, the following command returns the settings 
+           The following command returns the settings 
            in the {+default-profile+}:
 
            .. code-block:: sh
               :copyable: false
 
               mongocli config describe default
           
-           The command returns the following settings. The {+default-profile+} 
-           has a |svc-api-key|, which is redacted in the command output for 
-           security purposes, and project ID for an {{service}} deployment. 
+           The command returns the following settings. For security
+           purposes, the command redacts |api| keys in the output.
 
            .. code-block:: sh
               :copyable: false
               
+              {{opsMgrUrl}}
+              org_id = 5f1f39ffc902201990f12345
               private_api_key = redacted
-              public_api_key = redacted
               project_id = 7ehf04abc10defb66c7d1234c
+              public_api_key = redacted
               service = {{serviceName}}
 
      .. tab:: Named Profile
         :tabid: named-profile
         
         .. example::
 
-           In this example, the following command returns the settings 
+           The following command returns the settings 
            in the profile named ``myMongoDB``:
 
            .. code-block:: sh
               :copyable: false
 
               mongocli config describe myMongoDB
           
-           The command returns following settings. The ``myMongoDB`` profile 
-           has a |svc-api-key|, which is redacted in the command output for 
-           security purposes, and project ID for an {{service}} deployment.
+           The command returns following settings. For security
+           purposes, the command redacts |api| keys in the output.
 
            .. code-block:: sh
               :copyable: false
               
+              {{opsMgrUrl}}
+              org_id = 5f1f39ffc902201990f12345
               private_api_key = redacted
-              public_api_key = redacted
               project_id = 7ehf04abc10defb66c7d1234c
+              public_api_key = redacted
               service = {{serviceName}}
 
 

source/includes/steps-quick-start-atlas-config-mcli.yaml

@@ -1,18 +1,26 @@
 stepnum: 1
 source:
-  file: steps-quick-start-config-mcli.yaml
+  file: steps-configure-mcli.yaml
   ref: quick-create-profile
 replacement:
   mdbService: Atlas
   serviceOption: ""
 ---
 stepnum: 2
 source:
-  file: steps-quick-start-config-mcli.yaml
-  ref: config-enter-credentials
+  file: steps-configure-mcli.yaml
+  ref: enter-api-key
+replacement:
+  apiKeys: ":atlas:`Programmatic API Key </configure-api-access>`"
+  service: "|service|"
 ---
 stepnum: 3
 source:
-  file: steps-quick-start-config-mcli.yaml
-  ref: config-enter-projectid
+  file: steps-configure-mcli.yaml
+  ref: enter-orgid
+---
+stepnum: 4
+source:
+  file: steps-configure-mcli.yaml
+  ref: enter-projectid
 ...