Updates from spec version 257.0.0

troposphere/amazonmq.py

@@ -115,6 +115,7 @@ class Broker(AWSObject):
         "PubliclyAccessible": (boolean, True),
         "ResourceShareArns": ([str], False),
         "SecurityGroups": ([str], False),
+        "StorageSize": (integer, False),
         "StorageType": (str, False),
         "SubnetIds": ([str], False),
         "Tags": (validate_tags_or_list, False),

troposphere/appstream.py

@@ -306,6 +306,32 @@ class ImageBuilder(AWSObject):
     }
 
 
+class AgentAccessSetting(AWSProperty):
+    """
+    `AgentAccessSetting <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-agentaccesssetting.html>`__
+    """
+
+    props: PropsDictType = {
+        "AgentAction": (str, True),
+        "Permission": (str, True),
+    }
+
+
+class AgentAccessConfig(AWSProperty):
+    """
+    `AgentAccessConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-agentaccessconfig.html>`__
+    """
+
+    props: PropsDictType = {
+        "S3BucketArn": (str, False),
+        "ScreenImageFormat": (str, True),
+        "ScreenResolution": (str, True),
+        "ScreenshotsUploadEnabled": (boolean, False),
+        "Settings": ([AgentAccessSetting], True),
+        "UserControlMode": (str, False),
+    }
+
+
 class ApplicationSettings(AWSProperty):
     """
     `ApplicationSettings <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-applicationsettings.html>`__
@@ -382,6 +408,7 @@ class Stack(AWSObject):
 
     props: PropsDictType = {
         "AccessEndpoints": ([AccessEndpoint], False),
+        "AgentAccessConfig": (AgentAccessConfig, False),
         "ApplicationSettings": (ApplicationSettings, False),
         "AttributesToDelete": ([str], False),
         "ContentRedirection": (ContentRedirection, False),

troposphere/auditmanager.py

@@ -104,3 +104,40 @@ class Assessment(AWSObject):
         "Status": (str, False),
         "Tags": (Tags, False),
     }
+
+
+class ControlSetControl(AWSProperty):
+    """
+    `ControlSetControl <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessmentframework-controlsetcontrol.html>`__
+    """
+
+    props: PropsDictType = {
+        "Id": (str, True),
+    }
+
+
+class ControlSet(AWSProperty):
+    """
+    `ControlSet <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessmentframework-controlset.html>`__
+    """
+
+    props: PropsDictType = {
+        "Controls": ([ControlSetControl], True),
+        "Name": (str, True),
+    }
+
+
+class AssessmentFramework(AWSObject):
+    """
+    `AssessmentFramework <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-auditmanager-assessmentframework.html>`__
+    """
+
+    resource_type = "AWS::AuditManager::AssessmentFramework"
+
+    props: PropsDictType = {
+        "ComplianceType": (str, False),
+        "ControlSets": ([ControlSet], True),
+        "Description": (str, False),
+        "Name": (str, True),
+        "Tags": (Tags, False),
+    }

troposphere/awslambda.py

@@ -497,6 +497,7 @@ class Code(AWSProperty):
         "ImageUri": (str, False),
         "S3Bucket": (str, False),
         "S3Key": (str, False),
+        "S3ObjectStorageMode": (str, False),
         "S3ObjectVersion": (str, False),
         "SourceKMSKeyArn": (str, False),
         "ZipFile": (str, False),
@@ -523,6 +524,7 @@ class DurableConfig(AWSProperty):
 
     props: PropsDictType = {
         "ExecutionTimeout": (integer, True),
+        "KMSKeyArn": (str, False),
         "RetentionPeriodInDays": (integer, False),
     }
 

troposphere/bedrock.py

@@ -2557,7 +2557,7 @@ class ManagedKnowledgeBaseConfiguration(AWSProperty):
     """
 
     props: PropsDictType = {
-        "EmbeddingModelArn": (str, True),
+        "EmbeddingModelArn": (str, False),
         "EmbeddingModelConfiguration": (EmbeddingModelConfiguration, False),
         "EmbeddingModelType": (str, False),
         "ServerSideEncryptionConfiguration": (
@@ -3004,6 +3004,16 @@ class KnowledgeBase(AWSObject):
     }
 
 
+class ModelInvocationJob(AWSObject):
+    """
+    `ModelInvocationJob <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-modelinvocationjob.html>`__
+    """
+
+    resource_type = "AWS::Bedrock::ModelInvocationJob"
+
+    props: PropsDictType = {}
+
+
 class PromptAgentResource(AWSProperty):
     """
     `PromptAgentResource <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptagentresource.html>`__
@@ -3137,3 +3147,57 @@ class InferenceProfileModel(AWSProperty):
     props: PropsDictType = {
         "ModelArn": (str, False),
     }
+
+
+class ModelInvocationJobS3InputDataConfig(AWSProperty):
+    """
+    `ModelInvocationJobS3InputDataConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-modelinvocationjob-modelinvocationjobs3inputdataconfig.html>`__
+    """
+
+    props: PropsDictType = {
+        "S3BucketOwner": (str, False),
+        "S3Uri": (str, True),
+    }
+
+
+class ModelInvocationJobInputDataConfig(AWSProperty):
+    """
+    `ModelInvocationJobInputDataConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-modelinvocationjob-modelinvocationjobinputdataconfig.html>`__
+    """
+
+    props: PropsDictType = {
+        "S3InputDataConfig": (ModelInvocationJobS3InputDataConfig, True),
+    }
+
+
+class ModelInvocationJobS3OutputDataConfig(AWSProperty):
+    """
+    `ModelInvocationJobS3OutputDataConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-modelinvocationjob-modelinvocationjobs3outputdataconfig.html>`__
+    """
+
+    props: PropsDictType = {
+        "S3BucketOwner": (str, False),
+        "S3EncryptionKeyId": (str, False),
+        "S3Uri": (str, True),
+    }
+
+
+class ModelInvocationJobOutputDataConfig(AWSProperty):
+    """
+    `ModelInvocationJobOutputDataConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-modelinvocationjob-modelinvocationjoboutputdataconfig.html>`__
+    """
+
+    props: PropsDictType = {
+        "S3OutputDataConfig": (ModelInvocationJobS3OutputDataConfig, True),
+    }
+
+
+class VpcConfig(AWSProperty):
+    """
+    `VpcConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-modelinvocationjob-vpcconfig.html>`__
+    """
+
+    props: PropsDictType = {
+        "SecurityGroupIds": ([str], True),
+        "SubnetIds": ([str], True),
+    }

troposphere/bedrockagentcore.py

@@ -167,6 +167,16 @@ class BrowserProfile(AWSObject):
     }
 
 
+class CodeInterpreter(AWSObject):
+    """
+    `CodeInterpreter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-codeinterpreter.html>`__
+    """
+
+    resource_type = "AWS::BedrockAgentCore::CodeInterpreter"
+
+    props: PropsDictType = {}
+
+
 class CodeInterpreterNetworkConfiguration(AWSProperty):
     """
     `CodeInterpreterNetworkConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-codeinterpretercustom-codeinterpreternetworkconfiguration.html>`__
@@ -778,6 +788,92 @@ class HttpTargetConfiguration(AWSProperty):
     }
 
 
+class InferenceConnectorSource(AWSProperty):
+    """
+    `InferenceConnectorSource <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-gatewaytarget-inferenceconnectorsource.html>`__
+    """
+
+    props: PropsDictType = {
+        "ConnectorId": (str, True),
+    }
+
+
+class InferenceConnectorTargetConfiguration(AWSProperty):
+    """
+    `InferenceConnectorTargetConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-gatewaytarget-inferenceconnectortargetconfiguration.html>`__
+    """
+
+    props: PropsDictType = {
+        "Source": (InferenceConnectorSource, True),
+    }
+
+
+class ModelEntry(AWSProperty):
+    """
+    `ModelEntry <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-gatewaytarget-modelentry.html>`__
+    """
+
+    props: PropsDictType = {
+        "Model": (str, True),
+    }
+
+
+class InferenceOperationConfiguration(AWSProperty):
+    """
+    `InferenceOperationConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-gatewaytarget-inferenceoperationconfiguration.html>`__
+    """
+
+    props: PropsDictType = {
+        "Models": ([ModelEntry], False),
+        "Path": (str, True),
+        "ProviderPath": (str, False),
+    }
+
+
+class ProviderPrefix(AWSProperty):
+    """
+    `ProviderPrefix <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-gatewaytarget-providerprefix.html>`__
+    """
+
+    props: PropsDictType = {
+        "Separator": (str, False),
+        "Strip": (boolean, False),
+    }
+
+
+class ModelMapping(AWSProperty):
+    """
+    `ModelMapping <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-gatewaytarget-modelmapping.html>`__
+    """
+
+    props: PropsDictType = {
+        "ProviderPrefix": (ProviderPrefix, False),
+    }
+
+
+class InferenceProviderTargetConfiguration(AWSProperty):
+    """
+    `InferenceProviderTargetConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-gatewaytarget-inferenceprovidertargetconfiguration.html>`__
+    """
+
+    props: PropsDictType = {
+        "Endpoint": (str, True),
+        "ModelMapping": (ModelMapping, False),
+        "Operations": ([InferenceOperationConfiguration], False),
+    }
+
+
+class InferenceTargetConfiguration(AWSProperty):
+    """
+    `InferenceTargetConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-gatewaytarget-inferencetargetconfiguration.html>`__
+    """
+
+    props: PropsDictType = {
+        "Connector": (InferenceConnectorTargetConfiguration, False),
+        "Provider": (InferenceProviderTargetConfiguration, False),
+    }
+
+
 class ApiGatewayToolFilter(AWSProperty):
     """
     `ApiGatewayToolFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-gatewaytarget-apigatewaytoolfilter.html>`__
@@ -967,6 +1063,7 @@ class TargetConfiguration(AWSProperty):
 
     props: PropsDictType = {
         "Http": (HttpTargetConfiguration, False),
+        "Inference": (InferenceTargetConfiguration, False),
         "Mcp": (McpTargetConfiguration, False),
     }
 
@@ -2554,6 +2651,16 @@ class RuntimeEndpoint(AWSObject):
     }
 
 
+class TokenVault(AWSObject):
+    """
+    `TokenVault <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-tokenvault.html>`__
+    """
+
+    resource_type = "AWS::BedrockAgentCore::TokenVault"
+
+    props: PropsDictType = {}
+
+
 class WorkloadIdentity(AWSObject):
     """
     `WorkloadIdentity <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-workloadidentity.html>`__
@@ -2645,6 +2752,17 @@ class CoinbaseCdpConfigurationOutput(AWSProperty):
     }
 
 
+class KmsConfiguration(AWSProperty):
+    """
+    `KmsConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-tokenvault-kmsconfiguration.html>`__
+    """
+
+    props: PropsDictType = {
+        "KeyType": (str, True),
+        "KmsKeyArn": (str, False),
+    }
+
+
 class ManagedResourceDetails(AWSProperty):
     """
     `ManagedResourceDetails <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-gatewaytarget-managedresourcedetails.html>`__