Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vrtdev/troposphere
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 54347607a039b2329450c13294d5ba080724f442
Choose a base ref
..
head repository: vrtdev/troposphere
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f4ed6f9735839959ff9e2ae58794fd2929484252
Choose a head ref
Showing with 42 additions and 76 deletions.
  1. +0 −12 troposphere/dynamodb.py
  2. +0 −11 troposphere/ec2.py
  3. +1 −1 troposphere/elasticache.py
  4. +3 −2 troposphere/glue.py
  5. +2 −2 troposphere/guardduty.py
  6. +12 −12 troposphere/mediapackagev2.py
  7. +24 −36 troposphere/wafv2.py
12 changes: 0 additions & 12 deletions troposphere/dynamodb.py
View file
Original file line number Diff line number Diff line change
@@ -212,23 +212,12 @@ class ReplicaSpecification(AWSProperty):
}


class ResourcePolicy(AWSProperty):
"""
`ResourcePolicy <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-resourcepolicy.html>`__
"""

props: PropsDictType = {
"PolicyDocument": (dict, True),
}


class StreamSpecification(AWSProperty):
"""
`StreamSpecification <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-streamspecification.html>`__
"""

props: PropsDictType = {
"ResourcePolicy": (ResourcePolicy, False),
"StreamViewType": (str, True),
}

@@ -371,7 +360,6 @@ class Table(AWSObject):
"LocalSecondaryIndexes": ([LocalSecondaryIndex], False),
"PointInTimeRecoverySpecification": (PointInTimeRecoverySpecification, False),
"ProvisionedThroughput": (ProvisionedThroughput, False),
"ResourcePolicy": (ResourcePolicy, False),
"SSESpecification": (SSESpecification, False),
"StreamSpecification": (StreamSpecification, False),
"TableClass": (table_class_validator, False),
11 changes: 0 additions & 11 deletions troposphere/ec2.py
View file
Original file line number Diff line number Diff line change
@@ -204,16 +204,6 @@ class ClientLoginBannerOptions(AWSProperty):
}


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

props: PropsDictType = {
"Enabled": (boolean, False),
}


class ConnectionLogOptions(AWSProperty):
"""
`ConnectionLogOptions <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-connectionlogoptions.html>`__
@@ -238,7 +228,6 @@ class ClientVpnEndpoint(AWSObject):
"ClientCidrBlock": (str, True),
"ClientConnectOptions": (ClientConnectOptions, False),
"ClientLoginBannerOptions": (ClientLoginBannerOptions, False),
"ClientRouteMonitoringOptions": (ClientRouteMonitoringOptions, False),
"ConnectionLogOptions": (ConnectionLogOptions, True),
"Description": (str, False),
"DnsServers": ([str], False),
2 changes: 1 addition & 1 deletion troposphere/elasticache.py
View file
Original file line number Diff line number Diff line change
@@ -156,7 +156,7 @@ class GlobalReplicationGroup(AWSObject):

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

resource_type = "AWS::ElastiCache::ParameterGroup"
5 changes: 3 additions & 2 deletions troposphere/glue.py
View file
Original file line number Diff line number Diff line change
@@ -319,6 +319,7 @@ class EncryptionAtRest(AWSProperty):

props: PropsDictType = {
"CatalogEncryptionMode": (str, False),
"CatalogEncryptionServiceRole": (str, False),
"SseAwsKmsKeyId": (str, False),
}

@@ -988,8 +989,8 @@ class TableOptimizerConfiguration(AWSProperty):
"""

props: PropsDictType = {
"Enabled": (boolean, False),
"RoleArn": (str, False),
"Enabled": (boolean, True),
"RoleArn": (str, True),
}


4 changes: 2 additions & 2 deletions troposphere/guardduty.py
View file
Original file line number Diff line number Diff line change
@@ -213,10 +213,10 @@ class Member(AWSObject):
resource_type = "AWS::GuardDuty::Member"

props: PropsDictType = {
"DetectorId": (str, True),
"DetectorId": (str, False),
"DisableEmailNotification": (boolean, False),
"Email": (str, True),
"MemberId": (str, True),
"MemberId": (str, False),
"Message": (str, False),
"Status": (str, False),
}
24 changes: 12 additions & 12 deletions troposphere/mediapackagev2.py
View file
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@ class Channel(AWSObject):
resource_type = "AWS::MediaPackageV2::Channel"

props: PropsDictType = {
"ChannelGroupName": (str, False),
"ChannelName": (str, False),
"ChannelGroupName": (str, True),
"ChannelName": (str, True),
"Description": (str, False),
"Tags": (Tags, False),
}
@@ -33,7 +33,7 @@ class ChannelGroup(AWSObject):
resource_type = "AWS::MediaPackageV2::ChannelGroup"

props: PropsDictType = {
"ChannelGroupName": (str, False),
"ChannelGroupName": (str, True),
"Description": (str, False),
"Tags": (Tags, False),
}
@@ -47,8 +47,8 @@ class ChannelPolicy(AWSObject):
resource_type = "AWS::MediaPackageV2::ChannelPolicy"

props: PropsDictType = {
"ChannelGroupName": (str, False),
"ChannelName": (str, False),
"ChannelGroupName": (str, True),
"ChannelName": (str, True),
"Policy": (dict, True),
}

@@ -191,13 +191,13 @@ class OriginEndpoint(AWSObject):
resource_type = "AWS::MediaPackageV2::OriginEndpoint"

props: PropsDictType = {
"ChannelGroupName": (str, False),
"ChannelName": (str, False),
"ContainerType": (str, True),
"ChannelGroupName": (str, True),
"ChannelName": (str, True),
"ContainerType": (str, False),
"Description": (str, False),
"HlsManifests": ([HlsManifestConfiguration], False),
"LowLatencyHlsManifests": ([LowLatencyHlsManifestConfiguration], False),
"OriginEndpointName": (str, False),
"OriginEndpointName": (str, True),
"Segment": (Segment, False),
"StartoverWindowSeconds": (integer, False),
"Tags": (Tags, False),
@@ -212,9 +212,9 @@ class OriginEndpointPolicy(AWSObject):
resource_type = "AWS::MediaPackageV2::OriginEndpointPolicy"

props: PropsDictType = {
"ChannelGroupName": (str, False),
"ChannelName": (str, False),
"OriginEndpointName": (str, False),
"ChannelGroupName": (str, True),
"ChannelName": (str, True),
"OriginEndpointName": (str, True),
"Policy": (dict, True),
}

60 changes: 24 additions & 36 deletions troposphere/wafv2.py
View file
Original file line number Diff line number Diff line change
@@ -38,30 +38,6 @@ class IPSet(AWSObject):
}


class JsonMatchPattern(AWSProperty):
"""
`JsonMatchPattern <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-jsonmatchpattern.html>`__
"""

props: PropsDictType = {
"All": (dict, False),
"IncludedPaths": ([str], False),
}


class JsonBody(AWSProperty):
"""
`JsonBody <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-jsonbody.html>`__
"""

props: PropsDictType = {
"InvalidFallbackBehavior": (str, False),
"MatchPattern": (JsonMatchPattern, True),
"MatchScope": (str, True),
"OversizeHandling": (str, False),
}


class SingleHeader(AWSProperty):
"""
`SingleHeader <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-singleheader.html>`__
@@ -78,7 +54,6 @@ class LoggingConfigurationFieldToMatch(AWSProperty):
"""

props: PropsDictType = {
"JsonBody": (JsonBody, False),
"Method": (dict, False),
"QueryString": (dict, False),
"SingleHeader": (SingleHeader, False),
@@ -397,6 +372,30 @@ class Headers(AWSProperty):
}


class JsonMatchPattern(AWSProperty):
"""
`JsonMatchPattern <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-jsonmatchpattern.html>`__
"""

props: PropsDictType = {
"All": (dict, False),
"IncludedPaths": ([str], False),
}


class JsonBody(AWSProperty):
"""
`JsonBody <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-jsonbody.html>`__
"""

props: PropsDictType = {
"InvalidFallbackBehavior": (str, False),
"MatchPattern": (JsonMatchPattern, True),
"MatchScope": (str, True),
"OversizeHandling": (str, False),
}


class SingleQueryArgument(AWSProperty):
"""
`SingleQueryArgument <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-singlequeryargument.html>`__
@@ -1049,14 +1048,3 @@ class WebACLAssociation(AWSObject):
"ResourceArn": (str, True),
"WebACLArn": (str, True),
}


class MatchPattern(AWSProperty):
"""
`MatchPattern <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-loggingconfiguration-matchpattern.html>`__
"""

props: PropsDictType = {
"All": (dict, False),
"IncludedPaths": ([str], False),
}