Merge branch 'release-1.35.49'

* release-1.35.49:
  Bumping version to 1.35.49
  Update endpoints model
  Update to latest models

.changes/1.35.49.json

@@ -0,0 +1,27 @@
+[
+  {
+    "category": "``bedrock-agent``",
+    "description": "Add support of new model types for Bedrock Agents, Adding inference profile support for Flows and Prompt Management, Adding new field to configure additional inference configurations for Flows and Prompt Management",
+    "type": "api-change"
+  },
+  {
+    "category": "``codebuild``",
+    "description": "AWS CodeBuild now supports automatically retrying failed builds",
+    "type": "api-change"
+  },
+  {
+    "category": "``lambda``",
+    "description": "Add TagsError field in Lambda GetFunctionResponse. The TagsError field contains details related to errors retrieving tags.",
+    "type": "api-change"
+  },
+  {
+    "category": "``logs``",
+    "description": "Adding inferred token name for dynamic tokens in Anomalies.",
+    "type": "api-change"
+  },
+  {
+    "category": "``supplychain``",
+    "description": "API doc updates, and also support showing error message on a failed instance",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,16 @@
 CHANGELOG
 =========
 
+1.35.49
+=======
+
+* api-change:``bedrock-agent``: Add support of new model types for Bedrock Agents, Adding inference profile support for Flows and Prompt Management, Adding new field to configure additional inference configurations for Flows and Prompt Management
+* api-change:``codebuild``: AWS CodeBuild now supports automatically retrying failed builds
+* api-change:``lambda``: Add TagsError field in Lambda GetFunctionResponse. The TagsError field contains details related to errors retrieving tags.
+* api-change:``logs``: Adding inferred token name for dynamic tokens in Anomalies.
+* api-change:``supplychain``: API doc updates, and also support showing error message on a failed instance
+
+
 1.35.48
 =======
 

botocore/__init__.py

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

botocore/data/bedrock-agent/2023-06-05/service-2.json

@@ -2333,7 +2333,7 @@
         },
         "foundationModel":{
           "shape":"ModelIdentifier",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the foundation model to be used for orchestration by the agent you create.</p>"
+          "documentation":"<p>The identifier for the model that you want to be used for orchestration by the agent you create.</p> <p>The <code>modelId</code> to provide depends on the type of model or throughput that you use:</p> <ul> <li> <p>If you use a base model, specify the model ID or its ARN. For a list of model IDs for base models, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-ids.html#model-ids-arns\">Amazon Bedrock base model IDs (on-demand throughput)</a> in the Amazon Bedrock User Guide.</p> </li> <li> <p>If you use an inference profile, specify the inference profile ID or its ARN. For a list of inference profile IDs, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference-support.html\">Supported Regions and models for cross-region inference</a> in the Amazon Bedrock User Guide.</p> </li> <li> <p>If you use a provisioned model, specify the ARN of the Provisioned Throughput. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/prov-thru-use.html\">Run inference using a Provisioned Throughput</a> in the Amazon Bedrock User Guide.</p> </li> <li> <p>If you use a custom model, first purchase Provisioned Throughput for it. Then specify the ARN of the resulting provisioned model. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-customization-use.html\">Use a custom model in Amazon Bedrock</a> in the Amazon Bedrock User Guide.</p> </li> <li> <p>If you use an <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-customization-import-model.html\">imported model</a>, specify the ARN of the imported model. You can get the model ARN from a successful call to <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_CreateModelImportJob.html\">CreateModelImportJob</a> or from the Imported models page in the Amazon Bedrock console.</p> </li> </ul>"
         },
         "guardrailConfiguration":{
           "shape":"GuardrailConfiguration",
@@ -3514,6 +3514,12 @@
       "members":{
       }
     },
+    "Document":{
+      "type":"structure",
+      "members":{
+      },
+      "document":true
+    },
     "DraftVersion":{
       "type":"string",
       "max":5,
@@ -3699,8 +3705,7 @@
           "documentation":"<p>A name for the condition that you can reference.</p>"
         }
       },
-      "documentation":"<p>Defines a condition in the condition node.</p>",
-      "sensitive":true
+      "documentation":"<p>Defines a condition in the condition node.</p>"
     },
     "FlowConditionExpression":{
       "type":"string",
@@ -3727,8 +3732,7 @@
       "type":"list",
       "member":{"shape":"FlowCondition"},
       "max":5,
-      "min":1,
-      "sensitive":true
+      "min":1
     },
     "FlowConnection":{
       "type":"structure",
@@ -3824,7 +3828,8 @@
           "documentation":"<p>An array of node definitions in the flow.</p>"
         }
       },
-      "documentation":"<p>The definition of the nodes and connections between nodes in the flow.</p>"
+      "documentation":"<p>The definition of the nodes and connections between nodes in the flow.</p>",
+      "sensitive":true
     },
     "FlowDescription":{
       "type":"string",
@@ -4036,8 +4041,7 @@
       "type":"list",
       "member":{"shape":"FlowNode"},
       "max":20,
-      "min":0,
-      "sensitive":true
+      "min":0
     },
     "FlowStatus":{
       "type":"string",
@@ -5226,9 +5230,10 @@
     },
     "KnowledgeBaseModelIdentifier":{
       "type":"string",
+      "documentation":"<p>ARN or Id of a Bedrock Foundational Model or Inference Profile, or the ARN of a jumpstart model or imported model, or a provisioned throughput ARN for custom models.</p>",
       "max":2048,
       "min":1,
-      "pattern":"^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):(model-gateway|inference-profile)/[a-zA-Z0-9-:.]+)|([a-zA-Z0-9-:.]+)$"
+      "pattern":"^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:imported-model/[a-z0-9]{12})|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):(inference-profile|application-inference-profile)/[a-zA-Z0-9-:.]+)|([a-zA-Z0-9-:.]+)$"
     },
     "KnowledgeBaseRoleArn":{
       "type":"string",
@@ -5847,9 +5852,10 @@
     },
     "ModelIdentifier":{
       "type":"string",
+      "documentation":"<p>ARN or Id of a Bedrock Foundational Model or Inference Profile, or the ARN of a jumpstart model or imported model, or a provisioned throughput ARN for custom models.</p>",
       "max":2048,
       "min":1,
-      "pattern":"^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}(([:][a-z0-9-]{1,63}){0,2})?/[a-z0-9]{12})|(:foundation-model/([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})))|(([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2}))|(([0-9a-zA-Z][_-]?)+)$"
+      "pattern":"^(arn:aws(-[^:]{1,12})?:(bedrock|sagemaker):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-zA-Z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?$"
     },
     "MongoDbAtlasCollectionName":{
       "type":"string",
@@ -6323,6 +6329,10 @@
         "templateType"
       ],
       "members":{
+        "additionalModelRequestFields":{
+          "shape":"Document",
+          "documentation":"<p>Contains model-specific inference configurations that aren't in the <code>inferenceConfiguration</code> field. To see model-specific inference parameters, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters.html\">Inference request parameters and response fields for foundation models</a>.</p>"
+        },
         "inferenceConfiguration":{
           "shape":"PromptInferenceConfiguration",
           "documentation":"<p>Contains inference configurations for the prompt.</p>"
@@ -6450,9 +6460,10 @@
     },
     "PromptModelIdentifier":{
       "type":"string",
+      "documentation":"<p>ARN or Id of a Bedrock Foundational Model or Inference Profile, or the ARN of a jumpstart model or imported model, or a provisioned throughput ARN for custom models.</p>",
       "max":2048,
       "min":1,
-      "pattern":"^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):(model-gateway|inference-profile)/[a-zA-Z0-9-:.]+)|([a-zA-Z0-9-:.]+)$"
+      "pattern":"^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:imported-model/[a-z0-9]{12})|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):(inference-profile|application-inference-profile)/[a-zA-Z0-9-:.]+)|([a-zA-Z0-9-:.]+)$"
     },
     "PromptModelInferenceConfiguration":{
       "type":"structure",
@@ -6583,6 +6594,10 @@
         "templateType"
       ],
       "members":{
+        "additionalModelRequestFields":{
+          "shape":"Document",
+          "documentation":"<p>Contains model-specific inference configurations that aren't in the <code>inferenceConfiguration</code> field. To see model-specific inference parameters, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters.html\">Inference request parameters and response fields for foundation models</a>.</p>"
+        },
         "inferenceConfiguration":{
           "shape":"PromptInferenceConfiguration",
           "documentation":"<p>Contains inference configurations for the prompt variant.</p>"
@@ -7676,7 +7691,7 @@
         },
         "foundationModel":{
           "shape":"ModelIdentifier",
-          "documentation":"<p>Specifies a new foundation model to be used for orchestration by the agent.</p>"
+          "documentation":"<p>The identifier for the model that you want to be used for orchestration by the agent you create.</p> <p>The <code>modelId</code> to provide depends on the type of model or throughput that you use:</p> <ul> <li> <p>If you use a base model, specify the model ID or its ARN. For a list of model IDs for base models, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-ids.html#model-ids-arns\">Amazon Bedrock base model IDs (on-demand throughput)</a> in the Amazon Bedrock User Guide.</p> </li> <li> <p>If you use an inference profile, specify the inference profile ID or its ARN. For a list of inference profile IDs, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference-support.html\">Supported Regions and models for cross-region inference</a> in the Amazon Bedrock User Guide.</p> </li> <li> <p>If you use a provisioned model, specify the ARN of the Provisioned Throughput. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/prov-thru-use.html\">Run inference using a Provisioned Throughput</a> in the Amazon Bedrock User Guide.</p> </li> <li> <p>If you use a custom model, first purchase Provisioned Throughput for it. Then specify the ARN of the resulting provisioned model. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-customization-use.html\">Use a custom model in Amazon Bedrock</a> in the Amazon Bedrock User Guide.</p> </li> <li> <p>If you use an <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-customization-import-model.html\">imported model</a>, specify the ARN of the imported model. You can get the model ARN from a successful call to <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_CreateModelImportJob.html\">CreateModelImportJob</a> or from the Imported models page in the Amazon Bedrock console.</p> </li> </ul>"
         },
         "guardrailConfiguration":{
           "shape":"GuardrailConfiguration",

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

@@ -739,6 +739,28 @@
         "SECRETS_MANAGER"
       ]
     },
+    "AutoRetryConfig":{
+      "type":"structure",
+      "members":{
+        "autoRetryLimit":{
+          "shape":"WrapperInt",
+          "documentation":"<p>The maximum number of additional automatic retries after a failed build. For example, if the auto-retry limit is set to 2, CodeBuild will call the <code>RetryBuild</code> API to automatically retry your build for up to 2 additional times.</p>"
+        },
+        "autoRetryNumber":{
+          "shape":"WrapperInt",
+          "documentation":"<p>The number of times that the build has been retried. The initial build will have an auto-retry number of 0.</p>"
+        },
+        "nextAutoRetry":{
+          "shape":"String",
+          "documentation":"<p>The build ARN of the auto-retried build triggered by the current build. The next auto-retry will be <code>null</code> for builds that don't trigger an auto-retry.</p>"
+        },
+        "previousAutoRetry":{
+          "shape":"String",
+          "documentation":"<p>The build ARN of the build that triggered the current auto-retry build. The previous auto-retry will be <code>null</code> for the initial build.</p>"
+        }
+      },
+      "documentation":"<p>Information about the auto-retry configuration for the build.</p>"
+    },
     "BatchDeleteBuildsInput":{
       "type":"structure",
       "required":["ids"],
@@ -1061,6 +1083,10 @@
         "buildBatchArn":{
           "shape":"String",
           "documentation":"<p>The ARN of the batch build that this build is a member of, if applicable.</p>"
+        },
+        "autoRetryConfig":{
+          "shape":"AutoRetryConfig",
+          "documentation":"<p>Information about the auto-retry configuration for the build.</p>"
         }
       },
       "documentation":"<p>Information about a build.</p>"
@@ -1727,6 +1753,10 @@
         "concurrentBuildLimit":{
           "shape":"WrapperInt",
           "documentation":"<p>The maximum number of concurrent builds that are allowed for this project.</p> <p>New builds are only started if the current number of builds is less than or equal to this limit. If the current build count meets this limit, new builds are throttled and are not run.</p>"
+        },
+        "autoRetryLimit":{
+          "shape":"WrapperInt",
+          "documentation":"<p>The maximum number of additional automatic retries after a failed build. For example, if the auto-retry limit is set to 2, CodeBuild will call the <code>RetryBuild</code> API to automatically retry your build for up to 2 additional times.</p>"
         }
       }
     },
@@ -3199,6 +3229,10 @@
         "resourceAccessRole":{
           "shape":"NonEmptyString",
           "documentation":"<p>The ARN of the IAM role that enables CodeBuild to access the CloudWatch Logs and Amazon S3 artifacts for the project's builds.</p>"
+        },
+        "autoRetryLimit":{
+          "shape":"WrapperInt",
+          "documentation":"<p>The maximum number of additional automatic retries after a failed build. For example, if the auto-retry limit is set to 2, CodeBuild will call the <code>RetryBuild</code> API to automatically retry your build for up to 2 additional times.</p>"
         }
       },
       "documentation":"<p>Information about a build project.</p>"
@@ -4402,6 +4436,10 @@
         "fleetOverride":{
           "shape":"ProjectFleet",
           "documentation":"<p>A ProjectFleet object specified for this build that overrides the one defined in the build project.</p>"
+        },
+        "autoRetryLimitOverride":{
+          "shape":"WrapperInt",
+          "documentation":"<p>The maximum number of additional automatic retries after a failed build. For example, if the auto-retry limit is set to 2, CodeBuild will call the <code>RetryBuild</code> API to automatically retry your build for up to 2 additional times.</p>"
         }
       }
     },
@@ -4729,6 +4767,10 @@
         "concurrentBuildLimit":{
           "shape":"WrapperInt",
           "documentation":"<p>The maximum number of concurrent builds that are allowed for this project.</p> <p>New builds are only started if the current number of builds is less than or equal to this limit. If the current build count meets this limit, new builds are throttled and are not run.</p> <p>To remove this limit, set this value to -1.</p>"
+        },
+        "autoRetryLimit":{
+          "shape":"WrapperInt",
+          "documentation":"<p>The maximum number of additional automatic retries after a failed build. For example, if the auto-retry limit is set to 2, CodeBuild will call the <code>RetryBuild</code> API to automatically retry your build for up to 2 additional times.</p>"
         }
       }
     },

botocore/data/endpoints.json

@@ -13262,6 +13262,7 @@
           "ap-northeast-2" : { },
           "ap-northeast-3" : { },
           "ap-south-1" : { },
+          "ap-south-2" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
           "ap-southeast-4" : { },
@@ -13271,6 +13272,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-central-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -28113,6 +28115,36 @@
           }
         }
       },
+      "redshift-serverless" : {
+        "endpoints" : {
+          "fips-us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "deprecated" : true,
+            "hostname" : "redshift-serverless-fips.us-gov-east-1.amazonaws.com"
+          },
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "deprecated" : true,
+            "hostname" : "redshift-serverless-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : {
+            "variants" : [ {
+              "hostname" : "redshift-serverless-fips.us-gov-east-1.amazonaws.com",
+              "tags" : [ "fips" ]
+            } ]
+          },
+          "us-gov-west-1" : {
+            "variants" : [ {
+              "hostname" : "redshift-serverless-fips.us-gov-west-1.amazonaws.com",
+              "tags" : [ "fips" ]
+            } ]
+          }
+        }
+      },
       "rekognition" : {
         "endpoints" : {
           "rekognition-fips.us-gov-west-1" : {