Skip to content

Commit da3d5f6

Browse files
github-actions[bot]github-actions[bot]
authored
Updates from spec version 239.0.0 (#2354)
1 parent 44035c0 commit da3d5f6

9 files changed

Lines changed: 482 additions & 18 deletions

File tree

‎troposphere/arcregionswitch.py‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,32 @@ class ParallelExecutionBlockConfiguration(AWSProperty):
323323
}
324324

325325

326+
class RdsCreateCrossRegionReplicaConfiguration(AWSProperty):
327+
"""
328+
`RdsCreateCrossRegionReplicaConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-arcregionswitch-plan-rdscreatecrossregionreplicaconfiguration.html>`__
329+
"""
330+
331+
props: PropsDictType = {
332+
"CrossAccountRole": (str, False),
333+
"DbInstanceArnMap": (dict, True),
334+
"ExternalId": (str, False),
335+
"TimeoutMinutes": (double, False),
336+
}
337+
338+
339+
class RdsPromoteReadReplicaConfiguration(AWSProperty):
340+
"""
341+
`RdsPromoteReadReplicaConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-arcregionswitch-plan-rdspromotereadreplicaconfiguration.html>`__
342+
"""
343+
344+
props: PropsDictType = {
345+
"CrossAccountRole": (str, False),
346+
"DbInstanceArnMap": (dict, True),
347+
"ExternalId": (str, False),
348+
"TimeoutMinutes": (double, False),
349+
}
350+
351+
326352
class RegionSwitchPlanConfiguration(AWSProperty):
327353
"""
328354
`RegionSwitchPlanConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-arcregionswitch-plan-regionswitchplanconfiguration.html>`__
@@ -376,6 +402,11 @@ class ExecutionBlockConfiguration(AWSProperty):
376402
"ExecutionApprovalConfig": (ExecutionApprovalConfiguration, False),
377403
"GlobalAuroraConfig": (GlobalAuroraConfiguration, False),
378404
"ParallelConfig": (ParallelExecutionBlockConfiguration, False),
405+
"RdsCreateCrossRegionReadReplicaConfig": (
406+
RdsCreateCrossRegionReplicaConfiguration,
407+
False,
408+
),
409+
"RdsPromoteReadReplicaConfig": (RdsPromoteReadReplicaConfiguration, False),
379410
"RegionSwitchPlanConfig": (RegionSwitchPlanConfiguration, False),
380411
"Route53HealthCheckConfig": (Route53HealthCheckConfiguration, False),
381412
}

‎troposphere/bedrockagentcore.py‎

Lines changed: 297 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
from . import AWSObject, AWSProperty, PropsDictType, Tags
10-
from .validators import boolean, integer
10+
from .validators import boolean, double, integer
1111

1212

1313
class VpcConfig(AWSProperty):
@@ -83,6 +83,20 @@ class BrowserCustom(AWSObject):
8383
}
8484

8585

86+
class BrowserProfile(AWSObject):
87+
"""
88+
`BrowserProfile <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-browserprofile.html>`__
89+
"""
90+
91+
resource_type = "AWS::BedrockAgentCore::BrowserProfile"
92+
93+
props: PropsDictType = {
94+
"Description": (str, False),
95+
"Name": (str, True),
96+
"Tags": (dict, False),
97+
}
98+
99+
86100
class CodeInterpreterNetworkConfiguration(AWSProperty):
87101
"""
88102
`CodeInterpreterNetworkConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-codeinterpretercustom-codeinterpreternetworkconfiguration.html>`__
@@ -110,6 +124,112 @@ class CodeInterpreterCustom(AWSObject):
110124
}
111125

112126

127+
class InferenceConfiguration(AWSProperty):
128+
"""
129+
`InferenceConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-evaluator-inferenceconfiguration.html>`__
130+
"""
131+
132+
props: PropsDictType = {
133+
"MaxTokens": (integer, False),
134+
"Temperature": (double, False),
135+
"TopP": (double, False),
136+
}
137+
138+
139+
class BedrockEvaluatorModelConfig(AWSProperty):
140+
"""
141+
`BedrockEvaluatorModelConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-evaluator-bedrockevaluatormodelconfig.html>`__
142+
"""
143+
144+
props: PropsDictType = {
145+
"AdditionalModelRequestFields": (dict, False),
146+
"InferenceConfig": (InferenceConfiguration, False),
147+
"ModelId": (str, True),
148+
}
149+
150+
151+
class EvaluatorModelConfig(AWSProperty):
152+
"""
153+
`EvaluatorModelConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-evaluator-evaluatormodelconfig.html>`__
154+
"""
155+
156+
props: PropsDictType = {
157+
"BedrockEvaluatorModelConfig": (BedrockEvaluatorModelConfig, True),
158+
}
159+
160+
161+
class CategoricalScaleDefinition(AWSProperty):
162+
"""
163+
`CategoricalScaleDefinition <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-evaluator-categoricalscaledefinition.html>`__
164+
"""
165+
166+
props: PropsDictType = {
167+
"Definition": (str, True),
168+
"Label": (str, True),
169+
}
170+
171+
172+
class NumericalScaleDefinition(AWSProperty):
173+
"""
174+
`NumericalScaleDefinition <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-evaluator-numericalscaledefinition.html>`__
175+
"""
176+
177+
props: PropsDictType = {
178+
"Definition": (str, True),
179+
"Label": (str, True),
180+
"Value": (double, True),
181+
}
182+
183+
184+
class RatingScale(AWSProperty):
185+
"""
186+
`RatingScale <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-evaluator-ratingscale.html>`__
187+
"""
188+
189+
props: PropsDictType = {
190+
"Categorical": ([CategoricalScaleDefinition], False),
191+
"Numerical": ([NumericalScaleDefinition], False),
192+
}
193+
194+
195+
class LlmAsAJudgeEvaluatorConfig(AWSProperty):
196+
"""
197+
`LlmAsAJudgeEvaluatorConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-evaluator-llmasajudgeevaluatorconfig.html>`__
198+
"""
199+
200+
props: PropsDictType = {
201+
"Instructions": (str, True),
202+
"ModelConfig": (EvaluatorModelConfig, True),
203+
"RatingScale": (RatingScale, True),
204+
}
205+
206+
207+
class EvaluatorConfig(AWSProperty):
208+
"""
209+
`EvaluatorConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-evaluator-evaluatorconfig.html>`__
210+
"""
211+
212+
props: PropsDictType = {
213+
"LlmAsAJudge": (LlmAsAJudgeEvaluatorConfig, True),
214+
}
215+
216+
217+
class Evaluator(AWSObject):
218+
"""
219+
`Evaluator <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-evaluator.html>`__
220+
"""
221+
222+
resource_type = "AWS::BedrockAgentCore::Evaluator"
223+
224+
props: PropsDictType = {
225+
"Description": (str, False),
226+
"EvaluatorConfig": (EvaluatorConfig, True),
227+
"EvaluatorName": (str, True),
228+
"Level": (str, True),
229+
"Tags": (Tags, False),
230+
}
231+
232+
113233
class ClaimMatchValueType(AWSProperty):
114234
"""
115235
`ClaimMatchValueType <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-runtime-claimmatchvaluetype.html>`__
@@ -825,6 +945,162 @@ class Memory(AWSObject):
825945
}
826946

827947

948+
class CloudWatchLogsInputConfig(AWSProperty):
949+
"""
950+
`CloudWatchLogsInputConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-onlineevaluationconfig-cloudwatchlogsinputconfig.html>`__
951+
"""
952+
953+
props: PropsDictType = {
954+
"LogGroupNames": ([str], True),
955+
"ServiceNames": ([str], True),
956+
}
957+
958+
959+
class DataSourceConfig(AWSProperty):
960+
"""
961+
`DataSourceConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-onlineevaluationconfig-datasourceconfig.html>`__
962+
"""
963+
964+
props: PropsDictType = {
965+
"CloudWatchLogs": (CloudWatchLogsInputConfig, True),
966+
}
967+
968+
969+
class EvaluatorReference(AWSProperty):
970+
"""
971+
`EvaluatorReference <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-onlineevaluationconfig-evaluatorreference.html>`__
972+
"""
973+
974+
props: PropsDictType = {
975+
"EvaluatorId": (str, True),
976+
}
977+
978+
979+
class FilterValue(AWSProperty):
980+
"""
981+
`FilterValue <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-onlineevaluationconfig-filtervalue.html>`__
982+
"""
983+
984+
props: PropsDictType = {
985+
"BooleanValue": (boolean, False),
986+
"DoubleValue": (double, False),
987+
"StringValue": (str, False),
988+
}
989+
990+
991+
class Filter(AWSProperty):
992+
"""
993+
`Filter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-onlineevaluationconfig-filter.html>`__
994+
"""
995+
996+
props: PropsDictType = {
997+
"Key": (str, True),
998+
"Operator": (str, True),
999+
"Value": (FilterValue, True),
1000+
}
1001+
1002+
1003+
class SamplingConfig(AWSProperty):
1004+
"""
1005+
`SamplingConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-onlineevaluationconfig-samplingconfig.html>`__
1006+
"""
1007+
1008+
props: PropsDictType = {
1009+
"SamplingPercentage": (double, True),
1010+
}
1011+
1012+
1013+
class SessionConfig(AWSProperty):
1014+
"""
1015+
`SessionConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-onlineevaluationconfig-sessionconfig.html>`__
1016+
"""
1017+
1018+
props: PropsDictType = {
1019+
"SessionTimeoutMinutes": (integer, True),
1020+
}
1021+
1022+
1023+
class Rule(AWSProperty):
1024+
"""
1025+
`Rule <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-onlineevaluationconfig-rule.html>`__
1026+
"""
1027+
1028+
props: PropsDictType = {
1029+
"Filters": ([Filter], False),
1030+
"SamplingConfig": (SamplingConfig, True),
1031+
"SessionConfig": (SessionConfig, False),
1032+
}
1033+
1034+
1035+
class OnlineEvaluationConfig(AWSObject):
1036+
"""
1037+
`OnlineEvaluationConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-onlineevaluationconfig.html>`__
1038+
"""
1039+
1040+
resource_type = "AWS::BedrockAgentCore::OnlineEvaluationConfig"
1041+
1042+
props: PropsDictType = {
1043+
"DataSourceConfig": (DataSourceConfig, True),
1044+
"Description": (str, False),
1045+
"EvaluationExecutionRoleArn": (str, True),
1046+
"Evaluators": ([EvaluatorReference], True),
1047+
"OnlineEvaluationConfigName": (str, True),
1048+
"Rule": (Rule, True),
1049+
"Tags": (Tags, False),
1050+
}
1051+
1052+
1053+
class CedarPolicy(AWSProperty):
1054+
"""
1055+
`CedarPolicy <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-policy-cedarpolicy.html>`__
1056+
"""
1057+
1058+
props: PropsDictType = {
1059+
"Statement": (str, True),
1060+
}
1061+
1062+
1063+
class PolicyDefinition(AWSProperty):
1064+
"""
1065+
`PolicyDefinition <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-policy-policydefinition.html>`__
1066+
"""
1067+
1068+
props: PropsDictType = {
1069+
"Cedar": (CedarPolicy, True),
1070+
}
1071+
1072+
1073+
class Policy(AWSObject):
1074+
"""
1075+
`Policy <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-policy.html>`__
1076+
"""
1077+
1078+
resource_type = "AWS::BedrockAgentCore::Policy"
1079+
1080+
props: PropsDictType = {
1081+
"Definition": (PolicyDefinition, True),
1082+
"Description": (str, False),
1083+
"Name": (str, True),
1084+
"PolicyEngineId": (str, True),
1085+
"ValidationMode": (str, False),
1086+
}
1087+
1088+
1089+
class PolicyEngine(AWSObject):
1090+
"""
1091+
`PolicyEngine <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-policyengine.html>`__
1092+
"""
1093+
1094+
resource_type = "AWS::BedrockAgentCore::PolicyEngine"
1095+
1096+
props: PropsDictType = {
1097+
"Description": (str, False),
1098+
"EncryptionKeyArn": (str, False),
1099+
"Name": (str, True),
1100+
"Tags": (Tags, False),
1101+
}
1102+
1103+
8281104
class Code(AWSProperty):
8291105
"""
8301106
`Code <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-runtime-code.html>`__
@@ -952,6 +1228,26 @@ class WorkloadIdentity(AWSObject):
9521228
}
9531229

9541230

1231+
class CloudWatchOutputConfig(AWSProperty):
1232+
"""
1233+
`CloudWatchOutputConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-onlineevaluationconfig-cloudwatchoutputconfig.html>`__
1234+
"""
1235+
1236+
props: PropsDictType = {
1237+
"LogGroupName": (str, False),
1238+
}
1239+
1240+
1241+
class OutputConfig(AWSProperty):
1242+
"""
1243+
`OutputConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-onlineevaluationconfig-outputconfig.html>`__
1244+
"""
1245+
1246+
props: PropsDictType = {
1247+
"CloudWatchConfig": (CloudWatchOutputConfig, False),
1248+
}
1249+
1250+
9551251
class WorkloadIdentityDetails(AWSProperty):
9561252
"""
9571253
`WorkloadIdentityDetails <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrockagentcore-runtime-workloadidentitydetails.html>`__

‎troposphere/cloudwatch.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ class Alarm(AWSObject):
8181
"AlarmActions": ([str], False),
8282
"AlarmDescription": (str, False),
8383
"AlarmName": (str, False),
84-
"ComparisonOperator": (str, True),
84+
"ComparisonOperator": (str, False),
8585
"DatapointsToAlarm": (integer, False),
8686
"Dimensions": ([MetricDimension], False),
8787
"EvaluateLowSampleCountPercentile": (str, False),
88-
"EvaluationPeriods": (integer, True),
88+
"EvaluationPeriods": (integer, False),
8989
"ExtendedStatistic": (str, False),
9090
"InsufficientDataActions": ([str], False),
9191
"MetricName": (str, False),

0 commit comments

Comments
 (0)