Add capacityOptimized to spot fleet allocation strategy (#1200)

aws-cloudformation · Nov 18, 2019 · 7153305 · 7153305
1 parent 7908916
commit 7153305
Show file tree

Hide file tree

Showing 25 changed files with 911 additions and 1,034 deletions.
diff --git a/src/cfnlint/data/CloudSpecs/ap-east-1.json b/src/cfnlint/data/CloudSpecs/ap-east-1.json
@@ -5066,7 +5066,7 @@
           "Required": false,
           "UpdateType": "Immutable",
           "Value": {
-            "ValueType": "SpotFleetAllocationStrategy"
+            "ValueType": "Ec2FleetSpotAllocationStrategy"
           }
         },
         "ExcessCapacityTerminationPolicy": {
@@ -26843,8 +26843,9 @@
     },
     "Ec2FleetSpotAllocationStrategy": {
       "AllowedValues": [
+        "capacityOptimized",
         "diversified",
-        "lowest-price"
+        "lowestPrice"
       ]
     },
     "Ec2FleetSpotInterruptionBehavior": {
@@ -27483,12 +27484,6 @@
         "sqs"
       ]
     },
-    "SpotFleetAllocationStrategy": {
-      "AllowedValues": [
-        "diversified",
-        "lowestPrice"
-      ]
-    },
     "SpotFleetExcessCapacityTerminationPolicy": {
       "AllowedValues": [
         "default",

diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json
@@ -10310,7 +10310,7 @@
           "Required": false,
           "UpdateType": "Immutable",
           "Value": {
-            "ValueType": "SpotFleetAllocationStrategy"
+            "ValueType": "Ec2FleetSpotAllocationStrategy"
           }
         },
         "ExcessCapacityTerminationPolicy": {
@@ -48092,8 +48092,9 @@
     },
     "Ec2FleetSpotAllocationStrategy": {
       "AllowedValues": [
+        "capacityOptimized",
         "diversified",
-        "lowest-price"
+        "lowestPrice"
       ]
     },
     "Ec2FleetSpotInterruptionBehavior": {
@@ -48970,12 +48971,6 @@
         "sqs"
       ]
     },
-    "SpotFleetAllocationStrategy": {
-      "AllowedValues": [
-        "diversified",
-        "lowestPrice"
-      ]
-    },
     "SpotFleetExcessCapacityTerminationPolicy": {
       "AllowedValues": [
         "default",

diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json
@@ -10115,7 +10115,7 @@
           "Required": false,
           "UpdateType": "Immutable",
           "Value": {
-            "ValueType": "SpotFleetAllocationStrategy"
+            "ValueType": "Ec2FleetSpotAllocationStrategy"
           }
         },
         "ExcessCapacityTerminationPolicy": {
@@ -45246,8 +45246,9 @@
     },
     "Ec2FleetSpotAllocationStrategy": {
       "AllowedValues": [
+        "capacityOptimized",
         "diversified",
-        "lowest-price"
+        "lowestPrice"
       ]
     },
     "Ec2FleetSpotInterruptionBehavior": {
@@ -46062,12 +46063,6 @@
         "sqs"
       ]
     },
-    "SpotFleetAllocationStrategy": {
-      "AllowedValues": [
-        "diversified",
-        "lowestPrice"
-      ]
-    },
     "SpotFleetExcessCapacityTerminationPolicy": {
       "AllowedValues": [
         "default",

diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json
@@ -4765,7 +4765,7 @@
           "Required": false,
           "UpdateType": "Immutable",
           "Value": {
-            "ValueType": "SpotFleetAllocationStrategy"
+            "ValueType": "Ec2FleetSpotAllocationStrategy"
           }
         },
         "ExcessCapacityTerminationPolicy": {
@@ -25321,8 +25321,9 @@
     },
     "Ec2FleetSpotAllocationStrategy": {
       "AllowedValues": [
+        "capacityOptimized",
         "diversified",
-        "lowest-price"
+        "lowestPrice"
       ]
     },
     "Ec2FleetSpotInterruptionBehavior": {
@@ -26013,12 +26014,6 @@
         "sqs"
       ]
     },
-    "SpotFleetAllocationStrategy": {
-      "AllowedValues": [
-        "diversified",
-        "lowestPrice"
-      ]
-    },
     "SpotFleetExcessCapacityTerminationPolicy": {
       "AllowedValues": [
         "default",

diff --git a/src/cfnlint/data/CloudSpecs/ap-south-1.json b/src/cfnlint/data/CloudSpecs/ap-south-1.json
@@ -9684,7 +9684,7 @@
           "Required": false,
           "UpdateType": "Immutable",
           "Value": {
-            "ValueType": "SpotFleetAllocationStrategy"
+            "ValueType": "Ec2FleetSpotAllocationStrategy"
           }
         },
         "ExcessCapacityTerminationPolicy": {
@@ -44311,8 +44311,9 @@
     },
     "Ec2FleetSpotAllocationStrategy": {
       "AllowedValues": [
+        "capacityOptimized",
         "diversified",
-        "lowest-price"
+        "lowestPrice"
       ]
     },
     "Ec2FleetSpotInterruptionBehavior": {
@@ -45060,12 +45061,6 @@
         "sqs"
       ]
     },
-    "SpotFleetAllocationStrategy": {
-      "AllowedValues": [
-        "diversified",
-        "lowestPrice"
-      ]
-    },
     "SpotFleetExcessCapacityTerminationPolicy": {
       "AllowedValues": [
         "default",

diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json
@@ -10102,7 +10102,7 @@
           "Required": false,
           "UpdateType": "Immutable",
           "Value": {
-            "ValueType": "SpotFleetAllocationStrategy"
+            "ValueType": "Ec2FleetSpotAllocationStrategy"
           }
         },
         "ExcessCapacityTerminationPolicy": {
@@ -45502,8 +45502,9 @@
     },
     "Ec2FleetSpotAllocationStrategy": {
       "AllowedValues": [
+        "capacityOptimized",
         "diversified",
-        "lowest-price"
+        "lowestPrice"
       ]
     },
     "Ec2FleetSpotInterruptionBehavior": {
@@ -46385,12 +46386,6 @@
         "sqs"
       ]
     },
-    "SpotFleetAllocationStrategy": {
-      "AllowedValues": [
-        "diversified",
-        "lowestPrice"
-      ]
-    },
     "SpotFleetExcessCapacityTerminationPolicy": {
       "AllowedValues": [
         "default",

diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json
@@ -10299,7 +10299,7 @@
           "Required": false,
           "UpdateType": "Immutable",
           "Value": {
-            "ValueType": "SpotFleetAllocationStrategy"
+            "ValueType": "Ec2FleetSpotAllocationStrategy"
           }
         },
         "ExcessCapacityTerminationPolicy": {
@@ -47723,8 +47723,9 @@
     },
     "Ec2FleetSpotAllocationStrategy": {
       "AllowedValues": [
+        "capacityOptimized",
         "diversified",
-        "lowest-price"
+        "lowestPrice"
       ]
     },
     "Ec2FleetSpotInterruptionBehavior": {
@@ -48581,12 +48582,6 @@
         "sqs"
       ]
     },
-    "SpotFleetAllocationStrategy": {
-      "AllowedValues": [
-        "diversified",
-        "lowestPrice"
-      ]
-    },
     "SpotFleetExcessCapacityTerminationPolicy": {
       "AllowedValues": [
         "default",

diff --git a/src/cfnlint/data/CloudSpecs/ca-central-1.json b/src/cfnlint/data/CloudSpecs/ca-central-1.json
@@ -9345,7 +9345,7 @@
           "Required": false,
           "UpdateType": "Immutable",
           "Value": {
-            "ValueType": "SpotFleetAllocationStrategy"
+            "ValueType": "Ec2FleetSpotAllocationStrategy"
           }
         },
         "ExcessCapacityTerminationPolicy": {
@@ -37945,8 +37945,9 @@
     },
     "Ec2FleetSpotAllocationStrategy": {
       "AllowedValues": [
+        "capacityOptimized",
         "diversified",
-        "lowest-price"
+        "lowestPrice"
       ]
     },
     "Ec2FleetSpotInterruptionBehavior": {
@@ -38695,12 +38696,6 @@
         "sqs"
       ]
     },
-    "SpotFleetAllocationStrategy": {
-      "AllowedValues": [
-        "diversified",
-        "lowestPrice"
-      ]
-    },
     "SpotFleetExcessCapacityTerminationPolicy": {
       "AllowedValues": [
         "default",

diff --git a/src/cfnlint/data/CloudSpecs/cn-north-1.json b/src/cfnlint/data/CloudSpecs/cn-north-1.json
@@ -5088,7 +5088,7 @@
           "Required": false,
           "UpdateType": "Immutable",
           "Value": {
-            "ValueType": "SpotFleetAllocationStrategy"
+            "ValueType": "Ec2FleetSpotAllocationStrategy"
           }
         },
         "ExcessCapacityTerminationPolicy": {
@@ -26977,8 +26977,9 @@
     },
     "Ec2FleetSpotAllocationStrategy": {
       "AllowedValues": [
+        "capacityOptimized",
         "diversified",
-        "lowest-price"
+        "lowestPrice"
       ]
     },
     "Ec2FleetSpotInterruptionBehavior": {
@@ -27516,12 +27517,6 @@
         "sqs"
       ]
     },
-    "SpotFleetAllocationStrategy": {
-      "AllowedValues": [
-        "diversified",
-        "lowestPrice"
-      ]
-    },
     "SpotFleetExcessCapacityTerminationPolicy": {
       "AllowedValues": [
         "default",

diff --git a/src/cfnlint/data/CloudSpecs/cn-northwest-1.json b/src/cfnlint/data/CloudSpecs/cn-northwest-1.json
@@ -5088,7 +5088,7 @@
           "Required": false,
           "UpdateType": "Immutable",
           "Value": {
-            "ValueType": "SpotFleetAllocationStrategy"
+            "ValueType": "Ec2FleetSpotAllocationStrategy"
           }
         },
         "ExcessCapacityTerminationPolicy": {
@@ -24746,8 +24746,9 @@
     },
     "Ec2FleetSpotAllocationStrategy": {
       "AllowedValues": [
+        "capacityOptimized",
         "diversified",
-        "lowest-price"
+        "lowestPrice"
       ]
     },
     "Ec2FleetSpotInterruptionBehavior": {
@@ -25285,12 +25286,6 @@
         "sqs"
       ]
     },
-    "SpotFleetAllocationStrategy": {
-      "AllowedValues": [
-        "diversified",
-        "lowestPrice"
-      ]
-    },
     "SpotFleetExcessCapacityTerminationPolicy": {
       "AllowedValues": [
         "default",

diff --git a/src/cfnlint/data/CloudSpecs/eu-central-1.json b/src/cfnlint/data/CloudSpecs/eu-central-1.json
@@ -10181,7 +10181,7 @@
           "Required": false,
           "UpdateType": "Immutable",
           "Value": {
-            "ValueType": "SpotFleetAllocationStrategy"
+            "ValueType": "Ec2FleetSpotAllocationStrategy"
           }
         },
         "ExcessCapacityTerminationPolicy": {
@@ -48586,8 +48586,9 @@
     },
     "Ec2FleetSpotAllocationStrategy": {
       "AllowedValues": [
+        "capacityOptimized",
         "diversified",
-        "lowest-price"
+        "lowestPrice"
       ]
     },
     "Ec2FleetSpotInterruptionBehavior": {
@@ -49458,12 +49459,6 @@
         "sqs"
       ]
     },
-    "SpotFleetAllocationStrategy": {
-      "AllowedValues": [
-        "diversified",
-        "lowestPrice"
-      ]
-    },
     "SpotFleetExcessCapacityTerminationPolicy": {
       "AllowedValues": [
         "default",

diff --git a/src/cfnlint/data/CloudSpecs/eu-north-1.json b/src/cfnlint/data/CloudSpecs/eu-north-1.json
@@ -5833,7 +5833,7 @@
           "Required": false,
           "UpdateType": "Immutable",
           "Value": {
-            "ValueType": "SpotFleetAllocationStrategy"
+            "ValueType": "Ec2FleetSpotAllocationStrategy"
           }
         },
         "ExcessCapacityTerminationPolicy": {
@@ -30182,8 +30182,9 @@
     },
     "Ec2FleetSpotAllocationStrategy": {
       "AllowedValues": [
+        "capacityOptimized",
         "diversified",
-        "lowest-price"
+        "lowestPrice"
       ]
     },
     "Ec2FleetSpotInterruptionBehavior": {
@@ -30838,12 +30839,6 @@
         "sqs"
       ]
     },
-    "SpotFleetAllocationStrategy": {
-      "AllowedValues": [
-        "diversified",
-        "lowestPrice"
-      ]
-    },
     "SpotFleetExcessCapacityTerminationPolicy": {
       "AllowedValues": [
         "default",