Skip to content

Commit c57400a

Browse files
Updates from spec version 146.0.0 (cloudtools#2201)
1 parent 5b1d325 commit c57400a

File tree

7 files changed

+289
-15
lines changed

7 files changed

+289
-15
lines changed

troposphere/amplify.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,16 @@ class App(AWSObject):
9292
}
9393

9494

95+
class Backend(AWSProperty):
96+
"""
97+
`Backend <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-branch-backend.html>`__
98+
"""
99+
100+
props: PropsDictType = {
101+
"StackArn": (str, False),
102+
}
103+
104+
95105
class Branch(AWSObject):
96106
"""
97107
`Branch <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html>`__
@@ -101,6 +111,7 @@ class Branch(AWSObject):
101111

102112
props: PropsDictType = {
103113
"AppId": (str, True),
114+
"Backend": (Backend, False),
104115
"BasicAuthConfig": (BasicAuthConfig, False),
105116
"BranchName": (str, True),
106117
"BuildSpec": (str, False),

troposphere/customerprofiles.py

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,125 @@ class CalculatedAttributeDefinition(AWSObject):
8484
}
8585

8686

87+
class ConflictResolution(AWSProperty):
88+
"""
89+
`ConflictResolution <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-conflictresolution.html>`__
90+
"""
91+
92+
props: PropsDictType = {
93+
"ConflictResolvingModel": (str, True),
94+
"SourceName": (str, False),
95+
}
96+
97+
98+
class Consolidation(AWSProperty):
99+
"""
100+
`Consolidation <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-consolidation.html>`__
101+
"""
102+
103+
props: PropsDictType = {
104+
"MatchingAttributesList": (dict, True),
105+
}
106+
107+
108+
class AutoMerging(AWSProperty):
109+
"""
110+
`AutoMerging <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-automerging.html>`__
111+
"""
112+
113+
props: PropsDictType = {
114+
"ConflictResolution": (ConflictResolution, False),
115+
"Consolidation": (Consolidation, False),
116+
"Enabled": (boolean, True),
117+
"MinAllowedConfidenceScoreForMerging": (double, False),
118+
}
119+
120+
121+
class S3ExportingConfig(AWSProperty):
122+
"""
123+
`S3ExportingConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-s3exportingconfig.html>`__
124+
"""
125+
126+
props: PropsDictType = {
127+
"S3BucketName": (str, True),
128+
"S3KeyName": (str, False),
129+
}
130+
131+
132+
class ExportingConfig(AWSProperty):
133+
"""
134+
`ExportingConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-exportingconfig.html>`__
135+
"""
136+
137+
props: PropsDictType = {
138+
"S3Exporting": (S3ExportingConfig, False),
139+
}
140+
141+
142+
class JobSchedule(AWSProperty):
143+
"""
144+
`JobSchedule <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-jobschedule.html>`__
145+
"""
146+
147+
props: PropsDictType = {
148+
"DayOfTheWeek": (str, True),
149+
"Time": (str, True),
150+
}
151+
152+
153+
class Matching(AWSProperty):
154+
"""
155+
`Matching <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-matching.html>`__
156+
"""
157+
158+
props: PropsDictType = {
159+
"AutoMerging": (AutoMerging, False),
160+
"Enabled": (boolean, True),
161+
"ExportingConfig": (ExportingConfig, False),
162+
"JobSchedule": (JobSchedule, False),
163+
}
164+
165+
166+
class AttributeTypesSelector(AWSProperty):
167+
"""
168+
`AttributeTypesSelector <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-attributetypesselector.html>`__
169+
"""
170+
171+
props: PropsDictType = {
172+
"Address": ([str], False),
173+
"AttributeMatchingModel": (str, True),
174+
"EmailAddress": ([str], False),
175+
"PhoneNumber": ([str], False),
176+
}
177+
178+
179+
class MatchingRule(AWSProperty):
180+
"""
181+
`MatchingRule <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-matchingrule.html>`__
182+
"""
183+
184+
props: PropsDictType = {
185+
"Rule": ([str], True),
186+
}
187+
188+
189+
class RuleBasedMatching(AWSProperty):
190+
"""
191+
`RuleBasedMatching <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-rulebasedmatching.html>`__
192+
"""
193+
194+
props: PropsDictType = {
195+
"AttributeTypesSelector": (AttributeTypesSelector, False),
196+
"ConflictResolution": (ConflictResolution, False),
197+
"Enabled": (boolean, True),
198+
"ExportingConfig": (ExportingConfig, False),
199+
"MatchingRules": ([MatchingRule], False),
200+
"MaxAllowedRuleLevelForMatching": (integer, False),
201+
"MaxAllowedRuleLevelForMerging": (integer, False),
202+
"Status": (str, False),
203+
}
204+
205+
87206
class Domain(AWSObject):
88207
"""
89208
`Domain <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-domain.html>`__
@@ -96,6 +215,8 @@ class Domain(AWSObject):
96215
"DefaultEncryptionKey": (str, False),
97216
"DefaultExpirationDays": (integer, False),
98217
"DomainName": (str, True),
218+
"Matching": (Matching, False),
219+
"RuleBasedMatching": (RuleBasedMatching, False),
99220
"Tags": (Tags, False),
100221
}
101222

@@ -400,3 +521,16 @@ class DestinationDetails(AWSProperty):
400521
"Status": (str, True),
401522
"Uri": (str, True),
402523
}
524+
525+
526+
class DomainStats(AWSProperty):
527+
"""
528+
`DomainStats <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-domain-domainstats.html>`__
529+
"""
530+
531+
props: PropsDictType = {
532+
"MeteringProfileCount": (double, False),
533+
"ObjectCount": (double, False),
534+
"ProfileCount": (double, False),
535+
"TotalSize": (double, False),
536+
}

troposphere/ec2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1623,7 +1623,7 @@ class PortRange(AWSProperty):
16231623

16241624
class NetworkAclEntry(AWSObject):
16251625
"""
1626-
`NetworkAclEntry <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl-entry.html>`__
1626+
`NetworkAclEntry <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html>`__
16271627
"""
16281628

16291629
resource_type = "AWS::EC2::NetworkAclEntry"

troposphere/msk.py

Lines changed: 92 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# *** Do not modify - this file is autogenerated ***
77

88

9-
from . import AWSObject, AWSProperty, PropsDictType
9+
from . import AWSObject, AWSProperty, PropsDictType, Tags
1010
from .validators import boolean, integer
1111

1212

@@ -422,6 +422,97 @@ class Configuration(AWSObject):
422422
}
423423

424424

425+
class AmazonMskCluster(AWSProperty):
426+
"""
427+
`AmazonMskCluster <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-amazonmskcluster.html>`__
428+
"""
429+
430+
props: PropsDictType = {
431+
"MskClusterArn": (str, True),
432+
}
433+
434+
435+
class KafkaClusterClientVpcConfig(AWSProperty):
436+
"""
437+
`KafkaClusterClientVpcConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-kafkaclusterclientvpcconfig.html>`__
438+
"""
439+
440+
props: PropsDictType = {
441+
"SecurityGroupIds": ([str], False),
442+
"SubnetIds": ([str], True),
443+
}
444+
445+
446+
class KafkaCluster(AWSProperty):
447+
"""
448+
`KafkaCluster <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-kafkacluster.html>`__
449+
"""
450+
451+
props: PropsDictType = {
452+
"AmazonMskCluster": (AmazonMskCluster, True),
453+
"VpcConfig": (KafkaClusterClientVpcConfig, True),
454+
}
455+
456+
457+
class ConsumerGroupReplication(AWSProperty):
458+
"""
459+
`ConsumerGroupReplication <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-consumergroupreplication.html>`__
460+
"""
461+
462+
props: PropsDictType = {
463+
"ConsumerGroupsToExclude": ([str], False),
464+
"ConsumerGroupsToReplicate": ([str], True),
465+
"DetectAndCopyNewConsumerGroups": (boolean, False),
466+
"SynchroniseConsumerGroupOffsets": (boolean, False),
467+
}
468+
469+
470+
class TopicReplication(AWSProperty):
471+
"""
472+
`TopicReplication <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-topicreplication.html>`__
473+
"""
474+
475+
props: PropsDictType = {
476+
"CopyAccessControlListsForTopics": (boolean, False),
477+
"CopyTopicConfigurations": (boolean, False),
478+
"DetectAndCopyNewTopics": (boolean, False),
479+
"TopicsToExclude": ([str], False),
480+
"TopicsToReplicate": ([str], True),
481+
}
482+
483+
484+
class ReplicationInfo(AWSProperty):
485+
"""
486+
`ReplicationInfo <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-replicationinfo.html>`__
487+
"""
488+
489+
props: PropsDictType = {
490+
"ConsumerGroupReplication": (ConsumerGroupReplication, True),
491+
"SourceKafkaClusterArn": (str, True),
492+
"TargetCompressionType": (str, True),
493+
"TargetKafkaClusterArn": (str, True),
494+
"TopicReplication": (TopicReplication, True),
495+
}
496+
497+
498+
class Replicator(AWSObject):
499+
"""
500+
`Replicator <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-replicator.html>`__
501+
"""
502+
503+
resource_type = "AWS::MSK::Replicator"
504+
505+
props: PropsDictType = {
506+
"CurrentVersion": (str, False),
507+
"Description": (str, False),
508+
"KafkaClusters": ([KafkaCluster], True),
509+
"ReplicationInfoList": ([ReplicationInfo], True),
510+
"ReplicatorName": (str, True),
511+
"ServiceExecutionRoleArn": (str, True),
512+
"Tags": (Tags, False),
513+
}
514+
515+
425516
class VpcConfig(AWSProperty):
426517
"""
427518
`VpcConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-serverlesscluster-vpcconfig.html>`__

troposphere/networkmanager.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ class ConnectPeer(AWSObject):
7272
"CoreNetworkAddress": (str, False),
7373
"InsideCidrBlocks": ([str], False),
7474
"PeerAddress": (str, True),
75+
"SubnetArn": (str, False),
7576
"Tags": (Tags, False),
7677
}
7778

0 commit comments

Comments
 (0)