Skip to content

Commit cc45253

Browse files
github-actions[bot]github-actions[bot]
authored
Updates from spec version 224.0.0 (#2342)
1 parent 9510a31 commit cc45253

17 files changed

+673
-607
lines changed

‎troposphere/aps.py‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,25 @@ class EksConfiguration(AWSProperty):
218218
}
219219

220220

221+
class VpcConfiguration(AWSProperty):
222+
"""
223+
`VpcConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-aps-scraper-vpcconfiguration.html>`__
224+
"""
225+
226+
props: PropsDictType = {
227+
"SecurityGroupIds": ([str], True),
228+
"SubnetIds": ([str], True),
229+
}
230+
231+
221232
class Source(AWSProperty):
222233
"""
223234
`Source <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-aps-scraper-source.html>`__
224235
"""
225236

226237
props: PropsDictType = {
227-
"EksConfiguration": (EksConfiguration, True),
238+
"EksConfiguration": (EksConfiguration, False),
239+
"VpcConfiguration": (VpcConfiguration, False),
228240
}
229241

230242

‎troposphere/awslambda.py‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,19 @@ class FilterCriteria(AWSProperty):
226226
}
227227

228228

229+
class LoggingConfig(AWSProperty):
230+
"""
231+
`LoggingConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-loggingconfig.html>`__
232+
"""
233+
234+
props: PropsDictType = {
235+
"ApplicationLogLevel": (str, False),
236+
"LogFormat": (str, False),
237+
"LogGroup": (str, False),
238+
"SystemLogLevel": (str, False),
239+
}
240+
241+
229242
class MetricsConfig(AWSProperty):
230243
"""
231244
`MetricsConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-metricsconfig.html>`__
@@ -244,6 +257,7 @@ class ProvisionedPollerConfig(AWSProperty):
244257
props: PropsDictType = {
245258
"MaximumPollers": (integer, False),
246259
"MinimumPollers": (integer, False),
260+
"PollerGroupName": (str, False),
247261
}
248262

249263

@@ -321,6 +335,7 @@ class EventSourceMapping(AWSObject):
321335
"FunctionName": (str, True),
322336
"FunctionResponseTypes": ([str], False),
323337
"KmsKeyArn": (str, False),
338+
"LoggingConfig": (LoggingConfig, False),
324339
"MaximumBatchingWindowInSeconds": (integer, False),
325340
"MaximumRecordAgeInSeconds": (integer, False),
326341
"MaximumRetryAttempts": (integer, False),
@@ -414,19 +429,6 @@ def validate(self):
414429
validate_image_config(self)
415430

416431

417-
class LoggingConfig(AWSProperty):
418-
"""
419-
`LoggingConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-loggingconfig.html>`__
420-
"""
421-
422-
props: PropsDictType = {
423-
"ApplicationLogLevel": (str, False),
424-
"LogFormat": (str, False),
425-
"LogGroup": (str, False),
426-
"SystemLogLevel": (str, False),
427-
}
428-
429-
430432
class RuntimeManagementConfig(AWSProperty):
431433
"""
432434
`RuntimeManagementConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-runtimemanagementconfig.html>`__

‎troposphere/backup.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ class LogicallyAirGappedBackupVault(AWSObject):
274274
"BackupVaultTags": (dict, False),
275275
"MaxRetentionDays": (integer, True),
276276
"MinRetentionDays": (integer, True),
277+
"MpaApprovalTeamArn": (str, False),
277278
"Notifications": (NotificationObjectType, False),
278279
}
279280

‎troposphere/connect.py‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,6 +1075,54 @@ class Application(AWSProperty):
10751075
}
10761076

10771077

1078+
class PrimaryAttributeValue(AWSProperty):
1079+
"""
1080+
`PrimaryAttributeValue <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-securityprofile-primaryattributevalue.html>`__
1081+
"""
1082+
1083+
props: PropsDictType = {
1084+
"AccessType": (str, True),
1085+
"AttributeName": (str, True),
1086+
"Values": ([str], True),
1087+
}
1088+
1089+
1090+
class PrimaryAttributeAccessControlConfigurationItem(AWSProperty):
1091+
"""
1092+
`PrimaryAttributeAccessControlConfigurationItem <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-securityprofile-primaryattributeaccesscontrolconfigurationitem.html>`__
1093+
"""
1094+
1095+
props: PropsDictType = {
1096+
"PrimaryAttributeValues": ([PrimaryAttributeValue], True),
1097+
}
1098+
1099+
1100+
class DataTableAccessControlConfiguration(AWSProperty):
1101+
"""
1102+
`DataTableAccessControlConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-securityprofile-datatableaccesscontrolconfiguration.html>`__
1103+
"""
1104+
1105+
props: PropsDictType = {
1106+
"PrimaryAttributeAccessControlConfiguration": (
1107+
PrimaryAttributeAccessControlConfigurationItem,
1108+
False,
1109+
),
1110+
}
1111+
1112+
1113+
class GranularAccessControlConfiguration(AWSProperty):
1114+
"""
1115+
`GranularAccessControlConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-securityprofile-granularaccesscontrolconfiguration.html>`__
1116+
"""
1117+
1118+
props: PropsDictType = {
1119+
"DataTableAccessControlConfiguration": (
1120+
DataTableAccessControlConfiguration,
1121+
False,
1122+
),
1123+
}
1124+
1125+
10781126
class SecurityProfile(AWSObject):
10791127
"""
10801128
`SecurityProfile <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-securityprofile.html>`__
@@ -1087,6 +1135,10 @@ class SecurityProfile(AWSObject):
10871135
"AllowedAccessControlTags": (Tags, False),
10881136
"Applications": ([Application], False),
10891137
"Description": (str, False),
1138+
"GranularAccessControlConfiguration": (
1139+
GranularAccessControlConfiguration,
1140+
False,
1141+
),
10901142
"HierarchyRestrictedResources": ([str], False),
10911143
"InstanceArn": (str, True),
10921144
"Permissions": ([str], False),

‎troposphere/controltower.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ class LandingZone(AWSObject):
7171

7272
props: PropsDictType = {
7373
"Manifest": (dict, True),
74+
"RemediationTypes": ([str], False),
7475
"Tags": (Tags, False),
7576
"Version": (str, True),
7677
}

‎troposphere/dsql.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class Cluster(AWSObject):
3232
"DeletionProtectionEnabled": (boolean, False),
3333
"KmsEncryptionKey": (str, False),
3434
"MultiRegionProperties": (MultiRegionProperties, False),
35+
"PolicyDocument": (str, False),
3536
"Tags": (Tags, False),
3637
}
3738

‎troposphere/ec2.py‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,17 @@ class IPAMResourceDiscoveryAssociation(AWSObject):
980980
}
981981

982982

983+
class IpamScopeExternalAuthorityConfiguration(AWSProperty):
984+
"""
985+
`IpamScopeExternalAuthorityConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ipamscope-ipamscopeexternalauthorityconfiguration.html>`__
986+
"""
987+
988+
props: PropsDictType = {
989+
"ExternalResourceIdentifier": (str, True),
990+
"IpamScopeExternalAuthorityType": (str, True),
991+
}
992+
993+
983994
class IPAMScope(AWSObject):
984995
"""
985996
`IPAMScope <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamscope.html>`__
@@ -989,6 +1000,10 @@ class IPAMScope(AWSObject):
9891000

9901001
props: PropsDictType = {
9911002
"Description": (str, False),
1003+
"ExternalAuthorityConfiguration": (
1004+
IpamScopeExternalAuthorityConfiguration,
1005+
False,
1006+
),
9921007
"IpamId": (str, True),
9931008
"Tags": (Tags, False),
9941009
}
@@ -2780,6 +2795,7 @@ class TransitGateway(AWSObject):
27802795
"DefaultRouteTablePropagation": (str, False),
27812796
"Description": (str, False),
27822797
"DnsSupport": (str, False),
2798+
"EncryptionSupport": (str, False),
27832799
"MulticastSupport": (str, False),
27842800
"PropagationDefaultRouteTableId": (str, False),
27852801
"SecurityGroupReferencingSupport": (str, False),
@@ -3713,14 +3729,16 @@ class Volume(AWSObject):
37133729

37143730
props: PropsDictType = {
37153731
"AutoEnableIO": (boolean, False),
3716-
"AvailabilityZone": (str, True),
3732+
"AvailabilityZone": (str, False),
3733+
"AvailabilityZoneId": (str, False),
37173734
"Encrypted": (boolean, False),
37183735
"Iops": (integer, False),
37193736
"KmsKeyId": (str, False),
37203737
"MultiAttachEnabled": (boolean, False),
37213738
"OutpostArn": (str, False),
37223739
"Size": (integer, False),
37233740
"SnapshotId": (str, False),
3741+
"SourceVolumeId": (str, False),
37243742
"Tags": (validate_tags_or_list, False),
37253743
"Throughput": (integer, False),
37263744
"VolumeInitializationRate": (integer, False),

‎troposphere/elasticloadbalancingv2.py‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,30 @@ class ForwardConfig(AWSProperty):
112112
}
113113

114114

115+
class JwtValidationActionAdditionalClaim(AWSProperty):
116+
"""
117+
`JwtValidationActionAdditionalClaim <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-jwtvalidationactionadditionalclaim.html>`__
118+
"""
119+
120+
props: PropsDictType = {
121+
"Format": (str, True),
122+
"Name": (str, True),
123+
"Values": ([str], True),
124+
}
125+
126+
127+
class JwtValidationConfig(AWSProperty):
128+
"""
129+
`JwtValidationConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-jwtvalidationconfig.html>`__
130+
"""
131+
132+
props: PropsDictType = {
133+
"AdditionalClaims": ([JwtValidationActionAdditionalClaim], False),
134+
"Issuer": (str, True),
135+
"JwksEndpoint": (str, True),
136+
}
137+
138+
115139
class RedirectConfig(AWSProperty):
116140
"""
117141
`RedirectConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-redirectconfig.html>`__
@@ -140,6 +164,7 @@ class Action(AWSProperty):
140164
"AuthenticateOidcConfig": (AuthenticateOidcConfig, False),
141165
"FixedResponseConfig": (FixedResponseConfig, False),
142166
"ForwardConfig": (ForwardConfig, False),
167+
"JwtValidationConfig": (JwtValidationConfig, False),
143168
"Order": (integer, False),
144169
"RedirectConfig": (RedirectConfig, False),
145170
"TargetGroupArn": (str, False),
@@ -341,6 +366,7 @@ class ListenerRuleAction(AWSProperty):
341366
"AuthenticateOidcConfig": (ListenerRuleAuthenticateOidcConfig, False),
342367
"FixedResponseConfig": (FixedResponseConfig, False),
343368
"ForwardConfig": (ForwardConfig, False),
369+
"JwtValidationConfig": (JwtValidationConfig, False),
344370
"Order": (integer, False),
345371
"RedirectConfig": (RedirectConfig, False),
346372
"TargetGroupArn": (str, False),
@@ -480,6 +506,7 @@ class TargetDescription(AWSProperty):
480506
"AvailabilityZone": (str, False),
481507
"Id": (str, True),
482508
"Port": (validate_network_port, False),
509+
"QuicServerId": (str, False),
483510
}
484511

485512

‎troposphere/imagebuilder.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class ContainerRecipe(AWSObject):
119119
resource_type = "AWS::ImageBuilder::ContainerRecipe"
120120

121121
props: PropsDictType = {
122-
"Components": ([ContainerComponentConfiguration], True),
122+
"Components": ([ContainerComponentConfiguration], False),
123123
"ContainerType": (str, True),
124124
"Description": (str, False),
125125
"DockerfileTemplateData": (str, False),
@@ -488,7 +488,7 @@ class ImageRecipe(AWSObject):
488488
"AdditionalInstanceConfiguration": (AdditionalInstanceConfiguration, False),
489489
"AmiTags": (dict, False),
490490
"BlockDeviceMappings": ([InstanceBlockDeviceMapping], False),
491-
"Components": ([ComponentConfiguration], True),
491+
"Components": ([ComponentConfiguration], False),
492492
"Description": (str, False),
493493
"Name": (str, True),
494494
"ParentImage": (str, True),

0 commit comments

Comments
 (0)