From 1de57d3e0d3b6d6561bd9c349011f3ee6ac1f363 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 08:47:10 -0700 Subject: [PATCH] Updates from spec version 183.0.0 (#2259) --- troposphere/arczonalshift.py | 12 +++ troposphere/bedrock.py | 22 ++++ troposphere/cleanrooms.py | 172 ++++++++++++++++++++++++++++++++ troposphere/ec2.py | 1 + troposphere/emrserverless.py | 12 +++ troposphere/entityresolution.py | 1 - troposphere/firehose.py | 54 ++++++++++ troposphere/inspectorv2.py | 8 +- troposphere/sagemaker.py | 18 ++++ 9 files changed, 295 insertions(+), 5 deletions(-) diff --git a/troposphere/arczonalshift.py b/troposphere/arczonalshift.py index d304ebbbf..42a7ff660 100644 --- a/troposphere/arczonalshift.py +++ b/troposphere/arczonalshift.py @@ -9,6 +9,18 @@ from . import AWSObject, AWSProperty, PropsDictType +class AutoshiftObserverNotificationStatus(AWSObject): + """ + `AutoshiftObserverNotificationStatus `__ + """ + + resource_type = "AWS::ARCZonalShift::AutoshiftObserverNotificationStatus" + + props: PropsDictType = { + "Status": (str, True), + } + + class ControlCondition(AWSProperty): """ `ControlCondition `__ diff --git a/troposphere/bedrock.py b/troposphere/bedrock.py index 456c37b64..7e6855f9f 100644 --- a/troposphere/bedrock.py +++ b/troposphere/bedrock.py @@ -648,6 +648,27 @@ class ContentPolicyConfig(AWSProperty): } +class ContextualGroundingFilterConfig(AWSProperty): + """ + `ContextualGroundingFilterConfig `__ + """ + + props: PropsDictType = { + "Threshold": (double, True), + "Type": (str, True), + } + + +class ContextualGroundingPolicyConfig(AWSProperty): + """ + `ContextualGroundingPolicyConfig `__ + """ + + props: PropsDictType = { + "FiltersConfig": ([ContextualGroundingFilterConfig], True), + } + + class PiiEntityConfig(AWSProperty): """ `PiiEntityConfig `__ @@ -748,6 +769,7 @@ class Guardrail(AWSObject): "BlockedInputMessaging": (str, True), "BlockedOutputsMessaging": (str, True), "ContentPolicyConfig": (ContentPolicyConfig, False), + "ContextualGroundingPolicyConfig": (ContextualGroundingPolicyConfig, False), "Description": (str, False), "KmsKeyArn": (str, False), "Name": (str, True), diff --git a/troposphere/cleanrooms.py b/troposphere/cleanrooms.py index c0dc26660..c75f51363 100644 --- a/troposphere/cleanrooms.py +++ b/troposphere/cleanrooms.py @@ -145,6 +145,7 @@ class AnalysisRuleAggregation(AWSProperty): """ props: PropsDictType = { + "AdditionalAnalyses": (str, False), "AggregateColumns": ([AggregateColumn], True), "AllowedJoinOperators": ([str], False), "DimensionColumns": ([str], True), @@ -181,9 +182,11 @@ class AnalysisRuleCustom(AWSProperty): """ props: PropsDictType = { + "AdditionalAnalyses": (str, False), "AllowedAnalyses": ([str], True), "AllowedAnalysisProviders": ([str], False), "DifferentialPrivacy": (DifferentialPrivacy, False), + "DisallowedOutputColumns": ([str], False), } @@ -193,6 +196,7 @@ class AnalysisRuleList(AWSProperty): """ props: PropsDictType = { + "AdditionalAnalyses": (str, False), "AllowedJoinOperators": ([str], False), "JoinColumns": ([str], True), "ListColumns": ([str], True), @@ -271,6 +275,72 @@ class ConfiguredTable(AWSObject): } +class ConfiguredTableAssociationAnalysisRuleAggregation(AWSProperty): + """ + `ConfiguredTableAssociationAnalysisRuleAggregation `__ + """ + + props: PropsDictType = { + "AllowedAdditionalAnalyses": ([str], False), + "AllowedResultReceivers": ([str], False), + } + + +class ConfiguredTableAssociationAnalysisRuleCustom(AWSProperty): + """ + `ConfiguredTableAssociationAnalysisRuleCustom `__ + """ + + props: PropsDictType = { + "AllowedAdditionalAnalyses": ([str], False), + "AllowedResultReceivers": ([str], False), + } + + +class ConfiguredTableAssociationAnalysisRuleList(AWSProperty): + """ + `ConfiguredTableAssociationAnalysisRuleList `__ + """ + + props: PropsDictType = { + "AllowedAdditionalAnalyses": ([str], False), + "AllowedResultReceivers": ([str], False), + } + + +class ConfiguredTableAssociationAnalysisRulePolicyV1(AWSProperty): + """ + `ConfiguredTableAssociationAnalysisRulePolicyV1 `__ + """ + + props: PropsDictType = { + "Aggregation": (ConfiguredTableAssociationAnalysisRuleAggregation, False), + "Custom": (ConfiguredTableAssociationAnalysisRuleCustom, False), + "List": (ConfiguredTableAssociationAnalysisRuleList, False), + } + + +class ConfiguredTableAssociationAnalysisRulePolicy(AWSProperty): + """ + `ConfiguredTableAssociationAnalysisRulePolicy `__ + """ + + props: PropsDictType = { + "V1": (ConfiguredTableAssociationAnalysisRulePolicyV1, True), + } + + +class ConfiguredTableAssociationAnalysisRule(AWSProperty): + """ + `ConfiguredTableAssociationAnalysisRule `__ + """ + + props: PropsDictType = { + "Policy": (ConfiguredTableAssociationAnalysisRulePolicy, True), + "Type": (str, True), + } + + class ConfiguredTableAssociation(AWSObject): """ `ConfiguredTableAssociation `__ @@ -279,6 +349,10 @@ class ConfiguredTableAssociation(AWSObject): resource_type = "AWS::CleanRooms::ConfiguredTableAssociation" props: PropsDictType = { + "ConfiguredTableAssociationAnalysisRules": ( + [ConfiguredTableAssociationAnalysisRule], + False, + ), "ConfiguredTableIdentifier": (str, True), "Description": (str, False), "MembershipIdentifier": (str, True), @@ -288,6 +362,72 @@ class ConfiguredTableAssociation(AWSObject): } +class IdMappingTableInputReferenceConfig(AWSProperty): + """ + `IdMappingTableInputReferenceConfig `__ + """ + + props: PropsDictType = { + "InputReferenceArn": (str, True), + "ManageResourcePolicies": (boolean, True), + } + + +class IdMappingTable(AWSObject): + """ + `IdMappingTable `__ + """ + + resource_type = "AWS::CleanRooms::IdMappingTable" + + props: PropsDictType = { + "Description": (str, False), + "InputReferenceConfig": (IdMappingTableInputReferenceConfig, True), + "KmsKeyArn": (str, False), + "MembershipIdentifier": (str, True), + "Name": (str, True), + "Tags": (Tags, False), + } + + +class IdMappingConfig(AWSProperty): + """ + `IdMappingConfig `__ + """ + + props: PropsDictType = { + "AllowUseAsDimensionColumn": (boolean, True), + } + + +class IdNamespaceAssociationInputReferenceConfig(AWSProperty): + """ + `IdNamespaceAssociationInputReferenceConfig `__ + """ + + props: PropsDictType = { + "InputReferenceArn": (str, True), + "ManageResourcePolicies": (boolean, True), + } + + +class IdNamespaceAssociation(AWSObject): + """ + `IdNamespaceAssociation `__ + """ + + resource_type = "AWS::CleanRooms::IdNamespaceAssociation" + + props: PropsDictType = { + "Description": (str, False), + "IdMappingConfig": (IdMappingConfig, False), + "InputReferenceConfig": (IdNamespaceAssociationInputReferenceConfig, True), + "MembershipIdentifier": (str, True), + "Name": (str, True), + "Tags": (Tags, False), + } + + class MembershipQueryComputePaymentConfig(AWSProperty): """ `MembershipQueryComputePaymentConfig `__ @@ -395,3 +535,35 @@ class AnalysisSchema(AWSProperty): props: PropsDictType = { "ReferencedTables": ([str], True), } + + +class IdMappingTableInputSource(AWSProperty): + """ + `IdMappingTableInputSource `__ + """ + + props: PropsDictType = { + "IdNamespaceAssociationId": (str, True), + "Type": (str, True), + } + + +class IdMappingTableInputReferenceProperties(AWSProperty): + """ + `IdMappingTableInputReferenceProperties `__ + """ + + props: PropsDictType = { + "IdMappingTableInputSource": ([IdMappingTableInputSource], True), + } + + +class IdNamespaceAssociationInputReferenceProperties(AWSProperty): + """ + `IdNamespaceAssociationInputReferenceProperties `__ + """ + + props: PropsDictType = { + "IdMappingWorkflowsSupported": (Tags, False), + "IdNamespaceType": (str, False), + } diff --git a/troposphere/ec2.py b/troposphere/ec2.py index 9da7fa852..2b2940b2f 100644 --- a/troposphere/ec2.py +++ b/troposphere/ec2.py @@ -2890,6 +2890,7 @@ class VPNConnection(AWSObject): props: PropsDictType = { "CustomerGatewayId": (str, True), + "EnableAcceleration": (boolean, False), "StaticRoutesOnly": (boolean, False), "Tags": (validate_tags_or_list, False), "TransitGatewayId": (str, False), diff --git a/troposphere/emrserverless.py b/troposphere/emrserverless.py index da24e6054..74f5fb226 100644 --- a/troposphere/emrserverless.py +++ b/troposphere/emrserverless.py @@ -87,6 +87,17 @@ class InitialCapacityConfigKeyValuePair(AWSProperty): } +class InteractiveConfiguration(AWSProperty): + """ + `InteractiveConfiguration `__ + """ + + props: PropsDictType = { + "LivyEndpointEnabled": (boolean, False), + "StudioEnabled": (boolean, False), + } + + class MaximumAllowedResources(AWSProperty): """ `MaximumAllowedResources `__ @@ -195,6 +206,7 @@ class Application(AWSObject): "AutoStopConfiguration": (AutoStopConfiguration, False), "ImageConfiguration": (ImageConfigurationInput, False), "InitialCapacity": ([InitialCapacityConfigKeyValuePair], False), + "InteractiveConfiguration": (InteractiveConfiguration, False), "MaximumCapacity": (MaximumAllowedResources, False), "MonitoringConfiguration": (MonitoringConfiguration, False), "Name": (str, False), diff --git a/troposphere/entityresolution.py b/troposphere/entityresolution.py index 2be1b1c6b..0711ecca6 100644 --- a/troposphere/entityresolution.py +++ b/troposphere/entityresolution.py @@ -63,7 +63,6 @@ class IdMappingTechniques(AWSProperty): props: PropsDictType = { "IdMappingType": (str, False), - "NormalizationVersion": (str, False), "ProviderProperties": (ProviderProperties, False), "RuleBasedProperties": (IdMappingRuleBasedProperties, False), } diff --git a/troposphere/firehose.py b/troposphere/firehose.py index 021d5c358..c936c6e20 100644 --- a/troposphere/firehose.py +++ b/troposphere/firehose.py @@ -504,6 +504,47 @@ class HttpEndpointDestinationConfiguration(AWSProperty): } +class CatalogConfiguration(AWSProperty): + """ + `CatalogConfiguration `__ + """ + + props: PropsDictType = { + "CatalogArn": (str, False), + } + + +class DestinationTableConfiguration(AWSProperty): + """ + `DestinationTableConfiguration `__ + """ + + props: PropsDictType = { + "DestinationDatabaseName": (str, True), + "DestinationTableName": (str, True), + "S3ErrorOutputPrefix": (str, False), + "UniqueKeys": ([str], False), + } + + +class IcebergDestinationConfiguration(AWSProperty): + """ + `IcebergDestinationConfiguration `__ + """ + + props: PropsDictType = { + "BufferingHints": (BufferingHints, False), + "CatalogConfiguration": (CatalogConfiguration, True), + "CloudWatchLoggingOptions": (CloudWatchLoggingOptions, False), + "DestinationTableConfigurationList": ([DestinationTableConfiguration], False), + "ProcessingConfiguration": (ProcessingConfiguration, False), + "RetryOptions": (RetryOptions, False), + "RoleARN": (str, True), + "S3Configuration": (S3DestinationConfiguration, True), + "s3BackupMode": (str, False), + } + + class KinesisStreamSourceConfiguration(AWSProperty): """ `KinesisStreamSourceConfiguration `__ @@ -581,6 +622,17 @@ class RedshiftDestinationConfiguration(AWSProperty): } +class SnowflakeBufferingHints(AWSProperty): + """ + `SnowflakeBufferingHints `__ + """ + + props: PropsDictType = { + "IntervalInSeconds": (integer, False), + "SizeInMBs": (integer, False), + } + + class SnowflakeRetryOptions(AWSProperty): """ `SnowflakeRetryOptions `__ @@ -619,6 +671,7 @@ class SnowflakeDestinationConfiguration(AWSProperty): props: PropsDictType = { "AccountUrl": (str, True), + "BufferingHints": (SnowflakeBufferingHints, False), "CloudWatchLoggingOptions": (CloudWatchLoggingOptions, False), "ContentColumnName": (str, False), "DataLoadingOption": (str, False), @@ -715,6 +768,7 @@ class DeliveryStream(AWSObject): HttpEndpointDestinationConfiguration, False, ), + "IcebergDestinationConfiguration": (IcebergDestinationConfiguration, False), "KinesisStreamSourceConfiguration": (KinesisStreamSourceConfiguration, False), "MSKSourceConfiguration": (MSKSourceConfiguration, False), "RedshiftDestinationConfiguration": (RedshiftDestinationConfiguration, False), diff --git a/troposphere/inspectorv2.py b/troposphere/inspectorv2.py index 9ab932e45..185c0bcb2 100644 --- a/troposphere/inspectorv2.py +++ b/troposphere/inspectorv2.py @@ -85,11 +85,11 @@ class CisScanConfiguration(AWSObject): resource_type = "AWS::InspectorV2::CisScanConfiguration" props: PropsDictType = { - "ScanName": (str, False), - "Schedule": (Schedule, False), - "SecurityLevel": (str, False), + "ScanName": (str, True), + "Schedule": (Schedule, True), + "SecurityLevel": (str, True), "Tags": (dict, False), - "Targets": (CisTargets, False), + "Targets": (CisTargets, True), } diff --git a/troposphere/sagemaker.py b/troposphere/sagemaker.py index 9316fa835..f44801d33 100644 --- a/troposphere/sagemaker.py +++ b/troposphere/sagemaker.py @@ -17,6 +17,7 @@ class ResourceSpec(AWSProperty): props: PropsDictType = { "InstanceType": (str, False), + "LifecycleConfigArn": (str, False), "SageMakerImageArn": (str, False), "SageMakerImageVersionArn": (str, False), } @@ -539,6 +540,7 @@ class JupyterServerAppSettings(AWSProperty): props: PropsDictType = { "DefaultResourceSpec": (ResourceSpec, False), + "LifecycleConfigArns": ([str], False), } @@ -550,6 +552,7 @@ class KernelGatewayAppSettings(AWSProperty): props: PropsDictType = { "CustomImages": ([CustomImage], False), "DefaultResourceSpec": (ResourceSpec, False), + "LifecycleConfigArns": ([str], False), } @@ -2828,6 +2831,21 @@ class Space(AWSObject): } +class StudioLifecycleConfig(AWSObject): + """ + `StudioLifecycleConfig `__ + """ + + resource_type = "AWS::SageMaker::StudioLifecycleConfig" + + props: PropsDictType = { + "StudioLifecycleConfigAppType": (str, True), + "StudioLifecycleConfigContent": (str, True), + "StudioLifecycleConfigName": (str, True), + "Tags": (Tags, False), + } + + class UserProfile(AWSObject): """ `UserProfile `__