Skip to content

Commit

Permalink
Merge pull request aws#2601 from JordonPhillips/region
Browse files Browse the repository at this point in the history
Use AWS_PROFILE in documentation
  • Loading branch information
JordonPhillips authored May 12, 2017
2 parents ccc6efd + 6be3aa2 commit 88c26c4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ entries or both. The following table documents these.
============================= =========== ============================= ================================= ==================================
Variable Option Config Entry Environment Variable Description
============================= =========== ============================= ================================= ==================================
profile --profile profile AWS_DEFAULT_PROFILE Default profile name
profile --profile profile AWS_PROFILE Default profile name
----------------------------- ----------- ----------------------------- --------------------------------- ----------------------------------
region --region region AWS_DEFAULT_REGION Default AWS Region
----------------------------- ----------- ----------------------------- --------------------------------- ----------------------------------
Expand Down Expand Up @@ -238,7 +238,7 @@ Similarly, the ``profile`` variable can be used to specify which profile to use
if one is not explicitly specified on the command line via the
``--profile`` option. To set this via environment variable::

$ export AWS_DEFAULT_PROFILE=testing
$ export AWS_PROFILE=testing

The ``profile`` variable can not be specified in the configuration file
since it would have to be associated with a profile and would defeat the
Expand Down
8 changes: 4 additions & 4 deletions awscli/topics/config-vars.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ The AWS CLI has a few general options:
==================== =========== ===================== ===================== ============================
Variable Option Config Entry Environment Variable Description
==================== =========== ===================== ===================== ============================
profile --profile N/A AWS_DEFAULT_PROFILE Default profile name
profile --profile N/A AWS_PROFILE Default profile name
-------------------- ----------- --------------------- --------------------- ----------------------------
region --region region AWS_DEFAULT_REGION Default AWS Region
-------------------- ----------- --------------------- --------------------- ----------------------------
Expand Down Expand Up @@ -99,7 +99,7 @@ validation for performance reasons. Otherwise, it's recommended to leave
parameter validation enabled.

When you specify a profile, either using ``--profile profile-name`` or by
setting a value for the ``AWS_DEFAULT_PROFILE`` environment variable, profile
setting a value for the ``AWS_PROFILE`` environment variable, profile
name you provide is used to find the corresponding section in the AWS CLI
config file. For example, specifying ``--profile development`` will instruct
the AWS CLI to look for a section in the AWS CLI config file of
Expand Down Expand Up @@ -177,11 +177,11 @@ Precedence
Credentials from environment variables have precedence over credentials from
the shared credentials and AWS CLI config file. Credentials specified in the
shared credentials file have precedence over credentials in the AWS CLI config
file. If ``AWS_DEFAULT_PROFILE`` environment variable is set and the
file. If ``AWS_PROFILE`` environment variable is set and the
``AWS_ACCESS_KEY_ID`` and ``AWS_SECRET_ACCESS_KEY`` environment variables are
set, then the credentials provided by ``AWS_ACCESS_KEY_ID`` and
``AWS_SECRET_ACCESS_KEY`` will override the credentials located in the
profile provided by ``AWS_DEFAULT_PROFILE``.
profile provided by ``AWS_PROFILE``.


Using AWS IAM Roles
Expand Down

0 comments on commit 88c26c4

Please sign in to comment.