diff --git a/scripts/update_schemas_manually.py b/scripts/update_schemas_manually.py index ee341e9060..28ebb8e7de 100755 --- a/scripts/update_schemas_manually.py +++ b/scripts/update_schemas_manually.py @@ -79,28 +79,12 @@ ), Patch( values={ - "dependentExcluded": { - "InstanceId": [ - "LaunchConfigurationName", - "LaunchTemplate", - "MixedInstancesPolicy", - ], - "LaunchConfigurationName": [ - "InstanceId", - "LaunchTemplate", - "MixedInstancesPolicy", - ], - "LaunchTemplate": [ - "InstanceId", - "LaunchConfigurationName", - "MixedInstancesPolicy", - ], - "MixedInstancesPolicy": [ - "InstanceId", - "LaunchConfigurationName", - "LaunchTemplate", - ], - }, + "requiredXor": [ + "InstanceId", + "LaunchConfigurationName", + "LaunchTemplate", + "MixedInstancesPolicy", + ] }, path="/", ), diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_autoscaling_autoscalinggroup/manual.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_autoscaling_autoscalinggroup/manual.json index 8400243769..a9f5a7d95d 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_autoscaling_autoscalinggroup/manual.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_autoscaling_autoscalinggroup/manual.json @@ -17,28 +17,12 @@ }, { "op": "add", - "path": "/dependentExcluded", - "value": { - "InstanceId": [ - "LaunchConfigurationName", - "LaunchTemplate", - "MixedInstancesPolicy" - ], - "LaunchConfigurationName": [ - "InstanceId", - "LaunchTemplate", - "MixedInstancesPolicy" - ], - "LaunchTemplate": [ - "InstanceId", - "LaunchConfigurationName", - "MixedInstancesPolicy" - ], - "MixedInstancesPolicy": [ - "InstanceId", - "LaunchConfigurationName", - "LaunchTemplate" - ] - } + "path": "/requiredXor", + "value": [ + "InstanceId", + "LaunchConfigurationName", + "LaunchTemplate", + "MixedInstancesPolicy" + ] } ] diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-autoscalinggroup.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-autoscalinggroup.json index 895795a288..8f57b74325 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-autoscalinggroup.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-autoscalinggroup.json @@ -459,28 +459,6 @@ "type": "object" } }, - "dependentExcluded": { - "InstanceId": [ - "LaunchConfigurationName", - "LaunchTemplate", - "MixedInstancesPolicy" - ], - "LaunchConfigurationName": [ - "InstanceId", - "LaunchTemplate", - "MixedInstancesPolicy" - ], - "LaunchTemplate": [ - "InstanceId", - "LaunchConfigurationName", - "MixedInstancesPolicy" - ], - "MixedInstancesPolicy": [ - "InstanceId", - "LaunchConfigurationName", - "LaunchTemplate" - ] - }, "deprecatedProperties": [ "/properties/NotificationConfiguration" ], @@ -715,6 +693,12 @@ "MinSize", "MaxSize" ], + "requiredXor": [ + "InstanceId", + "LaunchConfigurationName", + "LaunchTemplate", + "MixedInstancesPolicy" + ], "tagging": { "cloudFormationSystemTags": true, "tagOnCreate": true,