awscli 1.40.17__py3-none-any.whl → 1.44.26__py3-none-any.whl

awscli/__init__.py

@@ -18,7 +18,7 @@ A Universal Command Line Environment for Amazon Web Services.
 
 import os
 
-__version__ = '1.40.17'
+__version__ = '1.44.26'
 
 #
 # Get our data path to be added to botocore's search path

awscli/alias.py

@@ -183,7 +183,7 @@ class ServiceAliasCommand(BaseAliasCommand):
         parsed_alias_args, remaining = self._parser.parse_known_args(
             alias_args
         )
-        self._update_parsed_globals(parsed_alias_args, parsed_globals)
+        self._update_parsed_globals(parsed_alias_args, parsed_globals, remaining)
         # Take any of the remaining arguments that were not parsed out and
         # prepend them to the remaining args provided to the alias.
         remaining.extend(args)
@@ -228,7 +228,7 @@ class ServiceAliasCommand(BaseAliasCommand):
         )
         return alias_args
 
-    def _update_parsed_globals(self, parsed_alias_args, parsed_globals):
+    def _update_parsed_globals(self, parsed_alias_args, parsed_globals, remaining):
         global_params_to_update = self._get_global_parameters_to_update(
             parsed_alias_args
         )
@@ -237,7 +237,7 @@ class ServiceAliasCommand(BaseAliasCommand):
         # global parameters provided in the alias before updating
         # the original provided global parameter values
         # and passing those onto subsequent commands.
-        emit_top_level_args_parsed_event(self._session, parsed_alias_args)
+        emit_top_level_args_parsed_event(self._session, parsed_alias_args, remaining)
         for param_name in global_params_to_update:
             updated_param_value = getattr(parsed_alias_args, param_name)
             setattr(parsed_globals, param_name, updated_param_value)

awscli/argprocess.py

@@ -65,7 +65,7 @@ class TooComplexError(Exception):
 
 
 def unpack_argument(
-    session, service_name, operation_name, cli_argument, value
+    session, service_name, operation_name, cli_argument, value, parsed_globals
 ):
     """
     Unpack an argument's value from the commandline. This is part one of a two
@@ -83,6 +83,7 @@ def unpack_argument(
         value=value,
         service_name=service_name,
         operation_name=operation_name,
+        parsed_globals=parsed_globals,
     )
 
     if value_override is not None:
@@ -535,7 +536,11 @@ class ParamShorthandDocGen(ParamShorthand):
 
     def _map_docs(self, argument_model, stack):
         k = argument_model.key
-        value_docs = self._shorthand_docs(argument_model.value, stack)
+        stack.append(argument_model.value.name)
+        try:
+            value_docs = self._shorthand_docs(argument_model.value, stack)
+        finally:
+            stack.pop()
         start = 'KeyName1=%s,KeyName2=%s' % (value_docs, value_docs)
         if k.enum and not stack:
             start += '\n\nWhere valid key names are:\n'

awscli/arguments.py

@@ -449,7 +449,7 @@ class CLIArgument(BaseCLIArgument):
         cli_name = self.cli_name
         parser.add_argument(
             cli_name,
-            help=self.documentation,
+            help=self.documentation.replace('%', '%%'),
             type=self.cli_type,
             required=self.required,
         )

awscli/bcdoc/docevents.py

@@ -13,6 +13,7 @@
 
 
 DOC_EVENTS = {
+    'doc-meta-description': '.%s',
     'doc-breadcrumbs': '.%s',
     'doc-title': '.%s',
     'doc-description': '.%s',
@@ -39,6 +40,8 @@ def generate_events(session, help_command):
     # Now generate the documentation events
     session.emit('doc-breadcrumbs.%s' % help_command.event_class,
                  help_command=help_command)
+    session.emit('doc-meta-description.%s' % help_command.event_class,
+                 help_command=help_command)
     session.emit('doc-title.%s' % help_command.event_class,
                  help_command=help_command)
     session.emit('doc-description.%s' % help_command.event_class,

awscli/clidocs.py

@@ -17,7 +17,7 @@ import re
 from botocore.model import StringShape
 from botocore.utils import is_json_value_header
 
-from awscli import SCALAR_TYPES
+from awscli import SCALAR_TYPES, __version__ as AWS_CLI_VERSION
 from awscli.argprocess import ParamShorthandDocGen
 from awscli.bcdoc.docevents import DOC_EVENTS
 from awscli.topictags import TopicTagDB
@@ -114,7 +114,8 @@ class CLIDocumentEventHandler:
                 full_cmd_list.append(cmd)
                 full_cmd_name = ' '.join(full_cmd_list)
                 doc.write(f':ref:`{cmd} <cli:{full_cmd_name}>`')
-            doc.write(' ]')
+            doc.writeln(' ]')
+            doc.writeln('')
 
     def doc_title(self, help_command, **kwargs):
         doc = help_command.doc
@@ -223,6 +224,9 @@ class CLIDocumentEventHandler:
         )
         doc.write('\n')
 
+    def doc_meta_description(self, help_command, **kwargs):
+        pass
+
     def _document_enums(self, model, doc):
         """Documents top-level parameter enums"""
         if isinstance(model, StringShape):
@@ -402,6 +406,13 @@ class ServiceDocumentEventHandler(CLIDocumentEventHandler):
         else:
             doc.style.tocitem(command_name)
 
+    def doc_meta_description(self, help_command, **kwargs):
+        doc = help_command.doc
+        reference = help_command.event_class.replace('.', ' ')
+        doc.writeln(".. meta::")
+        doc.writeln(f"   :description: Learn about the AWS CLI {AWS_CLI_VERSION} {reference} commands.")
+        doc.writeln("")
+
 
 class OperationDocumentEventHandler(CLIDocumentEventHandler):
     AWS_DOC_BASE = 'https://docs.aws.amazon.com/goto/WebAPI'
@@ -618,6 +629,12 @@ class OperationDocumentEventHandler(CLIDocumentEventHandler):
             for member_name, member_shape in output_shape.members.items():
                 self._doc_member(doc, member_name, member_shape, stack=[])
 
+    def doc_meta_description(self, help_command, **kwargs):
+        doc = help_command.doc
+        reference = help_command.event_class.replace('.', ' ')
+        doc.writeln(".. meta::")
+        doc.writeln(f"   :description: Use the AWS CLI {AWS_CLI_VERSION} to run the {reference} command.")
+        doc.writeln("")
 
 class TopicListerDocumentEventHandler(CLIDocumentEventHandler):
     DESCRIPTION = (

awscli/clidriver.py

@@ -48,7 +48,7 @@ from awscli.help import (
     ServiceHelpCommand,
 )
 from awscli.plugin import load_plugins
-from awscli.utils import emit_top_level_args_parsed_event, write_exception
+from awscli.utils import emit_top_level_args_parsed_event, write_exception, create_nested_client, resolve_v2_debug_mode
 from botocore import __version__ as botocore_version
 from botocore import xform_name
 
@@ -225,7 +225,7 @@ class CLIDriver:
             # that exceptions can be raised, which should have the same
             # general exception handling logic as calling into the
             # command table.  This is why it's in the try/except clause.
-            self._handle_top_level_args(parsed_args)
+            self._handle_top_level_args(parsed_args, remaining)
             self._emit_session_event(parsed_args)
             HISTORY_RECORDER.record(
                 'CLI_VERSION', self.session.user_agent(), 'CLI'
@@ -279,8 +279,8 @@ class CLIDriver:
         sys.stderr.write(msg)
         sys.stderr.write('\n')
 
-    def _handle_top_level_args(self, args):
-        emit_top_level_args_parsed_event(self.session, args)
+    def _handle_top_level_args(self, args, remaining):
+        emit_top_level_args_parsed_event(self.session, args, remaining)
         if args.profile:
             self.session.set_config_variable('profile', args.profile)
         if args.region:
@@ -542,9 +542,15 @@ class ServiceOperation:
             event, parsed_args=parsed_args, parsed_globals=parsed_globals
         )
         call_parameters = self._build_call_parameters(
-            parsed_args, self.arg_table
+            parsed_args, self.arg_table, parsed_globals
         )
 
+        self._detect_binary_file_migration_change(
+            self._session,
+            parsed_args,
+            parsed_globals,
+            self.arg_table
+        )
         event = f'calling-command.{self._parent_name}.{self._name}'
         override = self._emit_first_non_none_response(
             event,
@@ -590,7 +596,7 @@ class ServiceOperation:
         # CLIArguments for values.
         parser.add_argument('help', nargs='?')
 
-    def _build_call_parameters(self, args, arg_table):
+    def _build_call_parameters(self, args, arg_table, parsed_globals):
         # We need to convert the args specified on the command
         # line as valid **kwargs we can hand to botocore.
         service_params = {}
@@ -601,11 +607,11 @@ class ServiceOperation:
             py_name = arg_object.py_name
             if py_name in parsed_args:
                 value = parsed_args[py_name]
-                value = self._unpack_arg(arg_object, value)
+                value = self._unpack_arg(arg_object, value, parsed_globals)
                 arg_object.add_to_params(service_params, value)
         return service_params
 
-    def _unpack_arg(self, cli_argument, value):
+    def _unpack_arg(self, cli_argument, value, parsed_globals):
         # Unpacks a commandline argument into a Python value by firing the
         # load-cli-arg.service-name.operation-name event.
         session = self._session
@@ -613,7 +619,7 @@ class ServiceOperation:
         operation_name = xform_name(self._name, '-')
 
         return unpack_argument(
-            session, service_name, operation_name, cli_argument, value
+            session, service_name, operation_name, cli_argument, value, parsed_globals
         )
 
     def _create_argument_table(self):
@@ -661,6 +667,46 @@ class ServiceOperation:
         parser = ArgTableArgParser(arg_table)
         return parser
 
+    def _detect_binary_file_migration_change(
+            self,
+            session,
+            parsed_args,
+            parsed_globals,
+            arg_table
+    ):
+        if (
+                session.get_scoped_config()
+                        .get('cli_binary_format', None) == 'raw-in-base64-out'
+        ):
+            # if cli_binary_format is set to raw-in-base64-out, then v2 behavior will
+            # be the same as v1, so there is no breaking change in this case.
+            return
+        if resolve_v2_debug_mode(parsed_globals):
+            parsed_args_to_check = {
+                arg: getattr(parsed_args, arg)
+                for arg in vars(parsed_args) if getattr(parsed_args, arg)
+            }
+
+            arg_values_to_check = [
+                arg.py_name for arg in arg_table.values()
+                if arg.py_name in parsed_args_to_check
+                   and arg.argument_model.type_name == 'blob'
+            ]
+            if arg_values_to_check:
+                print(
+                    '\nAWS CLI v2 UPGRADE WARNING: When specifying a '
+                    'blob-type parameter, AWS CLI v2 will assume the '
+                    'parameter value is base64-encoded. This is different '
+                    'from v1 behavior, where the AWS CLI will automatically '
+                    'encode the value to base64. To retain v1 behavior in '
+                    'AWS CLI v2, set the `cli_binary_format` configuration '
+                    'variable to `raw-in-base64-out`. See '
+                    'https://docs.aws.amazon.com/cli/latest/userguide/'
+                    'cliv2-migration-changes.html'
+                    '#cliv2-migration-binaryparam.\n',
+                    file=sys.stderr
+                )
+
 
 class CLIOperationCaller:
     """Call an AWS operation and format the response."""
@@ -692,7 +738,8 @@ class CLIOperationCaller:
             value is returned.
 
         """
-        client = self._session.create_client(
+        client = create_nested_client(
+            self._session,
             service_name,
             region_name=parsed_globals.region,
             endpoint_url=parsed_globals.endpoint_url,

awscli/compat.py

@@ -13,6 +13,7 @@
 
 import collections.abc as collections_abc
 import contextlib
+import datetime
 import io
 import locale
 import os
@@ -502,3 +503,13 @@ except ImportError:
         if _id:
             id = _id
         return distname, version, id
+
+
+def get_current_datetime(remove_tzinfo=True):
+    # TODO: Consolidate to botocore.compat.get_current_datetime
+    # after it's had time to bake to avoid import errors with
+    # mismatched versions.
+    datetime_now = datetime.datetime.now(datetime.timezone.utc)
+    if remove_tzinfo:
+        datetime_now = datetime_now.replace(tzinfo=None)
+    return datetime_now

awscli/customizations/argrename.py

@@ -26,8 +26,6 @@ ARGUMENT_RENAMES = {
     'ec2.create-image.no-no-reboot': 'reboot',
     'ec2.*.no-egress': 'ingress',
     'ec2.*.no-disable-api-termination': 'enable-api-termination',
-    'opsworks.*.region': 'stack-region',
-    'elastictranscoder.*.output': 'job-output',
     'swf.register-activity-type.version': 'activity-version',
     'swf.register-workflow-type.version': 'workflow-version',
     'datapipeline.*.query': 'objects-query',
@@ -96,6 +94,7 @@ ARGUMENT_RENAMES = {
     'eks.update-cluster-version.version': 'kubernetes-version',
     'eks.create-nodegroup.version': 'kubernetes-version',
     'eks.update-nodegroup-version.version': 'kubernetes-version',
+    'eks.update-cluster-components-version.version': 'kubernetes-version',
     'schemas.*.version': 'schema-version',
     'sagemaker.delete-image-version.version': 'version-number',
     'sagemaker.describe-image-version.version': 'version-number',
@@ -140,7 +139,6 @@ HIDDEN_ALIASES = {
     'importexport.get-shipping-label.street3': 'street-3',
     'lambda.publish-version.code-sha256': 'code-sha-256',
     'lightsail.import-key-pair.public-key-base64': 'public-key-base-64',
-    'opsworks.register-volume.ec2-volume-id': 'ec-2-volume-id',
     'mgn.*.replication-servers-security-groups-ids':
         'replication-servers-security-groups-i-ds',
     'mgn.*.source-server-ids': 'source-server-i-ds',

awscli/customizations/cliinputjson.py

@@ -70,6 +70,10 @@ class CliInputJSONArgument(OverrideRequiredArgsArgument):
             try:
                 # Try to load the JSON string into a python dictionary
                 input_data = json.loads(retrieved_json)
+                self._session.register(
+                    f"get-cli-input-json-data",
+                    lambda **inner_kwargs: input_data
+                )
             except ValueError as e:
                 raise ParamError(
                     self.name, "Invalid JSON: %s\nJSON received: %s"

awscli/customizations/cloudformation/deploy.py

@@ -24,7 +24,8 @@ from awscli.customizations.cloudformation.yamlhelper import yaml_parse
 
 from awscli.customizations.commands import BasicCommand
 from awscli.compat import get_stdout_text_writer
-from awscli.utils import write_exception
+from awscli.customizations.utils import uni_print
+from awscli.utils import create_nested_client, write_exception, resolve_v2_debug_mode
 
 LOG = logging.getLogger(__name__)
 
@@ -267,8 +268,8 @@ class DeployCommand(BasicCommand):
 
     def _run_main(self, parsed_args, parsed_globals):
         cloudformation_client = \
-            self._session.create_client(
-                    'cloudformation', region_name=parsed_globals.region,
+            create_nested_client(
+                    self._session, 'cloudformation', region_name=parsed_globals.region,
                     endpoint_url=parsed_globals.endpoint_url,
                     verify=parsed_globals.verify_ssl)
 
@@ -300,7 +301,8 @@ class DeployCommand(BasicCommand):
 
         bucket = parsed_args.s3_bucket
         if bucket:
-            s3_client = self._session.create_client(
+            s3_client = create_nested_client(
+                self._session,
                 "s3",
                 config=Config(signature_version='s3v4'),
                 region_name=parsed_globals.region,
@@ -315,18 +317,33 @@ class DeployCommand(BasicCommand):
             s3_uploader = None
 
         deployer = Deployer(cloudformation_client)
+        v2_debug = resolve_v2_debug_mode(parsed_globals)
         return self.deploy(deployer, stack_name, template_str,
                            parameters, parsed_args.capabilities,
                            parsed_args.execute_changeset, parsed_args.role_arn,
                            parsed_args.notification_arns, s3_uploader,
                            tags, parsed_args.fail_on_empty_changeset,
-                           parsed_args.disable_rollback)
+                           parsed_args.disable_rollback, v2_debug)
 
     def deploy(self, deployer, stack_name, template_str,
                parameters, capabilities, execute_changeset, role_arn,
                notification_arns, s3_uploader, tags,
-               fail_on_empty_changeset=True, disable_rollback=False):
+               fail_on_empty_changeset=True, disable_rollback=False,
+               v2_debug=False):
         try:
+            if v2_debug and fail_on_empty_changeset:
+                uni_print(
+                    '\nAWS CLI v2 UPGRADE WARNING: In AWS CLI v2, deploying '
+                    'an AWS CloudFormation Template that results in an empty '
+                    'changeset will NOT result in an error by default. This '
+                    'is different from v1 behavior, where empty changesets '
+                    'result in an error by default. To migrate to v2 behavior '
+                    'and resolve this warning, you can add the '
+                    '`--no-fail-on-empty-changeset` flag to the command. '
+                    'See https://docs.aws.amazon.com/cli/latest/userguide/'
+                    'cliv2-migration-changes.html#cliv2-migration-cfn.\n',
+                    out_file=sys.stderr
+                )
             result = deployer.create_and_wait_for_changeset(
                 stack_name=stack_name,
                 cfn_template=template_str,

awscli/customizations/cloudformation/deployer.py

@@ -17,10 +17,10 @@ import logging
 import botocore
 import collections
 
+from awscli.compat import get_current_datetime
 from awscli.customizations.cloudformation import exceptions
 from awscli.customizations.cloudformation.artifact_exporter import mktempfile, parse_s3_url
 
-from datetime import datetime
 
 LOG = logging.getLogger(__name__)
 
@@ -85,7 +85,7 @@ class Deployer(object):
         :return:
         """
 
-        now = datetime.utcnow().isoformat()
+        now = get_current_datetime().isoformat()
         description = "Created by AWS CLI at {0} UTC".format(now)
 
         # Each changeset will get a unique name based on time

awscli/customizations/cloudformation/package.py

@@ -24,6 +24,7 @@ from awscli.customizations.cloudformation.yamlhelper import yaml_dump
 from awscli.customizations.cloudformation import exceptions
 from awscli.customizations.commands import BasicCommand
 from awscli.customizations.s3uploader import S3Uploader
+from awscli.utils import create_nested_client
 
 LOG = logging.getLogger(__name__)
 
@@ -124,8 +125,8 @@ class PackageCommand(BasicCommand):
     ]
 
     def _run_main(self, parsed_args, parsed_globals):
-        s3_client = self._session.create_client(
-            "s3",
+        s3_client = create_nested_client(
+            self._session, "s3",
             config=Config(signature_version='s3v4'),
             region_name=parsed_globals.region,
             verify=parsed_globals.verify_ssl)

awscli/customizations/cloudfront.py

@@ -21,6 +21,7 @@ from botocore.signers import CloudFrontSigner
 from awscli.arguments import CustomArgument
 from awscli.customizations.utils import validate_mutually_exclusive_handler
 from awscli.customizations.commands import BasicCommand
+from awscli.utils import create_nested_client
 
 
 def register(event_handler):
@@ -172,7 +173,8 @@ class UpdateDefaultRootObject(CreateDefaultRootObject):
 
     def add_to_params(self, parameters, value):
         if value is not None:
-            client = self.context['session'].create_client(
+            client = create_nested_client(
+                self.context['session'],
                 'cloudfront',
                 region_name=self.context['parsed_args'].region,
                 endpoint_url=self.context['parsed_args'].endpoint_url,

awscli/customizations/cloudtrail/subscribe.py

@@ -17,9 +17,9 @@ import sys
 from .utils import get_account_id
 from awscli.customizations.commands import BasicCommand
 from awscli.customizations.utils import s3_bucket_exists
+from awscli.utils import create_nested_client
 from botocore.exceptions import ClientError
 
-
 LOG = logging.getLogger(__name__)
 S3_POLICY_TEMPLATE = 'policy/S3/AWSCloudTrail-S3BucketPolicy-2014-12-17.json'
 SNS_POLICY_TEMPLATE = 'policy/SNS/AWSCloudTrail-SnsTopicPolicy-2014-12-17.json'
@@ -80,16 +80,16 @@ class CloudTrailSubscribe(BasicCommand):
 
         # Initialize services
         LOG.debug('Initializing S3, SNS and CloudTrail...')
-        self.sts = self._session.create_client('sts', **client_args)
-        self.s3 = self._session.create_client('s3', **client_args)
-        self.sns = self._session.create_client('sns', **client_args)
+        self.sts = create_nested_client(self._session, 'sts', **client_args)
+        self.s3 = create_nested_client(self._session, 's3', **client_args)
+        self.sns = create_nested_client(self._session, 'sns', **client_args)
         self.region_name = self.s3.meta.region_name
 
         # If the endpoint is specified, it is designated for the cloudtrail
         # service. Not all of the other services will use it.
         if parsed_globals.endpoint_url is not None:
             client_args['endpoint_url'] = parsed_globals.endpoint_url
-        self.cloudtrail = self._session.create_client('cloudtrail', **client_args)
+        self.cloudtrail = create_nested_client(self._session, 'cloudtrail', **client_args)
 
     def _call(self, options, parsed_globals):
         """

awscli/customizations/cloudtrail/validation.py

@@ -19,7 +19,7 @@ import re
 import sys
 import zlib
 from zlib import error as ZLibError
-from datetime import datetime, timedelta
+from datetime import timedelta
 from dateutil import tz, parser
 
 from pyasn1.error import PyAsn1Error
@@ -29,8 +29,9 @@ from awscli.customizations.cloudtrail.utils import get_trail_by_arn, \
     get_account_id_from_arn
 from awscli.customizations.commands import BasicCommand
 from botocore.exceptions import ClientError
+from awscli.compat import get_current_datetime
 from awscli.schema import ParameterRequiredError
-
+from awscli.utils import create_nested_client
 
 LOG = logging.getLogger(__name__)
 DATE_FORMAT = '%Y%m%dT%H%M%SZ'
@@ -193,7 +194,7 @@ class S3ClientProvider(object):
     def _create_client(self, region_name):
         """Creates an Amazon S3 client for the given region name"""
         if region_name not in self._client_cache:
-            client = self._session.create_client('s3', region_name)
+            client = create_nested_client(self._session, 's3', region_name=region_name)
             # Remove the CLI error event that prevents exceptions.
             self._client_cache[region_name] = client
         return self._client_cache[region_name]
@@ -281,9 +282,10 @@ class DigestProvider(object):
         """
         digests = []
         marker = self._create_digest_key(start_date, prefix)
+        s3_digest_files_prefix = self._create_digest_prefix(start_date, prefix)
         client = self._client_provider.get_client(bucket)
         paginator = client.get_paginator('list_objects')
-        page_iterator = paginator.paginate(Bucket=bucket, Marker=marker)
+        page_iterator = paginator.paginate(Bucket=bucket, Marker=marker, Prefix=s3_digest_files_prefix)
         key_filter = page_iterator.search('Contents[*].Key')
         # Create a target start end end date
         target_start_date = format_date(normalize_date(start_date))
@@ -293,7 +295,7 @@ class DigestProvider(object):
         # Ensure digests are from the same trail.
         digest_key_regex = re.compile(self._create_digest_key_regex(prefix))
         for key in key_filter:
-            if digest_key_regex.match(key):
+            if key and digest_key_regex.match(key):
                 # Use a lexicographic comparison to know when to stop.
                 extracted_date = extract_digest_key_date(key)
                 if extracted_date > target_end_date:
@@ -360,6 +362,25 @@ class DigestProvider(object):
             key = key_prefix + '/' + key
         return key
 
+    def _create_digest_prefix(self, start_date, key_prefix):
+        """Creates an S3 prefix to scope listing to trail's region.
+
+        :return: Returns a prefix string to limit S3 listing scope.
+        """
+        template = 'AWSLogs/'
+        template_params = {
+            'account_id': self.account_id,
+            'source_region': self.trail_source_region
+        }
+        if self.organization_id:
+            template += '{organization_id}/'
+            template_params['organization_id'] = self.organization_id
+        template += '{account_id}/CloudTrail-Digest/{source_region}'
+        prefix = template.format(**template_params)
+        if key_prefix:
+            prefix = key_prefix + '/' + prefix
+        return prefix
+
     def _create_digest_key_regex(self, key_prefix):
         """Creates a regular expression used to match against S3 keys"""
         template = 'AWSLogs/'
@@ -432,7 +453,7 @@ class DigestTraverser(object):
         :param end_date: Date to stop validating at (inclusive).
         """
         if end_date is None:
-            end_date = datetime.utcnow()
+            end_date = get_current_datetime()
         end_date = normalize_date(end_date)
         start_date = normalize_date(start_date)
         bucket = self.starting_bucket
@@ -735,7 +756,7 @@ class CloudTrailValidateLogs(BasicCommand):
         if args.end_time:
             self.end_time = normalize_date(parse_date(args.end_time))
         else:
-            self.end_time = normalize_date(datetime.utcnow())
+            self.end_time = normalize_date(get_current_datetime())
         if self.start_time > self.end_time:
             raise ValueError(('Invalid time range specified: start-time must '
                               'occur before end-time'))
@@ -753,13 +774,13 @@ class CloudTrailValidateLogs(BasicCommand):
             self._session, self._source_region)
         client_args = {'region_name': parsed_globals.region,
                        'verify': parsed_globals.verify_ssl}
-        self.organization_client = self._session.create_client(
-            'organizations', **client_args)
+        self.organization_client = create_nested_client(
+            self._session, 'organizations', **client_args)
 
         if parsed_globals.endpoint_url is not None:
             client_args['endpoint_url'] = parsed_globals.endpoint_url
-        self.cloudtrail_client = self._session.create_client(
-            'cloudtrail', **client_args)
+        self.cloudtrail_client = create_nested_client(
+            self._session, 'cloudtrail', **client_args)
 
     def _call(self):
         traverser = create_digest_traverser(

awscli/customizations/codecommit.py

@@ -16,13 +16,12 @@ import re
 import sys
 import logging
 import fileinput
-import datetime
 
 from botocore.auth import SigV4Auth
 from botocore.awsrequest import AWSRequest
 from botocore.compat import urlsplit
 from awscli.customizations.commands import BasicCommand
-from awscli.compat import NonTranslatedStdout
+from awscli.compat import NonTranslatedStdout, get_current_datetime
 
 logger = logging.getLogger('botocore.credentials')
 
@@ -150,7 +149,7 @@ class CodeCommitGetCommand(BasicCommand):
         request = AWSRequest()
         request.url = url_to_sign
         request.method = 'GIT'
-        now = datetime.datetime.utcnow()
+        now = get_current_datetime()
         request.context['timestamp'] = now.strftime('%Y%m%dT%H%M%S')
         split = urlsplit(request.url)
         # we don't want to include the port number in the signature

awscli/customizations/codedeploy/deregister.py

@@ -18,6 +18,7 @@ from botocore.exceptions import ClientError
 from awscli.customizations.commands import BasicCommand
 from awscli.customizations.codedeploy.utils import \
     validate_region, validate_instance_name, INSTANCE_NAME_ARG
+from awscli.utils import create_nested_client
 
 
 class Deregister(BasicCommand):
@@ -48,13 +49,15 @@ class Deregister(BasicCommand):
         validate_region(params, parsed_globals)
         validate_instance_name(params)
 
-        self.codedeploy = self._session.create_client(
+        self.codedeploy = create_nested_client(
+            self._session,
             'codedeploy',
             region_name=params.region,
             endpoint_url=parsed_globals.endpoint_url,
             verify=parsed_globals.verify_ssl
         )
-        self.iam = self._session.create_client(
+        self.iam = create_nested_client(
+            self._session,
             'iam',
             region_name=params.region
         )