Skip to content

Commit

Permalink
chore(cfnspec): fix spec patch not being applied for Route 53 healthc…
Browse files Browse the repository at this point in the history
…hecks (#11303)

The patch added in #11280 was not being applied as our patching requires the `PropertyTypes`
and `ResourceTypes` keys rather than use them directly through the `path` property.

Since they were previously relying entirely on the path, the patch was not actually
applied. Verified the final specification after all patches have been applied.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
  • Loading branch information
shivlaks authored Nov 5, 2020
1 parent 8478153 commit 246404d
Showing 1 changed file with 147 additions and 142 deletions.
289 changes: 147 additions & 142 deletions packages/@aws-cdk/cfnspec/spec-source/660_Route53_HealthCheck_patch.json
Original file line number Diff line number Diff line change
@@ -1,152 +1,157 @@
{
"patch": {
"description": "Patch Route 53 HealthCheck casing regression - mirrors cfn-lint (https://github.com/aws-cloudformation/cfn-python-lint/blob/master/src/cfnlint/data/ExtendedSpecs/all/01_spec_patch.json) ",
"operations": [
{
"op": "add",
"path": "/ResourceTypes/AWS::Route53::HealthCheck/Properties/HealthCheckConfig/Type",
"value": "HealthCheckConfig"
},
{
"op": "remove",
"path": "/ResourceTypes/AWS::Route53::HealthCheck/Properties/HealthCheckConfig/PrimitiveType"
},
{
"op": "add",
"path": "/PropertyTypes/AWS::Route53::HealthCheck.AlarmIdentifier",
"value": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-alarmidentifier.html",
"Properties": {
"Name": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-alarmidentifier.html#cfn-route53-healthcheck-alarmidentifier-name",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
},
"Region": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-alarmidentifier.html#cfn-route53-healthcheck-alarmidentifier-region",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
"PropertyTypes": {
"patch": {
"description": "Patch Route 53 HealthCheck casing regression - mirrors cfn-lint (https://github.com/aws-cloudformation/cfn-python-lint/blob/master/src/cfnlint/data/ExtendedSpecs/all/01_spec_patch.json) ",
"operations": [
{
"op": "add",
"path": "/AWS::Route53::HealthCheck.AlarmIdentifier",
"value": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-alarmidentifier.html",
"Properties": {
"Name": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-alarmidentifier.html#cfn-route53-healthcheck-alarmidentifier-name",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
},
"Region": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-alarmidentifier.html#cfn-route53-healthcheck-alarmidentifier-region",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
}
}
}
}
},
{
"op": "add",
"path": "/PropertyTypes/AWS::Route53::HealthCheck.HealthCheckConfig",
"value": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html",
"Properties": {
"AlarmIdentifier": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-alarmidentifier",
"Required": false,
"Type": "AlarmIdentifier",
"UpdateType": "Mutable"
},
"ChildHealthChecks": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-childhealthchecks",
"DuplicatesAllowed": false,
"PrimitiveItemType": "String",
"Required": false,
"Type": "List",
"UpdateType": "Mutable"
},
"EnableSNI": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-enablesni",
"PrimitiveType": "Boolean",
"Required": false,
"UpdateType": "Mutable"
},
"FailureThreshold": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-failurethreshold",
"PrimitiveType": "Integer",
"Required": false,
"UpdateType": "Mutable"
},
"FullyQualifiedDomainName": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-fullyqualifieddomainname",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable"
},
"HealthThreshold": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-healththreshold",
"PrimitiveType": "Integer",
"Required": false,
"UpdateType": "Mutable"
},
"IPAddress": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-ipaddress",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable"
},
"InsufficientDataHealthStatus": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-insufficientdatahealthstatus",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable",
"Value": {
"ValueType": "Route53HealthCheckConfigHealthStatus"
}
},
"Inverted": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-inverted",
"PrimitiveType": "Boolean",
"Required": false,
"UpdateType": "Mutable"
},
"MeasureLatency": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-measurelatency",
"PrimitiveType": "Boolean",
"Required": false,
"UpdateType": "Immutable"
},
"Port": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-port",
"PrimitiveType": "Integer",
"Required": false,
"UpdateType": "Mutable"
},
"Regions": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-regions",
"DuplicatesAllowed": false,
"PrimitiveItemType": "String",
"Required": false,
"Type": "List",
"UpdateType": "Mutable"
},
"RequestInterval": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-requestinterval",
"PrimitiveType": "Integer",
"Required": false,
"UpdateType": "Immutable"
},
"ResourcePath": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-resourcepath",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable"
},
"SearchString": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-searchstring",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable"
},
"Type": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-type",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Immutable",
"Value": {
"ValueType": "Route53HealthCheckConfigType"
},
{
"op": "add",
"path": "/AWS::Route53::HealthCheck.HealthCheckConfig",
"value": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html",
"Properties": {
"AlarmIdentifier": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-alarmidentifier",
"Required": false,
"Type": "AlarmIdentifier",
"UpdateType": "Mutable"
},
"ChildHealthChecks": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-childhealthchecks",
"DuplicatesAllowed": false,
"PrimitiveItemType": "String",
"Required": false,
"Type": "List",
"UpdateType": "Mutable"
},
"EnableSNI": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-enablesni",
"PrimitiveType": "Boolean",
"Required": false,
"UpdateType": "Mutable"
},
"FailureThreshold": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-failurethreshold",
"PrimitiveType": "Integer",
"Required": false,
"UpdateType": "Mutable"
},
"FullyQualifiedDomainName": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-fullyqualifieddomainname",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable"
},
"HealthThreshold": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-healththreshold",
"PrimitiveType": "Integer",
"Required": false,
"UpdateType": "Mutable"
},
"IPAddress": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-ipaddress",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable"
},
"InsufficientDataHealthStatus": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-insufficientdatahealthstatus",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable"
},
"Inverted": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-inverted",
"PrimitiveType": "Boolean",
"Required": false,
"UpdateType": "Mutable"
},
"MeasureLatency": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-measurelatency",
"PrimitiveType": "Boolean",
"Required": false,
"UpdateType": "Immutable"
},
"Port": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-port",
"PrimitiveType": "Integer",
"Required": false,
"UpdateType": "Mutable"
},
"Regions": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-regions",
"DuplicatesAllowed": false,
"PrimitiveItemType": "String",
"Required": false,
"Type": "List",
"UpdateType": "Mutable"
},
"RequestInterval": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-requestinterval",
"PrimitiveType": "Integer",
"Required": false,
"UpdateType": "Immutable"
},
"ResourcePath": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-resourcepath",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable"
},
"SearchString": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-searchstring",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable"
},
"Type": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-type",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Immutable"
}
}
}
}
]
}
},
"ResourceTypes": {
"AWS::Route53::HealthCheck": {
"patch": {
"description": "Patch Route 53 HealthCheck casing regression - mirrors cfn-lint (https://github.com/aws-cloudformation/cfn-python-lint/blob/master/src/cfnlint/data/ExtendedSpecs/all/01_spec_patch.json) ",
"operations": [
{
"op": "add",
"path": "/Properties/HealthCheckConfig/Type",
"value": "HealthCheckConfig"
},
{
"op": "remove",
"path": "/Properties/HealthCheckConfig/PrimitiveType"
}
]
}
]
}
}
}

0 comments on commit 246404d

Please sign in to comment.