Merging in latest boto.

boto/iam/connection.py

 # Copyright (c) 2010-2011 Mitch Garnaat http://garnaat.org/
 # Copyright (c) 2010-2011, Eucalyptus Systems, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
 # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
 # SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
 import boto
 import boto.jsonresponse
+from boto.iam.summarymap import SummaryMap
 from boto.connection import AWSQueryConnection
 
 #boto.set_stream_logger('iam')
 
 class IAMConnection(AWSQueryConnection):
 
     APIVersion = '2010-05-08'
 
     def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
                  is_secure=True, port=None, proxy=None, proxy_port=None,
                  proxy_user=None, proxy_pass=None, host='iam.amazonaws.com',
-                 debug=0, https_connection_factory=None, path='/'):
+                 debug=0, https_connection_factory=None,
+                 path='/'):
         AWSQueryConnection.__init__(self, aws_access_key_id,
                                     aws_secret_access_key,
                                     is_secure, port, proxy,
                                     proxy_port, proxy_user, proxy_pass,
-                                    host, debug, https_connection_factory, path)
+                                    host, debug, https_connection_factory,
+                                    path)
 
     def _required_auth_capability(self):
         return ['iam']
 
     def get_response(self, action, params, path='/', parent=None,
                      verb='GET', list_marker='Set'):
         """
         Utility method to handle calls to IAM and parsing of responses.
         """
         if not parent:
             parent = self
         response = self.make_request(action, params, path, verb)
         body = response.read()
         boto.log.debug(body)
         if response.status == 200:
-            e = boto.jsonresponse.Element(list_marker=list_marker)
+            e = boto.jsonresponse.Element(list_marker=list_marker,
+                                          pythonize_name=True)
             h = boto.jsonresponse.XmlHandler(e, parent)
             h.parse(body)
             return e
         else:
             boto.log.error('%s %s' % (response.status, response.reason))
             boto.log.error('%s' % body)
             raise self.ResponseError(response.status, response.reason, body)
 
     #
     # Group methods
@@ skipping 103 matching lines @@
             params['NewGroupName'] = new_group_name
         if new_path:
             params['NewPath'] = new_path
         return self.get_response('UpdateGroup', params)
 
     def add_user_to_group(self, group_name, user_name):
         """
         Add a user to a group
 
         :type group_name: string
-        :param group_name: The name of the new group
+        :param group_name: The name of the group
 
         :type user_name: string
         :param user_name: The to be added to the group.
 
         """
         params = {'GroupName' : group_name,
                   'UserName' : user_name}
         return self.get_response('AddUserToGroup', params)
 
     def remove_user_from_group(self, group_name, user_name):
         """
         Remove a user from a group.
 
         :type group_name: string
-        :param group_name: The name of the new group
+        :param group_name: The name of the group
 
         :type user_name: string
         :param user_name: The user to remove from the group.
 
         """
         params = {'GroupName' : group_name,
                   'UserName' : user_name}
         return self.get_response('RemoveUserFromGroup', params)
 
     def put_group_policy(self, group_name, policy_name, policy_json):
@@ skipping 279 matching lines @@
         
     #
     # Access Keys
     #
     
     def get_all_access_keys(self, user_name, marker=None, max_items=None):
         """
         Get all access keys associated with an account.
 
         :type user_name: string
-        :param user_name: The username of the new user
+        :param user_name: The username of the user
 
         :type marker: string
         :param marker: Use this only when paginating results and only in
                        follow-up request after you've received a response
                        where the results are truncated.  Set this to the
                        value of the Marker element in the response you
                        just received.
 
         :type max_items: int
         :param max_items: Use this only when paginating results to indicate
@@ skipping 10 matching lines @@
 
     def create_access_key(self, user_name=None):
         """
         Create a new AWS Secret Access Key and corresponding AWS Access Key ID
         for the specified user.  The default status for new keys is Active
 
         If the user_name is not specified, the user_name is determined
         implicitly based on the AWS Access Key ID used to sign the request.
 
         :type user_name: string
-        :param user_name: The username of the new user
+        :param user_name: The username of the user
 
         """
         params = {'UserName' : user_name}
         return self.get_response('CreateAccessKey', params)
 
     def update_access_key(self, access_key_id, status, user_name=None):
         """
         Changes the status of the specified access key from Active to Inactive
         or vice versa.  This action can be used to disable a user's key as
         part of a key rotation workflow.
@@ skipping 21 matching lines @@
         """
         Delete an access key associated with a user.
 
         If the user_name is not specified, it is determined implicitly based
         on the AWS Access Key ID used to sign the request.
 
         :type access_key_id: string
         :param access_key_id: The ID of the access key to be deleted.
 
         :type user_name: string
-        :param user_name: The username of the new user
+        :param user_name: The username of the user
 
         """
         params = {'AccessKeyId' : access_key_id}
         if user_name:
             params['UserName'] = user_name
         return self.get_response('DeleteAccessKey', params)
 
     #
     # Signing Certificates
     #
@@ skipping 60 matching lines @@
         Uploads an X.509 signing certificate and associates it with
         the specified user.
 
         If the user_name is not specified, it is determined implicitly based
         on the AWS Access Key ID used to sign the request.
 
         :type cert_body: string
         :param cert_body: The body of the signing certificate.
 
         :type user_name: string
-        :param user_name: The username of the new user
+        :param user_name: The username of the user
 
         """
         params = {'CertificateBody' : cert_body}
         if user_name:
             params['UserName'] = user_name
         return self.get_response('UploadSigningCertificate', params,
                                  verb='POST')
 
     def delete_signing_cert(self, cert_id, user_name=None):
         """
         Delete a signing certificate associated with a user.
 
         If the user_name is not specified, it is determined implicitly based
         on the AWS Access Key ID used to sign the request.
 
         :type user_name: string
-        :param user_name: The username of the new user
+        :param user_name: The username of the user
 
         :type cert_id: string
         :param cert_id: The ID of the certificate.
 
         """
         params = {'CertificateId' : cert_id}
         if user_name:
             params['UserName'] = user_name
         return self.get_response('DeleteSigningCertificate', params)
 
@@ skipping 221 matching lines @@
         """
         params = {'UserName' : user_name,
                   'SerialNumber' : serial_number,
                   'AuthenticationCode1' : auth_code_1,
                   'AuthenticationCode2' : auth_code_2}
         return self.get_response('ResyncMFADevice', params)
 
     #
     # Login Profiles
     #
+
+    def get_login_profiles(self, user_name):
+        """
+        Retrieves the login profile for the specified user.
+        
+        :type user_name: string
+        :param user_name: The username of the user
+        
+        """
+        params = {'UserName' : user_name}
+        return self.get_response('GetLoginProfile', params)
     
     def create_login_profile(self, user_name, password):
         """
         Creates a login profile for the specified user, give the user the
         ability to access AWS services and the AWS Management Console.
 
         :type user_name: string
-        :param user_name: The name of the new user
+        :param user_name: The name of the user
 
         :type password: string
         :param password: The new password for the user
 
         """
         params = {'UserName' : user_name,
                   'Password' : password}
         return self.get_response('CreateLoginProfile', params)
 
     def delete_login_profile(self, user_name):
@@ skipping 51 matching lines @@
     def get_account_alias(self):
         """
         Get the alias for the current account.
 
         This is referred to in the docs as list_account_aliases,
         but it seems you can only have one account alias currently.
         
         For more information on account id aliases, please see
         http://goo.gl/ToB7G
         """
-        r = self.get_response('ListAccountAliases', {})
-        response = r.get('ListAccountAliasesResponse')
-        result = response.get('ListAccountAliasesResult')
-        aliases = result.get('AccountAliases')
-        return aliases.get('member', None)
+        return self.get_response('ListAccountAliases', {},
+                                 list_marker='AccountAliases')
 
     def get_signin_url(self, service='ec2'):
         """
         Get the URL where IAM users can use their login profile to sign in
         to this account's console.
 
         :type service: string
         :param service: Default service to go to in the console.
         """
         alias = self.get_account_alias()
         if not alias:
             raise Exception('No alias associated with this account.  Please use iam.create_account_alias() first.')
 
         return "https://%s.signin.aws.amazon.com/console/%s" % (alias, service)
+
+    def get_account_summary(self):
+        """
+        Get the alias for the current account.
+
+        This is referred to in the docs as list_account_aliases,
+        but it seems you can only have one account alias currently.
+        
+        For more information on account id aliases, please see
+        http://goo.gl/ToB7G
+        """
+        return self.get_object('GetAccountSummary', {}, SummaryMap)
+
+