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

awscli/customizations/codedeploy/push.py

@@ -16,14 +16,13 @@ import sys
 import zipfile
 import tempfile
 import contextlib
-from datetime import datetime
 
 from botocore.exceptions import ClientError
 
 from awscli.customizations.codedeploy.utils import validate_s3_location
 from awscli.customizations.commands import BasicCommand
-from awscli.compat import BytesIO, ZIP_COMPRESSION_MODE
-
+from awscli.compat import BytesIO, ZIP_COMPRESSION_MODE, get_current_datetime
+from awscli.utils import create_nested_client
 
 ONE_MB = 1 << 20
 MULTIPART_LIMIT = 6 * ONE_MB
@@ -107,13 +106,15 @@ class Push(BasicCommand):
 
     def _run_main(self, parsed_args, parsed_globals):
         self._validate_args(parsed_args)
-        self.codedeploy = self._session.create_client(
+        self.codedeploy = create_nested_client(
+            self._session,
             'codedeploy',
             region_name=parsed_globals.region,
             endpoint_url=parsed_globals.endpoint_url,
             verify=parsed_globals.verify_ssl
         )
-        self.s3 = self._session.create_client(
+        self.s3 = create_nested_client(
+            self._session,
             's3',
             region_name=parsed_globals.region
         )
@@ -130,7 +131,7 @@ class Push(BasicCommand):
         if not parsed_args.description:
             parsed_args.description = (
                 'Uploaded by AWS CLI {0} UTC'.format(
-                    datetime.utcnow().isoformat()
+                    get_current_datetime().isoformat()
                 )
             )
 

awscli/customizations/codedeploy/register.py

@@ -18,6 +18,7 @@ from awscli.customizations.codedeploy.systems import DEFAULT_CONFIG_FILE
 from awscli.customizations.codedeploy.utils import \
     validate_region, validate_instance_name, validate_tags, \
     validate_iam_user_arn, INSTANCE_NAME_ARG, IAM_USER_ARN_ARG
+from awscli.utils import create_nested_client
 
 
 class Register(BasicCommand):
@@ -73,13 +74,15 @@ class Register(BasicCommand):
         validate_tags(params)
         validate_iam_user_arn(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
         )

awscli/customizations/codedeploy/systems.py

@@ -14,6 +14,7 @@
 import ctypes
 import os
 import subprocess
+from awscli.utils import create_nested_client
 
 DEFAULT_CONFIG_FILE = 'codedeploy.onpremises.yml'
 
@@ -26,7 +27,8 @@ class System:
 
     def __init__(self, params):
         self.session = params.session
-        self.s3 = self.session.create_client(
+        self.s3 = create_nested_client(
+            self.session,
             's3',
             region_name=params.region
         )

awscli/customizations/commands.py

@@ -154,7 +154,8 @@ class BasicCommand(CLICommand):
                 'custom',
                 self.name,
                 cli_argument,
-                value
+                value,
+                parsed_globals
             )
 
             # If this parameter has a schema defined, then allow plugins

awscli/customizations/configservice/getstatus.py

@@ -13,7 +13,7 @@
 import sys
 
 from awscli.customizations.commands import BasicCommand
-
+from awscli.utils import create_nested_client
 
 def register_get_status(cli):
     cli.register('building-command-table.configservice', add_get_status)
@@ -44,8 +44,8 @@ class GetStatusCommand(BasicCommand):
             'region_name': parsed_globals.region,
             'endpoint_url': parsed_globals.endpoint_url
         }
-        self._config_client = self._session.create_client('config',
-                                                          **client_args)
+        self._config_client = create_nested_client(self._session, 'config',
+                                           **client_args)
 
     def _check_configuration_recorders(self):
         status = self._config_client.describe_configuration_recorder_status()

awscli/customizations/datapipeline/__init__.py

@@ -12,17 +12,18 @@
 # language governing permissions and limitations under the License.
 
 import json
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 from awscli.formatter import get_formatter
 from awscli.arguments import CustomArgument
+from awscli.compat import get_current_datetime
 from awscli.customizations.commands import BasicCommand
 from awscli.customizations.datapipeline import translator
 from awscli.customizations.datapipeline.createdefaultroles \
     import CreateDefaultRoles
 from awscli.customizations.datapipeline.listrunsformatter \
     import ListRunsFormatter
-
+from awscli.utils import create_nested_client
 
 DEFINITION_HELP_TEXT = """\
 The JSON pipeline definition.  If the pipeline definition
@@ -184,7 +185,7 @@ class QueryArgBuilder(object):
     """
     def __init__(self, current_time=None):
         if current_time is None:
-            current_time = datetime.utcnow()
+            current_time = get_current_datetime()
         self.current_time = current_time
 
     def build_query(self, parsed_args):
@@ -361,7 +362,9 @@ class ListRunsCommand(BasicCommand):
     def _set_client(self, parsed_globals):
         # This is called from _run_main and is used to ensure that we have
         # a service/endpoint object to work with.
-        self.client = self._session.create_client(
+        from awscli.utils import create_nested_client
+        self.client = create_nested_client(
+            self._session,
             'datapipeline',
             region_name=parsed_globals.region,
             endpoint_url=parsed_globals.endpoint_url,

awscli/customizations/datapipeline/createdefaultroles.py

@@ -25,6 +25,8 @@ from awscli.customizations.datapipeline.constants \
 from awscli.customizations.commands import BasicCommand
 from awscli.customizations.datapipeline.translator \
     import display_response, dict_to_string, get_region
+from awscli.utils import create_nested_client
+
 from botocore.exceptions import ClientError
 
 LOG = logging.getLogger(__name__)
@@ -69,8 +71,8 @@ class CreateDefaultRoles(BasicCommand):
         """Call to run the commands"""
         self._region = get_region(self._session, parsed_globals)
         self._endpoint_url = parsed_globals.endpoint_url
-        self._iam_client = self._session.create_client(
-            'iam', 
+        self._iam_client = create_nested_client(
+            self._session, 'iam', 
             region_name=self._region, 
             endpoint_url=self._endpoint_url,
             verify=parsed_globals.verify_ssl

awscli/customizations/dlm/createdefaultrole.py

@@ -23,6 +23,7 @@ from awscli.customizations.dlm.constants \
     POLICY_ARN_PATTERN, \
     RESOURCE_TYPE_SNAPSHOT, \
     RESOURCE_TYPE_IMAGE
+from awscli.utils import create_nested_client
 
 LOG = logging.getLogger(__name__)
 
@@ -98,8 +99,9 @@ class CreateDefaultRole(BasicCommand):
         self._region = get_region(self._session, parsed_globals)
         self._endpoint_url = parsed_args.iam_endpoint
         self._resource_type = parsed_args.resource_type
-        self._iam_client = IAM(self._session.create_client(
-            'iam',
+        from awscli.utils import create_nested_client
+        self._iam_client = IAM(create_nested_client(
+            self._session, 'iam',
             region_name=self._region,
             endpoint_url=self._endpoint_url,
             verify=parsed_globals.verify_ssl

awscli/customizations/ec2/bundleinstance.py

@@ -18,6 +18,7 @@ import base64
 import datetime
 
 from awscli.arguments import CustomArgument
+from awscli.compat import get_current_datetime
 
 logger = logging.getLogger('ec2bundleinstance')
 
@@ -117,7 +118,7 @@ def _generate_policy(params):
     # Called if there is no policy supplied by the user.
     # Creates a policy that provides access for 24 hours.
     delta = datetime.timedelta(hours=24)
-    expires = datetime.datetime.utcnow() + delta
+    expires = get_current_datetime() + delta
     expires_iso = expires.strftime("%Y-%m-%dT%H:%M:%S.%fZ")
     policy = POLICY.format(expires=expires_iso,
                            bucket=params['Bucket'],

awscli/customizations/eks/get_token.py

@@ -16,11 +16,13 @@ import json
 import os
 import sys
 
-from datetime import datetime, timedelta
+from datetime import timedelta
 from botocore.signers import RequestSigner
 from botocore.model import ServiceId
 
 from awscli.formatter import get_formatter
+from awscli.utils import create_nested_client
+from awscli.compat import get_current_datetime
 from awscli.customizations.commands import BasicCommand
 from awscli.customizations.utils import uni_print
 from awscli.customizations.utils import validate_mutually_exclusive
@@ -106,7 +108,7 @@ class GetTokenCommand(BasicCommand):
     ]
 
     def get_expiration_time(self):
-        token_expiration = datetime.utcnow() + timedelta(
+        token_expiration = get_current_datetime() + timedelta(
             minutes=TOKEN_EXPIRATION_MINS
         )
         return token_expiration.strftime('%Y-%m-%dT%H:%M:%SZ')
@@ -247,12 +249,12 @@ class STSClientFactory(object):
             client_kwargs['aws_access_key_id'] = creds['AccessKeyId']
             client_kwargs['aws_secret_access_key'] = creds['SecretAccessKey']
             client_kwargs['aws_session_token'] = creds['SessionToken']
-        sts = self._session.create_client('sts', **client_kwargs)
+        sts = create_nested_client(self._session, 'sts', **client_kwargs)
         self._register_k8s_aws_id_handlers(sts)
         return sts
 
     def _get_role_credentials(self, region_name, role_arn):
-        sts = self._session.create_client('sts', region_name)
+        sts = create_nested_client(self._session, 'sts', region_name=region_name)
         return sts.assume_role(
             RoleArn=role_arn, RoleSessionName='EKSGetTokenAuth'
         )['Credentials']

awscli/customizations/eks/update_kubeconfig.py

@@ -26,6 +26,7 @@ from awscli.customizations.eks.kubeconfig import (Kubeconfig,
                                                   KubeconfigValidator,
                                                   KubeconfigAppender)
 from awscli.customizations.eks.ordered_yaml import ordered_yaml_dump
+from awscli.utils import create_nested_client
 
 LOG = logging.getLogger(__name__)
 
@@ -76,6 +77,12 @@ class UpdateKubeconfigCommand(BasicCommand):
                           "connect to the cluster the first time."),
             'required': False
         },
+        {
+            'name': 'proxy-url',
+            'help_text': ("Optionally specify a proxy url to route "
+                          "traffic via when connecting to a cluster."),
+            'required': False
+        },
         {
             'name': 'dry-run',
             'action': 'store_true',
@@ -270,7 +277,7 @@ class EKSClient(object):
 
         # Handle role assumption if needed
         if getattr(self._parsed_args, 'assume_role_arn', None):
-            sts_client = self._session.create_client('sts')
+            sts_client = create_nested_client(self._session, 'sts')
             credentials = sts_client.assume_role(
                 RoleArn=self._parsed_args.assume_role_arn,
                 RoleSessionName='EKSDescribeClusterSession'
@@ -282,7 +289,7 @@ class EKSClient(object):
                 "aws_session_token": credentials["SessionToken"],
             })
 
-        client = self._session.create_client("eks", **client_kwargs)
+        client = create_nested_client(self._session, "eks", **client_kwargs)
         full_description = client.describe_cluster(name=self._cluster_name)
         cluster = full_description.get("cluster")
 
@@ -304,7 +311,7 @@ class EKSClient(object):
         endpoint = self.cluster_description.get("endpoint")
         arn = self.cluster_description.get("arn")
 
-        return OrderedDict([
+        generated_cluster = OrderedDict([
             ("cluster", OrderedDict([
                 ("certificate-authority-data", cert_data),
                 ("server", endpoint)
@@ -312,6 +319,11 @@ class EKSClient(object):
             ("name", arn)
         ])
 
+        if self._parsed_args.proxy_url is not None:
+            generated_cluster["cluster"]["proxy-url"] = self._parsed_args.proxy_url
+
+        return generated_cluster
+
     def get_user_entry(self, user_alias=None):
         """
         Return a user entry generated using