Skip to content

Commit 50ab8fc

Browse files
Updates from spec version 217.0.0 (#2336)
1 parent 1a5c9c2 commit 50ab8fc

File tree

7 files changed

+324
-3
lines changed

7 files changed

+324
-3
lines changed

troposphere/amazonmq.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class LdapServerMetadata(AWSProperty):
4444
"RoleName": (str, False),
4545
"RoleSearchMatching": (str, True),
4646
"RoleSearchSubtree": (boolean, False),
47-
"ServiceAccountPassword": (str, True),
47+
"ServiceAccountPassword": (str, False),
4848
"ServiceAccountUsername": (str, True),
4949
"UserBase": (str, True),
5050
"UserRoleName": (str, False),
@@ -117,7 +117,7 @@ class Broker(AWSObject):
117117
"StorageType": (str, False),
118118
"SubnetIds": ([str], False),
119119
"Tags": (validate_tags_or_list, False),
120-
"Users": ([User], True),
120+
"Users": ([User], False),
121121
}
122122

123123

troposphere/applicationsignals.py

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,30 @@ class Discovery(AWSObject):
2020
props: PropsDictType = {}
2121

2222

23+
class GroupingAttributeDefinition(AWSProperty):
24+
"""
25+
`GroupingAttributeDefinition <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-groupingconfiguration-groupingattributedefinition.html>`__
26+
"""
27+
28+
props: PropsDictType = {
29+
"DefaultGroupingValue": (str, False),
30+
"GroupingName": (str, True),
31+
"GroupingSourceKeys": ([str], True),
32+
}
33+
34+
35+
class GroupingConfiguration(AWSObject):
36+
"""
37+
`GroupingConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationsignals-groupingconfiguration.html>`__
38+
"""
39+
40+
resource_type = "AWS::ApplicationSignals::GroupingConfiguration"
41+
42+
props: PropsDictType = {
43+
"GroupingAttributeDefinitions": ([GroupingAttributeDefinition], True),
44+
}
45+
46+
2347
class BurnRateConfiguration(AWSProperty):
2448
"""
2549
`BurnRateConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-burnrateconfiguration.html>`__

troposphere/bedrock.py

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,13 +523,55 @@ class OverrideConfiguration(AWSProperty):
523523
}
524524

525525

526+
class ChannelLabelingConfiguration(AWSProperty):
527+
"""
528+
`ChannelLabelingConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-dataautomationproject-channellabelingconfiguration.html>`__
529+
"""
530+
531+
props: PropsDictType = {
532+
"State": (str, True),
533+
}
534+
535+
536+
class SpeakerLabelingConfiguration(AWSProperty):
537+
"""
538+
`SpeakerLabelingConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-dataautomationproject-speakerlabelingconfiguration.html>`__
539+
"""
540+
541+
props: PropsDictType = {
542+
"State": (str, True),
543+
}
544+
545+
546+
class TranscriptConfiguration(AWSProperty):
547+
"""
548+
`TranscriptConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-dataautomationproject-transcriptconfiguration.html>`__
549+
"""
550+
551+
props: PropsDictType = {
552+
"ChannelLabeling": (ChannelLabelingConfiguration, False),
553+
"SpeakerLabeling": (SpeakerLabelingConfiguration, False),
554+
}
555+
556+
557+
class AudioExtractionCategoryTypeConfiguration(AWSProperty):
558+
"""
559+
`AudioExtractionCategoryTypeConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-dataautomationproject-audioextractioncategorytypeconfiguration.html>`__
560+
"""
561+
562+
props: PropsDictType = {
563+
"Transcript": (TranscriptConfiguration, False),
564+
}
565+
566+
526567
class AudioExtractionCategory(AWSProperty):
527568
"""
528569
`AudioExtractionCategory <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-dataautomationproject-audioextractioncategory.html>`__
529570
"""
530571

531572
props: PropsDictType = {
532573
"State": (str, True),
574+
"TypeConfiguration": (AudioExtractionCategoryTypeConfiguration, False),
533575
"Types": ([str], False),
534576
}
535577

troposphere/ec2.py

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,6 +1744,40 @@ class LocalGatewayRouteTableVirtualInterfaceGroupAssociation(AWSObject):
17441744
}
17451745

17461746

1747+
class LocalGatewayVirtualInterface(AWSObject):
1748+
"""
1749+
`LocalGatewayVirtualInterface <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayvirtualinterface.html>`__
1750+
"""
1751+
1752+
resource_type = "AWS::EC2::LocalGatewayVirtualInterface"
1753+
1754+
props: PropsDictType = {
1755+
"LocalAddress": (str, True),
1756+
"LocalGatewayVirtualInterfaceGroupId": (str, True),
1757+
"OutpostLagId": (str, True),
1758+
"PeerAddress": (str, True),
1759+
"PeerBgpAsn": (integer, False),
1760+
"PeerBgpAsnExtended": (integer, False),
1761+
"Tags": (Tags, False),
1762+
"Vlan": (integer, True),
1763+
}
1764+
1765+
1766+
class LocalGatewayVirtualInterfaceGroup(AWSObject):
1767+
"""
1768+
`LocalGatewayVirtualInterfaceGroup <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayvirtualinterfacegroup.html>`__
1769+
"""
1770+
1771+
resource_type = "AWS::EC2::LocalGatewayVirtualInterfaceGroup"
1772+
1773+
props: PropsDictType = {
1774+
"LocalBgpAsn": (integer, False),
1775+
"LocalBgpAsnExtended": (integer, False),
1776+
"LocalGatewayId": (str, True),
1777+
"Tags": (Tags, False),
1778+
}
1779+
1780+
17471781
class NatGateway(AWSObject):
17481782
"""
17491783
`NatGateway <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-natgateway.html>`__

troposphere/ecs.py

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,185 @@ class AutoScalingGroupProvider(AWSProperty):
5757
}
5858

5959

60+
class AcceleratorCountRequest(AWSProperty):
61+
"""
62+
`AcceleratorCountRequest <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-acceleratorcountrequest.html>`__
63+
"""
64+
65+
props: PropsDictType = {
66+
"Max": (integer, False),
67+
"Min": (integer, False),
68+
}
69+
70+
71+
class AcceleratorTotalMemoryMiBRequest(AWSProperty):
72+
"""
73+
`AcceleratorTotalMemoryMiBRequest <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-acceleratortotalmemorymibrequest.html>`__
74+
"""
75+
76+
props: PropsDictType = {
77+
"Max": (integer, False),
78+
"Min": (integer, False),
79+
}
80+
81+
82+
class BaselineEbsBandwidthMbpsRequest(AWSProperty):
83+
"""
84+
`BaselineEbsBandwidthMbpsRequest <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-baselineebsbandwidthmbpsrequest.html>`__
85+
"""
86+
87+
props: PropsDictType = {
88+
"Max": (integer, False),
89+
"Min": (integer, False),
90+
}
91+
92+
93+
class MemoryGiBPerVCpuRequest(AWSProperty):
94+
"""
95+
`MemoryGiBPerVCpuRequest <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-memorygibpervcpurequest.html>`__
96+
"""
97+
98+
props: PropsDictType = {
99+
"Max": (double, False),
100+
"Min": (double, False),
101+
}
102+
103+
104+
class MemoryMiBRequest(AWSProperty):
105+
"""
106+
`MemoryMiBRequest <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-memorymibrequest.html>`__
107+
"""
108+
109+
props: PropsDictType = {
110+
"Max": (integer, False),
111+
"Min": (integer, True),
112+
}
113+
114+
115+
class NetworkBandwidthGbpsRequest(AWSProperty):
116+
"""
117+
`NetworkBandwidthGbpsRequest <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-networkbandwidthgbpsrequest.html>`__
118+
"""
119+
120+
props: PropsDictType = {
121+
"Max": (double, False),
122+
"Min": (double, False),
123+
}
124+
125+
126+
class NetworkInterfaceCountRequest(AWSProperty):
127+
"""
128+
`NetworkInterfaceCountRequest <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-networkinterfacecountrequest.html>`__
129+
"""
130+
131+
props: PropsDictType = {
132+
"Max": (integer, False),
133+
"Min": (integer, False),
134+
}
135+
136+
137+
class TotalLocalStorageGBRequest(AWSProperty):
138+
"""
139+
`TotalLocalStorageGBRequest <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-totallocalstoragegbrequest.html>`__
140+
"""
141+
142+
props: PropsDictType = {
143+
"Max": (double, False),
144+
"Min": (double, False),
145+
}
146+
147+
148+
class VCpuCountRangeRequest(AWSProperty):
149+
"""
150+
`VCpuCountRangeRequest <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-vcpucountrangerequest.html>`__
151+
"""
152+
153+
props: PropsDictType = {
154+
"Max": (integer, False),
155+
"Min": (integer, True),
156+
}
157+
158+
159+
class InstanceRequirementsRequest(AWSProperty):
160+
"""
161+
`InstanceRequirementsRequest <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-instancerequirementsrequest.html>`__
162+
"""
163+
164+
props: PropsDictType = {
165+
"AcceleratorCount": (AcceleratorCountRequest, False),
166+
"AcceleratorManufacturers": ([str], False),
167+
"AcceleratorNames": ([str], False),
168+
"AcceleratorTotalMemoryMiB": (AcceleratorTotalMemoryMiBRequest, False),
169+
"AcceleratorTypes": ([str], False),
170+
"AllowedInstanceTypes": ([str], False),
171+
"BareMetal": (str, False),
172+
"BaselineEbsBandwidthMbps": (BaselineEbsBandwidthMbpsRequest, False),
173+
"BurstablePerformance": (str, False),
174+
"CpuManufacturers": ([str], False),
175+
"ExcludedInstanceTypes": ([str], False),
176+
"InstanceGenerations": ([str], False),
177+
"LocalStorage": (str, False),
178+
"LocalStorageTypes": ([str], False),
179+
"MaxSpotPriceAsPercentageOfOptimalOnDemandPrice": (integer, False),
180+
"MemoryGiBPerVCpu": (MemoryGiBPerVCpuRequest, False),
181+
"MemoryMiB": (MemoryMiBRequest, True),
182+
"NetworkBandwidthGbps": (NetworkBandwidthGbpsRequest, False),
183+
"NetworkInterfaceCount": (NetworkInterfaceCountRequest, False),
184+
"OnDemandMaxPricePercentageOverLowestPrice": (integer, False),
185+
"RequireHibernateSupport": (boolean, False),
186+
"SpotMaxPricePercentageOverLowestPrice": (integer, False),
187+
"TotalLocalStorageGB": (TotalLocalStorageGBRequest, False),
188+
"VCpuCount": (VCpuCountRangeRequest, True),
189+
}
190+
191+
192+
class ManagedInstancesNetworkConfiguration(AWSProperty):
193+
"""
194+
`ManagedInstancesNetworkConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-managedinstancesnetworkconfiguration.html>`__
195+
"""
196+
197+
props: PropsDictType = {
198+
"SecurityGroups": ([str], False),
199+
"Subnets": ([str], True),
200+
}
201+
202+
203+
class ManagedInstancesStorageConfiguration(AWSProperty):
204+
"""
205+
`ManagedInstancesStorageConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-managedinstancesstorageconfiguration.html>`__
206+
"""
207+
208+
props: PropsDictType = {
209+
"StorageSizeGiB": (integer, True),
210+
}
211+
212+
213+
class InstanceLaunchTemplate(AWSProperty):
214+
"""
215+
`InstanceLaunchTemplate <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-instancelaunchtemplate.html>`__
216+
"""
217+
218+
props: PropsDictType = {
219+
"Ec2InstanceProfileArn": (str, True),
220+
"InstanceRequirements": (InstanceRequirementsRequest, False),
221+
"Monitoring": (str, False),
222+
"NetworkConfiguration": (ManagedInstancesNetworkConfiguration, True),
223+
"StorageConfiguration": (ManagedInstancesStorageConfiguration, False),
224+
}
225+
226+
227+
class ManagedInstancesProvider(AWSProperty):
228+
"""
229+
`ManagedInstancesProvider <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-managedinstancesprovider.html>`__
230+
"""
231+
232+
props: PropsDictType = {
233+
"InfrastructureRoleArn": (str, True),
234+
"InstanceLaunchTemplate": (InstanceLaunchTemplate, True),
235+
"PropagateTags": (str, False),
236+
}
237+
238+
60239
class CapacityProvider(AWSObject):
61240
"""
62241
`CapacityProvider <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-capacityprovider.html>`__
@@ -66,6 +245,8 @@ class CapacityProvider(AWSObject):
66245

67246
props: PropsDictType = {
68247
"AutoScalingGroupProvider": (AutoScalingGroupProvider, False),
248+
"ClusterName": (str, False),
249+
"ManagedInstancesProvider": (ManagedInstancesProvider, False),
69250
"Name": (str, False),
70251
"Tags": (Tags, False),
71252
}

0 commit comments

Comments
 (0)