diff --git a/scripts/update_schemas_manually.py b/scripts/update_schemas_manually.py index 74beb6fdf3..ccd691b26d 100755 --- a/scripts/update_schemas_manually.py +++ b/scripts/update_schemas_manually.py @@ -884,7 +884,7 @@ path="/definitions/BlockDeviceMapping/properties/VirtualName", ), Patch( - path="/", + path="/definitions/SpotFleetRequestConfigData", values={ "requiredXor": ["LaunchSpecifications", "LaunchTemplateConfigs"] }, diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_spotfleet/manual.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_spotfleet/manual.json index 50b628eb4e..40427842b4 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_spotfleet/manual.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_spotfleet/manual.json @@ -15,7 +15,7 @@ }, { "op": "add", - "path": "/requiredXor", + "path": "/definitions/SpotFleetRequestConfigData/requiredXor", "value": [ "LaunchSpecifications", "LaunchTemplateConfigs" diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-spotfleet.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-spotfleet.json index cf6ff407a5..d132978064 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-spotfleet.json +++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-spotfleet.json @@ -432,6 +432,10 @@ "IamFleetRole", "TargetCapacity" ], + "requiredXor": [ + "LaunchSpecifications", + "LaunchTemplateConfigs" + ], "type": "object" }, "SpotFleetTagSpecification": { @@ -536,9 +540,5 @@ "required": [ "SpotFleetRequestConfigData" ], - "requiredXor": [ - "LaunchSpecifications", - "LaunchTemplateConfigs" - ], "typeName": "AWS::EC2::SpotFleet" } diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-spotfleet.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-spotfleet.json index cf6ff407a5..d132978064 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-spotfleet.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-spotfleet.json @@ -432,6 +432,10 @@ "IamFleetRole", "TargetCapacity" ], + "requiredXor": [ + "LaunchSpecifications", + "LaunchTemplateConfigs" + ], "type": "object" }, "SpotFleetTagSpecification": { @@ -536,9 +540,5 @@ "required": [ "SpotFleetRequestConfigData" ], - "requiredXor": [ - "LaunchSpecifications", - "LaunchTemplateConfigs" - ], "typeName": "AWS::EC2::SpotFleet" } diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-spotfleet.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-spotfleet.json index cf6ff407a5..d132978064 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-spotfleet.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-spotfleet.json @@ -432,6 +432,10 @@ "IamFleetRole", "TargetCapacity" ], + "requiredXor": [ + "LaunchSpecifications", + "LaunchTemplateConfigs" + ], "type": "object" }, "SpotFleetTagSpecification": { @@ -536,9 +540,5 @@ "required": [ "SpotFleetRequestConfigData" ], - "requiredXor": [ - "LaunchSpecifications", - "LaunchTemplateConfigs" - ], "typeName": "AWS::EC2::SpotFleet" } diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-spotfleet.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-spotfleet.json index 2a0164a22c..2b09ab5669 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-spotfleet.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-spotfleet.json @@ -764,6 +764,10 @@ "IamFleetRole", "TargetCapacity" ], + "requiredXor": [ + "LaunchSpecifications", + "LaunchTemplateConfigs" + ], "type": "object" }, "SpotFleetTagSpecification": { @@ -946,10 +950,6 @@ "required": [ "SpotFleetRequestConfigData" ], - "requiredXor": [ - "LaunchSpecifications", - "LaunchTemplateConfigs" - ], "typeName": "AWS::EC2::SpotFleet", "writeOnlyProperties": [ "/properties/SpotFleetRequestConfigData/TagSpecifications",