Updates from spec version 146.0.0 (cloudtools#2201)

troposphere/amplify.py

@@ -92,6 +92,16 @@ class App(AWSObject):
     }
 
 
+class Backend(AWSProperty):
+    """
+    `Backend <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-branch-backend.html>`__
+    """
+
+    props: PropsDictType = {
+        "StackArn": (str, False),
+    }
+
+
 class Branch(AWSObject):
     """
     `Branch <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html>`__
@@ -101,6 +111,7 @@ class Branch(AWSObject):
 
     props: PropsDictType = {
         "AppId": (str, True),
+        "Backend": (Backend, False),
         "BasicAuthConfig": (BasicAuthConfig, False),
         "BranchName": (str, True),
         "BuildSpec": (str, False),

troposphere/customerprofiles.py

@@ -84,6 +84,125 @@ class CalculatedAttributeDefinition(AWSObject):
     }
 
 
+class ConflictResolution(AWSProperty):
+    """
+    `ConflictResolution <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-conflictresolution.html>`__
+    """
+
+    props: PropsDictType = {
+        "ConflictResolvingModel": (str, True),
+        "SourceName": (str, False),
+    }
+
+
+class Consolidation(AWSProperty):
+    """
+    `Consolidation <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-consolidation.html>`__
+    """
+
+    props: PropsDictType = {
+        "MatchingAttributesList": (dict, True),
+    }
+
+
+class AutoMerging(AWSProperty):
+    """
+    `AutoMerging <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-automerging.html>`__
+    """
+
+    props: PropsDictType = {
+        "ConflictResolution": (ConflictResolution, False),
+        "Consolidation": (Consolidation, False),
+        "Enabled": (boolean, True),
+        "MinAllowedConfidenceScoreForMerging": (double, False),
+    }
+
+
+class S3ExportingConfig(AWSProperty):
+    """
+    `S3ExportingConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-s3exportingconfig.html>`__
+    """
+
+    props: PropsDictType = {
+        "S3BucketName": (str, True),
+        "S3KeyName": (str, False),
+    }
+
+
+class ExportingConfig(AWSProperty):
+    """
+    `ExportingConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-exportingconfig.html>`__
+    """
+
+    props: PropsDictType = {
+        "S3Exporting": (S3ExportingConfig, False),
+    }
+
+
+class JobSchedule(AWSProperty):
+    """
+    `JobSchedule <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-jobschedule.html>`__
+    """
+
+    props: PropsDictType = {
+        "DayOfTheWeek": (str, True),
+        "Time": (str, True),
+    }
+
+
+class Matching(AWSProperty):
+    """
+    `Matching <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-matching.html>`__
+    """
+
+    props: PropsDictType = {
+        "AutoMerging": (AutoMerging, False),
+        "Enabled": (boolean, True),
+        "ExportingConfig": (ExportingConfig, False),
+        "JobSchedule": (JobSchedule, False),
+    }
+
+
+class AttributeTypesSelector(AWSProperty):
+    """
+    `AttributeTypesSelector <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-attributetypesselector.html>`__
+    """
+
+    props: PropsDictType = {
+        "Address": ([str], False),
+        "AttributeMatchingModel": (str, True),
+        "EmailAddress": ([str], False),
+        "PhoneNumber": ([str], False),
+    }
+
+
+class MatchingRule(AWSProperty):
+    """
+    `MatchingRule <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-matchingrule.html>`__
+    """
+
+    props: PropsDictType = {
+        "Rule": ([str], True),
+    }
+
+
+class RuleBasedMatching(AWSProperty):
+    """
+    `RuleBasedMatching <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-rulebasedmatching.html>`__
+    """
+
+    props: PropsDictType = {
+        "AttributeTypesSelector": (AttributeTypesSelector, False),
+        "ConflictResolution": (ConflictResolution, False),
+        "Enabled": (boolean, True),
+        "ExportingConfig": (ExportingConfig, False),
+        "MatchingRules": ([MatchingRule], False),
+        "MaxAllowedRuleLevelForMatching": (integer, False),
+        "MaxAllowedRuleLevelForMerging": (integer, False),
+        "Status": (str, False),
+    }
+
+
 class Domain(AWSObject):
     """
     `Domain <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-domain.html>`__
@@ -96,6 +215,8 @@ class Domain(AWSObject):
         "DefaultEncryptionKey": (str, False),
         "DefaultExpirationDays": (integer, False),
         "DomainName": (str, True),
+        "Matching": (Matching, False),
+        "RuleBasedMatching": (RuleBasedMatching, False),
         "Tags": (Tags, False),
     }
 
@@ -400,3 +521,16 @@ class DestinationDetails(AWSProperty):
         "Status": (str, True),
         "Uri": (str, True),
     }
+
+
+class DomainStats(AWSProperty):
+    """
+    `DomainStats <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-domainstats.html>`__
+    """
+
+    props: PropsDictType = {
+        "MeteringProfileCount": (double, False),
+        "ObjectCount": (double, False),
+        "ProfileCount": (double, False),
+        "TotalSize": (double, False),
+    }

troposphere/ec2.py

@@ -1623,7 +1623,7 @@ class PortRange(AWSProperty):
 
 class NetworkAclEntry(AWSObject):
     """
-    `NetworkAclEntry <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl-entry.html>`__
+    `NetworkAclEntry <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html>`__
     """
 
     resource_type = "AWS::EC2::NetworkAclEntry"

troposphere/msk.py

@@ -6,7 +6,7 @@
 # *** Do not modify - this file is autogenerated ***
 
 
-from . import AWSObject, AWSProperty, PropsDictType
+from . import AWSObject, AWSProperty, PropsDictType, Tags
 from .validators import boolean, integer
 
 
@@ -422,6 +422,97 @@ class Configuration(AWSObject):
     }
 
 
+class AmazonMskCluster(AWSProperty):
+    """
+    `AmazonMskCluster <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-amazonmskcluster.html>`__
+    """
+
+    props: PropsDictType = {
+        "MskClusterArn": (str, True),
+    }
+
+
+class KafkaClusterClientVpcConfig(AWSProperty):
+    """
+    `KafkaClusterClientVpcConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-kafkaclusterclientvpcconfig.html>`__
+    """
+
+    props: PropsDictType = {
+        "SecurityGroupIds": ([str], False),
+        "SubnetIds": ([str], True),
+    }
+
+
+class KafkaCluster(AWSProperty):
+    """
+    `KafkaCluster <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-kafkacluster.html>`__
+    """
+
+    props: PropsDictType = {
+        "AmazonMskCluster": (AmazonMskCluster, True),
+        "VpcConfig": (KafkaClusterClientVpcConfig, True),
+    }
+
+
+class ConsumerGroupReplication(AWSProperty):
+    """
+    `ConsumerGroupReplication <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-consumergroupreplication.html>`__
+    """
+
+    props: PropsDictType = {
+        "ConsumerGroupsToExclude": ([str], False),
+        "ConsumerGroupsToReplicate": ([str], True),
+        "DetectAndCopyNewConsumerGroups": (boolean, False),
+        "SynchroniseConsumerGroupOffsets": (boolean, False),
+    }
+
+
+class TopicReplication(AWSProperty):
+    """
+    `TopicReplication <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-topicreplication.html>`__
+    """
+
+    props: PropsDictType = {
+        "CopyAccessControlListsForTopics": (boolean, False),
+        "CopyTopicConfigurations": (boolean, False),
+        "DetectAndCopyNewTopics": (boolean, False),
+        "TopicsToExclude": ([str], False),
+        "TopicsToReplicate": ([str], True),
+    }
+
+
+class ReplicationInfo(AWSProperty):
+    """
+    `ReplicationInfo <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-replicationinfo.html>`__
+    """
+
+    props: PropsDictType = {
+        "ConsumerGroupReplication": (ConsumerGroupReplication, True),
+        "SourceKafkaClusterArn": (str, True),
+        "TargetCompressionType": (str, True),
+        "TargetKafkaClusterArn": (str, True),
+        "TopicReplication": (TopicReplication, True),
+    }
+
+
+class Replicator(AWSObject):
+    """
+    `Replicator <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-replicator.html>`__
+    """
+
+    resource_type = "AWS::MSK::Replicator"
+
+    props: PropsDictType = {
+        "CurrentVersion": (str, False),
+        "Description": (str, False),
+        "KafkaClusters": ([KafkaCluster], True),
+        "ReplicationInfoList": ([ReplicationInfo], True),
+        "ReplicatorName": (str, True),
+        "ServiceExecutionRoleArn": (str, True),
+        "Tags": (Tags, False),
+    }
+
+
 class VpcConfig(AWSProperty):
     """
     `VpcConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-serverlesscluster-vpcconfig.html>`__

troposphere/networkmanager.py

@@ -72,6 +72,7 @@ class ConnectPeer(AWSObject):
         "CoreNetworkAddress": (str, False),
         "InsideCidrBlocks": ([str], False),
         "PeerAddress": (str, True),
+        "SubnetArn": (str, False),
         "Tags": (Tags, False),
     }