Merge branch 'release-1.35.96' into develop

* release-1.35.96:
  Bumping version to 1.35.96
  Update partitions file
  Update endpoints model
  Update to latest models

Author: aws-sdk-python-automation

.changes/1.35.96.json

@@ -0,0 +1,17 @@
+[
+  {
+    "category": "``codebuild``",
+    "description": "AWS CodeBuild Now Supports BuildBatch in Reserved Capacity and Lambda",
+    "type": "api-change"
+  },
+  {
+    "category": "``compute-optimizer``",
+    "description": "This release expands AWS Compute Optimizer rightsizing recommendation support for Amazon EC2 Auto Scaling groups to include those with scaling policies and multiple instance types.",
+    "type": "api-change"
+  },
+  {
+    "category": "``fms``",
+    "description": "AWS Firewall Manager now lets you combine multiple resource tags using the logical AND operator or the logical OR operator.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.35.96
+=======
+
+* api-change:``codebuild``: AWS CodeBuild Now Supports BuildBatch in Reserved Capacity and Lambda
+* api-change:``compute-optimizer``: This release expands AWS Compute Optimizer rightsizing recommendation support for Amazon EC2 Auto Scaling groups to include those with scaling policies and multiple instance types.
+* api-change:``fms``: AWS Firewall Manager now lets you combine multiple resource tags using the logical AND operator or the logical OR operator.
+
+
 1.35.95
 =======
 

botocore/__init__.py

@@ -16,7 +16,7 @@
 import os
 import re
 
-__version__ = '1.35.95'
+__version__ = '1.35.96'
 
 
 class NullHandler(logging.Handler):

botocore/data/codebuild/2016-10-06/service-2.json

@@ -939,6 +939,10 @@
         "computeTypesAllowed":{
           "shape":"ComputeTypesAllowed",
           "documentation":"<p>An array of strings that specify the compute types that are allowed for the batch build. See <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html\">Build environment compute types</a> in the <i>CodeBuild User Guide</i> for these values. </p>"
+        },
+        "fleetsAllowed":{
+          "shape":"FleetsAllowed",
+          "documentation":"<p>An array of strings that specify the fleets that are allowed for the batch build. See <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/fleets.html\">Run builds on reserved capacity fleets</a> in the <i>CodeBuild User Guide</i> for more information. </p>"
         }
       },
       "documentation":"<p>Specifies restrictions for the batch build.</p>"
@@ -2466,6 +2470,10 @@
       "max":100,
       "min":1
     },
+    "FleetsAllowed":{
+      "type":"list",
+      "member":{"shape":"NonEmptyString"}
+    },
     "GetReportGroupTrendInput":{
       "type":"structure",
       "required":[
@@ -3549,7 +3557,7 @@
         },
         "reportBuildStatus":{
           "shape":"WrapperBoolean",
-          "documentation":"<p> Set to true to report the status of a build's start and finish to your source provider. This option is valid only when your source provider is GitHub, GitHub Enterprise, GitLab, GitLab Self Managed, or Bitbucket. If this is set and you use a different source provider, an <code>invalidInputException</code> is thrown. </p> <p>To be able to report the build status to the source provider, the user associated with the source provider must have write access to the repo. If the user does not have write access, the build status cannot be updated. For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/access-tokens.html\">Source provider access</a> in the <i>CodeBuild User Guide</i>.</p> <p>The status of a build triggered by a webhook is always reported to your source provider. </p> <p>If your project's builds are triggered by a webhook, you must push a new commit to the repo for a change to this property to take effect.</p>"
+          "documentation":"<p> Set to true to report the status of a build's start and finish to your source provider. This option is valid only when your source provider is GitHub, GitHub Enterprise, GitLab, GitLab Self Managed, GitLab, GitLab Self Managed, or Bitbucket. If this is set and you use a different source provider, an <code>invalidInputException</code> is thrown. </p> <p>To be able to report the build status to the source provider, the user associated with the source provider must have write access to the repo. If the user does not have write access, the build status cannot be updated. For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/access-tokens.html\">Source provider access</a> in the <i>CodeBuild User Guide</i>.</p> <p>The status of a build triggered by a webhook is always reported to your source provider. </p> <p>If your project's builds are triggered by a webhook, you must push a new commit to the repo for a change to this property to take effect.</p>"
         },
         "buildStatusConfig":{
           "shape":"BuildStatusConfig",
@@ -4412,7 +4420,7 @@
         },
         "reportBuildStatusOverride":{
           "shape":"WrapperBoolean",
-          "documentation":"<p> Set to true to report to your source provider the status of a build's start and completion. If you use this option with a source provider other than GitHub, GitHub Enterprise, or Bitbucket, an <code>invalidInputException</code> is thrown. </p> <p>To be able to report the build status to the source provider, the user associated with the source provider must have write access to the repo. If the user does not have write access, the build status cannot be updated. For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/access-tokens.html\">Source provider access</a> in the <i>CodeBuild User Guide</i>.</p> <note> <p> The status of a build triggered by a webhook is always reported to your source provider. </p> </note>"
+          "documentation":"<p> Set to true to report to your source provider the status of a build's start and completion. If you use this option with a source provider other than GitHub, GitHub Enterprise, GitLab, GitLab Self Managed, or Bitbucket, an <code>invalidInputException</code> is thrown. </p> <p>To be able to report the build status to the source provider, the user associated with the source provider must have write access to the repo. If the user does not have write access, the build status cannot be updated. For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/access-tokens.html\">Source provider access</a> in the <i>CodeBuild User Guide</i>.</p> <note> <p> The status of a build triggered by a webhook is always reported to your source provider. </p> </note>"
         },
         "buildStatusConfigOverride":{
           "shape":"BuildStatusConfig",

botocore/data/compute-optimizer/2019-11-01/service-2.json

@@ -611,6 +611,20 @@
       "member":{"shape":"AccountId"}
     },
     "AllocatedStorage":{"type":"integer"},
+    "AllocationStrategy":{
+      "type":"string",
+      "enum":[
+        "Prioritized",
+        "LowestPrice"
+      ]
+    },
+    "AsgType":{
+      "type":"string",
+      "enum":[
+        "SingleInstanceType",
+        "MixedInstanceTypes"
+      ]
+    },
     "AutoScalingConfiguration":{
       "type":"string",
       "enum":[
@@ -628,22 +642,38 @@
       "members":{
         "desiredCapacity":{
           "shape":"DesiredCapacity",
-          "documentation":"<p>The desired capacity, or number of instances, for the Auto Scaling group.</p>"
+          "documentation":"<p>The desired capacity, or number of instances, for the EC2 Auto Scaling group.</p>"
         },
         "minSize":{
           "shape":"MinSize",
-          "documentation":"<p>The minimum size, or minimum number of instances, for the Auto Scaling group.</p>"
+          "documentation":"<p>The minimum size, or minimum number of instances, for the EC2 Auto Scaling group.</p>"
         },
         "maxSize":{
           "shape":"MaxSize",
-          "documentation":"<p>The maximum size, or maximum number of instances, for the Auto Scaling group.</p>"
+          "documentation":"<p>The maximum size, or maximum number of instances, for the EC2 Auto Scaling group.</p>"
         },
         "instanceType":{
-          "shape":"InstanceType",
-          "documentation":"<p>The instance type for the Auto Scaling group.</p>"
+          "shape":"NullableInstanceType",
+          "documentation":"<p>The instance type for the EC2 Auto Scaling group.</p>"
+        },
+        "allocationStrategy":{
+          "shape":"AllocationStrategy",
+          "documentation":"<p> Describes the allocation strategy that the EC2 Auto Scaling group uses. This field is only available for EC2 Auto Scaling groups with mixed instance types. </p>"
+        },
+        "estimatedInstanceHourReductionPercentage":{
+          "shape":"NullableEstimatedInstanceHourReductionPercentage",
+          "documentation":"<p> Describes the projected percentage reduction in instance hours after adopting the recommended configuration. This field is only available for EC2 Auto Scaling groups with scaling policies. </p>"
+        },
+        "type":{
+          "shape":"AsgType",
+          "documentation":"<p> Describes whether the EC2 Auto Scaling group has a single instance type or a mixed instance type configuration. </p>"
+        },
+        "mixedInstanceTypes":{
+          "shape":"MixedInstanceTypes",
+          "documentation":"<p> List the instance types within an EC2 Auto Scaling group that has mixed instance types. </p>"
         }
       },
-      "documentation":"<p>Describes the configuration of an Auto Scaling group.</p>"
+      "documentation":"<p>Describes the configuration of an EC2 Auto Scaling group.</p>"
     },
     "AutoScalingGroupEstimatedMonthlySavings":{
       "type":"structure",
@@ -1905,6 +1935,9 @@
         "CurrentConfigurationDesiredCapacity",
         "CurrentConfigurationMinSize",
         "CurrentConfigurationMaxSize",
+        "CurrentConfigurationAllocationStrategy",
+        "CurrentConfigurationMixedInstanceTypes",
+        "CurrentConfigurationType",
         "CurrentOnDemandPrice",
         "CurrentStandardOneYearNoUpfrontReservedPrice",
         "CurrentStandardThreeYearNoUpfrontReservedPrice",
@@ -1916,6 +1949,10 @@
         "RecommendationOptionsConfigurationDesiredCapacity",
         "RecommendationOptionsConfigurationMinSize",
         "RecommendationOptionsConfigurationMaxSize",
+        "RecommendationOptionsConfigurationEstimatedInstanceHourReductionPercentage",
+        "RecommendationOptionsConfigurationAllocationStrategy",
+        "RecommendationOptionsConfigurationMixedInstanceTypes",
+        "RecommendationOptionsConfigurationType",
         "RecommendationOptionsProjectedUtilizationMetricsCpuMaximum",
         "RecommendationOptionsProjectedUtilizationMetricsMemoryMaximum",
         "RecommendationOptionsPerformanceRisk",
@@ -4223,9 +4260,16 @@
       "exception":true,
       "synthetic":true
     },
+    "MixedInstanceType":{"type":"string"},
+    "MixedInstanceTypes":{
+      "type":"list",
+      "member":{"shape":"MixedInstanceType"}
+    },
     "NextToken":{"type":"string"},
     "NullableCpu":{"type":"integer"},
+    "NullableEstimatedInstanceHourReductionPercentage":{"type":"double"},
     "NullableIOPS":{"type":"integer"},
+    "NullableInstanceType":{"type":"string"},
     "NullableMaxAllocatedStorage":{"type":"integer"},
     "NullableMemory":{"type":"integer"},
     "NullableMemoryReservation":{"type":"integer"},

botocore/data/endpoints.json

@@ -8457,6 +8457,12 @@
               "tags" : [ "fips" ]
             } ]
           },
+          "ap-southeast-7" : {
+            "variants" : [ {
+              "hostname" : "elasticfilesystem-fips.ap-southeast-7.amazonaws.com",
+              "tags" : [ "fips" ]
+            } ]
+          },
           "ca-central-1" : {
             "variants" : [ {
               "hostname" : "elasticfilesystem-fips.ca-central-1.amazonaws.com",
@@ -8601,6 +8607,13 @@
             "deprecated" : true,
             "hostname" : "elasticfilesystem-fips.ap-southeast-5.amazonaws.com"
           },
+          "fips-ap-southeast-7" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-7"
+            },
+            "deprecated" : true,
+            "hostname" : "elasticfilesystem-fips.ap-southeast-7.amazonaws.com"
+          },
           "fips-ca-central-1" : {
             "credentialScope" : {
               "region" : "ca-central-1"

botocore/data/fms/2018-01-01/service-2.json

@@ -3211,6 +3211,10 @@
         "PolicyStatus":{
           "shape":"CustomerPolicyStatus",
           "documentation":"<p>Indicates whether the policy is in or out of an admin's policy or Region scope.</p> <ul> <li> <p> <code>ACTIVE</code> - The administrator can manage and delete the policy.</p> </li> <li> <p> <code>OUT_OF_ADMIN_SCOPE</code> - The administrator can view the policy, but they can't edit or delete the policy. Existing policy protections stay in place. Any new resources that come into scope of the policy won't be protected.</p> </li> </ul>"
+        },
+        "ResourceTagLogicalOperator":{
+          "shape":"ResourceTagLogicalOperator",
+          "documentation":"<p>Specifies whether to combine multiple resource tags with AND, so that a resource must have all tags to be included or excluded, or OR, so that a resource must have at least one tag.</p> <p>Default: <code>AND</code> </p>"
         }
       },
       "documentation":"<p>An Firewall Manager policy.</p>"
@@ -3925,18 +3929,25 @@
           "documentation":"<p>The resource tag value. To specify an empty string value, either don't provide this or specify it as \"\". </p>"
         }
       },
-      "documentation":"<p>The resource tags that Firewall Manager uses to determine if a particular resource should be included or excluded from the Firewall Manager policy. Tags enable you to categorize your Amazon Web Services resources in different ways, for example, by purpose, owner, or environment. Each tag consists of a key and an optional value. Firewall Manager combines the tags with \"AND\" so that, if you add more than one tag to a policy scope, a resource must have all the specified tags to be included or excluded. For more information, see <a href=\"https://docs.aws.amazon.com/awsconsolehelpdocs/latest/gsg/tag-editor.html\">Working with Tag Editor</a>.</p> <p>Every resource tag must have a string value, either a non-empty string or an empty string. If you don't provide a value for a resource tag, Firewall Manager saves the value as an empty string: \"\". When Firewall Manager compares tags, it only matches two tags if they have the same key and the same value. A tag with an empty string value only matches with tags that also have an empty string value. </p>"
+      "documentation":"<p>The resource tags that Firewall Manager uses to determine if a particular resource should be included or excluded from the Firewall Manager policy. Tags enable you to categorize your Amazon Web Services resources in different ways, for example, by purpose, owner, or environment. Each tag consists of a key and an optional value. If you add more than one tag to a policy, you can specify whether to combine them using the logical AND operator or the logical OR operator. For more information, see <a href=\"https://docs.aws.amazon.com/awsconsolehelpdocs/latest/gsg/tag-editor.html\">Working with Tag Editor</a>.</p> <p>Every resource tag must have a string value, either a non-empty string or an empty string. If you don't provide a value for a resource tag, Firewall Manager saves the value as an empty string: \"\". When Firewall Manager compares tags, it only matches two tags if they have the same key and the same value. A tag with an empty string value only matches with tags that also have an empty string value. </p>"
     },
     "ResourceTagKey":{
       "type":"string",
       "max":128,
       "min":1,
-      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:\\/=+\\-@*\\\\]*)$"
+    },
+    "ResourceTagLogicalOperator":{
+      "type":"string",
+      "enum":[
+        "AND",
+        "OR"
+      ]
     },
     "ResourceTagValue":{
       "type":"string",
       "max":256,
-      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:\\/=+\\-@*\\\\]*)$"
     },
     "ResourceTags":{
       "type":"list",

botocore/data/partitions.json

@@ -47,6 +47,9 @@
       "ap-southeast-5" : {
         "description" : "Asia Pacific (Malaysia)"
       },
+      "ap-southeast-7" : {
+        "description" : "Asia Pacific (Thailand)"
+      },
       "aws-global" : {
         "description" : "AWS Standard global region"
       },

docs/source/conf.py

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