Skip to content

Commit c23b2d9

Browse files
kddejongkddejong
authored
Fix an issue where SSM patches weren't emptied (#2765)
1 parent b1885ab commit c23b2d9

35 files changed

+516
-34979
lines changed

‎scripts/update_specs_services_from_ssm.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,12 @@ def add_spec_missing_services_patch(region, services):
204204
elif standard_spec_type == "ResourceTypes":
205205
print("patch for %s not found" % service)
206206

207-
if patches:
208-
filename = (
209-
"src/cfnlint/data/ExtendedSpecs/%s/07_ssm_service_addition.json" % region
210-
)
211-
with open(filename, "w+", encoding="utf-8") as f:
212-
json.dump(patches, f, indent=1, sort_keys=True, separators=(",", ": "))
207+
filename = (
208+
"src/cfnlint/data/ExtendedSpecs/%s/07_ssm_service_addition.json" % region
209+
)
210+
with open(filename, "w+", encoding="utf-8") as f:
211+
json.dump(patches, f, indent=1, sort_keys=True, separators=(",", ": "))
212+
213213

214214

215215
def main():

‎src/cfnlint/data/CloudSpecs/ap-east-1.json

Lines changed: 204 additions & 2328 deletions
Large diffs are not rendered by default.

‎src/cfnlint/data/CloudSpecs/ap-northeast-1.json

Lines changed: 7 additions & 231 deletions
Original file line numberDiff line numberDiff line change
@@ -4690,58 +4690,9 @@
46904690
"AWS::SES::ConfigurationSet.SuppressionOptions": "CACHED",
46914691
"AWS::SES::ConfigurationSet.TrackingOptions": "CACHED",
46924692
"AWS::SES::ConfigurationSet.VdmOptions": "CACHED",
4693-
"AWS::SES::ConfigurationSetEventDestination.CloudWatchDestination": {
4694-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-cloudwatchdestination.html",
4695-
"Properties": {
4696-
"DimensionConfigurations": {
4697-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-cloudwatchdestination.html#cfn-ses-configurationseteventdestination-cloudwatchdestination-dimensionconfigurations",
4698-
"ItemType": "DimensionConfiguration",
4699-
"Required": false,
4700-
"Type": "List",
4701-
"UpdateType": "Mutable"
4702-
}
4703-
}
4704-
},
4693+
"AWS::SES::ConfigurationSetEventDestination.CloudWatchDestination": "CACHED",
47054694
"AWS::SES::ConfigurationSetEventDestination.DimensionConfiguration": "CACHED",
4706-
"AWS::SES::ConfigurationSetEventDestination.EventDestination": {
4707-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventdestination.html",
4708-
"Properties": {
4709-
"CloudWatchDestination": {
4710-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventdestination.html#cfn-ses-configurationseteventdestination-eventdestination-cloudwatchdestination",
4711-
"Required": false,
4712-
"Type": "CloudWatchDestination",
4713-
"UpdateType": "Mutable"
4714-
},
4715-
"Enabled": {
4716-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventdestination.html#cfn-ses-configurationseteventdestination-eventdestination-enabled",
4717-
"PrimitiveType": "Boolean",
4718-
"Required": false,
4719-
"UpdateType": "Mutable"
4720-
},
4721-
"KinesisFirehoseDestination": {
4722-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventdestination.html#cfn-ses-configurationseteventdestination-eventdestination-kinesisfirehosedestination",
4723-
"Required": false,
4724-
"Type": "KinesisFirehoseDestination",
4725-
"UpdateType": "Mutable"
4726-
},
4727-
"MatchingEventTypes": {
4728-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventdestination.html#cfn-ses-configurationseteventdestination-eventdestination-matchingeventtypes",
4729-
"PrimitiveItemType": "String",
4730-
"Required": true,
4731-
"Type": "List",
4732-
"UpdateType": "Mutable"
4733-
},
4734-
"Name": {
4735-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventdestination.html#cfn-ses-configurationseteventdestination-eventdestination-name",
4736-
"PrimitiveType": "String",
4737-
"Required": false,
4738-
"UpdateType": "Mutable",
4739-
"Value": {
4740-
"ValueType": "AWS::SES::ConfigurationSetEventDestination.EventDestination.Name"
4741-
}
4742-
}
4743-
}
4744-
},
4695+
"AWS::SES::ConfigurationSetEventDestination.EventDestination": "CACHED",
47454696
"AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination": "CACHED",
47464697
"AWS::SES::ConfigurationSetEventDestination.SnsDestination": "CACHED",
47474698
"AWS::SES::ContactList.Topic": "CACHED",
@@ -4750,107 +4701,7 @@
47504701
"AWS::SES::EmailIdentity.DkimSigningAttributes": "CACHED",
47514702
"AWS::SES::EmailIdentity.FeedbackAttributes": "CACHED",
47524703
"AWS::SES::EmailIdentity.MailFromAttributes": "CACHED",
4753-
"AWS::SES::ReceiptFilter.Filter": "CACHED",
4754-
"AWS::SES::ReceiptFilter.IpFilter": {
4755-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptfilter-ipfilter.html",
4756-
"Properties": {
4757-
"Cidr": {
4758-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptfilter-ipfilter.html#cfn-ses-receiptfilter-ipfilter-cidr",
4759-
"PrimitiveType": "String",
4760-
"Required": true,
4761-
"UpdateType": "Mutable"
4762-
},
4763-
"Policy": {
4764-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptfilter-ipfilter.html#cfn-ses-receiptfilter-ipfilter-policy",
4765-
"PrimitiveType": "String",
4766-
"Required": true,
4767-
"UpdateType": "Mutable"
4768-
}
4769-
}
4770-
},
4771-
"AWS::SES::ReceiptRule.Action": "CACHED",
4772-
"AWS::SES::ReceiptRule.AddHeaderAction": "CACHED",
4773-
"AWS::SES::ReceiptRule.BounceAction": "CACHED",
4774-
"AWS::SES::ReceiptRule.LambdaAction": "CACHED",
4775-
"AWS::SES::ReceiptRule.Rule": {
4776-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-rule.html",
4777-
"Properties": {
4778-
"Actions": {
4779-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-rule.html#cfn-ses-receiptrule-rule-actions",
4780-
"ItemType": "Action",
4781-
"Required": false,
4782-
"Type": "List",
4783-
"UpdateType": "Mutable"
4784-
},
4785-
"Enabled": {
4786-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-rule.html#cfn-ses-receiptrule-rule-enabled",
4787-
"PrimitiveType": "Boolean",
4788-
"Required": false,
4789-
"UpdateType": "Mutable"
4790-
},
4791-
"Name": {
4792-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-rule.html#cfn-ses-receiptrule-rule-name",
4793-
"PrimitiveType": "String",
4794-
"Required": false,
4795-
"UpdateType": "Immutable"
4796-
},
4797-
"Recipients": {
4798-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-rule.html#cfn-ses-receiptrule-rule-recipients",
4799-
"PrimitiveItemType": "String",
4800-
"Required": false,
4801-
"Type": "List",
4802-
"UpdateType": "Mutable"
4803-
},
4804-
"ScanEnabled": {
4805-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-rule.html#cfn-ses-receiptrule-rule-scanenabled",
4806-
"PrimitiveType": "Boolean",
4807-
"Required": false,
4808-
"UpdateType": "Mutable"
4809-
},
4810-
"TlsPolicy": {
4811-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-rule.html#cfn-ses-receiptrule-rule-tlspolicy",
4812-
"PrimitiveType": "String",
4813-
"Required": false,
4814-
"UpdateType": "Mutable"
4815-
}
4816-
}
4817-
},
4818-
"AWS::SES::ReceiptRule.S3Action": "CACHED",
4819-
"AWS::SES::ReceiptRule.SNSAction": "CACHED",
4820-
"AWS::SES::ReceiptRule.StopAction": "CACHED",
4821-
"AWS::SES::ReceiptRule.WorkmailAction": "CACHED",
4822-
"AWS::SES::Template.Template": {
4823-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-template-template.html",
4824-
"Properties": {
4825-
"HtmlPart": {
4826-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-template-template.html#cfn-ses-template-template-htmlpart",
4827-
"PrimitiveType": "String",
4828-
"Required": false,
4829-
"UpdateType": "Mutable"
4830-
},
4831-
"SubjectPart": {
4832-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-template-template.html#cfn-ses-template-template-subjectpart",
4833-
"PrimitiveType": "String",
4834-
"Required": false,
4835-
"UpdateType": "Mutable"
4836-
},
4837-
"TemplateName": {
4838-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-template-template.html#cfn-ses-template-template-templatename",
4839-
"PrimitiveType": "String",
4840-
"Required": false,
4841-
"UpdateType": "Immutable",
4842-
"Value": {
4843-
"ValueType": "AWS::SES::Template.Template.TemplateName"
4844-
}
4845-
},
4846-
"TextPart": {
4847-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-template-template.html#cfn-ses-template-template-textpart",
4848-
"PrimitiveType": "String",
4849-
"Required": false,
4850-
"UpdateType": "Mutable"
4851-
}
4852-
}
4853-
},
4704+
"AWS::SES::Template.Template": "CACHED",
48544705
"AWS::SES::VdmAttributes.DashboardAttributes": "CACHED",
48554706
"AWS::SES::VdmAttributes.GuardianAttributes": "CACHED",
48564707
"AWS::SNS::Topic.Subscription": "CACHED",
@@ -6516,87 +6367,12 @@
65166367
"AWS::S3Outposts::BucketPolicy": "CACHED",
65176368
"AWS::S3Outposts::Endpoint": "CACHED",
65186369
"AWS::SDB::Domain": "CACHED",
6519-
"AWS::SES::ConfigurationSet": {
6520-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-configurationset.html",
6521-
"Properties": {
6522-
"Name": {
6523-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-configurationset.html#cfn-ses-configurationset-name",
6524-
"PrimitiveType": "String",
6525-
"Required": false,
6526-
"UpdateType": "Immutable",
6527-
"Value": {
6528-
"ValueType": "AWS::SES::ConfigurationSet.Name"
6529-
}
6530-
}
6531-
}
6532-
},
6533-
"AWS::SES::ConfigurationSetEventDestination": {
6534-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-configurationseteventdestination.html",
6535-
"Properties": {
6536-
"ConfigurationSetName": {
6537-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-configurationseteventdestination.html#cfn-ses-configurationseteventdestination-configurationsetname",
6538-
"PrimitiveType": "String",
6539-
"Required": true,
6540-
"UpdateType": "Immutable"
6541-
},
6542-
"EventDestination": {
6543-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-configurationseteventdestination.html#cfn-ses-configurationseteventdestination-eventdestination",
6544-
"Required": true,
6545-
"Type": "EventDestination",
6546-
"UpdateType": "Mutable"
6547-
}
6548-
}
6549-
},
6550-
"AWS::SES::ContactList": {
6551-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-contactlist.html",
6552-
"Properties": {
6553-
"ContactListName": {
6554-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-contactlist.html#cfn-ses-contactlist-contactlistname",
6555-
"PrimitiveType": "String",
6556-
"Required": false,
6557-
"UpdateType": "Immutable",
6558-
"Value": {
6559-
"ValueType": "AWS::SES::ContactList.ContactListName"
6560-
}
6561-
},
6562-
"Description": {
6563-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-contactlist.html#cfn-ses-contactlist-description",
6564-
"PrimitiveType": "String",
6565-
"Required": false,
6566-
"UpdateType": "Mutable"
6567-
},
6568-
"Tags": {
6569-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-contactlist.html#cfn-ses-contactlist-tags",
6570-
"ItemType": "Tag",
6571-
"Required": false,
6572-
"Type": "List",
6573-
"UpdateType": "Mutable"
6574-
},
6575-
"Topics": {
6576-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-contactlist.html#cfn-ses-contactlist-topics",
6577-
"ItemType": "Topic",
6578-
"Required": false,
6579-
"Type": "List",
6580-
"UpdateType": "Mutable"
6581-
}
6582-
}
6583-
},
6370+
"AWS::SES::ConfigurationSet": "CACHED",
6371+
"AWS::SES::ConfigurationSetEventDestination": "CACHED",
6372+
"AWS::SES::ContactList": "CACHED",
65846373
"AWS::SES::DedicatedIpPool": "CACHED",
65856374
"AWS::SES::EmailIdentity": "CACHED",
6586-
"AWS::SES::ReceiptFilter": "CACHED",
6587-
"AWS::SES::ReceiptRule": "CACHED",
6588-
"AWS::SES::ReceiptRuleSet": "CACHED",
6589-
"AWS::SES::Template": {
6590-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-template.html",
6591-
"Properties": {
6592-
"Template": {
6593-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-template.html#cfn-ses-template-template",
6594-
"Required": false,
6595-
"Type": "Template",
6596-
"UpdateType": "Mutable"
6597-
}
6598-
}
6599-
},
6375+
"AWS::SES::Template": "CACHED",
66006376
"AWS::SES::VdmAttributes": "CACHED",
66016377
"AWS::SNS::Subscription": "CACHED",
66026378
"AWS::SNS::Topic": "CACHED",

0 commit comments

Comments
 (0)