aws-sdk-core 2.0.0.rc4 → 2.0.0.rc5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (158) hide show
  1. checksums.yaml +4 -4
  2. data/apis/CloudFront-2013-11-11.json +5502 -0
  3. data/apis/CloudWatch-2010-08-01.json +186 -1
  4. data/apis/DirectConnect-2012-10-25.json +758 -140
  5. data/apis/DynamoDB-2012-08-10.json +860 -2
  6. data/apis/EC2-2013-10-15.json +14698 -0
  7. data/apis/EMR-2009-03-31.json +86 -0
  8. data/apis/ElastiCache-2013-06-15.json +13 -5
  9. data/apis/ElasticBeanstalk-2010-12-01.json +141 -16
  10. data/apis/ElasticLoadBalancing-2012-06-01.json +0 -72
  11. data/apis/IAM-2010-05-08.json +156 -0
  12. data/apis/Kinesis-2013-12-02.json +9 -1
  13. data/apis/OpsWorks-2013-02-18.json +180 -6
  14. data/apis/RDS-2013-02-12.json +2 -1
  15. data/apis/RDS-2013-09-09.json +7963 -0
  16. data/apis/Redshift-2012-12-01.json +3273 -702
  17. data/apis/Route53-2012-12-12.json +2 -2
  18. data/apis/S3-2006-03-01.json +579 -538
  19. data/apis/SNS-2010-03-31.json +14 -0
  20. data/apis/SQS-2012-11-05.json +43 -6
  21. data/apis/STS-2011-06-15.json +81 -0
  22. data/apis/StorageGateway-2013-06-30.json +28 -28
  23. data/apis/source/cloudformation-2010-05-15.json +199 -199
  24. data/apis/source/cloudfront-2013-11-11.json +8828 -0
  25. data/apis/source/cloudfront-2013-11-11.paginators.json +32 -0
  26. data/apis/source/cloudfront-2013-11-11.waiters.json +29 -0
  27. data/apis/source/cloudsearch-2011-02-01.json +16 -23
  28. data/apis/source/datapipeline-2012-10-29.paginators.json +3 -2
  29. data/apis/source/directconnect-2012-10-25.json +1302 -363
  30. data/apis/source/dynamodb-2011-12-05.paginators.json +4 -1
  31. data/apis/source/dynamodb-2011-12-05.waiters.json +27 -0
  32. data/apis/source/dynamodb-2012-08-10.json +1634 -417
  33. data/apis/source/dynamodb-2012-08-10.paginators.json +4 -1
  34. data/apis/source/dynamodb-2012-08-10.waiters.json +25 -0
  35. data/apis/source/ec2-2013-10-15.json +19911 -0
  36. data/apis/source/ec2-2013-10-15.paginators.json +126 -0
  37. data/apis/source/ec2-2013-10-15.waiters.json +146 -0
  38. data/apis/source/elasticache-2013-06-15.json +10 -8
  39. data/apis/source/elasticache-2013-06-15.paginators.json +8 -2
  40. data/apis/source/elasticbeanstalk-2010-12-01.json +186 -32
  41. data/apis/source/elasticloadbalancing-2012-06-01.json +166 -293
  42. data/apis/source/elasticmapreduce-2009-03-31.json +229 -134
  43. data/apis/source/elastictranscoder-2012-09-25.json +1 -1
  44. data/apis/source/glacier-2012-06-01.paginators.json +3 -3
  45. data/apis/source/glacier-2012-06-01.waiters.json +23 -0
  46. data/apis/source/iam-2010-05-08.json +1306 -626
  47. data/apis/source/iam-2010-05-08.paginators.json +3 -0
  48. data/apis/source/kinesis-2013-12-02.json +4 -4
  49. data/apis/source/kinesis-2013-12-02.paginators.json +10 -4
  50. data/apis/source/monitoring-2010-08-01.json +336 -28
  51. data/apis/source/opsworks-2013-02-18.json +385 -102
  52. data/apis/source/rds-2013-01-10.paginators.json +6 -2
  53. data/apis/source/rds-2013-02-12.paginators.json +6 -2
  54. data/apis/source/rds-2013-09-09.json +10658 -0
  55. data/apis/source/rds-2013-09-09.paginators.json +110 -0
  56. data/apis/source/rds-2013-09-09.waiters.json +36 -0
  57. data/apis/source/redshift-2012-12-01.json +4759 -1237
  58. data/apis/source/redshift-2012-12-01.paginators.json +20 -1
  59. data/apis/source/redshift-2012-12-01.waiters.json +43 -0
  60. data/apis/source/route53-2012-12-12.paginators.json +2 -2
  61. data/apis/source/s3-2006-03-01.json +1032 -985
  62. data/apis/source/s3-2006-03-01.paginators.json +14 -3
  63. data/apis/source/s3-2006-03-01.waiters.json +27 -0
  64. data/apis/source/sns-2010-03-31.paginators.json +10 -0
  65. data/apis/source/sqs-2012-11-05.json +153 -101
  66. data/apis/source/storagegateway-2013-06-30.json +403 -442
  67. data/apis/source/storagegateway-2013-06-30.paginators.json +24 -0
  68. data/apis/source/sts-2011-06-15.json +258 -75
  69. data/apis/source/support-2013-04-15.paginators.json +0 -6
  70. data/apis/source/swf-2012-01-25.paginators.json +7 -7
  71. data/features/autoscaling/client.feature +6 -10
  72. data/features/autoscaling/{setup.rb → step_definitions.rb} +1 -1
  73. data/features/cloudformation/client.feature +5 -6
  74. data/features/cloudformation/{setup.rb → step_definitions.rb} +1 -1
  75. data/features/cloudfront/client.feature +5 -9
  76. data/features/cloudfront/{setup.rb → step_definitions.rb} +1 -1
  77. data/features/cloudsearch/client.feature +4 -6
  78. data/features/cloudsearch/{setup.rb → step_definitions.rb} +1 -1
  79. data/features/cloudwatch/client.feature +7 -9
  80. data/features/cloudwatch/{setup.rb → step_definitions.rb} +1 -1
  81. data/features/datapipeline/client.feature +5 -7
  82. data/features/datapipeline/{setup.rb → step_definitions.rb} +1 -1
  83. data/features/directconnect/client.feature +5 -7
  84. data/features/directconnect/{setup.rb → step_definitions.rb} +1 -1
  85. data/features/dynamodb/client.feature +6 -10
  86. data/features/dynamodb/simplified.feature +5 -9
  87. data/features/dynamodb/step_definitions.rb +9 -1
  88. data/features/ec2/client.feature +4 -9
  89. data/features/ec2/step_definitions.rb +3 -16
  90. data/features/elasticache/client.feature +4 -6
  91. data/features/elasticache/{setup.rb → step_definitions.rb} +1 -1
  92. data/features/elasticbeanstalk/client.feature +4 -6
  93. data/features/elasticbeanstalk/{setup.rb → step_definitions.rb} +1 -1
  94. data/features/elasticloadbalancing/client.feature +4 -6
  95. data/features/elasticloadbalancing/{setup.rb → step_definitions.rb} +1 -1
  96. data/features/elastictranscoder/client.feature +4 -6
  97. data/features/elastictranscoder/{setup.rb → step_definitions.rb} +1 -1
  98. data/features/emr/client.feature +4 -6
  99. data/features/emr/{setup.rb → step_definitions.rb} +1 -1
  100. data/features/env.rb +0 -2
  101. data/features/glacier/client.feature +10 -34
  102. data/features/glacier/step_definitions.rb +25 -8
  103. data/features/glacier/upload.feature +27 -0
  104. data/features/iam/client.feature +4 -6
  105. data/features/iam/{setup.rb → step_definitions.rb} +1 -1
  106. data/features/importexport/client.feature +4 -6
  107. data/features/importexport/{setup.rb → step_definitions.rb} +1 -1
  108. data/features/kinesis/client.feature +4 -6
  109. data/features/kinesis/{setup.rb → step_definitions.rb} +1 -1
  110. data/features/opsworks/client.feature +4 -6
  111. data/features/opsworks/{setup.rb → step_definitions.rb} +1 -1
  112. data/features/rds/client.feature +4 -6
  113. data/features/rds/{setup.rb → step_definitions.rb} +1 -1
  114. data/features/redshift/client.feature +4 -6
  115. data/features/redshift/{setup.rb → step_definitions.rb} +1 -1
  116. data/features/route53/client.feature +4 -6
  117. data/features/route53/{setup.rb → step_definitions.rb} +1 -1
  118. data/features/s3/buckets.feature +8 -0
  119. data/features/s3/step_definitions.rb +42 -3
  120. data/features/sdb/client.feature +4 -6
  121. data/features/sdb/{setup.rb → step_definitions.rb} +1 -1
  122. data/features/ses/client.feature +4 -6
  123. data/features/ses/{setup.rb → step_definitions.rb} +1 -1
  124. data/features/sns/client.feature +5 -6
  125. data/features/sns/{setup.rb → step_definitions.rb} +1 -1
  126. data/features/sqs/client.feature +5 -7
  127. data/features/sqs/step_definitions.rb +11 -0
  128. data/features/step_definitions.rb +88 -0
  129. data/features/storagegateway/client.feature +4 -6
  130. data/features/storagegateway/{setup.rb → step_definitions.rb} +1 -1
  131. data/features/sts/client.feature +5 -6
  132. data/features/sts/{setup.rb → step_definitions.rb} +1 -1
  133. data/features/swf/client.feature +5 -9
  134. data/features/swf/{setup.rb → step_definitions.rb} +1 -1
  135. data/lib/aws/api/shape_translator.rb +1 -0
  136. data/lib/aws/errors.rb +35 -11
  137. data/lib/aws/plugins/credentials.rb +11 -5
  138. data/lib/aws/plugins/regional_endpoint.rb +7 -3
  139. data/lib/aws/plugins/s3_regional_endpoint.rb +0 -2
  140. data/lib/aws/request_handler.rb +8 -3
  141. data/lib/aws/signers/s3.rb +14 -18
  142. data/lib/aws/version.rb +1 -1
  143. data/spec/aws/errors_spec.rb +39 -0
  144. data/spec/aws/plugins/credentials_spec.rb +12 -0
  145. data/spec/aws/plugins/region_endpoint_spec.rb +16 -4
  146. data/spec/aws/plugins/retry_errors_spec.rb +26 -26
  147. data/spec/aws/service_spec.rb +1 -1
  148. data/spec/fixtures/operations/route53/change_resource_record_sets.yml +18 -0
  149. data/tasks/test.rake +6 -18
  150. data/vendor/seahorse/lib/seahorse/client/http/headers.rb +20 -0
  151. data/vendor/seahorse/tasks/test.rake +2 -15
  152. metadata +77 -64
  153. data/features/common/step_definitions.rb +0 -63
  154. data/features/dynamodb/setup.rb +0 -8
  155. data/features/ec2/setup.rb +0 -6
  156. data/features/glacier/setup.rb +0 -16
  157. data/features/s3/setup.rb +0 -17
  158. data/features/sqs/setup.rb +0 -10
data/apis/source/elasticmapreduce-2009-03-31.json CHANGED
@@ -8,6 +8,7 @@
8
8
  "service_abbreviation": "Amazon EMR",
9
9
  "timestamp_format": "unixTimestamp",
10
10
  "endpoint_prefix": "elasticmapreduce",
11
+ "xmlnamespace": "http://elasticmapreduce.amazonaws.com/doc/2009-03-31",
11
12
  "documentation": "\n <p> This is the <i>Amazon Elastic MapReduce API Reference</i>. This guide provides descriptions and\n samples of the Amazon Elastic MapReduce APIs.</p>\n\n <p>Amazon Elastic MapReduce (Amazon EMR) is a web service that makes it easy to process large amounts of\n data efficiently. Amazon EMR uses Hadoop processing combined with several AWS\n products to do tasks such as web indexing, data mining, log file analysis, machine\n learning, scientific simulation, and data warehousing.</p>\n\n ",
12
13
  "operations": {
13
14
  "AddInstanceGroups": {
@@ -279,6 +280,84 @@
279
280
  ],
280
281
  "documentation": "\n <p> AddJobFlowSteps adds new steps to a running job flow. A maximum of 256 steps are allowed\n in each job flow. </p>\n <p>If your job flow is long-running (such as a Hive data warehouse) or complex, you may require more than 256 steps to process your data. You can bypass the 256-step limitation in various ways, including using the SSH shell to connect to the master node and submitting queries directly to the software running on the master node, such as Hive and Hadoop. For more information on how to do this, go to <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/AddMoreThan256Steps.html\">Add More than 256 Steps to a Job Flow</a> in the <i>Amazon Elastic MapReduce Developer's Guide</i>.</p>\n <p> A step specifies the location of a JAR file stored either on the master node of the job\n flow or in Amazon S3. Each step is performed by the main function of the main class of the\n JAR file. The main class can be specified either in the manifest of the JAR or by using the\n MainFunction parameter of the step. </p>\n <p> Elastic MapReduce executes each step in the order listed. For a step to be considered\n complete, the main function must exit with a zero exit code and all Hadoop jobs started\n while the step was running must have completed and run successfully. </p>\n <p> You can only add steps to a job flow that is in one of the following states: STARTING,\n BOOTSTRAPPING, RUNNING, or WAITING.</p>\n\n <examples>\n <queryrequest>POST / HTTP/1.1\nContent-Type: application/x-amz-json-1.1\nX-Amz-Target: ElasticMapReduce.AddJobFlowSteps\nContent-Length: 426\nUser-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32\nHost: us-east-1.elasticmapreduce.amazonaws.com\nX-Amz-Date: 20130716T210948Z\nX-Amz-Content-Sha256: 9e5ad0a93c22224947ce98eea94f766103d91b28fa82eb60d0cb8b6f9555a6b2\nAuthorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130716/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=2a2393390760ae85eb74ee3a539e1d758bfdd8815a1a6d6f14d4a2fbcfdcd5b7\nAccept: */*\n\n{\n \"JobFlowId\": \"j-3TS0OIYO4NFN\",\n \"Steps\": [{\n \"Name\": \"Example Jar Step\",\n \"ActionOnFailure\": \"CANCEL_AND_WAIT\",\n \"HadoopJarStep\": {\n \"Jar\": \"s3n:\\\\/\\\\/elasticmapreduce\\\\/samples\\\\/cloudburst\\\\/cloudburst.jar\",\n \"Args\": [\n \"s3n:\\\\/\\\\/elasticmapreduce\\\\/samples\\\\/cloudburst\\\\/input\\\\/s_suis.br\",\n \"s3n:\\\\/\\\\/elasticmapreduce\\\\/samples\\\\/cloudburst\\\\/input\\\\/100k.br\",\n \"s3n:\\\\/\\\\/examples-bucket\\\\/cloudburst\\\\/output\",\n \"36\",\n \"3\",\n \"0\",\n \"1\",\n \"240\",\n \"48\",\n \"24\",\n \"24\",\n \"128\",\n \"16\"\n ]\n }\n }]\n}\n</queryrequest>\n\n <queryresponse>HTTP/1.1 200 OK\nx-amzn-RequestId: 6514261f-ee5b-11e2-9345-5332e9ab2e6d\nContent-Type: application/x-amz-json-1.1\nContent-Length: 0\nDate: Tue, 16 Jul 2013 21:05:07 GMT\n\n </queryresponse>\n </examples>\n "
281
282
  },
283
+ "AddTags": {
284
+ "name": "AddTags",
285
+ "input": {
286
+ "shape_name": "AddTagsInput",
287
+ "type": "structure",
288
+ "members": {
289
+ "ResourceId": {
290
+ "shape_name": "ResourceId",
291
+ "type": "string",
292
+ "documentation": "\n <p>The Amazon EMR resource identifier to which tags will be added. This value must be a cluster identifier.</p>\n "
293
+ },
294
+ "Tags": {
295
+ "shape_name": "TagList",
296
+ "type": "list",
297
+ "members": {
298
+ "shape_name": "Tag",
299
+ "type": "structure",
300
+ "members": {
301
+ "Key": {
302
+ "shape_name": "String",
303
+ "type": "string",
304
+ "documentation": "\n <p>A user-defined key, which is the minimum required information for a valid tag.\n For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-plan-tags.html\">Tagging Amazon EMR Resources</a>. \n </p> \n "
305
+ },
306
+ "Value": {
307
+ "shape_name": "String",
308
+ "type": "string",
309
+ "documentation": "\n <p>A user-defined value, which is optional in a tag.\n For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-plan-tags.html\">Tagging Amazon EMR Resources</a>. \n </p> \n "
310
+ }
311
+ },
312
+ "documentation": "\n <p>A key/value pair that contains user-defined metadata that you can associate with an Amazon EMR resource. Tags make it easier to associate clusters in various ways, such as grouping clusters to track your Amazon EMR resource allocation costs. \n For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-plan-tags.html\">Tagging Amazon EMR Resources</a>. \n </p> \n "
313
+ },
314
+ "documentation": "\n <p>A list of tags to associate with a cluster and propagate to Amazon EC2 instances. Tags are user-defined key/value pairs that consist of a required key string with a maximum of 128 characters, and an optional value string with a maximum of 256 characters.</p>\n "
315
+ }
316
+ },
317
+ "documentation": "\n <p>This input identifies a cluster and a list of tags to attach.\n </p> \n "
318
+ },
319
+ "output": {
320
+ "shape_name": "AddTagsOutput",
321
+ "type": "structure",
322
+ "members": {
323
+ },
324
+ "documentation": "\n <p>This output indicates the result of adding tags to a resource. \n </p> \n "
325
+ },
326
+ "errors": [
327
+ {
328
+ "shape_name": "InternalServerException",
329
+ "type": "structure",
330
+ "members": {
331
+ "Message": {
332
+ "shape_name": "ErrorMessage",
333
+ "type": "string",
334
+ "documentation": "\n <p>The message associated with the exception.</p> \n \n "
335
+ }
336
+ },
337
+ "documentation": "\n <p>This exception occurs when there is an internal failure in the EMR service.</p> \n \n "
338
+ },
339
+ {
340
+ "shape_name": "InvalidRequestException",
341
+ "type": "structure",
342
+ "members": {
343
+ "ErrorCode": {
344
+ "shape_name": "ErrorCode",
345
+ "type": "string",
346
+ "min_length": 1,
347
+ "max_length": 256,
348
+ "documentation": "\n <p>The error code associated with the exception.</p> \n \n "
349
+ },
350
+ "Message": {
351
+ "shape_name": "ErrorMessage",
352
+ "type": "string",
353
+ "documentation": "\n <p>The message associated with the exception.</p> \n \n "
354
+ }
355
+ },
356
+ "documentation": "\n <p>This exception occurs when there is something wrong with user input.</p> \n \n "
357
+ }
358
+ ],
359
+ "documentation": "\n <p>Adds tags to an Amazon EMR resource. Tags make it easier to associate clusters in various ways, such as grouping clusters to track your Amazon EMR resource allocation costs. \n For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-plan-tags.html\">Tagging Amazon EMR Resources</a>. \n </p> \n "
360
+ },
282
361
  "DescribeCluster": {
283
362
  "name": "DescribeCluster",
284
363
  "input": {
@@ -288,8 +367,6 @@
288
367
  "ClusterId": {
289
368
  "shape_name": "ClusterId",
290
369
  "type": "string",
291
- "min_length": 1,
292
- "max_length": 64,
293
370
  "documentation": "\n <p>The identifier of the cluster to describe.</p>\n "
294
371
  }
295
372
  },
@@ -306,15 +383,11 @@
306
383
  "Id": {
307
384
  "shape_name": "ClusterId",
308
385
  "type": "string",
309
- "min_length": 1,
310
- "max_length": 64,
311
386
  "documentation": "\n <p>The unique identifier for the cluster.</p>"
312
387
  },
313
388
  "Name": {
314
- "shape_name": "StringMaxLen256",
389
+ "shape_name": "String",
315
390
  "type": "string",
316
- "min_length": 0,
317
- "max_length": 256,
318
391
  "documentation": "\n <p>The name of the cluster.</p>"
319
392
  },
320
393
  "Status": {
@@ -391,31 +464,23 @@
391
464
  "type": "structure",
392
465
  "members": {
393
466
  "Ec2KeyName": {
394
- "shape_name": "StringMaxLen256",
467
+ "shape_name": "String",
395
468
  "type": "string",
396
- "min_length": 0,
397
- "max_length": 256,
398
469
  "documentation": "\n <p>The name of the Amazon EC2 key pair to use when connecting with SSH into the master node as\n a user named \"hadoop\".</p>\n "
399
470
  },
400
471
  "Ec2SubnetId": {
401
- "shape_name": "StringMaxLen256",
472
+ "shape_name": "String",
402
473
  "type": "string",
403
- "min_length": 0,
404
- "max_length": 256,
405
474
  "documentation": "\n <p>\n To launch the job flow in Amazon VPC, set this parameter to the identifier of the Amazon VPC subnet where \n 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 \n a VPC. \n </p>\n <p>\n Amazon VPC currently does not support cluster compute quadruple extra large (cc1.4xlarge) instances. \n Thus, you cannot specify the cc1.4xlarge instance type for nodes of a job flow launched in a VPC.\n </p>\n "
406
475
  },
407
476
  "Ec2AvailabilityZone": {
408
- "shape_name": "StringMaxLen256",
477
+ "shape_name": "String",
409
478
  "type": "string",
410
- "min_length": 0,
411
- "max_length": 256,
412
479
  "documentation": "\n <p>The Availability Zone in which the cluster will run.</p>\n "
413
480
  },
414
481
  "IamInstanceProfile": {
415
- "shape_name": "StringMaxLen256",
482
+ "shape_name": "String",
416
483
  "type": "string",
417
- "min_length": 0,
418
- "max_length": 256,
419
484
  "documentation": "\n <p>The IAM role that was specified when the job flow was launched. The EC2 instances of the job flow assume this role.</p>\n "
420
485
  }
421
486
  },
@@ -427,17 +492,13 @@
427
492
  "documentation": "\n <p>The path to the Amazon S3 location where logs for this cluster are stored.</p> \n "
428
493
  },
429
494
  "RequestedAmiVersion": {
430
- "shape_name": "StringMaxLen256",
495
+ "shape_name": "String",
431
496
  "type": "string",
432
- "min_length": 0,
433
- "max_length": 256,
434
497
  "documentation": "\n <p>The AMI version requested for this cluster.<!-- For more information, see <a>JobFlowDetail$AmiVersion</a>.--></p>\n "
435
498
  },
436
499
  "RunningAmiVersion": {
437
- "shape_name": "StringMaxLen256",
500
+ "shape_name": "String",
438
501
  "type": "string",
439
- "min_length": 0,
440
- "max_length": 256,
441
502
  "documentation": "\n <p>The AMI version running on this cluster. This differs from the requested version only if the requested version is a meta version, such as \"latest\". <!--For more information, see <a>JobFlowDetail$AmiVersion</a>.--></p>\n "
442
503
  },
443
504
  "AutoTerminate": {
@@ -463,17 +524,13 @@
463
524
  "type": "structure",
464
525
  "members": {
465
526
  "Name": {
466
- "shape_name": "StringMaxLen256",
527
+ "shape_name": "String",
467
528
  "type": "string",
468
- "min_length": 0,
469
- "max_length": 256,
470
529
  "documentation": "\n <p>The name of the application.</p>"
471
530
  },
472
531
  "Version": {
473
- "shape_name": "StringMaxLen256",
532
+ "shape_name": "String",
474
533
  "type": "string",
475
- "min_length": 0,
476
- "max_length": 256,
477
534
  "documentation": "\n <p>The version of the application.</p>"
478
535
  },
479
536
  "Args": {
@@ -490,10 +547,8 @@
490
547
  "shape_name": "StringMap",
491
548
  "type": "map",
492
549
  "keys": {
493
- "shape_name": "StringMaxLen256",
550
+ "shape_name": "String",
494
551
  "type": "string",
495
- "min_length": 0,
496
- "max_length": 256,
497
552
  "documentation": null
498
553
  },
499
554
  "members": {
@@ -504,9 +559,31 @@
504
559
  "documentation": "\n <p>This option is for advanced users only. This is meta information about third-party applications that third-party vendors use for testing purposes.</p>"
505
560
  }
506
561
  },
507
- "documentation": "\n <p>An application is any Amazon or third-party software that you can add to the cluster. This structure contains a list of strings that indicates the software to use with the cluster and accepts a user argument list. Amazon EMR accepts and forwards the argument list to the corresponding installation\n script as bootstrap action argument. For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-mapr.html\">Launch a Job Flow on the MapR Distribution for Hadoop</a>. Currently supported values are:</p>\n <ul>\n <li>\"karmasphere-enterprise-utility\" - tag the \n job flow for management by <a href=\"http://aws.amazon.com/elasticmapreduce/karmasphere/\">Karmasphere</a>.</li>\n <li>\"mapr-m3\" - launch the job flow using MapR M3 Edition.</li>\n <li>\"mapr-m5\" - launch the job flow using MapR M5 Edition.</li>\n <li>\"mapr\" with the user arguments specifying \"--edition,m3\" or \"--edition,m5\" - launch the job flow using MapR M3 or M5 Edition, respectively.</li>\n </ul>\n "
562
+ "documentation": "\n <p>An application is any Amazon or third-party software that you can add to the cluster. This structure contains a list of strings that indicates the software to use with the cluster and accepts a user argument list. Amazon EMR accepts and forwards the argument list to the corresponding installation\n script as bootstrap action argument. For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-mapr.html\">Launch a Job Flow on the MapR Distribution for Hadoop</a>. Currently supported values are:</p>\n <ul> \n <li>\"mapr-m3\" - launch the job flow using MapR M3 Edition.</li>\n <li>\"mapr-m5\" - launch the job flow using MapR M5 Edition.</li>\n <li>\"mapr\" with the user arguments specifying \"--edition,m3\" or \"--edition,m5\" - launch the job flow using MapR M3 or M5 Edition, respectively.</li>\n </ul>\n "
508
563
  },
509
564
  "documentation": "\n <p>The applications installed on this cluster.</p>\n "
565
+ },
566
+ "Tags": {
567
+ "shape_name": "TagList",
568
+ "type": "list",
569
+ "members": {
570
+ "shape_name": "Tag",
571
+ "type": "structure",
572
+ "members": {
573
+ "Key": {
574
+ "shape_name": "String",
575
+ "type": "string",
576
+ "documentation": "\n <p>A user-defined key, which is the minimum required information for a valid tag.\n For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-plan-tags.html\">Tagging Amazon EMR Resources</a>. \n </p> \n "
577
+ },
578
+ "Value": {
579
+ "shape_name": "String",
580
+ "type": "string",
581
+ "documentation": "\n <p>A user-defined value, which is optional in a tag.\n For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-plan-tags.html\">Tagging Amazon EMR Resources</a>. \n </p> \n "
582
+ }
583
+ },
584
+ "documentation": "\n <p>A key/value pair that contains user-defined metadata that you can associate with an Amazon EMR resource. Tags make it easier to associate clusters in various ways, such as grouping clusters to track your Amazon EMR resource allocation costs. \n For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-plan-tags.html\">Tagging Amazon EMR Resources</a>. \n </p> \n "
585
+ },
586
+ "documentation": "\n <p>A list of tags associated with cluster.</p>"
510
587
  }
511
588
  },
512
589
  "documentation": "\n <p>This output contains the details for the requested cluster.</p>\n "
@@ -1192,15 +1269,11 @@
1192
1269
  "ClusterId": {
1193
1270
  "shape_name": "ClusterId",
1194
1271
  "type": "string",
1195
- "min_length": 1,
1196
- "max_length": 64,
1197
1272
  "documentation": "\n <p>The identifier of the cluster with steps to describe.</p>\n "
1198
1273
  },
1199
1274
  "StepId": {
1200
1275
  "shape_name": "StepId",
1201
1276
  "type": "string",
1202
- "min_length": 1,
1203
- "max_length": 64,
1204
1277
  "documentation": "\n <p>The identifier of the step to describe.</p>\n "
1205
1278
  }
1206
1279
  },
@@ -1217,15 +1290,11 @@
1217
1290
  "Id": {
1218
1291
  "shape_name": "StepId",
1219
1292
  "type": "string",
1220
- "min_length": 1,
1221
- "max_length": 64,
1222
1293
  "documentation": "\n <p>The identifier of the cluster step.</p>\n "
1223
1294
  },
1224
1295
  "Name": {
1225
- "shape_name": "StringMaxLen256",
1296
+ "shape_name": "String",
1226
1297
  "type": "string",
1227
- "min_length": 0,
1228
- "max_length": 256,
1229
1298
  "documentation": "\n <p>The name of the cluster step.</p>\n "
1230
1299
  },
1231
1300
  "Config": {
@@ -1241,10 +1310,8 @@
1241
1310
  "shape_name": "StringMap",
1242
1311
  "type": "map",
1243
1312
  "keys": {
1244
- "shape_name": "StringMaxLen256",
1313
+ "shape_name": "String",
1245
1314
  "type": "string",
1246
- "min_length": 0,
1247
- "max_length": 256,
1248
1315
  "documentation": null
1249
1316
  },
1250
1317
  "members": {
@@ -1395,16 +1462,12 @@
1395
1462
  "ClusterId": {
1396
1463
  "shape_name": "ClusterId",
1397
1464
  "type": "string",
1398
- "min_length": 1,
1399
- "max_length": 64,
1400
- "documentation": "\n <p>The cluster identifier for the bootstrap actions to list\n .</p>\n "
1465
+ "documentation": "\n <p>The cluster identifier for the bootstrap actions to list.</p>\n "
1401
1466
  },
1402
1467
  "Marker": {
1403
1468
  "shape_name": "Marker",
1404
1469
  "type": "string",
1405
- "min_length": 1,
1406
- "max_length": 512,
1407
- "documentation": "\n <p>The pagination token that indicates the next set of results to retrieve\n .</p>\n "
1470
+ "documentation": "\n <p>The pagination token is a random string indicating whether there are more results to fetch. Provide the pagination token from earlier API calls to retrieve the next page of results. When the value is null, all results have been returned.</p>\n "
1408
1471
  }
1409
1472
  },
1410
1473
  "documentation": "\n <p>This input determines which bootstrap actions to retrieve.</p>\n "
@@ -1421,10 +1484,8 @@
1421
1484
  "type": "structure",
1422
1485
  "members": {
1423
1486
  "Name": {
1424
- "shape_name": "StringMaxLen256",
1487
+ "shape_name": "String",
1425
1488
  "type": "string",
1426
- "min_length": 0,
1427
- "max_length": 256,
1428
1489
  "documentation": "\n <p>The name of the command.</p>\n "
1429
1490
  },
1430
1491
  "ScriptPath": {
@@ -1445,17 +1506,15 @@
1445
1506
  },
1446
1507
  "documentation": "\n <p>An entity describing an executable that runs on a cluster.</p>\n "
1447
1508
  },
1448
- "documentation": "\n <p>The bootstrap actions associated with the cluster\n .</p>\n "
1509
+ "documentation": "\n <p>The bootstrap actions associated with the cluster.</p>\n "
1449
1510
  },
1450
1511
  "Marker": {
1451
1512
  "shape_name": "Marker",
1452
1513
  "type": "string",
1453
- "min_length": 1,
1454
- "max_length": 512,
1455
- "documentation": "\n <p>The pagination token that indicates the next set of results to retrieve\n .</p>\n "
1514
+ "documentation": "\n <p>The pagination token is a random string indicating whether there are more results to fetch. Use the pagination token in later API calls to retrieve the next page of results. When the value is null, all results have been returned.</p>\n "
1456
1515
  }
1457
1516
  },
1458
- "documentation": "\n <p>This output contains the boostrap actions detail\n .</p>\n "
1517
+ "documentation": "\n <p>This output contains the bootstrap actions detail.</p>\n "
1459
1518
  },
1460
1519
  "errors": [
1461
1520
  {
@@ -1501,12 +1560,12 @@
1501
1560
  "CreatedAfter": {
1502
1561
  "shape_name": "Date",
1503
1562
  "type": "timestamp",
1504
- "documentation": "\n <p>The creation date and time beginning value filter for listing clusters\n .</p>\n "
1563
+ "documentation": "\n <p>The creation date and time beginning value filter for listing clusters.</p>\n "
1505
1564
  },
1506
1565
  "CreatedBefore": {
1507
1566
  "shape_name": "Date",
1508
1567
  "type": "timestamp",
1509
- "documentation": "\n <p>The creation date and time end value filter for listing clusters\n .</p>\n "
1568
+ "documentation": "\n <p>The creation date and time end value filter for listing clusters.</p>\n "
1510
1569
  },
1511
1570
  "ClusterStates": {
1512
1571
  "shape_name": "ClusterStateList",
@@ -1530,9 +1589,7 @@
1530
1589
  "Marker": {
1531
1590
  "shape_name": "Marker",
1532
1591
  "type": "string",
1533
- "min_length": 1,
1534
- "max_length": 512,
1535
- "documentation": "\n <p>The pagination token that indicates the next set of results to retrieve.\n </p>\n "
1592
+ "documentation": "\n <p>The pagination token is a random string indicating whether there are more results to fetch. Provide the pagination token from earlier API calls to retrieve the next page of results. When the value is null, all results have been returned.\n </p>\n "
1536
1593
  }
1537
1594
  },
1538
1595
  "documentation": "\n <p>This input determines how the ListClusters action filters the list of clusters that it returns.</p> \n "
@@ -1551,15 +1608,11 @@
1551
1608
  "Id": {
1552
1609
  "shape_name": "ClusterId",
1553
1610
  "type": "string",
1554
- "min_length": 1,
1555
- "max_length": 64,
1556
1611
  "documentation": "\n <p>The unique identifier for the cluster.</p>\n "
1557
1612
  },
1558
1613
  "Name": {
1559
- "shape_name": "StringMaxLen256",
1614
+ "shape_name": "String",
1560
1615
  "type": "string",
1561
- "min_length": 0,
1562
- "max_length": 256,
1563
1616
  "documentation": "\n <p>The name of the cluster.</p>\n "
1564
1617
  },
1565
1618
  "Status": {
@@ -1639,9 +1692,7 @@
1639
1692
  "Marker": {
1640
1693
  "shape_name": "Marker",
1641
1694
  "type": "string",
1642
- "min_length": 1,
1643
- "max_length": 512,
1644
- "documentation": "\n <p>The pagination token that indicates the next set of results to retrieve.\n </p>\n "
1695
+ "documentation": "\n <p>The pagination token is a random string indicating whether there are more results to fetch. Use the pagination token in later API calls to retrieve the next page of results. When the value is null, all results have been returned. \n </p>\n "
1645
1696
  }
1646
1697
  },
1647
1698
  "documentation": "\n <p>This contains a ClusterSummaryList with the cluster details; for example, the cluster IDs, names, and status.</p> \n "
@@ -1690,16 +1741,12 @@
1690
1741
  "ClusterId": {
1691
1742
  "shape_name": "ClusterId",
1692
1743
  "type": "string",
1693
- "min_length": 1,
1694
- "max_length": 64,
1695
1744
  "documentation": "\n <p>The identifier of the cluster for which to list the instance groups.</p>\n "
1696
1745
  },
1697
1746
  "Marker": {
1698
1747
  "shape_name": "Marker",
1699
1748
  "type": "string",
1700
- "min_length": 1,
1701
- "max_length": 512,
1702
- "documentation": "\n <p>The pagination token that indicates the next set of results to retrieve.</p>\n "
1749
+ "documentation": "\n <p>The pagination token is a random string indicating whether there are more results to fetch. Provide the pagination token from earlier API calls to retrieve the next page of results. When the value is null, all results have been returned.</p>\n "
1703
1750
  }
1704
1751
  },
1705
1752
  "documentation": "\n <p>This input determines which instance groups to retrieve.</p>\n "
@@ -1718,15 +1765,11 @@
1718
1765
  "Id": {
1719
1766
  "shape_name": "InstanceGroupId",
1720
1767
  "type": "string",
1721
- "min_length": 1,
1722
- "max_length": 64,
1723
1768
  "documentation": "\n <p>The identifier of the instance group.</p>\n "
1724
1769
  },
1725
1770
  "Name": {
1726
- "shape_name": "StringMaxLen256",
1771
+ "shape_name": "String",
1727
1772
  "type": "string",
1728
- "min_length": 0,
1729
- "max_length": 256,
1730
1773
  "documentation": "\n <p>The name of the instance group.</p>\n "
1731
1774
  },
1732
1775
  "Market": {
@@ -1749,10 +1792,8 @@
1749
1792
  "documentation": "\n <p>The type of the instance group. Valid values are MASTER, CORE or TASK.</p>\n "
1750
1793
  },
1751
1794
  "BidPrice": {
1752
- "shape_name": "StringMaxLen256",
1795
+ "shape_name": "String",
1753
1796
  "type": "string",
1754
- "min_length": 0,
1755
- "max_length": 256,
1756
1797
  "documentation": "\n <p>The bid price for each EC2 instance in the\n instance group when launching nodes as Spot Instances, expressed in USD.</p>\n "
1757
1798
  },
1758
1799
  "InstanceType": {
@@ -1850,9 +1891,7 @@
1850
1891
  "Marker": {
1851
1892
  "shape_name": "Marker",
1852
1893
  "type": "string",
1853
- "min_length": 1,
1854
- "max_length": 512,
1855
- "documentation": "\n <p>The pagination token that indicates the next set of results to retrieve.</p>\n "
1894
+ "documentation": "\n <p>The pagination token is a random string indicating whether there are more results to fetch. Use the pagination token in later API calls to retrieve the next page of results. When the value is null, all results have been returned.</p>\n "
1856
1895
  }
1857
1896
  },
1858
1897
  "documentation": "\n <p>This input determines which instance groups to retrieve.</p>\n "
@@ -1901,15 +1940,11 @@
1901
1940
  "ClusterId": {
1902
1941
  "shape_name": "ClusterId",
1903
1942
  "type": "string",
1904
- "min_length": 1,
1905
- "max_length": 64,
1906
1943
  "documentation": "\n <p>The identifier of the cluster for which to list the instances.</p>\n "
1907
1944
  },
1908
1945
  "InstanceGroupId": {
1909
1946
  "shape_name": "InstanceGroupId",
1910
1947
  "type": "string",
1911
- "min_length": 1,
1912
- "max_length": 64,
1913
1948
  "documentation": "\n <p>The identifier of the instance group for which to list the instances.</p>\n "
1914
1949
  },
1915
1950
  "InstanceGroupTypes": {
@@ -1930,9 +1965,7 @@
1930
1965
  "Marker": {
1931
1966
  "shape_name": "Marker",
1932
1967
  "type": "string",
1933
- "min_length": 1,
1934
- "max_length": 512,
1935
- "documentation": "\n <p>The pagination token that indicates the next set of results to retrieve.</p>\n "
1968
+ "documentation": "\n <p>The pagination token is a random string indicating whether there are more results to fetch. Provide the pagination token from earlier API calls to retrieve the next page of results. When the value is null, all results have been returned.</p>\n "
1936
1969
  }
1937
1970
  },
1938
1971
  "documentation": "\n <p>This input determines which instances to list.</p>\n "
@@ -1951,43 +1984,31 @@
1951
1984
  "Id": {
1952
1985
  "shape_name": "InstanceId",
1953
1986
  "type": "string",
1954
- "min_length": 1,
1955
- "max_length": 64,
1956
1987
  "documentation": "\n <p>The unique identifier for the instance in Amazon EMR.</p>\n "
1957
1988
  },
1958
1989
  "Ec2InstanceId": {
1959
1990
  "shape_name": "InstanceId",
1960
1991
  "type": "string",
1961
- "min_length": 1,
1962
- "max_length": 64,
1963
1992
  "documentation": "\n <p>The unique identifier of the instance in Amazon EC2.</p>\n "
1964
1993
  },
1965
1994
  "PublicDnsName": {
1966
- "shape_name": "StringMaxLen256",
1995
+ "shape_name": "String",
1967
1996
  "type": "string",
1968
- "min_length": 0,
1969
- "max_length": 256,
1970
1997
  "documentation": "\n <p>The public DNS name of the instance.</p>\n "
1971
1998
  },
1972
1999
  "PublicIpAddress": {
1973
- "shape_name": "StringMaxLen256",
2000
+ "shape_name": "String",
1974
2001
  "type": "string",
1975
- "min_length": 0,
1976
- "max_length": 256,
1977
2002
  "documentation": "\n <p>The public IP address of the instance.</p>\n "
1978
2003
  },
1979
2004
  "PrivateDnsName": {
1980
- "shape_name": "StringMaxLen256",
2005
+ "shape_name": "String",
1981
2006
  "type": "string",
1982
- "min_length": 0,
1983
- "max_length": 256,
1984
2007
  "documentation": "\n <p>The private DNS name of the instance.</p>\n "
1985
2008
  },
1986
2009
  "PrivateIpAddress": {
1987
- "shape_name": "StringMaxLen256",
2010
+ "shape_name": "String",
1988
2011
  "type": "string",
1989
- "min_length": 0,
1990
- "max_length": 256,
1991
2012
  "documentation": "\n <p>The private IP address of the instance.</p>\n "
1992
2013
  },
1993
2014
  "Status": {
@@ -2063,9 +2084,7 @@
2063
2084
  "Marker": {
2064
2085
  "shape_name": "Marker",
2065
2086
  "type": "string",
2066
- "min_length": 1,
2067
- "max_length": 512,
2068
- "documentation": "\n <p>The pagination token that indicates the next set of results to retrieve.</p>\n "
2087
+ "documentation": "\n <p>The pagination token is a random string indicating whether there are more results to fetch. Use the pagination token in later API calls to retrieve the next page of results. When the value is null, all results have been returned.</p>\n "
2069
2088
  }
2070
2089
  },
2071
2090
  "documentation": "\n <p>This output contains the list of instances.</p>\n "
@@ -2114,8 +2133,6 @@
2114
2133
  "ClusterId": {
2115
2134
  "shape_name": "ClusterId",
2116
2135
  "type": "string",
2117
- "min_length": 1,
2118
- "max_length": 64,
2119
2136
  "documentation": "\n <p>The identifier of the cluster for which to list the steps.</p>\n "
2120
2137
  },
2121
2138
  "StepStates": {
@@ -2139,9 +2156,7 @@
2139
2156
  "Marker": {
2140
2157
  "shape_name": "Marker",
2141
2158
  "type": "string",
2142
- "min_length": 1,
2143
- "max_length": 512,
2144
- "documentation": "\n <p>The pagination token that indicates the next set of results to retrieve.</p>\n "
2159
+ "documentation": "\n <p>The pagination token is a random string indicating whether there are more results to fetch. Provide the pagination token from earlier API calls to retrieve the next page of results. When the value is null, all results have been returned.</p>\n "
2145
2160
  }
2146
2161
  },
2147
2162
  "documentation": "\n <p>This input determines which steps to list.</p>\n "
@@ -2160,15 +2175,11 @@
2160
2175
  "Id": {
2161
2176
  "shape_name": "StepId",
2162
2177
  "type": "string",
2163
- "min_length": 1,
2164
- "max_length": 64,
2165
2178
  "documentation": "\n <p>The identifier of the cluster step.\n </p>\n "
2166
2179
  },
2167
2180
  "Name": {
2168
- "shape_name": "StringMaxLen256",
2181
+ "shape_name": "String",
2169
2182
  "type": "string",
2170
- "min_length": 0,
2171
- "max_length": 256,
2172
2183
  "documentation": "\n <p>The name of the cluster step.\n </p>\n "
2173
2184
  },
2174
2185
  "Status": {
@@ -2241,9 +2252,7 @@
2241
2252
  "Marker": {
2242
2253
  "shape_name": "Marker",
2243
2254
  "type": "string",
2244
- "min_length": 1,
2245
- "max_length": 512,
2246
- "documentation": "\n <p>The pagination token that indicates the next set of results to retrieve.</p>\n "
2255
+ "documentation": "\n <p>The pagination token is a random string indicating whether there are more results to fetch. Use the pagination token in later API calls to retrieve the next page of results. When the value is null, all results have been returned.</p>\n "
2247
2256
  }
2248
2257
  },
2249
2258
  "documentation": "\n <p>This output contains the list of steps.</p>\n "
@@ -2316,8 +2325,6 @@
2316
2325
  "members": {
2317
2326
  "shape_name": "InstanceId",
2318
2327
  "type": "string",
2319
- "min_length": 1,
2320
- "max_length": 64,
2321
2328
  "documentation": null
2322
2329
  },
2323
2330
  "documentation": "\n <p>The EC2 InstanceIds to terminate. For advanced users only. \n Once you terminate the instances, the instance group will not return to its original requested size.</p>\n "
@@ -2342,6 +2349,72 @@
2342
2349
  ],
2343
2350
  "documentation": "\n <p>ModifyInstanceGroups modifies the number of nodes and configuration settings of an instance\n group. The input parameters include the new target instance count for the group and the\n instance group ID. The call will either succeed or fail atomically.</p>\n\n <examples>\n <queryrequest>POST / HTTP/1.1\nContent-Type: application/x-amz-json-1.1\nX-Amz-Target: ElasticMapReduce.ModifyInstanceGroups\nContent-Length: 77\nUser-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32\nHost: us-east-1.elasticmapreduce.amazonaws.com\nX-Amz-Date: 20130716T205843Z\nX-Amz-Content-Sha256: bb1af3d0c6c6a1a09f21ccd7f04a0e2e6c9ce5b5810b0f6777560fe4f81bda8c\nAuthorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130716/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=17bbbb4448a1f47a14d5657445e9de5cadf16bed58b850585f80865882133b33\nAccept: */*\n\n{\"InstanceGroups\": [{\n \"InstanceGroupId\": \"ig-1S8NWT31S2OVG\",\n \"InstanceCount\": 5\n}]}\n</queryrequest>\n\n <queryresponse>HTTP/1.1 200 OK\nx-amzn-RequestId: 80a74808-ee5a-11e2-90db-69a5154aeb8d\nContent-Type: application/x-amz-json-1.1\nContent-Length: 0\nDate: Tue, 16 Jul 2013 20:58:44 GMT\n\n </queryresponse>\n </examples>\n \n "
2344
2351
  },
2352
+ "RemoveTags": {
2353
+ "name": "RemoveTags",
2354
+ "input": {
2355
+ "shape_name": "RemoveTagsInput",
2356
+ "type": "structure",
2357
+ "members": {
2358
+ "ResourceId": {
2359
+ "shape_name": "ResourceId",
2360
+ "type": "string",
2361
+ "documentation": "\n <p>The Amazon EMR resource identifier from which tags will be removed. This value must be a cluster identifier.</p>\n "
2362
+ },
2363
+ "TagKeys": {
2364
+ "shape_name": "StringList",
2365
+ "type": "list",
2366
+ "members": {
2367
+ "shape_name": "String",
2368
+ "type": "string",
2369
+ "documentation": null
2370
+ },
2371
+ "documentation": "\n <p>A list of tag keys to remove from a resource.</p>\n "
2372
+ }
2373
+ },
2374
+ "documentation": "\n <p>This input identifies a cluster and a list of tags to remove. \n </p> \n "
2375
+ },
2376
+ "output": {
2377
+ "shape_name": "RemoveTagsOutput",
2378
+ "type": "structure",
2379
+ "members": {
2380
+ },
2381
+ "documentation": "\n <p>This output indicates the result of removing tags from a resource. \n </p> \n "
2382
+ },
2383
+ "errors": [
2384
+ {
2385
+ "shape_name": "InternalServerException",
2386
+ "type": "structure",
2387
+ "members": {
2388
+ "Message": {
2389
+ "shape_name": "ErrorMessage",
2390
+ "type": "string",
2391
+ "documentation": "\n <p>The message associated with the exception.</p> \n \n "
2392
+ }
2393
+ },
2394
+ "documentation": "\n <p>This exception occurs when there is an internal failure in the EMR service.</p> \n \n "
2395
+ },
2396
+ {
2397
+ "shape_name": "InvalidRequestException",
2398
+ "type": "structure",
2399
+ "members": {
2400
+ "ErrorCode": {
2401
+ "shape_name": "ErrorCode",
2402
+ "type": "string",
2403
+ "min_length": 1,
2404
+ "max_length": 256,
2405
+ "documentation": "\n <p>The error code associated with the exception.</p> \n \n "
2406
+ },
2407
+ "Message": {
2408
+ "shape_name": "ErrorMessage",
2409
+ "type": "string",
2410
+ "documentation": "\n <p>The message associated with the exception.</p> \n \n "
2411
+ }
2412
+ },
2413
+ "documentation": "\n <p>This exception occurs when there is something wrong with user input.</p> \n \n "
2414
+ }
2415
+ ],
2416
+ "documentation": "\n <p>Removes tags from an Amazon EMR resource. Tags make it easier to associate clusters in various ways, such as grouping clusters to track your Amazon EMR resource allocation costs. \n For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-plan-tags.html\">Tagging Amazon EMR Resources</a>. \n </p> \n \n "
2417
+ },
2345
2418
  "RunJobFlow": {
2346
2419
  "name": "RunJobFlow",
2347
2420
  "input": {
@@ -2683,7 +2756,7 @@
2683
2756
  "max_length": 256,
2684
2757
  "documentation": null
2685
2758
  },
2686
- "documentation": "\n <p>A list of strings that indicates third-party software to use with the job flow. For more information, go to <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-supported-products.html\">Use Third Party Applications with Amazon EMR</a>. Currently supported values are:</p>\n <ul>\n <li>\"karmasphere-enterprise-utility\" - tag the \n job flow for management by <a href=\"http://aws.amazon.com/elasticmapreduce/karmasphere/\">Karmasphere.</a>\n</li>\n <li>\"mapr-m3\" - launch the job flow using MapR M3 Edition.</li>\n <li>\"mapr-m5\" - launch the job flow using MapR M5 Edition.</li>\n </ul>\n "
2759
+ "documentation": "\n <p>A list of strings that indicates third-party software to use with the job flow. For more information, go to <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-supported-products.html\">Use Third Party Applications with Amazon EMR</a>. Currently supported values are:</p>\n <ul> \n <li>\"mapr-m3\" - launch the job flow using MapR M3 Edition.</li>\n <li>\"mapr-m5\" - launch the job flow using MapR M5 Edition.</li>\n </ul>\n "
2687
2760
  },
2688
2761
  "NewSupportedProducts": {
2689
2762
  "shape_name": "NewSupportedProductsList",
@@ -2716,7 +2789,7 @@
2716
2789
  },
2717
2790
  "documentation": "\n <p>The list of supported product configurations which allow user-supplied arguments. EMR accepts these arguments and forwards them to the corresponding installation script as bootstrap action arguments. </p>\n "
2718
2791
  },
2719
- "documentation": "\n <p>A list of strings that indicates third-party software to use with the job flow that accepts a user argument list. EMR accepts and forwards the argument list to the corresponding installation\n script as bootstrap action arguments. For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-mapr.html\">Launch a Job Flow on the MapR Distribution for Hadoop</a>. Currently supported values are:</p>\n <ul>\n <li>\"karmasphere-enterprise-utility\" - tag the \n job flow for management by <a href=\"http://aws.amazon.com/elasticmapreduce/karmasphere/\">Karmasphere.</a>\n</li>\n <li>\"mapr-m3\" - launch the job flow using MapR M3 Edition.</li>\n <li>\"mapr-m5\" - launch the job flow using MapR M5 Edition.</li>\n <li>\"mapr\" with the user arguments specifying \"--edition,m3\" or \"--edition,m5\" - launch the job flow using MapR M3 or M5 Edition respectively.</li>\n </ul>\n "
2792
+ "documentation": "\n <p>A list of strings that indicates third-party software to use with the job flow that accepts a user argument list. EMR accepts and forwards the argument list to the corresponding installation\n script as bootstrap action arguments. For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-mapr.html\">Launch a Job Flow on the MapR Distribution for Hadoop</a>. Currently supported values are:</p>\n <ul>\n <li>\"mapr-m3\" - launch the job flow using MapR M3 Edition.</li>\n <li>\"mapr-m5\" - launch the job flow using MapR M5 Edition.</li>\n <li>\"mapr\" with the user arguments specifying \"--edition,m3\" or \"--edition,m5\" - launch the job flow using MapR M3 or M5 Edition respectively.</li>\n </ul>\n "
2720
2793
  },
2721
2794
  "VisibleToAllUsers": {
2722
2795
  "shape_name": "Boolean",
@@ -2730,6 +2803,28 @@
2730
2803
  "min_length": 0,
2731
2804
  "max_length": 10280,
2732
2805
  "documentation": "\n <p>An IAM role for the job flow. The EC2 instances of the job flow assume this role. The default role is <code>EMRJobflowDefault</code>. In order to use the default role, you must have already created it using the CLI.</p>\n "
2806
+ },
2807
+ "Tags": {
2808
+ "shape_name": "TagList",
2809
+ "type": "list",
2810
+ "members": {
2811
+ "shape_name": "Tag",
2812
+ "type": "structure",
2813
+ "members": {
2814
+ "Key": {
2815
+ "shape_name": "String",
2816
+ "type": "string",
2817
+ "documentation": "\n <p>A user-defined key, which is the minimum required information for a valid tag.\n For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-plan-tags.html\">Tagging Amazon EMR Resources</a>. \n </p> \n "
2818
+ },
2819
+ "Value": {
2820
+ "shape_name": "String",
2821
+ "type": "string",
2822
+ "documentation": "\n <p>A user-defined value, which is optional in a tag.\n For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-plan-tags.html\">Tagging Amazon EMR Resources</a>. \n </p> \n "
2823
+ }
2824
+ },
2825
+ "documentation": "\n <p>A key/value pair that contains user-defined metadata that you can associate with an Amazon EMR resource. Tags make it easier to associate clusters in various ways, such as grouping clusters to track your Amazon EMR resource allocation costs. \n For more information, see <a href=\"http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-plan-tags.html\">Tagging Amazon EMR Resources</a>. \n </p> \n "
2826
+ },
2827
+ "documentation": "\n <p>A list of tags to associate with a cluster and propagate to Amazon EC2 instances.</p>\n "
2733
2828
  }
2734
2829
  },
2735
2830
  "documentation": "\n <p> Input to the <a>RunJobFlow</a> operation. </p>\n "
@@ -2878,4 +2973,4 @@
2878
2973
  "documentation": "\n <p> \n TerminateJobFlows shuts a list of job flows down. When a job flow is shut down, any step\n not yet completed is canceled and the EC2 instances on which the job flow is running are\n stopped. Any log files not already saved are uploaded to Amazon S3 if a LogUri was\n specified when the job flow was created. \n </p>\n <p>\n The call to TerminateJobFlows is asynchronous. Depending on the configuration of the job flow, \n it may take up to 5-20 minutes for the job flow to \n completely terminate and release allocated resources, such as Amazon EC2 instances.\n </p>\n \n <examples>\n <queryrequest>POST / HTTP/1.1\nContent-Type: application/x-amz-json-1.1\nX-Amz-Target: ElasticMapReduce.TerminateJobFlows\nContent-Length: 33\nUser-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32\nHost: us-east-1.elasticmapreduce.amazonaws.com\nX-Amz-Date: 20130716T211858Z\nX-Amz-Content-Sha256: ab64713f61e066e80a6083844b9249b6c6362d34a7ae7393047aa46d38b9e315\nAuthorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130716/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=9791416eaf09f36aa753a324b0de27ff5cc7084b8548cc748487a2bcb3439d58\nAccept: */*\n\n{\"JobFlowIds\": [\"j-3TS0OIYO4NFN\"]}\n</queryrequest>\n\n <queryresponse>HTTP/1.1 200 OK\nx-amzn-RequestId: 5551a7c9-ee5d-11e2-9542-25296c300ff0\nContent-Type: application/x-amz-json-1.1\nContent-Length: 0\nDate: Tue, 16 Jul 2013 21:18:59 GMT\n </queryresponse>\n </examples>\n "
2879
2974
  }
2880
2975
  }
2881
- }
2976
+ }