Move requireXor to SpotFleetRequestConfigData (#3737)

* Move requireXor to SpotFleetRequestConfigData --------- Co-authored-by: Steven Gubler <[email protected]> Co-authored-by: Kevin DeJong <[email protected]>
aws-cloudformation · Oct 8, 2024 · ee77420 · ee77420
1 parent 79689ba
commit ee77420
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",