Merge branch 'release-1.25.31'

* release-1.25.31: Bumping version to 1.25.31 Update changelog based on model updates Update helptext to remove information in create clusters description (#7090) CLI examples for codeartifact, rds, sns (#7106)
aws · Jul 15, 2022 · aade525 · aade525
2 parents b30b08e + 19d58f2
commit aade525
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 35 deletions.
diff --git a/.changes/1.25.31.json b/.changes/1.25.31.json
@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``datasync``",
+    "description": "Documentation updates for AWS DataSync regarding configuring Amazon FSx for ONTAP location security groups and SMB user permissions.",
+    "type": "api-change"
+  },
+  {
+    "category": "``drs``",
+    "description": "Changed existing APIs to allow choosing a dynamic volume type for replicating volumes, to reduce costs for customers.",
+    "type": "api-change"
+  },
+  {
+    "category": "``evidently``",
+    "description": "This release adds support for the new segmentation feature.",
+    "type": "api-change"
+  },
+  {
+    "category": "``wafv2``",
+    "description": "This SDK release provide customers ability to add sensitivity level for WAF SQLI Match Statements.",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.25.31
+=======
+
+* api-change:``datasync``: Documentation updates for AWS DataSync regarding configuring Amazon FSx for ONTAP location security groups and SMB user permissions.
+* api-change:``drs``: Changed existing APIs to allow choosing a dynamic volume type for replicating volumes, to reduce costs for customers.
+* api-change:``evidently``: This release adds support for the new segmentation feature.
+* api-change:``wafv2``: This SDK release provide customers ability to add sensitivity level for WAF SQLI Match Statements.
+
+
 1.25.30
 =======
 

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.25.30'
+__version__ = '1.25.31'
 
 #
 # Get our data path to be added to botocore's search path

diff --git a/awscli/customizations/emr/helptext.py b/awscli/customizations/emr/helptext.py
@@ -48,13 +48,7 @@
 # create-cluster options help text
 
 CREATE_CLUSTER_DESCRIPTION = (
-    'Creates an Amazon EMR cluster with the specified configurations. '
-    'Quick start: '
-    'aws emr create-cluster --release-label <release-label> '
-    '--instance-type <instance-type> --instance-count <instance-count>'
-    'Values for the following can be set in the AWS CLI. '
-    'config file using the <code>aws configure set</code> command: <code>--service-role, --log-uri, '
-    'and InstanceProfile and KeyName arguments under --ec2-attributes.')
+    'Creates an Amazon EMR cluster with the specified configurations.')
 
 DESCRIBE_CLUSTER_DESCRIPTION = (
     'Provides  cluster-level details including status, hardware '
@@ -511,4 +505,4 @@
     '<p>You must grant the execution role the permissions needed '
     'to access the same IAM resources that the step can access. '
     'The execution role can be a cross-account IAM Role.</p> '
-)
+)
diff --git a/awscli/examples/codeartifact/describe-domain.rst b/awscli/examples/codeartifact/describe-domain.rst
@@ -2,7 +2,7 @@
 
 The following ``describe-domain`` example returns a DomainDescription object for a domain named test-domain. ::
 
-    aws codeartifact create-domain \
+    aws codeartifact describe-domain \
         --domain test-domain
 
 Output::
@@ -16,7 +16,8 @@ Output::
             "createdTime": "2020-10-20T13:16:48.559000-04:00",
             "encryptionKey": "arn:aws:kms:us-west-2:111122223333:key/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111",
             "repositoryCount": 2,
-            "assetSizeBytes": 0
+            "assetSizeBytes": 0,
+            "s3BucketArn": "arn:aws:s3:::assets-111122223333-us-west-2"
         }
     }
 

diff --git a/awscli/examples/rds/remove-from-global-cluster.rst b/awscli/examples/rds/remove-from-global-cluster.rst
@@ -37,4 +37,4 @@ Output::
         }
     }
 
-For more information, see `Removing a cluster from an Amazon Aurora global database<https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-global-database-managing.html#aurora-global-database-detaching>`__ in the *Amazon Aurora User Guide*.
+For more information, see `Removing a cluster from an Amazon Aurora global database <https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-global-database-managing.html#aurora-global-database-detaching>`__ in the *Amazon Aurora User Guide*.
diff --git a/awscli/examples/sns/check-if-phone-number-is-opted-out.rst b/awscli/examples/sns/check-if-phone-number-is-opted-out.rst
@@ -1,12 +1,12 @@
-**To check SMS message opt-out for a phone number**
-
-The following ``check-if-phone-number-is-opted-out`` example checks whether the specified phone number is opted out of receiving SMS messages from the current AWS account. ::
-
-    aws sns check-if-phone-number-is-opted-out \
-        --phone-number 555-555-0100
-
-Output::
-
-    {
-        "isOptedOut": false
-    }
+**To check SMS message opt-out for a phone number**
+
+The following ``check-if-phone-number-is-opted-out`` example checks whether the specified phone number is opted out of receiving SMS messages from the current AWS account. ::
+
+    aws sns check-if-phone-number-is-opted-out \
+        --phone-number +1555550100
+
+Output::
+
+    {
+        "isOptedOut": false
+    }
diff --git a/awscli/examples/sns/opt-in-phone-number.rst b/awscli/examples/sns/opt-in-phone-number.rst
@@ -1,8 +1,8 @@
-**To opt-in for SMS messages**
-
-The following ``opt-in-phone-number`` example opts the specified phone number into receiving SMS messages. ::
-
-    aws sns opt-in-phone-number \
-        --phone-number +1-555-555-0100
-
-This command produces no output.
+**To opt-in for SMS messages**
+
+The following ``opt-in-phone-number`` example opts the specified phone number into receiving SMS messages. ::
+
+    aws sns opt-in-phone-number \
+        --phone-number +15555550100
+
+This command produces no output.
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.25.'
 # The full version, including alpha/beta/rc tags.
-release = '1.25.30'
+release = '1.25.31'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-        botocore==1.27.30
+        botocore==1.27.31
         docutils>=0.10,<0.17
         s3transfer>=0.6.0,<0.7.0
         PyYAML>=3.10,<5.5

diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'botocore==1.27.30',
+    'botocore==1.27.31',
     'docutils>=0.10,<0.17',
     's3transfer>=0.6.0,<0.7.0',
     'PyYAML>=3.10,<5.5',