EMR: Bug fixes:Fixed describe-cluster to support pagination.

Surya Vadan Adivikolanu · sdiao · commit 762e8d378560 · 2014-06-04T15:08:12.000-07:00
diff --git a/awscli/customizations/emr/createdefaultroles.py b/awscli/customizations/emr/createdefaultroles.py
@@ -95,7 +95,7 @@ def _get_regex_match_from_endpoint_host(endpoint_host):
 
 class CreateDefaultRoles(BasicCommand):
     NAME = "create-default-roles"
-    DESCRIPTION = ('Creates the default IAM roles ' +
+    DESCRIPTION = ('Creates the default IAM role ' +
                    EC2_ROLE_NAME + ' which can be used when'
                    ' creating the cluster using the create-cluster command.')
     ARG_TABLE = [
diff --git a/awscli/customizations/emr/describecluster.py b/awscli/customizations/emr/describecluster.py
@@ -74,9 +74,10 @@ def _call(self, operation_object, parameters, parsed_globals):
                 if http_response.status_code == 200:
                     response_data = page[1]
                     keys = response_data.keys()
-                    if keys is not None and len(keys) > 0:
-                        key = keys[0]
+                    key = self.get_key_of_result(keys)
+                    if key is not None:
                         result += response_data.get(key)
+
             if key is not None:
                 return {key: result}
             else:
@@ -86,6 +87,12 @@ def _call(self, operation_object, parameters, parsed_globals):
                                                                  **parameters)
             return response_data
 
+    def get_key_of_result(self, keys):
+        # Return the first key that is not "Marker"
+        for key in keys:
+            if key != "Marker":
+                return key
+
     def construct_result(
             self, describe_cluster_result, list_instance_groups_result,
             list_bootstrap_actions_result):
diff --git a/awscli/examples/emr/create-default-roles.rst b/awscli/examples/emr/create-default-roles.rst
@@ -1,17 +1,14 @@
-**1. To create the default IAM roles for EMR and EC2**
+**1. To create the default IAM role for EC2**
 
 - Command::
 
     aws emr create-default-roles
 
 - Output::
 
-    If both the roles already exist then the command returns nothing.
+    If the role already exists then the command returns nothing.
 
-    If only one of the roles does not exist, the command returns the
-    created 'Role' and the 'RolePolicy'.
-
-    If neither of the roles exist then the output will be:
+    If the role does not exist then the output will be:
 
     [
         {
@@ -50,65 +47,11 @@
                         }
                     ]
                 },
-                "RoleId": "AROAJDKUOAL65X57SBWFK",
+                "RoleId": "AROLORKUOAL65X57SBWFK",
                 "CreateDate": "2014-05-07T00:02:06.154Z",
                 "RoleName": "EMR_EC2_DefaultRole",
                 "Path": "/",
                 "Arn": "arn:aws:iam::176430881729:role/EMR_EC2_DefaultRole"
             }
-        },
-        {
-            "RolePolicy": {
-                "Version": "2012-10-17",
-                "Statement": [
-                    {
-                        "Action": [
-                            "ec2:AuthorizeSecurityGroupIngress",
-                            "ec2:CancelSpotInstanceRequests",
-                            "ec2:CreateSecurityGroup",
-                            "ec2:CreateTags",
-                            "ec2:Describe*",
-                            "ec2:DeleteTags",
-                            "ec2:ModifyImageAttribute",
-                            "ec2:ModifyInstanceAttribute",
-                            "ec2:RequestSpotInstances",
-                            "ec2:RunInstances",
-                            "ec2:TerminateInstances",
-                            "iam:PassRole",
-                            "iam:ListRolePolicies",
-                            "iam:GetRole",
-                            "iam:GetRolePolicy",
-                            "iam:ListInstanceProfiles",
-                            "s3:Get*",
-                            "s3:List*",
-                            "s3:CreateBucket",
-                            "sdb:BatchPutAttributes",
-                            "sdb:Select"
-                        ],
-                        "Resource": "*",
-                        "Effect": "Allow"
-                    }
-                ]
-            },
-            "Role": {
-                "AssumeRolePolicyDocument": {
-                    "Version": "2008-10-17",
-                    "Statement": [
-                        {
-                            "Action": "sts:AssumeRole",
-                            "Sid": "",
-                            "Effect": "Allow",
-                            "Principal": {
-                                "Service": "elasticmapreduce.amazonaws.com"
-                            }
-                        }
-                    ]
-                },
-                "RoleId": "AROAJ46UH7B2XLI3RQAS4",
-                "CreateDate": "2014-05-07T00:02:08.724Z",
-                "RoleName": "EMR_DefaultRole",
-                "Path": "/",
-                "Arn": "arn:aws:iam::176430881729:role/EMR_DefaultRole"
-            }
         }
-    ]
+    ]
diff --git a/tests/unit/customizations/emr/test_emr_utils.py b/tests/unit/customizations/emr/test_emr_utils.py
@@ -19,7 +19,7 @@
 class TestEMRutils(object):
 
     def test_which_with_existing_command(self):
-        pythonPath = which('python')
+        pythonPath = which('python') or which('python.exe')
         assert_not_equal(pythonPath, None)
 
     def test_which_with_non_existing_command(self):
