Skip to content

Commit d4d7e2b

Browse files
authored
Update schema patching and fix some issues (#3570)
* Update schema patching and fix some issues * Cleanup of AWS::IAM::Group
1 parent 39ca987 commit d4d7e2b

File tree

73 files changed

+192
-3324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+192
-3324
lines changed

scripts/update_schemas_manually.py

-4
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@
7777
values={"requiredXor": ["LaunchTemplateId", "LaunchTemplateName"]},
7878
path="/definitions/LaunchTemplateSpecification",
7979
),
80-
Patch(
81-
values={"pattern": "^ephemeral([0-9]|[1][0-9]|[2][0-3])$"},
82-
path="/definitions/BlockDeviceMapping/properties/VirtualName",
83-
),
8480
Patch(
8581
values={
8682
"dependentExcluded": {
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"e45c54c3a5c71778a502ab083126b1fa\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"13e2ba2de2278576e21963023dc47eb9\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"4c81dcd19aa9816dfaa8593700c8b256\"", "url": "https://schema.cloudformation.us-gov-east-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"c5a0d95dbb08a6630ecb0d0afccdc1c9\"", "url": "https://schema.cloudformation.us-gov-east-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"8aad0081fc5aa178830b85318675d35a\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"b3496749571dd1d88c79b5d7f65e01d4\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"2ea262252de69675e96d642565768882\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"babf77f32064122868adcaacd6e6cf2a\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"ce9d915909dfbf40b4b70d41faac8eb5\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"7b36451bce4de8d4adbb079e44906d70\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"16cf790a1063e4ff2ceb494a84ef5106\"", "url": "https://schema.cloudformation.eu-west-2.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"31f53d67c72c89b3a0a7d42ae4011bd2\"", "url": "https://schema.cloudformation.eu-west-2.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"4eec9daa1781dcb148c850bc451672b9\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"1072d0485f7b5d06f887e1a9595db65e\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"18998b0ae923fffebacca8ef1b921860\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"ebfe2d60e21a0621519f4bbcb09f73aa\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"5f81eab795885987d59d1723064991c0\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"a1f5c3420a76e24c4e6ab98c2450b976\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"055992d589da8f7d83d860a833bbf9c8\"", "url": "https://schema.cloudformation.ap-south-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"3ddf68c043d9e9b54a99406435f73fa5\"", "url": "https://schema.cloudformation.ap-south-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"26da827da26466c0e4e9e66416263b70\"", "url": "https://schema.cloudformation.ap-southeast-4.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"967e93658732751c98a6359c52b76221\"", "url": "https://schema.cloudformation.ap-southeast-4.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"ab8051be145f827b2026c8ac2dc7e711\"", "url": "https://schema.cloudformation.us-east-2.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"e7ba3b3b1f564a05f8ef6fbf467edbce\"", "url": "https://schema.cloudformation.us-east-2.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"4ea9140666e056175d560ddf4db3f32c\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"8e514a8ec045575ff059aeb81ed0779b\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"e8433152cfddd2425b7cb5b351f30aa3\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"a9e556527d5bb7c0ec81e40b976523c7\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"3eabcf49b17463f84d79bdd4cfed5ba2\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"19efa72570c84eab9dff600f4d48b7a1\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"ea086e9fd6c340ad68cfda6171979f11\"", "url": "https://schema.cloudformation.ap-southeast-2.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"9cad48037f601bb883e0ec7d728b60ff\"", "url": "https://schema.cloudformation.ap-southeast-2.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"beab4a210da56c904872b7172287ab72\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"6f3328cd84a62d7b2b7971e94d615960\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"0d71cdf3774c6d17aa0137c143d4a599\"", "url": "https://schema.cloudformation.eu-central-2.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"95603a27f963cea737b1972f8d079417\"", "url": "https://schema.cloudformation.eu-central-2.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"8d3c0ca36bef826c791d9332b3294b45\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"5f291ba3d1e67c93c345ffdcaf36bef0\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"d96cbf63de582f3a84eca64210e18ab3\"", "url": "https://schema.cloudformation.eu-south-2.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"c6d560fb5796260a954c040ef9e0ad7b\"", "url": "https://schema.cloudformation.eu-south-2.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"bf496693cdeec53441391670ebb9137d\"", "url": "https://schema.cloudformation.ca-central-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"090821fcf2cfb2c2421d9507871c725f\"", "url": "https://schema.cloudformation.ca-central-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"798c2d3e9f1910dff0637434fc4bc5a7\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"dcb6f2b1f562542607d4f4a3ca4d2dfa\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"fa531a88fd97a35e6d560759c5339aea\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"429b619a92b755518f883c1bfafde202\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"e88ca4cbdccde6f2a47c2a9be820cc16\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"2612ab90cebe491a5d06f0a8d21c983e\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"620982705a95dba5258daa8fc0703ff3\"", "url": "https://schema.cloudformation.ap-south-2.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"a098f8aab8e96142bf8528eb90e0c25e\"", "url": "https://schema.cloudformation.ap-south-2.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"06da2b21928da255943e68f7199dd148\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"e985314b846cbb7fc5d7896d2f41b98e\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"e85eee307215b9ad6e6499fadeaa48b8\"", "url": "https://schema.cloudformation.eu-west-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"0bb56400b046eef97c15dc41d85b6d77\"", "url": "https://schema.cloudformation.eu-west-1.amazonaws.com/CloudformationSchema.zip"}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"etag": "\"88115ccc33a8cff2306deb520e3b747f\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}
1+
{"etag": "\"0c26a280b66fbb26f9e98da5ed6de5cd\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/schemas/patches/extensions/all/aws_autoscaling_autoscalinggroup/manual.json

-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
"LaunchTemplateName"
1616
]
1717
},
18-
{
19-
"op": "add",
20-
"path": "/definitions/BlockDeviceMapping/properties/VirtualName/pattern",
21-
"value": "^ephemeral([0-9]|[1][0-9]|[2][0-3])$"
22-
},
2318
{
2419
"op": "add",
2520
"path": "/dependentExcluded",

src/cfnlint/data/schemas/patches/extensions/all/aws_dynamodb_table/boto.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
{
2020
"op": "add",
21-
"path": "/definitions/KeySchema/properties/KeyType/enum",
21+
"path": "/definitions/KeySchema/items/properties/KeyType/enum",
2222
"value": [
2323
"HASH",
2424
"RANGE"

src/cfnlint/data/schemas/patches/providers/all/aws_dynamodb_table/keyschema.json

-4
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@
4444
"type": "string"
4545
},
4646
"KeyType": {
47-
"enum": [
48-
"HASH",
49-
"RANGE"
50-
],
5147
"type": "string"
5248
}
5349
},

src/cfnlint/data/schemas/patches/providers/all/aws_iam_group/policy_policydocument.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"path": "/definitions/Policy/properties/PolicyDocument",
1212
"value": {
1313
"type": [
14-
"object"
14+
"object",
15+
"string"
1516
]
1617
}
1718
}

src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -2133,7 +2133,6 @@
21332133
"aws-sso-instance.json",
21342134
"aws-sso-instanceaccesscontrolattributeconfiguration.json",
21352135
"aws-sso-permissionset.json",
2136-
"aws-stepfunctions-activity.json",
21372136
"aws-stepfunctions-statemachine.json",
21382137
"aws-stepfunctions-statemachinealias.json",
21392138
"aws-stepfunctions-statemachineversion.json",

src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -1430,6 +1430,7 @@
14301430
"aws-servicediscovery-privatednsnamespace.json",
14311431
"aws-servicediscovery-publicdnsnamespace.json",
14321432
"aws-servicediscovery-service.json",
1433+
"aws-ses-configurationset.json",
14331434
"aws-ses-configurationseteventdestination.json",
14341435
"aws-ses-contactlist.json",
14351436
"aws-ses-dedicatedippool.json",

src/cfnlint/data/schemas/providers/ap_south_1/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2051,6 +2051,7 @@
20512051
"aws-sagemaker-modelbiasjobdefinition.json",
20522052
"aws-sagemaker-modelcard.json",
20532053
"aws-sagemaker-modelexplainabilityjobdefinition.json",
2054+
"aws-sagemaker-modelpackage.json",
20542055
"aws-sagemaker-modelpackagegroup.json",
20552056
"aws-sagemaker-modelqualityjobdefinition.json",
20562057
"aws-sagemaker-monitoringschedule.json",
@@ -2109,7 +2110,6 @@
21092110
"aws-servicediscovery-privatednsnamespace.json",
21102111
"aws-servicediscovery-publicdnsnamespace.json",
21112112
"aws-servicediscovery-service.json",
2112-
"aws-ses-configurationset.json",
21132113
"aws-ses-configurationseteventdestination.json",
21142114
"aws-ses-contactlist.json",
21152115
"aws-ses-dedicatedippool.json",

src/cfnlint/data/schemas/providers/ap_southeast_1/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -2191,6 +2191,7 @@
21912191
"aws-sagemaker-modelbiasjobdefinition.json",
21922192
"aws-sagemaker-modelcard.json",
21932193
"aws-sagemaker-modelexplainabilityjobdefinition.json",
2194+
"aws-sagemaker-modelpackage.json",
21942195
"aws-sagemaker-modelpackagegroup.json",
21952196
"aws-sagemaker-modelqualityjobdefinition.json",
21962197
"aws-sagemaker-monitoringschedule.json",

src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -2288,6 +2288,7 @@
22882288
"aws-servicediscovery-privatednsnamespace.json",
22892289
"aws-servicediscovery-publicdnsnamespace.json",
22902290
"aws-servicediscovery-service.json",
2291+
"aws-ses-configurationset.json",
22912292
"aws-ses-configurationseteventdestination.json",
22922293
"aws-ses-contactlist.json",
22932294
"aws-ses-dedicatedippool.json",

src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -1133,6 +1133,8 @@
11331133
"aws-sso-instance.json",
11341134
"aws-sso-instanceaccesscontrolattributeconfiguration.json",
11351135
"aws-sso-permissionset.json",
1136+
"aws-stepfunctions-activity.json",
1137+
"aws-stepfunctions-statemachine.json",
11361138
"aws-stepfunctions-statemachinealias.json",
11371139
"aws-stepfunctions-statemachineversion.json",
11381140
"aws-synthetics-canary.json",

0 commit comments

Comments
 (0)