Merge branch 'release-1.27.14'

* release-1.27.14: Bumping version to 1.27.14 Update to latest models sse encoding for SelectObjectCount s3 op (#2700)
boto · Jun 21, 2022 · 682355b · 682355b
2 parents 489abf9 + 9b2c3af
commit 682355b
Show file tree

Hide file tree

Showing 9 changed files with 142 additions and 58 deletions.
diff --git a/.changes/1.27.14.json b/.changes/1.27.14.json
@@ -0,0 +1,17 @@
+[
+  {
+    "category": "``ec2``",
+    "description": "This release adds support for Private IP VPNs, a new feature allowing S2S VPN connections to use private ip addresses as the tunnel outside ip address over Direct Connect as transport.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ecs``",
+    "description": "Amazon ECS UpdateService now supports the following parameters: PlacementStrategies, PlacementConstraints and CapacityProviderStrategy.",
+    "type": "api-change"
+  },
+  {
+    "category": "``wellarchitected``",
+    "description": "Adds support for lens tagging, Adds support for multiple helpful-resource urls and multiple improvement-plan urls.",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.27.14
+=======
+
+* api-change:``ec2``: This release adds support for Private IP VPNs, a new feature allowing S2S VPN connections to use private ip addresses as the tunnel outside ip address over Direct Connect as transport.
+* api-change:``ecs``: Amazon ECS UpdateService now supports the following parameters: PlacementStrategies, PlacementConstraints and CapacityProviderStrategy.
+* api-change:``wellarchitected``: Adds support for lens tagging, Adds support for multiple helpful-resource urls and multiple improvement-plan urls.
+
+
 1.27.13
 =======
 

diff --git a/botocore/__init__.py b/botocore/__init__.py
@@ -16,7 +16,7 @@
 import os
 import re
 
-__version__ = '1.27.13'
+__version__ = '1.27.14'
 
 
 class NullHandler(logging.Handler):

diff --git a/botocore/data/ec2/2016-11-15/service-2.json b/botocore/data/ec2/2016-11-15/service-2.json
@@ -536,7 +536,7 @@
       },
       "input":{"shape":"CreateCustomerGatewayRequest"},
       "output":{"shape":"CreateCustomerGatewayResult"},
-      "documentation":"<p>Provides information to Amazon Web Services about your VPN customer gateway device. The customer gateway is the appliance at your end of the VPN connection. (The device on the Amazon Web Services side of the VPN connection is the virtual private gateway.) You must provide the internet-routable IP address of the customer gateway's external interface. The IP address must be static and can be behind a device performing network address translation (NAT).</p> <p>For devices that use Border Gateway Protocol (BGP), you can also provide the device's BGP Autonomous System Number (ASN). You can use an existing ASN assigned to your network. If you don't have an ASN already, you can use a private ASN. For more information, see <a href=\"https://docs.aws.amazon.com/vpn/latest/s2svpn/cgw-options.html\">Customer gateway options for your Site-to-Site VPN connection</a> in the <i>Amazon Web Services Site-to-Site VPN User Guide</i>.</p> <p>To create more than one customer gateway with the same VPN type, IP address, and BGP ASN, specify a unique device name for each customer gateway. An identical request returns information about the existing customer gateway; it doesn't create a new customer gateway.</p>"
+      "documentation":"<p>Provides information to Amazon Web Services about your customer gateway device. The customer gateway device is the appliance at your end of the VPN connection. You must provide the IP address of the customer gateway device’s external interface. The IP address must be static and can be behind a device performing network address translation (NAT).</p> <p>For devices that use Border Gateway Protocol (BGP), you can also provide the device's BGP Autonomous System Number (ASN). You can use an existing ASN assigned to your network. If you don't have an ASN already, you can use a private ASN. For more information, see <a href=\"https://docs.aws.amazon.com/vpn/latest/s2svpn/cgw-options.html\">Customer gateway options for your Site-to-Site VPN connection</a> in the <i>Amazon Web Services Site-to-Site VPN User Guide</i>.</p> <p>To create more than one customer gateway with the same VPN type, IP address, and BGP ASN, specify a unique device name for each customer gateway. An identical request returns information about the existing customer gateway; it doesn't create a new customer gateway.</p>"
     },
     "CreateDefaultSubnet":{
       "name":"CreateDefaultSubnet",
@@ -10553,8 +10553,7 @@
         },
         "PublicIp":{
           "shape":"String",
-          "documentation":"<p>The Internet-routable IP address for the customer gateway's outside interface. The address must be static.</p>",
-          "locationName":"IpAddress"
+          "documentation":"<p> <i>This member has been deprecated.</i> The Internet-routable IP address for the customer gateway's outside interface. The address must be static.</p>"
         },
         "CertificateArn":{
           "shape":"String",
@@ -10573,6 +10572,10 @@
           "shape":"String",
           "documentation":"<p>A name for the customer gateway device.</p> <p>Length Constraints: Up to 255 characters.</p>"
         },
+        "IpAddress":{
+          "shape":"String",
+          "documentation":"<p> IPv4 address for the customer gateway device's outside interface. The address must be static. </p>"
+        },
         "DryRun":{
           "shape":"Boolean",
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
@@ -13738,7 +13741,7 @@
         },
         "IpAddress":{
           "shape":"String",
-          "documentation":"<p>The Internet-routable IP address of the customer gateway's outside interface.</p>",
+          "documentation":"<p>The IP address of the customer gateway device's outside interface.</p>",
           "locationName":"ipAddress"
         },
         "CertificateArn":{
@@ -16404,7 +16407,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>bgp-asn</code> - The customer gateway's Border Gateway Protocol (BGP) Autonomous System Number (ASN).</p> </li> <li> <p> <code>customer-gateway-id</code> - The ID of the customer gateway.</p> </li> <li> <p> <code>ip-address</code> - The IP address of the customer gateway's Internet-routable external interface.</p> </li> <li> <p> <code>state</code> - The state of the customer gateway (<code>pending</code> | <code>available</code> | <code>deleting</code> | <code>deleted</code>).</p> </li> <li> <p> <code>type</code> - The type of customer gateway. Currently, the only supported type is <code>ipsec.1</code>.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> </ul>",
+          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>bgp-asn</code> - The customer gateway's Border Gateway Protocol (BGP) Autonomous System Number (ASN).</p> </li> <li> <p> <code>customer-gateway-id</code> - The ID of the customer gateway.</p> </li> <li> <p> <code>ip-address</code> - The IP address of the customer gateway device's external interface.</p> </li> <li> <p> <code>state</code> - The state of the customer gateway (<code>pending</code> | <code>available</code> | <code>deleting</code> | <code>deleted</code>).</p> </li> <li> <p> <code>type</code> - The type of customer gateway. Currently, the only supported type is <code>ipsec.1</code>.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "DryRun":{
@@ -51138,6 +51141,16 @@
           "documentation":"<p>The IPv6 CIDR on the Amazon Web Services side of the VPN connection.</p>",
           "locationName":"remoteIpv6NetworkCidr"
         },
+        "OutsideIpAddressType":{
+          "shape":"String",
+          "documentation":"<p>The type of IPv4 address assigned to the outside interface of the customer gateway.</p> <p>Valid values: <code>PrivateIpv4</code> | <code>PublicIpv4</code> </p> <p>Default: <code>PublicIpv4</code> </p>",
+          "locationName":"outsideIpAddressType"
+        },
+        "TransportTransitGatewayAttachmentId":{
+          "shape":"String",
+          "documentation":"<p>The transit gateway attachment ID in use for the VPN tunnel.</p>",
+          "locationName":"transportTransitGatewayAttachmentId"
+        },
         "TunnelInsideIpVersion":{
           "shape":"TunnelInsideIpVersion",
           "documentation":"<p>Indicates whether the VPN tunnels process IPv4 or IPv6 traffic.</p>",
@@ -51186,6 +51199,14 @@
         "RemoteIpv6NetworkCidr":{
           "shape":"String",
           "documentation":"<p>The IPv6 CIDR on the Amazon Web Services side of the VPN connection.</p> <p>Default: <code>::/0</code> </p>"
+        },
+        "OutsideIpAddressType":{
+          "shape":"String",
+          "documentation":"<p>The type of IPv4 address assigned to the outside interface of the customer gateway device.</p> <p>Valid values: <code>PrivateIpv4</code> | <code>PublicIpv4</code> </p> <p>Default: <code>PublicIpv4</code> </p>"
+        },
+        "TransportTransitGatewayAttachmentId":{
+          "shape":"TransitGatewayAttachmentId",
+          "documentation":"<p>The transit gateway attachment ID to use for the VPN tunnel.</p> <p>Required if <code>OutsideIpAddressType</code> is set to <code>PrivateIpv4</code>.</p>"
         }
       },
       "documentation":"<p>Describes VPN connection options.</p>"

diff --git a/botocore/data/ecs/2014-11-13/service-2.json b/botocore/data/ecs/2014-11-13/service-2.json
diff --git a/botocore/data/wellarchitected/2020-03-31/service-2.json b/botocore/data/wellarchitected/2020-03-31/service-2.json
@@ -509,7 +509,7 @@
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>List the tags for a resource.</p>"
+      "documentation":"<p>List the tags for a resource.</p> <note> <p>The WorkloadArn parameter can be either a workload ARN or a custom lens ARN.</p> </note>"
     },
     "ListWorkloadShares":{
       "name":"ListWorkloadShares",
@@ -556,7 +556,7 @@
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Adds one or more tags to the specified resource.</p>"
+      "documentation":"<p>Adds one or more tags to the specified resource.</p> <note> <p>The WorkloadArn parameter can be either a workload ARN or a custom lens ARN.</p> </note>"
     },
     "UntagResource":{
       "name":"UntagResource",
@@ -570,7 +570,7 @@
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Deletes specified tags from a resource.</p> <p>To specify multiple tags, use separate <b>tagKeys</b> parameters, for example:</p> <p> <code>DELETE /tags/WorkloadArn?tagKeys=key1&amp;tagKeys=key2</code> </p>"
+      "documentation":"<p>Deletes specified tags from a resource.</p> <note> <p>The WorkloadArn parameter can be either a workload ARN or a custom lens ARN.</p> </note> <p>To specify multiple tags, use separate <b>tagKeys</b> parameters, for example:</p> <p> <code>DELETE /tags/WorkloadArn?tagKeys=key1&amp;tagKeys=key2</code> </p>"
     },
     "UpdateAnswer":{
       "name":"UpdateAnswer",
@@ -691,6 +691,31 @@
       "error":{"httpStatusCode":403},
       "exception":true
     },
+    "AdditionalResourceType":{
+      "type":"string",
+      "enum":[
+        "HELPFUL_RESOURCE",
+        "IMPROVEMENT_PLAN"
+      ]
+    },
+    "AdditionalResources":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"AdditionalResourceType",
+          "documentation":"<p>Type of additional resource.</p>"
+        },
+        "Content":{
+          "shape":"Urls",
+          "documentation":"<p>The URLs for additional resources, either helpful resources or improvement plans. Up to five additional URLs can be specified.</p>"
+        }
+      },
+      "documentation":"<p>The choice level additional resources.</p>"
+    },
+    "AdditionalResourcesList":{
+      "type":"list",
+      "member":{"shape":"AdditionalResources"}
+    },
     "Answer":{
       "type":"structure",
       "members":{
@@ -799,6 +824,10 @@
         "ImprovementPlan":{
           "shape":"ChoiceContent",
           "documentation":"<p>The choice level improvement plan.</p>"
+        },
+        "AdditionalResources":{
+          "shape":"AdditionalResourcesList",
+          "documentation":"<p>The additional resources for a choice. A choice can have up to two additional resources: one of type <code>HELPFUL_RESOURCE</code>, one of type <code>IMPROVEMENT_PLAN</code>, or both.</p>"
         }
       },
       "documentation":"<p>A choice available to answer question.</p>"
@@ -1080,7 +1109,6 @@
         "WorkloadName",
         "Description",
         "Environment",
-        "ReviewOwner",
         "Lenses",
         "ClientRequestToken"
       ],
@@ -1660,13 +1688,17 @@
         "ShareInvitationId":{
           "shape":"ShareInvitationId",
           "documentation":"<p>The ID assigned to the share invitation.</p>"
+        },
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags assigned to the lens.</p>"
         }
       },
       "documentation":"<p>A lens return object.</p>"
     },
     "LensAlias":{
       "type":"string",
-      "documentation":"<p>The alias of the lens, for example, <code>serverless</code>.</p> <p>Each lens is identified by its <a>LensSummary$LensAlias</a>.</p>",
+      "documentation":"<p>The alias of the lens.</p> <p>For Amazon Web Services official lenses, this is either the lens alias, such as <code>serverless</code>, or the lens ARN, such as <code>arn:aws:wellarchitected:us-west-2::lens/serverless</code>.</p> <p>For custom lenses, this is the lens ARN, such as <code>arn:aws:wellarchitected:us-east-1:123456789012:lens/my-lens</code>. </p> <p>Each lens is identified by its <a>LensSummary$LensAlias</a>.</p>",
       "max":128,
       "min":1
     },
@@ -2896,6 +2928,10 @@
         "ClientRequestToken":{"shape":"ClientRequestToken"}
       }
     },
+    "Urls":{
+      "type":"list",
+      "member":{"shape":"ChoiceContent"}
+    },
     "ValidationException":{
       "type":"structure",
       "required":["Message"],

diff --git a/botocore/handlers.py b/botocore/handlers.py
@@ -1109,6 +1109,7 @@ def add_retry_headers(request, **kwargs):
     ('before-parameter-build.s3.UploadPart', sse_md5),
     ('before-parameter-build.s3.UploadPartCopy', sse_md5),
     ('before-parameter-build.s3.UploadPartCopy', copy_source_sse_md5),
+    ('before-parameter-build.s3.SelectObjectContent', sse_md5),
     ('before-parameter-build.ec2.RunInstances', base64_encode_user_data),
     (
         'before-parameter-build.autoscaling.CreateLaunchConfiguration',

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -54,7 +54,7 @@
 # The short X.Y version.
 version = '1.27.'
 # The full version, including alpha/beta/rc tags.
-release = '1.27.13'
+release = '1.27.14'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/tests/unit/test_handlers.py b/tests/unit/test_handlers.py
@@ -1166,6 +1166,7 @@ def test_sse_params(self):
             'CreateMultipartUpload',
             'UploadPart',
             'UploadPartCopy',
+            'SelectObjectContent',
         ):
             event = 'before-parameter-build.s3.%s' % op
             params = {