Skip to content

Commit 2318619

Browse files
markpeekgithub-actions[bot]
authored andcommitted
Updates from spec version 192.0.0
1 parent b5f1fa7 commit 2318619

7 files changed

Lines changed: 155 additions & 0 deletions

File tree

troposphere/acmpca.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,9 @@ class CrlConfiguration(AWSProperty):
270270
CrlDistributionPointExtensionConfiguration,
271271
False,
272272
),
273+
"CrlType": (str, False),
273274
"CustomCname": (str, False),
275+
"CustomPath": (str, False),
274276
"Enabled": (boolean, True),
275277
"ExpirationInDays": (integer, False),
276278
"S3BucketName": (str, False),

troposphere/bedrock.py

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,29 @@ class AgentActionGroup(AWSProperty):
9595
}
9696

9797

98+
class AgentDescriptor(AWSProperty):
99+
"""
100+
`AgentDescriptor <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-agentdescriptor.html>`__
101+
"""
102+
103+
props: PropsDictType = {
104+
"AliasArn": (str, False),
105+
}
106+
107+
108+
class AgentCollaborator(AWSProperty):
109+
"""
110+
`AgentCollaborator <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-agentcollaborator.html>`__
111+
"""
112+
113+
props: PropsDictType = {
114+
"AgentDescriptor": (AgentDescriptor, True),
115+
"CollaborationInstruction": (str, True),
116+
"CollaboratorName": (str, True),
117+
"RelayConversationHistory": (str, False),
118+
}
119+
120+
98121
class AgentKnowledgeBase(AWSProperty):
99122
"""
100123
`AgentKnowledgeBase <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-agentknowledgebase.html>`__
@@ -107,6 +130,26 @@ class AgentKnowledgeBase(AWSProperty):
107130
}
108131

109132

133+
class OrchestrationExecutor(AWSProperty):
134+
"""
135+
`OrchestrationExecutor <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-orchestrationexecutor.html>`__
136+
"""
137+
138+
props: PropsDictType = {
139+
"Lambda": (str, True),
140+
}
141+
142+
143+
class CustomOrchestration(AWSProperty):
144+
"""
145+
`CustomOrchestration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-customorchestration.html>`__
146+
"""
147+
148+
props: PropsDictType = {
149+
"Executor": (OrchestrationExecutor, False),
150+
}
151+
152+
110153
class GuardrailConfiguration(AWSProperty):
111154
"""
112155
`GuardrailConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-guardrailconfiguration.html>`__
@@ -118,6 +161,28 @@ class GuardrailConfiguration(AWSProperty):
118161
}
119162

120163

164+
class SessionSummaryConfiguration(AWSProperty):
165+
"""
166+
`SessionSummaryConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-sessionsummaryconfiguration.html>`__
167+
"""
168+
169+
props: PropsDictType = {
170+
"MaxRecentSessions": (double, False),
171+
}
172+
173+
174+
class MemoryConfiguration(AWSProperty):
175+
"""
176+
`MemoryConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-memoryconfiguration.html>`__
177+
"""
178+
179+
props: PropsDictType = {
180+
"EnabledMemoryTypes": ([str], False),
181+
"SessionSummaryConfiguration": (SessionSummaryConfiguration, False),
182+
"StorageDays": (double, False),
183+
}
184+
185+
121186
class InferenceConfiguration(AWSProperty):
122187
"""
123188
`InferenceConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-inferenceconfiguration.html>`__
@@ -139,6 +204,7 @@ class PromptConfiguration(AWSProperty):
139204

140205
props: PropsDictType = {
141206
"BasePromptTemplate": (str, False),
207+
"FoundationModel": (str, False),
142208
"InferenceConfiguration": (InferenceConfiguration, False),
143209
"ParserMode": (str, False),
144210
"PromptCreationMode": (str, False),
@@ -167,16 +233,21 @@ class Agent(AWSObject):
167233

168234
props: PropsDictType = {
169235
"ActionGroups": ([AgentActionGroup], False),
236+
"AgentCollaboration": (str, False),
237+
"AgentCollaborators": ([AgentCollaborator], False),
170238
"AgentName": (str, True),
171239
"AgentResourceRoleArn": (str, False),
172240
"AutoPrepare": (boolean, False),
241+
"CustomOrchestration": (CustomOrchestration, False),
173242
"CustomerEncryptionKeyArn": (str, False),
174243
"Description": (str, False),
175244
"FoundationModel": (str, False),
176245
"GuardrailConfiguration": (GuardrailConfiguration, False),
177246
"IdleSessionTTLInSeconds": (double, False),
178247
"Instruction": (str, False),
179248
"KnowledgeBases": ([AgentKnowledgeBase], False),
249+
"MemoryConfiguration": (MemoryConfiguration, False),
250+
"OrchestrationType": (str, False),
180251
"PromptOverrideConfiguration": (PromptOverrideConfiguration, False),
181252
"SkipResourceInUseCheckOnDelete": (boolean, False),
182253
"Tags": (dict, False),

troposphere/ec2.py

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,16 @@ class IpamOperatingRegion(AWSProperty):
767767
}
768768

769769

770+
class IpamOrganizationalUnitExclusion(AWSProperty):
771+
"""
772+
`IpamOrganizationalUnitExclusion <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ipam-ipamorganizationalunitexclusion.html>`__
773+
"""
774+
775+
props: PropsDictType = {
776+
"OrganizationsEntityPath": (str, True),
777+
}
778+
779+
770780
class IPAM(AWSObject):
771781
"""
772782
`IPAM <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipam.html>`__
@@ -775,6 +785,10 @@ class IPAM(AWSObject):
775785
resource_type = "AWS::EC2::IPAM"
776786

777787
props: PropsDictType = {
788+
"DefaultResourceDiscoveryOrganizationalUnitExclusions": (
789+
[IpamOrganizationalUnitExclusion],
790+
False,
791+
),
778792
"Description": (str, False),
779793
"EnablePrivateGua": (boolean, False),
780794
"OperatingRegions": ([IpamOperatingRegion], False),
@@ -862,6 +876,16 @@ class IPAMPoolCidr(AWSObject):
862876
}
863877

864878

879+
class IpamResourceDiscoveryOrganizationalUnitExclusion(AWSProperty):
880+
"""
881+
`IpamResourceDiscoveryOrganizationalUnitExclusion <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ipamresourcediscovery-ipamresourcediscoveryorganizationalunitexclusion.html>`__
882+
"""
883+
884+
props: PropsDictType = {
885+
"OrganizationsEntityPath": (str, True),
886+
}
887+
888+
865889
class IPAMResourceDiscovery(AWSObject):
866890
"""
867891
`IPAMResourceDiscovery <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamresourcediscovery.html>`__
@@ -872,6 +896,10 @@ class IPAMResourceDiscovery(AWSObject):
872896
props: PropsDictType = {
873897
"Description": (str, False),
874898
"OperatingRegions": ([IpamOperatingRegion], False),
899+
"OrganizationalUnitExclusions": (
900+
[IpamResourceDiscoveryOrganizationalUnitExclusion],
901+
False,
902+
),
875903
"Tags": (Tags, False),
876904
}
877905

troposphere/mediapackagev2.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,26 @@
1010
from .validators import boolean, double, integer
1111

1212

13+
class InputSwitchConfiguration(AWSProperty):
14+
"""
15+
`InputSwitchConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-channel-inputswitchconfiguration.html>`__
16+
"""
17+
18+
props: PropsDictType = {
19+
"MQCSInputSwitching": (boolean, False),
20+
}
21+
22+
23+
class OutputHeaderConfiguration(AWSProperty):
24+
"""
25+
`OutputHeaderConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-channel-outputheaderconfiguration.html>`__
26+
"""
27+
28+
props: PropsDictType = {
29+
"PublishMQCS": (boolean, False),
30+
}
31+
32+
1333
class Channel(AWSObject):
1434
"""
1535
`Channel <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackagev2-channel.html>`__
@@ -21,7 +41,9 @@ class Channel(AWSObject):
2141
"ChannelGroupName": (str, True),
2242
"ChannelName": (str, True),
2343
"Description": (str, False),
44+
"InputSwitchConfiguration": (InputSwitchConfiguration, False),
2445
"InputType": (str, False),
46+
"OutputHeaderConfiguration": (OutputHeaderConfiguration, False),
2547
"Tags": (Tags, False),
2648
}
2749

troposphere/sagemaker.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,6 +1138,7 @@ class ProductionVariant(AWSProperty):
11381138
props: PropsDictType = {
11391139
"ContainerStartupHealthCheckTimeoutInSeconds": (integer, False),
11401140
"EnableSSMAccess": (boolean, False),
1141+
"InferenceAmiVersion": (str, False),
11411142
"InitialInstanceCount": (integer, False),
11421143
"InitialVariantWeight": (double, False),
11431144
"InstanceType": (str, False),

troposphere/wisdom.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ class AnswerRecommendationAIAgentConfiguration(AWSProperty):
9191
"AnswerGenerationAIPromptId": (str, False),
9292
"AssociationConfigurations": ([AssociationConfiguration], False),
9393
"IntentLabelingGenerationAIPromptId": (str, False),
94+
"Locale": (str, False),
9495
"QueryReformulationAIPromptId": (str, False),
9596
}
9697

@@ -104,6 +105,7 @@ class ManualSearchAIAgentConfiguration(AWSProperty):
104105
"AnswerGenerationAIGuardrailId": (str, False),
105106
"AnswerGenerationAIPromptId": (str, False),
106107
"AssociationConfigurations": ([AssociationConfiguration], False),
108+
"Locale": (str, False),
107109
}
108110

109111

@@ -120,6 +122,17 @@ class SelfServiceAIAgentConfiguration(AWSProperty):
120122
}
121123

122124

125+
class SessionSummarizationAIAgentConfiguration(AWSProperty):
126+
"""
127+
`SessionSummarizationAIAgentConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-aiagent-sessionsummarizationaiagentconfiguration.html>`__
128+
"""
129+
130+
props: PropsDictType = {
131+
"Locale": (str, False),
132+
"SessionSummarizationAIPromptId": (str, False),
133+
}
134+
135+
123136
class AIAgentConfiguration(AWSProperty):
124137
"""
125138
`AIAgentConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-aiagent-aiagentconfiguration.html>`__
@@ -132,6 +145,10 @@ class AIAgentConfiguration(AWSProperty):
132145
),
133146
"ManualSearchAIAgentConfiguration": (ManualSearchAIAgentConfiguration, False),
134147
"SelfServiceAIAgentConfiguration": (SelfServiceAIAgentConfiguration, False),
148+
"SessionSummarizationAIAgentConfiguration": (
149+
SessionSummarizationAIAgentConfiguration,
150+
False,
151+
),
135152
}
136153

137154

troposphere/workspacesweb.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,19 @@ class CookieSynchronizationConfiguration(AWSProperty):
227227
}
228228

229229

230+
class ToolbarConfiguration(AWSProperty):
231+
"""
232+
`ToolbarConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspacesweb-usersettings-toolbarconfiguration.html>`__
233+
"""
234+
235+
props: PropsDictType = {
236+
"HiddenToolbarItems": ([str], False),
237+
"MaxDisplayResolution": (str, False),
238+
"ToolbarType": (str, False),
239+
"VisualMode": (str, False),
240+
}
241+
242+
230243
class UserSettings(AWSObject):
231244
"""
232245
`UserSettings <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-usersettings.html>`__
@@ -249,5 +262,6 @@ class UserSettings(AWSObject):
249262
"PasteAllowed": (str, True),
250263
"PrintAllowed": (str, True),
251264
"Tags": (Tags, False),
265+
"ToolbarConfiguration": (ToolbarConfiguration, False),
252266
"UploadAllowed": (str, True),
253267
}

0 commit comments

Comments
 (0)