New spot fleet launch specification features.

aws · Jul 23, 2015 · 0fa4c9a · 0fa4c9a
1 parent 14dbf15
commit 0fa4c9a
Show file tree

Hide file tree

Showing 3 changed files with 128 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 Unreleased Changes
 ------------------
 
+* Feature - Aws::EC2 - Added support for new spot fleet launch specification features.
+
 * Feature - Aws::Glacier - Added support for vault locks.
 
 * Feature - Aws::ElasticMapReduce - Adds support for Amazon EMR release 4.0.0, which

diff --git a/aws-sdk-core/apis/ec2/2015-04-15/api-2.json b/aws-sdk-core/apis/ec2/2015-04-15/api-2.json
@@ -3154,10 +3154,6 @@
         "VpcPeeringConnectionId":{
           "shape":"String",
           "locationName":"vpcPeeringConnectionId"
-        },
-        "ClientToken":{
-          "shape":"String",
-          "locationName":"clientToken"
         }
       }
     },
@@ -3167,10 +3163,6 @@
         "Return":{
           "shape":"Boolean",
           "locationName":"return"
-        },
-        "ClientToken":{
-          "shape":"String",
-          "locationName":"clientToken"
         }
       }
     },
@@ -7933,7 +7925,7 @@
     "LaunchSpecsList":{
       "type":"list",
       "member":{
-        "shape":"LaunchSpecification",
+        "shape":"SpotFleetLaunchSpecification",
         "locationName":"item"
       },
       "min":1
@@ -8108,10 +8100,6 @@
         }
       }
     },
-    "ModifySnapshotAttributeName":{
-      "type":"string",
-      "enum":["createVolumePermission"]
-    },
     "ModifySnapshotAttributeRequest":{
       "type":"structure",
       "required":["SnapshotId"],
@@ -8121,7 +8109,7 @@
           "locationName":"dryRun"
         },
         "SnapshotId":{"shape":"String"},
-        "Attribute":{"shape":"ModifySnapshotAttributeName"},
+        "Attribute":{"shape":"SnapshotAttributeName"},
         "OperationType":{"shape":"String"},
         "UserIds":{
           "shape":"UserIdStringList",
@@ -9823,7 +9811,7 @@
           "locationName":"dryRun"
         },
         "SnapshotId":{"shape":"String"},
-        "Attribute":{"shape":"ModifySnapshotAttributeName"}
+        "Attribute":{"shape":"SnapshotAttributeName"}
       }
     },
     "ResourceIdList":{
@@ -10452,6 +10440,80 @@
         }
       }
     },
+    "SpotFleetLaunchSpecification":{
+      "type":"structure",
+      "members":{
+        "ImageId":{
+          "shape":"String",
+          "locationName":"imageId"
+        },
+        "KeyName":{
+          "shape":"String",
+          "locationName":"keyName"
+        },
+        "SecurityGroups":{
+          "shape":"GroupIdentifierList",
+          "locationName":"groupSet"
+        },
+        "UserData":{
+          "shape":"String",
+          "locationName":"userData"
+        },
+        "AddressingType":{
+          "shape":"String",
+          "locationName":"addressingType"
+        },
+        "InstanceType":{
+          "shape":"InstanceType",
+          "locationName":"instanceType"
+        },
+        "Placement":{
+          "shape":"SpotPlacement",
+          "locationName":"placement"
+        },
+        "KernelId":{
+          "shape":"String",
+          "locationName":"kernelId"
+        },
+        "RamdiskId":{
+          "shape":"String",
+          "locationName":"ramdiskId"
+        },
+        "BlockDeviceMappings":{
+          "shape":"BlockDeviceMappingList",
+          "locationName":"blockDeviceMapping"
+        },
+        "Monitoring":{
+          "shape":"SpotFleetMonitoring",
+          "locationName":"monitoring"
+        },
+        "SubnetId":{
+          "shape":"String",
+          "locationName":"subnetId"
+        },
+        "NetworkInterfaces":{
+          "shape":"InstanceNetworkInterfaceSpecificationList",
+          "locationName":"networkInterfaceSet"
+        },
+        "IamInstanceProfile":{
+          "shape":"IamInstanceProfileSpecification",
+          "locationName":"iamInstanceProfile"
+        },
+        "EbsOptimized":{
+          "shape":"Boolean",
+          "locationName":"ebsOptimized"
+        }
+      }
+    },
+    "SpotFleetMonitoring":{
+      "type":"structure",
+      "members":{
+        "Enabled":{
+          "shape":"Boolean",
+          "locationName":"enabled"
+        }
+      }
+    },
     "SpotFleetRequestConfig":{
       "type":"structure",
       "required":[