Skip to content

Commit f2509da

Browse files
markpeekgithub-actions[bot]
authored andcommitted
Updates from spec version 227.0.0
1 parent f743e6d commit f2509da

22 files changed

+748
-36
lines changed

troposphere/bedrock.py

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,29 @@ class ModalityProcessingConfiguration(AWSProperty):
459459
}
460460

461461

462+
class PIIEntitiesConfiguration(AWSProperty):
463+
"""
464+
`PIIEntitiesConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-dataautomationproject-piientitiesconfiguration.html>`__
465+
"""
466+
467+
props: PropsDictType = {
468+
"PiiEntityTypes": ([str], False),
469+
"RedactionMaskMode": (str, False),
470+
}
471+
472+
473+
class SensitiveDataConfiguration(AWSProperty):
474+
"""
475+
`SensitiveDataConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-dataautomationproject-sensitivedataconfiguration.html>`__
476+
"""
477+
478+
props: PropsDictType = {
479+
"DetectionMode": (str, False),
480+
"DetectionScope": ([str], False),
481+
"PiiEntitiesConfiguration": (PIIEntitiesConfiguration, False),
482+
}
483+
484+
462485
class AudioOverrideConfiguration(AWSProperty):
463486
"""
464487
`AudioOverrideConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-dataautomationproject-audiooverrideconfiguration.html>`__
@@ -467,6 +490,7 @@ class AudioOverrideConfiguration(AWSProperty):
467490
props: PropsDictType = {
468491
"LanguageConfiguration": (AudioLanguageConfiguration, False),
469492
"ModalityProcessing": (ModalityProcessingConfiguration, False),
493+
"SensitiveDataConfiguration": (SensitiveDataConfiguration, False),
470494
}
471495

472496

@@ -487,6 +511,7 @@ class DocumentOverrideConfiguration(AWSProperty):
487511

488512
props: PropsDictType = {
489513
"ModalityProcessing": (ModalityProcessingConfiguration, False),
514+
"SensitiveDataConfiguration": (SensitiveDataConfiguration, False),
490515
"Splitter": (SplitterConfiguration, False),
491516
}
492517

@@ -498,6 +523,7 @@ class ImageOverrideConfiguration(AWSProperty):
498523

499524
props: PropsDictType = {
500525
"ModalityProcessing": (ModalityProcessingConfiguration, False),
526+
"SensitiveDataConfiguration": (SensitiveDataConfiguration, False),
501527
}
502528

503529

@@ -521,6 +547,7 @@ class VideoOverrideConfiguration(AWSProperty):
521547

522548
props: PropsDictType = {
523549
"ModalityProcessing": (ModalityProcessingConfiguration, False),
550+
"SensitiveDataConfiguration": (SensitiveDataConfiguration, False),
524551
}
525552

526553

@@ -842,6 +869,7 @@ class DataAutomationProject(AWSObject):
842869
"OverrideConfiguration": (OverrideConfiguration, False),
843870
"ProjectDescription": (str, False),
844871
"ProjectName": (str, True),
872+
"ProjectType": (str, False),
845873
"StandardOutputConfiguration": (StandardOutputConfiguration, False),
846874
"Tags": (Tags, False),
847875
}
@@ -2491,14 +2519,56 @@ class SqlKnowledgeBaseConfiguration(AWSProperty):
24912519
}
24922520

24932521

2522+
class AudioSegmentationConfiguration(AWSProperty):
2523+
"""
2524+
`AudioSegmentationConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-audiosegmentationconfiguration.html>`__
2525+
"""
2526+
2527+
props: PropsDictType = {
2528+
"FixedLengthDuration": (integer, True),
2529+
}
2530+
2531+
2532+
class AudioConfiguration(AWSProperty):
2533+
"""
2534+
`AudioConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-audioconfiguration.html>`__
2535+
"""
2536+
2537+
props: PropsDictType = {
2538+
"SegmentationConfiguration": (AudioSegmentationConfiguration, True),
2539+
}
2540+
2541+
2542+
class VideoSegmentationConfiguration(AWSProperty):
2543+
"""
2544+
`VideoSegmentationConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-videosegmentationconfiguration.html>`__
2545+
"""
2546+
2547+
props: PropsDictType = {
2548+
"FixedLengthDuration": (integer, True),
2549+
}
2550+
2551+
2552+
class VideoConfiguration(AWSProperty):
2553+
"""
2554+
`VideoConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-videoconfiguration.html>`__
2555+
"""
2556+
2557+
props: PropsDictType = {
2558+
"SegmentationConfiguration": (VideoSegmentationConfiguration, True),
2559+
}
2560+
2561+
24942562
class BedrockEmbeddingModelConfiguration(AWSProperty):
24952563
"""
24962564
`BedrockEmbeddingModelConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-bedrockembeddingmodelconfiguration.html>`__
24972565
"""
24982566

24992567
props: PropsDictType = {
2568+
"Audio": ([AudioConfiguration], False),
25002569
"Dimensions": (integer, False),
25012570
"EmbeddingDataType": (str, False),
2571+
"Video": ([VideoConfiguration], False),
25022572
}
25032573

25042574

troposphere/billingconductor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@ class LineItemFilter(AWSProperty):
8888

8989
props: PropsDictType = {
9090
"Attribute": (str, True),
91+
"AttributeValues": ([str], False),
9192
"MatchOption": (str, True),
92-
"Values": ([str], True),
93+
"Values": ([str], False),
9394
}
9495

9596

troposphere/cleanrooms.py

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,50 @@ class ErrorMessageConfiguration(AWSProperty):
117117
}
118118

119119

120+
class SyntheticDataColumnProperties(AWSProperty):
121+
"""
122+
`SyntheticDataColumnProperties <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-analysistemplate-syntheticdatacolumnproperties.html>`__
123+
"""
124+
125+
props: PropsDictType = {
126+
"ColumnName": (str, True),
127+
"ColumnType": (str, True),
128+
"IsPredictiveValue": (boolean, True),
129+
}
130+
131+
132+
class ColumnClassificationDetails(AWSProperty):
133+
"""
134+
`ColumnClassificationDetails <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-analysistemplate-columnclassificationdetails.html>`__
135+
"""
136+
137+
props: PropsDictType = {
138+
"ColumnMapping": ([SyntheticDataColumnProperties], True),
139+
}
140+
141+
142+
class MLSyntheticDataParameters(AWSProperty):
143+
"""
144+
`MLSyntheticDataParameters <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-analysistemplate-mlsyntheticdataparameters.html>`__
145+
"""
146+
147+
props: PropsDictType = {
148+
"ColumnClassification": (ColumnClassificationDetails, True),
149+
"Epsilon": (double, True),
150+
"MaxMembershipInferenceAttackScore": (double, True),
151+
}
152+
153+
154+
class SyntheticDataParameters(AWSProperty):
155+
"""
156+
`SyntheticDataParameters <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-analysistemplate-syntheticdataparameters.html>`__
157+
"""
158+
159+
props: PropsDictType = {
160+
"MlSyntheticDataParameters": (MLSyntheticDataParameters, True),
161+
}
162+
163+
120164
class AnalysisTemplate(AWSObject):
121165
"""
122166
`AnalysisTemplate <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-analysistemplate.html>`__
@@ -134,6 +178,7 @@ class AnalysisTemplate(AWSObject):
134178
"Schema": (AnalysisSchema, False),
135179
"Source": (AnalysisSource, True),
136180
"SourceMetadata": (AnalysisSourceMetadata, False),
181+
"SyntheticDataParameters": (SyntheticDataParameters, False),
137182
"Tags": (Tags, False),
138183
}
139184

@@ -191,6 +236,16 @@ class ModelTrainingPaymentConfig(AWSProperty):
191236
}
192237

193238

239+
class SyntheticDataGenerationPaymentConfig(AWSProperty):
240+
"""
241+
`SyntheticDataGenerationPaymentConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-collaboration-syntheticdatagenerationpaymentconfig.html>`__
242+
"""
243+
244+
props: PropsDictType = {
245+
"IsResponsible": (boolean, True),
246+
}
247+
248+
194249
class MLPaymentConfig(AWSProperty):
195250
"""
196251
`MLPaymentConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-collaboration-mlpaymentconfig.html>`__
@@ -199,6 +254,7 @@ class MLPaymentConfig(AWSProperty):
199254
props: PropsDictType = {
200255
"ModelInference": (ModelInferencePaymentConfig, False),
201256
"ModelTraining": (ModelTrainingPaymentConfig, False),
257+
"SyntheticDataGeneration": (SyntheticDataGenerationPaymentConfig, False),
202258
}
203259

204260

@@ -659,6 +715,16 @@ class MembershipModelTrainingPaymentConfig(AWSProperty):
659715
}
660716

661717

718+
class MembershipSyntheticDataGenerationPaymentConfig(AWSProperty):
719+
"""
720+
`MembershipSyntheticDataGenerationPaymentConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-membership-membershipsyntheticdatagenerationpaymentconfig.html>`__
721+
"""
722+
723+
props: PropsDictType = {
724+
"IsResponsible": (boolean, True),
725+
}
726+
727+
662728
class MembershipMLPaymentConfig(AWSProperty):
663729
"""
664730
`MembershipMLPaymentConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-membership-membershipmlpaymentconfig.html>`__
@@ -667,6 +733,10 @@ class MembershipMLPaymentConfig(AWSProperty):
667733
props: PropsDictType = {
668734
"ModelInference": (MembershipModelInferencePaymentConfig, False),
669735
"ModelTraining": (MembershipModelTrainingPaymentConfig, False),
736+
"SyntheticDataGeneration": (
737+
MembershipSyntheticDataGenerationPaymentConfig,
738+
False,
739+
),
670740
}
671741

672742

troposphere/cloudfront.py

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,17 @@
2929
)
3030

3131

32+
class IpamCidrConfig(AWSProperty):
33+
"""
34+
`IpamCidrConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-anycastiplist-ipamcidrconfig.html>`__
35+
"""
36+
37+
props: PropsDictType = {
38+
"Cidr": (str, True),
39+
"IpamPoolArn": (str, True),
40+
}
41+
42+
3243
class AnycastIpList(AWSObject):
3344
"""
3445
`AnycastIpList <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-anycastiplist.html>`__
@@ -39,6 +50,7 @@ class AnycastIpList(AWSObject):
3950
props: PropsDictType = {
4051
"IpAddressType": (str, False),
4152
"IpCount": (integer, True),
53+
"IpamCidrConfigs": ([IpamCidrConfig], False),
4254
"Name": (str, True),
4355
"Tags": (validate_tags_items_array, False),
4456
}
@@ -1471,29 +1483,25 @@ class VpcOrigin(AWSObject):
14711483
}
14721484

14731485

1474-
class AnycastIpListProperty(AWSProperty):
1486+
class DomainResult(AWSProperty):
14751487
"""
1476-
`AnycastIpListProperty <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-anycastiplist-anycastiplist.html>`__
1488+
`DomainResult <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distributiontenant-domainresult.html>`__
14771489
"""
14781490

14791491
props: PropsDictType = {
1480-
"AnycastIps": ([str], True),
1481-
"Arn": (str, True),
1482-
"Id": (str, True),
1483-
"IpAddressType": (str, False),
1484-
"IpCount": (integer, True),
1485-
"LastModifiedTime": (str, True),
1486-
"Name": (str, True),
1487-
"Status": (str, True),
1492+
"Domain": (str, False),
1493+
"Status": (str, False),
14881494
}
14891495

14901496

1491-
class DomainResult(AWSProperty):
1497+
class IpamCidrConfigResult(AWSProperty):
14921498
"""
1493-
`DomainResult <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distributiontenant-domainresult.html>`__
1499+
`IpamCidrConfigResult <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-anycastiplist-ipamcidrconfigresult.html>`__
14941500
"""
14951501

14961502
props: PropsDictType = {
1497-
"Domain": (str, False),
1503+
"AnycastIp": (str, False),
1504+
"Cidr": (str, False),
1505+
"IpamPoolArn": (str, False),
14981506
"Status": (str, False),
14991507
}

0 commit comments

Comments
 (0)