awscli 1.40.31__py3-none-any.whl → 1.40.33__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.31'
+__version__ = '1.40.33'
 
 #
 # Get our data path to be added to botocore's search path

awscli/customizations/s3uploader.py

@@ -11,7 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-import hashlib
 import logging
 import threading
 import os
@@ -19,6 +18,7 @@ import sys
 
 import botocore
 import botocore.exceptions
+from botocore.compat import get_md5
 from s3transfer.manager import TransferManager
 from s3transfer.subscribers import BaseSubscriber
 
@@ -27,6 +27,16 @@ from awscli.compat import collections_abc
 LOG = logging.getLogger(__name__)
 
 
+def _get_checksum():
+    hashlib_params = {"usedforsecurity": False}
+    try:
+        checksum = get_md5(**hashlib_params)
+    except botocore.exceptions.MD5UnavailableError:
+        import hashlib
+        checksum = hashlib.sha256(**hashlib_params)
+    return checksum
+
+
 class NoSuchBucketError(Exception):
     def __init__(self, **kwargs):
         msg = self.fmt.format(**kwargs)
@@ -128,7 +138,7 @@ class S3Uploader(object):
 
     def upload_with_dedup(self, file_name, extension=None):
         """
-        Makes and returns name of the S3 object based on the file's MD5 sum
+        Makes and returns name of the S3 object based on the file's checksum
 
         :param file_name: file to upload
         :param extension: String of file extension to append to the object
@@ -140,8 +150,8 @@ class S3Uploader(object):
         # and re-upload only if necessary. So the template points to same file
         # in multiple places, this will upload only once
 
-        filemd5 = self.file_checksum(file_name)
-        remote_path = filemd5
+        file_checksum = self.file_checksum(file_name)
+        remote_path = file_checksum
         if extension:
             remote_path = remote_path + "." + extension
 
@@ -172,7 +182,7 @@ class S3Uploader(object):
     def file_checksum(self, file_name):
 
         with open(file_name, "rb") as file_handle:
-            md5 = hashlib.md5()
+            checksum = _get_checksum()
             # Read file in chunks of 4096 bytes
             block_size = 4096
 
@@ -182,13 +192,13 @@ class S3Uploader(object):
 
             buf = file_handle.read(block_size)
             while len(buf) > 0:
-                md5.update(buf)
+                checksum.update(buf)
                 buf = file_handle.read(block_size)
 
             # Restore file cursor's position
             file_handle.seek(curpos)
 
-            return md5.hexdigest()
+            return checksum.hexdigest()
 
     def to_path_style_s3_url(self, key, version=None):
         """

awscli/examples/cloudformation/_package_description.rst

@@ -49,8 +49,8 @@ current working directory. The exception is ``AWS::ApiGateway::RestApi``;
 if you don't specify a ``BodyS3Location``, this command will not upload an artifact to S3.
 
 Before the command uploads artifacts, it checks if the artifacts are already
-present in the S3 bucket to prevent unnecessary uploads. The command uses MD5
-checksums to compare files. If the values match, the command doesn't upload the
-artifacts. Use the ``--force-upload flag`` to skip this check and always upload the
-artifacts.
+present in the S3 bucket to prevent unnecessary uploads. If the values match, the
+command doesn't upload the artifacts. Use the ``--force-upload flag`` to skip this
+check and always upload the artifacts. The command uses MD5 checksums to compare
+files by default. If MD5 is not available in the environment, a SHA256 checksum is used.
 

{awscli-1.40.31.dist-info → awscli-1.40.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: awscli
-Version: 1.40.31
+Version: 1.40.33
 Summary: Universal Command Line Environment for AWS.
 Home-page: http://aws.amazon.com/cli/
 Author: Amazon Web Services
@@ -22,7 +22,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >= 3.9
 License-File: LICENSE.txt
-Requires-Dist: botocore (==1.38.32)
+Requires-Dist: botocore (==1.38.34)
 Requires-Dist: docutils (<=0.19,>=0.18.1)
 Requires-Dist: s3transfer (<0.14.0,>=0.13.0)
 Requires-Dist: PyYAML (<6.1,>=3.10)

{awscli-1.40.31.dist-info → awscli-1.40.33.dist-info}/RECORD

@@ -1,4 +1,4 @@
-awscli/__init__.py,sha256=JHtu3JvexGVyfYEjsqZHtyAKJ9sme5UBIoFHYu_l7k4,1534
+awscli/__init__.py,sha256=tz4FdxncmUdB2yY5VyiaRD-2rqzqNgKEENhoI00HPNc,1534
 awscli/__main__.py,sha256=iBjOg0tBxNlhzTi_tyc1G0SMGBvHMVvBJzX3JqYaooY,662
 awscli/alias.py,sha256=Jj2jetpajUMcjqx9tFhHUOKpzLChQygnH2zqDFfmgIM,11315
 awscli/argparser.py,sha256=3Pxx-vWytdV985Y6MIl9DeutUXyehIvACIs_PDby8GI,7650
@@ -66,7 +66,7 @@ awscli/customizations/removals.py,sha256=OK-nzQa2HcufHRG5E4XYfyFxuJQdQczlu5y8KkT
 awscli/customizations/route53.py,sha256=TyEnjZz7bPegLQ23X5r1tNUJ1gSAmGeQBaF98t5PLmU,1187
 awscli/customizations/s3errormsg.py,sha256=STKQ3714dnXOzPSPszCikhv5hoRBUJnk-u0kFp7FaEU,2480
 awscli/customizations/s3events.py,sha256=ZcNmDN26dXxLrLawawl9jRFWqK1lMEQpty0YRNjBQws,4795
-awscli/customizations/s3uploader.py,sha256=jgCfzagRu-CkzuY5nEP9me79BcrhzYjbQcKUAyvMCA8,7810
+awscli/customizations/s3uploader.py,sha256=vRz9bBLPby5ZZzBZpkI_SeWezoOmLkmOPeQ9jHemVpU,8133
 awscli/customizations/sagemaker.py,sha256=mlYPscN-aQgV6L8dRK62QolmY7_iDmtHLe6DyGjayD8,1014
 awscli/customizations/scalarparse.py,sha256=LIcIwHLHzFR1vQboh58N3spPEcR9IF2Wk9f-wA-IXoA,3041
 awscli/customizations/sessendemail.py,sha256=uWgx-f0ILiTGKyjoQcJWx8XoG-BIWUkWNBy-yXvYpTU,4459
@@ -739,7 +739,7 @@ awscli/examples/cloudcontrol/list-resource-requests.rst,sha256=4RDKnlLXblL7ZnzYS
 awscli/examples/cloudcontrol/list-resources.rst,sha256=hOfny2L4EshkHMILYO9RFNZaL9c1-M82MWV_P0kNVB8,829
 awscli/examples/cloudcontrol/update-resource.rst,sha256=xK_BwVa_HJmLFRiiC3n-4B-ATKQIcBMHg3KSgmi-Mso,966
 awscli/examples/cloudformation/_deploy_description.rst,sha256=tKFsU-kBgkYWmZhsyD8dqzdI15X_NGcVkp8h5V_odZ0,392
-awscli/examples/cloudformation/_package_description.rst,sha256=x502ZaLUlN690Ec7wr3gWWTU9g1dYwrYHXigKDTl0ws,3558
+awscli/examples/cloudformation/_package_description.rst,sha256=jhuwmVLF27KDHkr5IbCUhSZ9-OLBjKI7zb2nFY5Vlmg,3640
 awscli/examples/cloudformation/activate-type.rst,sha256=lK7ABVXq9IjRunlNx6VhWDIJp53XiZSadgfbzuu6w08,676
 awscli/examples/cloudformation/batch-describe-type-configurations.rst,sha256=ZL59dBVV7gFBhVWcwWAt0lFnvyimZljfoN1BJKpoRCk,1304
 awscli/examples/cloudformation/cancel-update-stack.rst,sha256=iXh30epVbKsksPDXoHLeoFQ5JMksU12FH48oflQ3BYU,217
@@ -6129,13 +6129,13 @@ awscli/topics/return-codes.rst,sha256=d9lpNFZwD75IiYcDEADQzu-4QiR8P28UPHkrNwPV5J
 awscli/topics/s3-config.rst,sha256=5EIVd4ggLBHtzjtHFvQp9hY415yMGZiG7S_rO9qy2t0,11663
 awscli/topics/s3-faq.rst,sha256=9qO0HFI6F9hx1wVEUDl8Jy6yoCUd9zbtv-Z0Re4dsiw,2934
 awscli/topics/topic-tags.json,sha256=6lUSrs3FKCZNRSQMnjcXNgWyRNGjZIeur1988a4IO5o,1577
-awscli-1.40.31.data/scripts/aws,sha256=r24FExgs0-JjILTQ3XZAqXBYE4SV6UMTtALkLGAj86g,805
-awscli-1.40.31.data/scripts/aws.cmd,sha256=s46DkC6LNgX63CIkzxxbPnFMJ6DRDBkvc88GnWa8Pvg,1432
-awscli-1.40.31.data/scripts/aws_bash_completer,sha256=RRpoEGJRagRzyHZKZZOwpltuVYv2EoiZsdXhmyWPZ54,204
-awscli-1.40.31.data/scripts/aws_completer,sha256=oC9kuMDlWE47dWk_4xjPde2PQvN-M0vND0J4YSLabVQ,1126
-awscli-1.40.31.data/scripts/aws_zsh_completer.sh,sha256=Qm6Z8ejNAMzpJjaT0pzqxbSDT2zxdmzVe5haRA7qLoc,1808
-awscli-1.40.31.dist-info/LICENSE.txt,sha256=o5XhFlwu0OK_BBrijlKCRa7dQAm36UrUB3gCV_cEr8E,549
-awscli-1.40.31.dist-info/METADATA,sha256=hHhSzDkcsUFO3IhgWW2QAmqjSKtZRt3iVeGt1O4iaX4,11055
-awscli-1.40.31.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-awscli-1.40.31.dist-info/top_level.txt,sha256=vt9wXFr1_nGYK6abhJgt6zY3fULe4JSZedm_5XOM9S0,7
-awscli-1.40.31.dist-info/RECORD,,
+awscli-1.40.33.data/scripts/aws,sha256=r24FExgs0-JjILTQ3XZAqXBYE4SV6UMTtALkLGAj86g,805
+awscli-1.40.33.data/scripts/aws.cmd,sha256=s46DkC6LNgX63CIkzxxbPnFMJ6DRDBkvc88GnWa8Pvg,1432
+awscli-1.40.33.data/scripts/aws_bash_completer,sha256=RRpoEGJRagRzyHZKZZOwpltuVYv2EoiZsdXhmyWPZ54,204
+awscli-1.40.33.data/scripts/aws_completer,sha256=oC9kuMDlWE47dWk_4xjPde2PQvN-M0vND0J4YSLabVQ,1126
+awscli-1.40.33.data/scripts/aws_zsh_completer.sh,sha256=Qm6Z8ejNAMzpJjaT0pzqxbSDT2zxdmzVe5haRA7qLoc,1808
+awscli-1.40.33.dist-info/LICENSE.txt,sha256=o5XhFlwu0OK_BBrijlKCRa7dQAm36UrUB3gCV_cEr8E,549
+awscli-1.40.33.dist-info/METADATA,sha256=g_a-5YKPBN44gUI77xYhjilW9zkfpTNgQuQGMcD8uDQ,11055
+awscli-1.40.33.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+awscli-1.40.33.dist-info/top_level.txt,sha256=vt9wXFr1_nGYK6abhJgt6zY3fULe4JSZedm_5XOM9S0,7
+awscli-1.40.33.dist-info/RECORD,,