Merge branch 'release-1.24.4'

* release-1.24.4:
  Bumping version to 1.24.4
  Update changelog based on model updates
  Update sample command set-identity-pool-roles
  Fix wording in the additional low-level s3 docs link
  Update _concepts.rst
  rectified set-endpoint-attributes.rst [get->set]
  Delete extra whitespace
  Improved readablity and simplified logic to find first quote character.

.changes/1.24.4.json

@@ -0,0 +1,12 @@
+[
+  {
+    "category": "``gamesparks``",
+    "description": "This release adds an optional DeploymentResult field in the responses of GetStageDeploymentIntegrationTests and ListStageDeploymentIntegrationTests APIs.",
+    "type": "api-change"
+  },
+  {
+    "category": "``lookoutmetrics``",
+    "description": "In this release we added SnsFormat to SNSConfiguration to support human readable alert.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+1.24.4
+======
+
+* api-change:``gamesparks``: This release adds an optional DeploymentResult field in the responses of GetStageDeploymentIntegrationTests and ListStageDeploymentIntegrationTests APIs.
+* api-change:``lookoutmetrics``: In this release we added SnsFormat to SNSConfiguration to support human readable alert.
+
+
 1.24.3
 ======
 

awscli/__init__.py

@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.24.3'
+__version__ = '1.24.4'
 
 #
 # Get our data path to be added to botocore's search path

awscli/customizations/s3/comparator.py

@@ -24,7 +24,7 @@ class Comparator(object):
     def __init__(self, file_at_src_and_dest_sync_strategy,
                  file_not_at_dest_sync_strategy,
                  file_not_at_src_sync_strategy):
-        
+
         self._sync_strategy = file_at_src_and_dest_sync_strategy
         self._not_at_dest_sync_strategy = file_not_at_dest_sync_strategy
         self._not_at_src_sync_strategy = file_not_at_src_sync_strategy
@@ -110,7 +110,7 @@ def call(self, src_files, dest_files):
                     src_take = False
                     dest_take = True
                     should_sync = self._not_at_src_sync_strategy.determine_should_sync(None, dest_file)
-                    if should_sync:                        
+                    if should_sync:
                         yield dest_file
 
             elif (not src_done) and dest_done:
@@ -122,7 +122,7 @@ def call(self, src_files, dest_files):
             elif src_done and (not dest_done):
                 dest_take = True
                 should_sync = self._not_at_src_sync_strategy.determine_should_sync(None, dest_file)
-                if should_sync:                        
+                if should_sync:
                     yield dest_file
             else:
                 break

awscli/customizations/s3/fileinfobuilder.py

@@ -25,12 +25,12 @@ def __init__(self, client, source_client=None,
         if source_client is not None:
             self._source_client = source_client
         self._parameters = parameters
-        self._is_stream = is_stream 
+        self._is_stream = is_stream
 
     def call(self, files):
         for file_base in files:
             file_info = self._inject_info(file_base)
-            yield file_info            
+            yield file_info
 
     def _inject_info(self, file_base):
         file_info_attr = {}

awscli/examples/cognito-identity/set-identity-pool-roles.rst

@@ -1,4 +1,4 @@
-**To get identity pool roles**
+**To set identity pool roles**
 
 The following ``set-identity-pool-roles``  example sets an identity pool role. ::
 

awscli/examples/s3/_concepts.rst

@@ -1,5 +1,9 @@
 This section explains prominent concepts and notations in the set of high-level S3 commands provided.
 
+If you are looking for the low level S3 commands for the CLI, please see the
+``s3api`` command `reference page
+<https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html>`_.
+
 Path Argument Type
 ++++++++++++++++++
 

awscli/examples/sns/get-endpoint-attributes.rst

@@ -5,7 +5,6 @@ The following ``get-endpoint-attributes`` example lists the attributes for the s
     aws sns get-endpoint-attributes \
         --endpoint-arn arn:aws:sns:us-west-2:123456789012:endpoint/GCM/MyApplication/12345678-abcd-9012-efgh-345678901234
 
-This command produces no output.
 Output::
 
     {

awscli/examples/sns/set-endpoint-attributes.rst

@@ -2,7 +2,7 @@
 
 The following ``set-endpoint-attributes`` example disables the specified platform application endpoint. ::
 
-    aws sns get-endpoint-attributes \
+    aws sns set-endpoint-attributes \
         --endpoint-arn arn:aws:sns:us-west-2:123456789012:endpoint/GCM/MyApplication/12345678-abcd-9012-efgh-345678901234 \
         --attributes Enabled=false
 

awscli/utils.py

@@ -98,19 +98,16 @@ def _eat_items(value, iter_parts, part, end_char, replace_char=''):
 
 
 def _find_quote_char_in_part(part):
-    if '"' not in part and "'" not in part:
-        return
+    """
+    Returns a single or double quote character, whichever appears first in the
+    given string. None is returned if the given string doesn't have a single or
+    double quote character.
+    """
     quote_char = None
-    double_quote = part.find('"')
-    single_quote = part.find("'")
-    if double_quote >= 0 and single_quote == -1:
-        quote_char = '"'
-    elif single_quote >= 0 and double_quote == -1:
-        quote_char = "'"
-    elif double_quote < single_quote:
-        quote_char = '"'
-    elif single_quote < double_quote:
-        quote_char = "'"
+    for ch in part:
+        if ch in ('"', "'"):
+            quote_char = ch
+            break
     return quote_char
 
 

doc/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.24'
 # The full version, including alpha/beta/rc tags.
-release = '1.24.3'
+release = '1.24.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.cfg

@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-        botocore==1.26.3
+        botocore==1.26.4
         docutils>=0.10,<0.16
         s3transfer>=0.5.0,<0.6.0
         PyYAML>=3.10,<5.5

setup.py

@@ -24,7 +24,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'botocore==1.26.3',
+    'botocore==1.26.4',
     'docutils>=0.10,<0.16',
     's3transfer>=0.5.0,<0.6.0',
     'PyYAML>=3.10,<5.5',

tests/unit/customizations/emr/test_create_cluster_release_label.py

@@ -1323,7 +1323,7 @@ def test_instance_fleets_with_both_subnetid_subnetids_specified(self):
         self.assertEqual(expected_error_msg, result[1])
 
     def test_create_cluster_with_security_config(self):
-        cmd = (self.prefix + '--release-label emr-4.7.2 --security-configuration MySecurityConfig '+ 
+        cmd = (self.prefix + '--release-label emr-4.7.2 --security-configuration MySecurityConfig '+
                '--instance-groups ' + DEFAULT_INSTANCE_GROUPS_ARG)
         result = \
             {

tests/unit/customizations/s3/test_comparator.py

@@ -117,7 +117,7 @@ def test_compare_key_greater(self):
 
         # Try when the sync strategy says to sync the file.
         self.not_at_src_sync_strategy.determine_should_sync.return_value = True
-        
+
         src_files = []
         dest_files = []
         ref_list = []