Updated Aws::EMR api model.

CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+* Feature - Aws::EMR - Added support for Custom security groups feature for
+  Amazon Elastic MapReduce (EMR). Custom security groups allow you to define
+  fine grain control over the security rules for your EMR cluster by specifying
+  your own Amazon EC2 security groups.
+
 * Feature - Aws::CognitoIdentity - Amazon Cognito now allows developers to save
   the association between IAM roles and an identity pool via the
   `#set_identity_pool_roles` API. Identity pools with IAM roles associated can

aws-sdk-core/apis/EMR.api.json

@@ -594,7 +594,11 @@
         "Ec2KeyName":{"shape":"String"},
         "Ec2SubnetId":{"shape":"String"},
         "Ec2AvailabilityZone":{"shape":"String"},
-        "IamInstanceProfile":{"shape":"String"}
+        "IamInstanceProfile":{"shape":"String"},
+        "EmrManagedMasterSecurityGroup":{"shape":"String"},
+        "EmrManagedSlaveSecurityGroup":{"shape":"String"},
+        "AdditionalMasterSecurityGroups":{"shape":"StringList"},
+        "AdditionalSlaveSecurityGroups":{"shape":"StringList"}
       }
     },
     "ErrorCode":{
@@ -941,7 +945,11 @@
         "KeepJobFlowAliveWhenNoSteps":{"shape":"Boolean"},
         "TerminationProtected":{"shape":"Boolean"},
         "HadoopVersion":{"shape":"XmlStringMaxLen256"},
-        "Ec2SubnetId":{"shape":"XmlStringMaxLen256"}
+        "Ec2SubnetId":{"shape":"XmlStringMaxLen256"},
+        "EmrManagedMasterSecurityGroup":{"shape":"XmlStringMaxLen256"},
+        "EmrManagedSlaveSecurityGroup":{"shape":"XmlStringMaxLen256"},
+        "AdditionalMasterSecurityGroups":{"shape":"SecurityGroupsList"},
+        "AdditionalSlaveSecurityGroups":{"shape":"SecurityGroupsList"}
       }
     },
     "JobFlowInstancesDetail":{
@@ -1136,6 +1144,10 @@
         "Args":{"shape":"XmlStringList"}
       }
     },
+    "SecurityGroupsList":{
+      "type":"list",
+      "member":{"shape":"XmlStringMaxLen256"}
+    },
     "SetTerminationProtectionInput":{
       "type":"structure",
       "required":[

aws-sdk-core/apis/EMR.docs.json

@@ -677,6 +677,13 @@
         "BootstrapActionConfig$ScriptBootstrapAction": "<p>The script run by the bootstrap action.</p>"
       }
     },
+    "SecurityGroupsList": {
+      "base": null,
+      "refs": {
+        "JobFlowInstancesConfig$AdditionalMasterSecurityGroups": "<p>A list of additional Amazon EC2 security group IDs for the master node.</p>",
+        "JobFlowInstancesConfig$AdditionalSlaveSecurityGroups": "<p>A list of additional Amazon EC2 security group IDs for the slave nodes.</p>"
+      }
+    },
     "SetTerminationProtectionInput": {
       "base": "<p> The input argument to the <a>TerminationProtection</a> operation. </p>",
       "refs": {
@@ -814,6 +821,8 @@
         "Ec2InstanceAttributes$Ec2SubnetId": "<p> To launch the job flow in Amazon VPC, set this parameter to the identifier of the Amazon VPC subnet where you want the job flow to launch. If you do not specify this value, the job flow is launched in the normal AWS cloud, outside of a VPC. </p> <p> Amazon VPC currently does not support cluster compute quadruple extra large (cc1.4xlarge) instances. Thus, you cannot specify the cc1.4xlarge instance type for nodes of a job flow launched in a VPC. </p>",
         "Ec2InstanceAttributes$Ec2AvailabilityZone": "<p>The Availability Zone in which the cluster will run.</p>",
         "Ec2InstanceAttributes$IamInstanceProfile": "<p>The IAM role that was specified when the job flow was launched. The EC2 instances of the job flow assume this role.</p>",
+        "Ec2InstanceAttributes$EmrManagedMasterSecurityGroup": "<p>The identifier of the Amazon EC2 security group (managed by Amazon Elastic MapReduce) for the master node.</p>",
+        "Ec2InstanceAttributes$EmrManagedSlaveSecurityGroup": "<p>The identifier of the Amazon EC2 security group (managed by Amazon Elastic MapReduce) for the slave nodes.</p>",
         "HadoopStepConfig$Jar": "<p>The path to the JAR file that runs during the step.</p>",
         "HadoopStepConfig$MainClass": "<p>The name of the main class in the specified Java file. If not specified, the JAR file should specify a main class in its manifest file.</p>",
         "Instance$PublicDnsName": "<p>The public DNS name of the instance.</p>",
@@ -839,6 +848,8 @@
       "refs": {
         "Application$Args": "<p>Arguments for Amazon EMR to pass to the application.</p>",
         "Command$Args": "<p>Arguments for Amazon EMR to pass to the command for execution.</p>",
+        "Ec2InstanceAttributes$AdditionalMasterSecurityGroups": "<p>A list of additional Amazon EC2 security group IDs for the master node.</p>",
+        "Ec2InstanceAttributes$AdditionalSlaveSecurityGroups": "<p>A list of additional Amazon EC2 security group IDs for the slave nodes.</p>",
         "HadoopStepConfig$Args": "<p>The list of command line arguments to pass to the JAR file's main function for execution.</p>",
         "RemoveTagsInput$TagKeys": "<p>A list of tag keys to remove from a resource.</p>"
       }
@@ -939,12 +950,15 @@
         "JobFlowInstancesConfig$Ec2KeyName": "<p>The name of the Amazon EC2 key pair that can be used to ssh to the master node as the user called \"hadoop.\"</p>",
         "JobFlowInstancesConfig$HadoopVersion": "<p>The Hadoop version for the job flow. Valid inputs are \"0.18\", \"0.20\", \"0.20.205\", \"1.0.3\", \"2.2.0\", or \"2.4.0\". If you do not set this value, the default of 0.18 is used, unless the AmiVersion parameter is set in the RunJobFlow call, in which case the default version of Hadoop for that AMI version is used.</p>",
         "JobFlowInstancesConfig$Ec2SubnetId": "<p> To launch the job flow in Amazon Virtual Private Cloud (Amazon VPC), set this parameter to the identifier of the Amazon VPC subnet where you want the job flow to launch. If you do not specify this value, the job flow is launched in the normal Amazon Web Services cloud, outside of an Amazon VPC. </p> <p> Amazon VPC currently does not support cluster compute quadruple extra large (cc1.4xlarge) instances. Thus you cannot specify the cc1.4xlarge instance type for nodes of a job flow launched in a Amazon VPC. </p>",
+        "JobFlowInstancesConfig$EmrManagedMasterSecurityGroup": "<p>The identifier of the Amazon EC2 security group (managed by Amazon ElasticMapReduce) for the master node.</p>",
+        "JobFlowInstancesConfig$EmrManagedSlaveSecurityGroup": "<p>The identifier of the Amazon EC2 security group (managed by Amazon ElasticMapReduce) for the slave nodes.</p>",
         "JobFlowInstancesDetail$Ec2KeyName": "<p>The name of an Amazon EC2 key pair that can be used to ssh to the master node of job flow.</p>",
         "JobFlowInstancesDetail$Ec2SubnetId": "<p>For job flows launched within Amazon Virtual Private Cloud, this value specifies the identifier of the subnet where the job flow was launched.</p>",
         "JobFlowInstancesDetail$HadoopVersion": "<p>The Hadoop version for the job flow.</p>",
         "RunJobFlowInput$Name": "<p>The name of the job flow.</p>",
         "RunJobFlowInput$AmiVersion": "<p>The version of the Amazon Machine Image (AMI) to use when launching Amazon EC2 instances in the job flow. The following values are valid: </p> <ul> <li>\"latest\" (uses the latest AMI)</li> <li>The version number of the AMI to use, for example, \"2.0\"</li> </ul> <p>If the AMI supports multiple versions of Hadoop (for example, AMI 1.0 supports both Hadoop 0.18 and 0.20) you can use the <a>JobFlowInstancesConfig</a> <code>HadoopVersion</code> parameter to modify the version of Hadoop from the defaults shown above.</p> <p>For details about the AMI versions currently supported by Amazon Elastic MapReduce, go to <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/EnvironmentConfig_AMIVersion.html#ami-versions-supported\">AMI Versions Supported in Elastic MapReduce</a> in the <i>Amazon Elastic MapReduce Developer's Guide.</i> </p>",
         "RunJobFlowOutput$JobFlowId": "<p>An unique identifier for the job flow.</p>",
+        "SecurityGroupsList$member": null,
         "StepConfig$Name": "<p>The name of the job flow step.</p>",
         "StepIdsList$member": null,
         "SupportedProductConfig$Name": "<p>The name of the product configuration.</p>",