Updates from spec version 180.0.0 (updated)

Spec version 180.0.0 was updated around 2024-07-12. This change also resolves some conflicts in AWS::SES that came in this update.
cloudtools · Jul 14, 2024 · b947a39 · b947a39
1 parent 93f7667
commit b947a39
Show file tree

Hide file tree

Showing 8 changed files with 603 additions and 44 deletions.
diff --git a/scripts/patches/ses.py b/scripts/patches/ses.py
@@ -10,4 +10,26 @@
         "path": "/ResourceTypes/AWS::SES::Template/Properties/Template/Type",
         "value": "EmailTemplate",
     },
+    # Resolve conflict between AWS::SES::ReceiptRule.Rule and AWS::SES::MailManagerRuleSet.Rule
+    {
+        "op": "move",
+        "from": "/PropertyTypes/AWS::SES::MailManagerRuleSet.Rule",
+        "path": "/PropertyTypes/AWS::SES::MailManagerRuleSet.MailManagerRule",
+    },
+    {
+        "op": "replace",
+        "path": "/ResourceTypes/AWS::SES::MailManagerRuleSet/Properties/Rules/ItemType",
+        "value": "MailManagerRule",
+    },
+    # Resolve conflict between AWS::SES::ReceiptRule.S3Actio and AWS::SES::MailManagerRuleSet.S3Action
+    {
+        "op": "move",
+        "from": "/PropertyTypes/AWS::SES::MailManagerRuleSet.S3Action",
+        "path": "/PropertyTypes/AWS::SES::MailManagerRuleSet.MailManagerS3Action",
+    },
+    {
+        "op": "replace",
+        "path": "/PropertyTypes/AWS::SES::MailManagerRuleSet.RuleAction/Properties/WriteToS3/Type",
+        "value": "MailManagerS3Action",
+    },
 ]
diff --git a/troposphere/cloudformation.py b/troposphere/cloudformation.py
@@ -234,6 +234,7 @@ class OperationPreferences(AWSProperty):
     """
 
     props: PropsDictType = {
+        "ConcurrencyMode": (str, False),
         "FailureToleranceCount": (integer, False),
         "FailureTolerancePercentage": (integer, False),
         "MaxConcurrentCount": (integer, False),

diff --git a/troposphere/codepipeline.py b/troposphere/codepipeline.py
@@ -71,7 +71,7 @@ class CustomActionType(AWSObject):
 
 class EncryptionKey(AWSProperty):
     """
-    `EncryptionKey <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore-encryptionkey.html>`__
+    `EncryptionKey <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-encryptionkey.html>`__
     """
 
     props: PropsDictType = {
@@ -105,7 +105,7 @@ class ArtifactStoreMap(AWSProperty):
 
 class DisableInboundStageTransitions(AWSProperty):
     """
-    `DisableInboundStageTransitions <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-disableinboundstagetransitions.html>`__
+    `DisableInboundStageTransitions <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stagetransition.html>`__
     """
 
     props: PropsDictType = {
@@ -116,7 +116,7 @@ class DisableInboundStageTransitions(AWSProperty):
 
 class GitBranchFilterCriteria(AWSProperty):
     """
-    `GitBranchFilterCriteria <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-branch-filter-criteria.html>`__
+    `GitBranchFilterCriteria <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitbranchfiltercriteria.html>`__
     """
 
     props: PropsDictType = {
@@ -127,7 +127,7 @@ class GitBranchFilterCriteria(AWSProperty):
 
 class GitFilePathFilterCriteria(AWSProperty):
     """
-    `GitFilePathFilterCriteria <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-file-path-filter-criteria.html>`__
+    `GitFilePathFilterCriteria <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitfilepathfiltercriteria.html>`__
     """
 
     props: PropsDictType = {
@@ -138,7 +138,7 @@ class GitFilePathFilterCriteria(AWSProperty):
 
 class GitPullRequestFilter(AWSProperty):
     """
-    `GitPullRequestFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-pull-request-filter.html>`__
+    `GitPullRequestFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitpullrequestfilter.html>`__
     """
 
     props: PropsDictType = {
@@ -150,7 +150,7 @@ class GitPullRequestFilter(AWSProperty):
 
 class GitTagFilterCriteria(AWSProperty):
     """
-    `GitTagFilterCriteria <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-tag-filter-criteria.html>`__
+    `GitTagFilterCriteria <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gittagfiltercriteria.html>`__
     """
 
     props: PropsDictType = {
@@ -161,7 +161,7 @@ class GitTagFilterCriteria(AWSProperty):
 
 class GitPushFilter(AWSProperty):
     """
-    `GitPushFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-push-filter.html>`__
+    `GitPushFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitpushfilter.html>`__
     """
 
     props: PropsDictType = {
@@ -173,7 +173,7 @@ class GitPushFilter(AWSProperty):
 
 class GitConfiguration(AWSProperty):
     """
-    `GitConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-configuration.html>`__
+    `GitConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitconfiguration.html>`__
     """
 
     props: PropsDictType = {
@@ -185,7 +185,7 @@ class GitConfiguration(AWSProperty):
 
 class PipelineTriggerDeclaration(AWSProperty):
     """
-    `PipelineTriggerDeclaration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers.html>`__
+    `PipelineTriggerDeclaration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-pipelinetriggerdeclaration.html>`__
     """
 
     props: PropsDictType = {
@@ -196,7 +196,7 @@ class PipelineTriggerDeclaration(AWSProperty):
 
 class ActionTypeId(AWSProperty):
     """
-    `ActionTypeId <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-actiontypeid.html>`__
+    `ActionTypeId <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiontypeid.html>`__
     """
 
     props: PropsDictType = {
@@ -209,7 +209,7 @@ class ActionTypeId(AWSProperty):
 
 class InputArtifacts(AWSProperty):
     """
-    `InputArtifacts <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-inputartifacts.html>`__
+    `InputArtifacts <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-inputartifact.html>`__
     """
 
     props: PropsDictType = {
@@ -219,7 +219,7 @@ class InputArtifacts(AWSProperty):
 
 class OutputArtifacts(AWSProperty):
     """
-    `OutputArtifacts <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-outputartifacts.html>`__
+    `OutputArtifacts <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-outputartifact.html>`__
     """
 
     props: PropsDictType = {
@@ -229,7 +229,7 @@ class OutputArtifacts(AWSProperty):
 
 class Actions(AWSProperty):
     """
-    `Actions <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html>`__
+    `Actions <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiondeclaration.html>`__
     """
 
     props: PropsDictType = {
@@ -248,7 +248,7 @@ class Actions(AWSProperty):
 
 class Blockers(AWSProperty):
     """
-    `Blockers <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-blockers.html>`__
+    `Blockers <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-blockerdeclaration.html>`__
     """
 
     props: PropsDictType = {
@@ -259,17 +259,17 @@ class Blockers(AWSProperty):
 
 class FailureConditions(AWSProperty):
     """
-    `FailureConditions <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-failure-conditions.html>`__
+    `FailureConditions <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-failureconditions.html>`__
     """
 
     props: PropsDictType = {
-        "Result": (str, True),
+        "Result": (str, False),
     }
 
 
 class Stages(AWSProperty):
     """
-    `Stages <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages.html>`__
+    `Stages <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stagedeclaration.html>`__
     """
 
     props: PropsDictType = {
@@ -282,7 +282,7 @@ class Stages(AWSProperty):
 
 class VariableDeclaration(AWSProperty):
     """
-    `VariableDeclaration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-variables.html>`__
+    `VariableDeclaration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-variabledeclaration.html>`__
     """
 
     props: PropsDictType = {

diff --git a/troposphere/deadline.py b/troposphere/deadline.py
@@ -226,11 +226,8 @@ class MeteredProduct(AWSObject):
     resource_type = "AWS::Deadline::MeteredProduct"
 
     props: PropsDictType = {
-        "Family": (str, False),
         "LicenseEndpointId": (str, False),
-        "Port": (integer, False),
         "ProductId": (str, False),
-        "Vendor": (str, False),
     }
 
 

diff --git a/troposphere/ec2.py b/troposphere/ec2.py
@@ -2453,6 +2453,7 @@ class TrafficMirrorFilterRule(AWSObject):
         "RuleNumber": (integer, True),
         "SourceCidrBlock": (str, True),
         "SourcePortRange": (TrafficMirrorPortRange, False),
+        "Tags": (Tags, False),
         "TrafficDirection": (str, True),
         "TrafficMirrorFilterId": (str, True),
     }

diff --git a/troposphere/entityresolution.py b/troposphere/entityresolution.py
@@ -10,6 +10,30 @@
 from .validators import boolean
 
 
+class Rule(AWSProperty):
+    """
+    `Rule <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-matchingworkflow-rule.html>`__
+    """
+
+    props: PropsDictType = {
+        "MatchingKeys": ([str], True),
+        "RuleName": (str, True),
+    }
+
+
+class IdMappingRuleBasedProperties(AWSProperty):
+    """
+    `IdMappingRuleBasedProperties <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idmappingworkflow-idmappingrulebasedproperties.html>`__
+    """
+
+    props: PropsDictType = {
+        "AttributeMatchingModel": (str, True),
+        "RecordMatchingModel": (str, True),
+        "RuleDefinitionType": (str, False),
+        "Rules": ([Rule], False),
+    }
+
+
 class IntermediateSourceConfiguration(AWSProperty):
     """
     `IntermediateSourceConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-matchingworkflow-intermediatesourceconfiguration.html>`__
@@ -39,7 +63,9 @@ class IdMappingTechniques(AWSProperty):
 
     props: PropsDictType = {
         "IdMappingType": (str, False),
+        "NormalizationVersion": (str, False),
         "ProviderProperties": (ProviderProperties, False),
+        "RuleBasedProperties": (IdMappingRuleBasedProperties, False),
     }
 
 
@@ -95,6 +121,19 @@ class NamespaceProviderProperties(AWSProperty):
     }
 
 
+class NamespaceRuleBasedProperties(AWSProperty):
+    """
+    `NamespaceRuleBasedProperties <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idnamespace-namespacerulebasedproperties.html>`__
+    """
+
+    props: PropsDictType = {
+        "AttributeMatchingModel": (str, False),
+        "RecordMatchingModels": ([str], False),
+        "RuleDefinitionTypes": ([str], False),
+        "Rules": ([Rule], False),
+    }
+
+
 class IdNamespaceIdMappingWorkflowProperties(AWSProperty):
     """
     `IdNamespaceIdMappingWorkflowProperties <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idnamespace-idnamespaceidmappingworkflowproperties.html>`__
@@ -103,6 +142,7 @@ class IdNamespaceIdMappingWorkflowProperties(AWSProperty):
     props: PropsDictType = {
         "IdMappingType": (str, True),
         "ProviderProperties": (NamespaceProviderProperties, False),
+        "RuleBasedProperties": (NamespaceRuleBasedProperties, False),
     }
 
 
@@ -174,24 +214,14 @@ class OutputSource(AWSProperty):
     }
 
 
-class Rule(AWSProperty):
-    """
-    `Rule <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-matchingworkflow-rule.html>`__
-    """
-
-    props: PropsDictType = {
-        "MatchingKeys": ([str], True),
-        "RuleName": (str, True),
-    }
-
-
 class RuleBasedProperties(AWSProperty):
     """
     `RuleBasedProperties <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-matchingworkflow-rulebasedproperties.html>`__
     """
 
     props: PropsDictType = {
         "AttributeMatchingModel": (str, True),
+        "MatchPurpose": (str, False),
         "Rules": ([Rule], True),
     }
 
@@ -251,6 +281,7 @@ class SchemaInputAttribute(AWSProperty):
     props: PropsDictType = {
         "FieldName": (str, True),
         "GroupName": (str, False),
+        "Hashed": (boolean, False),
         "MatchKey": (str, False),
         "SubType": (str, False),
         "Type": (str, True),