awscli 1.35.0__py3-none-any.whl → 1.35.2__py3-none-any.whl

awscli/__init__.py

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

awscli/bcdoc/restdoc.py

@@ -67,6 +67,23 @@ class ReSTDocument(object):
         """
         self._writes.append(s)
 
+    def find_last_write(self, content):
+        """
+        Returns the index of the last occurrence of the content argument
+        in the stack, or returns None if content is not on the stack.
+        """
+        try:
+            return len(self._writes) - self._writes[::-1].index(content) - 1
+        except ValueError:
+            return None
+
+    def insert_write(self, index, content):
+        """
+        Inserts the content argument to the stack directly before the
+        supplied index.
+        """
+        self._writes.insert(index, content)
+
     def getvalue(self):
         """
         Returns the current content of the document as a string.

awscli/customizations/s3events.py

@@ -31,6 +31,12 @@ def register_event_stream_arg(event_handlers):
     )
 
 
+def register_document_expires_string(event_handlers):
+    event_handlers.register_last(
+        'doc-output.s3api',
+        document_expires_string
+    )
+
 def add_event_stream_output_arg(argument_table, operation_model,
                                 session, **kwargs):
     argument_table['outfile'] = S3SelectStreamOutputArgument(
@@ -56,6 +62,30 @@ def replace_event_stream_docs(help_command, **kwargs):
     doc.write("This command generates no output.  The selected "
               "object content is written to the specified outfile.\n")
 
+def document_expires_string(help_command, **kwargs):
+    doc = help_command.doc
+    expires_field_idx = doc.find_last_write('Expires -> (timestamp)')
+
+    if expires_field_idx is None:
+        return
+
+    deprecation_note_and_expires_string = [
+        f'\n\n\n{" " * doc.style.indentation * doc.style.indent_width}',
+        '.. note::',
+        f'\n\n\n{" " * (doc.style.indentation + 1) * doc.style.indent_width}',
+        'This member has been deprecated. Please use `ExpiresString` instead.\n',
+        f'\n\n{" " * doc.style.indentation * doc.style.indent_width}',
+        f'\n\n{" " * doc.style.indentation * doc.style.indent_width}',
+        'ExpiresString -> (string)\n\n',
+        '\tThe raw, unparsed value of the ``Expires`` field.',
+        f'\n\n{" " * doc.style.indentation * doc.style.indent_width}'
+    ]
+
+    for idx, write in enumerate(deprecation_note_and_expires_string):
+        # We add 4 to the index of the expires field name because each
+        # field in the output section consists of exactly 4 elements.
+        doc.insert_write(expires_field_idx + idx + 4, write)
+
 
 class S3SelectStreamOutputArgument(CustomArgument):
     _DOCUMENT_AS_REQUIRED = True

awscli/handlers.py

@@ -105,7 +105,7 @@ from awscli.customizations.removals import register_removals
 from awscli.customizations.route53 import register_create_hosted_zone_doc_fix
 from awscli.customizations.s3.s3 import s3_plugin_initialize
 from awscli.customizations.s3errormsg import register_s3_error_msg
-from awscli.customizations.s3events import register_event_stream_arg
+from awscli.customizations.s3events import register_event_stream_arg, register_document_expires_string
 from awscli.customizations.sagemaker import (
     register_alias_sagemaker_runtime_command,
 )
@@ -215,6 +215,7 @@ def awscli_initialize(event_handlers):
     register_history_mode(event_handlers)
     register_history_commands(event_handlers)
     register_event_stream_arg(event_handlers)
+    register_document_expires_string(event_handlers)
     dlm_initialize(event_handlers)
     register_ssm_session(event_handlers)
     register_sms_voice_hide(event_handlers)

{awscli-1.35.0.dist-info → awscli-1.35.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: awscli
-Version: 1.35.0
+Version: 1.35.2
 Summary: Universal Command Line Environment for AWS.
 Home-page: http://aws.amazon.com/cli/
 Author: Amazon Web Services
@@ -23,7 +23,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >= 3.8
 License-File: LICENSE.txt
-Requires-Dist: botocore (==1.35.34)
+Requires-Dist: botocore (==1.35.36)
 Requires-Dist: docutils (<0.17,>=0.10)
 Requires-Dist: s3transfer (<0.11.0,>=0.10.0)
 Requires-Dist: PyYAML (<6.1,>=3.10)

{awscli-1.35.0.dist-info → awscli-1.35.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-awscli/__init__.py,sha256=09oDL3b1wjy0Ojep-G6ZYhH2DAubPa8VQyU2bqVf8dE,1533
+awscli/__init__.py,sha256=0KRYxly_BYuq8m0jxu2Is5CGpHYne0oq9JnZgbjhHtE,1533
 awscli/__main__.py,sha256=iBjOg0tBxNlhzTi_tyc1G0SMGBvHMVvBJzX3JqYaooY,662
 awscli/alias.py,sha256=Us9pvP8Zplbr1W4N3rE5gxicWLqlRG3l_9VPskxafgs,11313
 awscli/argparser.py,sha256=3Pxx-vWytdV985Y6MIl9DeutUXyehIvACIs_PDby8GI,7650
@@ -11,7 +11,7 @@ awscli/compat.py,sha256=rdygqFsDwb2W_0ehi7PLEA6u49yh-8UoUMIPi0LKIoU,16451
 awscli/completer.py,sha256=vNCS1kr1Q_JO8fLh5YGwfUK3sSaDp3k8rrpa_cCIgY4,5986
 awscli/errorhandler.py,sha256=2bIBZrKvFICKAhoD180Cx7rRX608pG9RHsmlAcRb0wc,3139
 awscli/formatter.py,sha256=EI_dUo5uGf2YxWg5js4un_cksF5h58KuvOkkmptuu4o,10951
-awscli/handlers.py,sha256=ku3MgkFQTO4VizAZYd0yKS8MpY0odTHIgbsSCnprLvI,10699
+awscli/handlers.py,sha256=1EohF1cebRLI0OhVgggFgV65tz4iWIyie_eyufLpkBU,10786
 awscli/help.py,sha256=-u2OtAdW9X8891FBA70xUC5Ky9lhjiWgtbh4hm-DoW8,14205
 awscli/paramfile.py,sha256=vmNWmjer3kw97Xdqv-tojFlNLmpl2EBQnzqAP85ceG0,10885
 awscli/plugin.py,sha256=B3wgRerhgFK1v-QQeASYv2VNLSa9oMuD4X_hcLSescI,2265
@@ -25,7 +25,7 @@ awscli/utils.py,sha256=Blo6Z3b0m-WaOTF3NOlCXGOfxK_cRMR2ZeLRhhOOpj0,9501
 awscli/bcdoc/__init__.py,sha256=V2g87AefB2DOD9_3xIF5k9Nv5ttb4_gNJOVvSF0Mp3s,588
 awscli/bcdoc/docevents.py,sha256=h99ATaPm-Yb0KsrOTO6eaItjMMQzdA6W63R927etjWQ,4877
 awscli/bcdoc/docstringparser.py,sha256=-QMoUsJrmnI-G46YbDm2UACU4jpHXonwouG9CFAlzNg,5679
-awscli/bcdoc/restdoc.py,sha256=ZNz0TcFRhhTwWQonmFYJ3tAavnynVj9i4QUsZQPyMks,7375
+awscli/bcdoc/restdoc.py,sha256=NXdEjs4gqPOno2dVklr5XnMEes8CIG1pB0Gqet1WhHE,7931
 awscli/bcdoc/style.py,sha256=Zf7DB_WSQgfseH3mnXMqKkE0Q8eC_iNYw3w_Pkx63os,11833
 awscli/bcdoc/textwriter.py,sha256=z6WyK2qm-f4xWFZhcAc_Dori_XrrSsIdkkITQ61De_w,20611
 awscli/customizations/__init__.py,sha256=enP4McjXiSlxQrYPyUcOvpUtzy5Q2p6o9M6ydJPkbD0,1484
@@ -65,7 +65,7 @@ awscli/customizations/rekognition.py,sha256=NHajCaaLkSC5YDmtJe-EdLdgmObrQetj6as0
 awscli/customizations/removals.py,sha256=dOILjuIJex1l1rzBp8TqmZxATHkEeiPvl8FQ_x33a00,3874
 awscli/customizations/route53.py,sha256=TyEnjZz7bPegLQ23X5r1tNUJ1gSAmGeQBaF98t5PLmU,1187
 awscli/customizations/s3errormsg.py,sha256=STKQ3714dnXOzPSPszCikhv5hoRBUJnk-u0kFp7FaEU,2480
-awscli/customizations/s3events.py,sha256=vhvOzXNZVgZh9jF2nSAni_wnX6knrUDSusnAIyXt8Sc,3544
+awscli/customizations/s3events.py,sha256=ZcNmDN26dXxLrLawawl9jRFWqK1lMEQpty0YRNjBQws,4795
 awscli/customizations/s3uploader.py,sha256=apRT1dtSsTlV3rjYuNAlHFw5qfyTCYfD3Q6X06p6kvw,7786
 awscli/customizations/sagemaker.py,sha256=mlYPscN-aQgV6L8dRK62QolmY7_iDmtHLe6DyGjayD8,1014
 awscli/customizations/scalarparse.py,sha256=LIcIwHLHzFR1vQboh58N3spPEcR9IF2Wk9f-wA-IXoA,3041
@@ -5953,13 +5953,13 @@ awscli/topics/return-codes.rst,sha256=d9lpNFZwD75IiYcDEADQzu-4QiR8P28UPHkrNwPV5J
 awscli/topics/s3-config.rst,sha256=FwwCczTylrSLwELuDQ-VA8sCI7ruwV9PEJJrqxjUeG0,11502
 awscli/topics/s3-faq.rst,sha256=sS5jKHF_7X5eiGwpUg7aTqQt2zCRN-m_xXOcE0Bme0Q,1899
 awscli/topics/topic-tags.json,sha256=6lUSrs3FKCZNRSQMnjcXNgWyRNGjZIeur1988a4IO5o,1577
-awscli-1.35.0.data/scripts/aws,sha256=r24FExgs0-JjILTQ3XZAqXBYE4SV6UMTtALkLGAj86g,805
-awscli-1.35.0.data/scripts/aws.cmd,sha256=s46DkC6LNgX63CIkzxxbPnFMJ6DRDBkvc88GnWa8Pvg,1432
-awscli-1.35.0.data/scripts/aws_bash_completer,sha256=RRpoEGJRagRzyHZKZZOwpltuVYv2EoiZsdXhmyWPZ54,204
-awscli-1.35.0.data/scripts/aws_completer,sha256=oC9kuMDlWE47dWk_4xjPde2PQvN-M0vND0J4YSLabVQ,1126
-awscli-1.35.0.data/scripts/aws_zsh_completer.sh,sha256=Qm6Z8ejNAMzpJjaT0pzqxbSDT2zxdmzVe5haRA7qLoc,1808
-awscli-1.35.0.dist-info/LICENSE.txt,sha256=o5XhFlwu0OK_BBrijlKCRa7dQAm36UrUB3gCV_cEr8E,549
-awscli-1.35.0.dist-info/METADATA,sha256=Q7yUG1Kkbn_6AJmn60CHCXTtVlOeoE2pU-1NU99C2tU,11330
-awscli-1.35.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-awscli-1.35.0.dist-info/top_level.txt,sha256=vt9wXFr1_nGYK6abhJgt6zY3fULe4JSZedm_5XOM9S0,7
-awscli-1.35.0.dist-info/RECORD,,
+awscli-1.35.2.data/scripts/aws,sha256=r24FExgs0-JjILTQ3XZAqXBYE4SV6UMTtALkLGAj86g,805
+awscli-1.35.2.data/scripts/aws.cmd,sha256=s46DkC6LNgX63CIkzxxbPnFMJ6DRDBkvc88GnWa8Pvg,1432
+awscli-1.35.2.data/scripts/aws_bash_completer,sha256=RRpoEGJRagRzyHZKZZOwpltuVYv2EoiZsdXhmyWPZ54,204
+awscli-1.35.2.data/scripts/aws_completer,sha256=oC9kuMDlWE47dWk_4xjPde2PQvN-M0vND0J4YSLabVQ,1126
+awscli-1.35.2.data/scripts/aws_zsh_completer.sh,sha256=Qm6Z8ejNAMzpJjaT0pzqxbSDT2zxdmzVe5haRA7qLoc,1808
+awscli-1.35.2.dist-info/LICENSE.txt,sha256=o5XhFlwu0OK_BBrijlKCRa7dQAm36UrUB3gCV_cEr8E,549
+awscli-1.35.2.dist-info/METADATA,sha256=QY4PWk5wt5PWsnpSzO9rfPJYVow5U24OZBGn89mwS_E,11330
+awscli-1.35.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+awscli-1.35.2.dist-info/top_level.txt,sha256=vt9wXFr1_nGYK6abhJgt6zY3fULe4JSZedm_5XOM9S0,7
+awscli-1.35.2.dist-info/RECORD,,