Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates from spec version 145.0.0 #2195

Merged
merged 1 commit into from Oct 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions troposphere/appconfig.py
Expand Up @@ -50,6 +50,7 @@ class ConfigurationProfile(AWSObject):
props: PropsDictType = {
"ApplicationId": (str, True),
"Description": (str, False),
"KmsKeyIdentifier": (str, False),
"LocationUri": (str, True),
"Name": (str, True),
"RetrievalRoleArn": (str, False),
Expand Down
2 changes: 1 addition & 1 deletion troposphere/appintegrations.py
Expand Up @@ -45,7 +45,7 @@ class DataIntegration(AWSObject):
"KmsKey": (str, True),
"Name": (str, True),
"ObjectConfiguration": (dict, False),
"ScheduleConfig": (ScheduleConfig, True),
"ScheduleConfig": (ScheduleConfig, False),
"SourceURI": (str, True),
"Tags": (Tags, False),
}
Expand Down
26 changes: 13 additions & 13 deletions troposphere/autoscaling.py
Expand Up @@ -64,7 +64,7 @@ class LifecycleHookSpecification(AWSProperty):

class MetricsCollection(AWSProperty):
"""
`MetricsCollection <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-metricscollection.html>`__
`MetricsCollection <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-metricscollection.html>`__
"""

props: PropsDictType = {
Expand All @@ -75,7 +75,7 @@ class MetricsCollection(AWSProperty):

class InstancesDistribution(AWSProperty):
"""
`InstancesDistribution <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancesdistribution.html>`__
`InstancesDistribution <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-instancesdistribution.html>`__
"""

props: PropsDictType = {
Expand Down Expand Up @@ -127,8 +127,8 @@ class MemoryGiBPerVCpuRequest(AWSProperty):
"""

props: PropsDictType = {
"Max": (integer, False),
"Min": (integer, False),
"Max": (double, False),
"Min": (double, False),
}


Expand Down Expand Up @@ -171,8 +171,8 @@ class TotalLocalStorageGBRequest(AWSProperty):
"""

props: PropsDictType = {
"Max": (integer, False),
"Min": (integer, False),
"Max": (double, False),
"Min": (double, False),
}


Expand All @@ -189,7 +189,7 @@ class VCpuCountRequest(AWSProperty):

class InstanceRequirements(AWSProperty):
"""
`InstanceRequirements <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html>`__
`InstanceRequirements <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-instancerequirements.html>`__
"""

props: PropsDictType = {
Expand Down Expand Up @@ -221,7 +221,7 @@ class InstanceRequirements(AWSProperty):

class LaunchTemplateOverrides(AWSProperty):
"""
`LaunchTemplateOverrides <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-launchtemplateoverrides.html>`__
`LaunchTemplateOverrides <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-launchtemplateoverrides.html>`__
"""

props: PropsDictType = {
Expand All @@ -234,7 +234,7 @@ class LaunchTemplateOverrides(AWSProperty):

class LaunchTemplate(AWSProperty):
"""
`LaunchTemplate <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-launchtemplate.html>`__
`LaunchTemplate <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-launchtemplate.html>`__
"""

props: PropsDictType = {
Expand All @@ -245,7 +245,7 @@ class LaunchTemplate(AWSProperty):

class MixedInstancesPolicy(AWSProperty):
"""
`MixedInstancesPolicy <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-group-mixedinstancespolicy.html>`__
`MixedInstancesPolicy <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-mixedinstancespolicy.html>`__
"""

props: PropsDictType = {
Expand All @@ -256,18 +256,18 @@ class MixedInstancesPolicy(AWSProperty):

class NotificationConfigurations(AWSProperty):
"""
`NotificationConfigurations <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-notificationconfigurations.html>`__
`NotificationConfigurations <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-notificationconfiguration.html>`__
"""

props: PropsDictType = {
"NotificationTypes": ([str], False),
"TopicARN": (str, True),
"TopicARN": ([str], True),
}


class AutoScalingGroup(AWSObject):
"""
`AutoScalingGroup <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html>`__
`AutoScalingGroup <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-autoscalinggroup.html>`__
"""

resource_type = "AWS::AutoScaling::AutoScalingGroup"
Expand Down
13 changes: 13 additions & 0 deletions troposphere/awslambda.py
Expand Up @@ -417,6 +417,7 @@ class Function(AWSObject):
"Layers": ([str], False),
"MemorySize": (validate_memory_size, False),
"PackageType": (validate_package_type, False),
"Policy": (dict, False),
"ReservedConcurrentExecutions": (integer, False),
"Role": (str, True),
"Runtime": (str, False),
Expand Down Expand Up @@ -523,6 +524,17 @@ class Url(AWSObject):
}


class RuntimePolicy(AWSProperty):
"""
`RuntimePolicy <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-version-runtimepolicy.html>`__
"""

props: PropsDictType = {
"RuntimeVersionArn": (str, False),
"UpdateRuntimeOn": (str, True),
}


class Version(AWSObject):
"""
`Version <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-version.html>`__
Expand All @@ -535,6 +547,7 @@ class Version(AWSObject):
"Description": (str, False),
"FunctionName": (str, True),
"ProvisionedConcurrencyConfig": (ProvisionedConcurrencyConfiguration, False),
"RuntimePolicy": (RuntimePolicy, False),
}


Expand Down
39 changes: 37 additions & 2 deletions troposphere/cognito.py
Expand Up @@ -7,7 +7,7 @@


from . import AWSObject, AWSProperty, PropsDictType
from .validators import boolean, double, integer
from .validators import boolean, integer
from .validators.cognito import validate_recoveryoption_name


Expand Down Expand Up @@ -97,6 +97,41 @@ class IdentityPoolRoleAttachment(AWSObject):
}


class CloudWatchLogsConfiguration(AWSProperty):
"""
`CloudWatchLogsConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-logdeliveryconfiguration-cloudwatchlogsconfiguration.html>`__
"""

props: PropsDictType = {
"LogGroupArn": (str, False),
}


class LogConfiguration(AWSProperty):
"""
`LogConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-logdeliveryconfiguration-logconfiguration.html>`__
"""

props: PropsDictType = {
"CloudWatchLogsConfiguration": (CloudWatchLogsConfiguration, False),
"EventSource": (str, False),
"LogLevel": (str, False),
}


class LogDeliveryConfiguration(AWSObject):
"""
`LogDeliveryConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-logdeliveryconfiguration.html>`__
"""

resource_type = "AWS::Cognito::LogDeliveryConfiguration"

props: PropsDictType = {
"LogConfigurations": ([LogConfiguration], False),
"UserPoolId": (str, True),
}


class RecoveryOption(AWSProperty):
"""
`RecoveryOption <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-recoveryoption.html>`__
Expand Down Expand Up @@ -459,7 +494,7 @@ class UserPoolGroup(AWSObject):
props: PropsDictType = {
"Description": (str, False),
"GroupName": (str, False),
"Precedence": (double, False),
"Precedence": (integer, False),
"RoleArn": (str, False),
"UserPoolId": (str, True),
}
Expand Down
2 changes: 2 additions & 0 deletions troposphere/connect.py
Expand Up @@ -395,6 +395,7 @@ class RoutingProfile(AWSObject):
resource_type = "AWS::Connect::RoutingProfile"

props: PropsDictType = {
"AgentAvailabilityTimer": (str, False),
"DefaultOutboundQueueArn": (str, True),
"Description": (str, True),
"InstanceArn": (str, True),
Expand Down Expand Up @@ -708,6 +709,7 @@ class UserHierarchyGroup(AWSObject):
"InstanceArn": (str, True),
"Name": (str, True),
"ParentGroupArn": (str, False),
"Tags": (Tags, False),
}


Expand Down
15 changes: 15 additions & 0 deletions troposphere/ec2.py
Expand Up @@ -2876,6 +2876,17 @@ class NetworkInterfaceOptions(AWSProperty):
}


class SseSpecification(AWSProperty):
"""
`SseSpecification <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-verifiedaccesstrustprovider-ssespecification.html>`__
"""

props: PropsDictType = {
"CustomerManagedKeyEnabled": (boolean, False),
"KmsKeyArn": (str, False),
}


class VerifiedAccessEndpoint(AWSObject):
"""
`VerifiedAccessEndpoint <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-verifiedaccessendpoint.html>`__
Expand All @@ -2895,6 +2906,7 @@ class VerifiedAccessEndpoint(AWSObject):
"PolicyDocument": (str, False),
"PolicyEnabled": (boolean, False),
"SecurityGroupIds": ([str], False),
"SseSpecification": (SseSpecification, False),
"Tags": (Tags, False),
"VerifiedAccessGroupId": (str, True),
}
Expand All @@ -2911,6 +2923,7 @@ class VerifiedAccessGroup(AWSObject):
"Description": (str, False),
"PolicyDocument": (str, False),
"PolicyEnabled": (boolean, False),
"SseSpecification": (SseSpecification, False),
"Tags": (Tags, False),
"VerifiedAccessInstanceId": (str, True),
}
Expand Down Expand Up @@ -2988,6 +3001,7 @@ class VerifiedAccessInstance(AWSObject):

props: PropsDictType = {
"Description": (str, False),
"FipsEnabled": (boolean, False),
"LoggingConfigurations": (VerifiedAccessLogs, False),
"Tags": (Tags, False),
"VerifiedAccessTrustProviderIds": ([str], False),
Expand Down Expand Up @@ -3034,6 +3048,7 @@ class VerifiedAccessTrustProvider(AWSObject):
"DeviceTrustProviderType": (str, False),
"OidcOptions": (OidcOptions, False),
"PolicyReferenceName": (str, True),
"SseSpecification": (SseSpecification, False),
"Tags": (Tags, False),
"TrustProviderType": (str, True),
"UserTrustProviderType": (str, False),
Expand Down
2 changes: 1 addition & 1 deletion troposphere/emr.py
Expand Up @@ -374,7 +374,7 @@ class ManagedScalingPolicy(AWSProperty):

class HadoopJarStepConfig(AWSProperty):
"""
`HadoopJarStepConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-hadoopjarstepconfig.html>`__
`HadoopJarStepConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-step-hadoopjarstepconfig.html>`__
"""

props: PropsDictType = {
Expand Down
13 changes: 2 additions & 11 deletions troposphere/events.py
Expand Up @@ -229,6 +229,7 @@ class EventBus(AWSObject):
props: PropsDictType = {
"EventSourceName": (str, False),
"Name": (str, True),
"Policy": (dict, False),
"Tags": (Tags, False),
}

Expand Down Expand Up @@ -427,6 +428,7 @@ class RedshiftDataParameters(AWSProperty):
"DbUser": (str, False),
"SecretManagerArn": (str, False),
"Sql": (str, False),
"Sqls": ([str], False),
"StatementName": (str, False),
"WithEvent": (boolean, False),
}
Expand Down Expand Up @@ -538,14 +540,3 @@ class Rule(AWSObject):
"Tags": (Tags, False),
"Targets": ([Target], False),
}


class TagEntry(AWSProperty):
"""
`TagEntry <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-eventbus-tagentry.html>`__
"""

props: PropsDictType = {
"Key": (str, True),
"Value": (str, True),
}
1 change: 1 addition & 0 deletions troposphere/gamelift.py
Expand Up @@ -174,6 +174,7 @@ class Fleet(AWSObject):
"EC2InstanceType": (str, False),
"FleetType": (str, False),
"InstanceRoleARN": (str, False),
"InstanceRoleCredentialsProvider": (str, False),
"Locations": ([LocationConfiguration], False),
"MaxSize": (integer, False),
"MetricGroups": ([str], False),
Expand Down
2 changes: 1 addition & 1 deletion troposphere/iam.py
Expand Up @@ -48,7 +48,7 @@ class Policy(AWSProperty):

class Group(AWSObject):
"""
`Group <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html>`__
`Group <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-group.html>`__
"""

resource_type = "AWS::IAM::Group"
Expand Down
13 changes: 13 additions & 0 deletions troposphere/iot.py
Expand Up @@ -541,6 +541,7 @@ class Policy(AWSObject):
props: PropsDictType = {
"PolicyDocument": (policytypes, True),
"PolicyName": (str, False),
"Tags": (Tags, False),
}


Expand Down Expand Up @@ -1106,6 +1107,17 @@ class IotSiteWiseAction(AWSProperty):
}


class KafkaActionHeader(AWSProperty):
"""
`KafkaActionHeader <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kafkaactionheader.html>`__
"""

props: PropsDictType = {
"Key": (str, True),
"Value": (str, True),
}


class KafkaAction(AWSProperty):
"""
`KafkaAction <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kafkaaction.html>`__
Expand All @@ -1114,6 +1126,7 @@ class KafkaAction(AWSProperty):
props: PropsDictType = {
"ClientProperties": (dict, True),
"DestinationArn": (str, True),
"Headers": ([KafkaActionHeader], False),
"Key": (str, False),
"Partition": (str, False),
"Topic": (str, True),
Expand Down
11 changes: 0 additions & 11 deletions troposphere/kendra.py
Expand Up @@ -548,16 +548,6 @@ class SharePointConfiguration(AWSProperty):
}


class TemplateConfiguration(AWSProperty):
"""
`TemplateConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-templateconfiguration.html>`__
"""

props: PropsDictType = {
"Template": (str, True),
}


class ProxyConfiguration(AWSProperty):
"""
`ProxyConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-proxyconfiguration.html>`__
Expand Down Expand Up @@ -671,7 +661,6 @@ class DataSourceConfiguration(AWSProperty):
"SalesforceConfiguration": (SalesforceConfiguration, False),
"ServiceNowConfiguration": (ServiceNowConfiguration, False),
"SharePointConfiguration": (SharePointConfiguration, False),
"TemplateConfiguration": (TemplateConfiguration, False),
"WebCrawlerConfiguration": (WebCrawlerConfiguration, False),
"WorkDocsConfiguration": (WorkDocsConfiguration, False),
}
Expand Down