[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit 333ec895854756ec5e26dc8766daa3894170aa65
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Feb 18 22:30:02 2013 -0800

    Port GetUserPolicy

diff --git a/bin/euare-usergetpolicy b/bin/euare-usergetpolicy
index 6e9cd32..a3c0ba4 100755
--- a/bin/euare-usergetpolicy
+++ b/bin/euare-usergetpolicy
@@ -1,7 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euare.getuserpolicy
 
 if __name__ == '__main__':
-    r = euca2ools.commands.euare.getuserpolicy.GetUserPolicy()
-    r.main_cli()
+    euca2ools.commands.euare.getuserpolicy.GetUserPolicy.run()
diff --git a/euca2ools/commands/euare/getuserpolicy.py b/euca2ools/commands/euare/getuserpolicy.py
index 7b47ba4..83c32f6 100644
--- a/euca2ools/commands/euare/getuserpolicy.py
+++ b/euca2ools/commands/euare/getuserpolicy.py
@@ -1,6 +1,6 @@
 # Software License Agreement (BSD License)
 #
-# Copyright (c) 2009-2011, Eucalyptus Systems, Inc.
+# Copyright (c) 2009-2013, Eucalyptus Systems, Inc.
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms, with or
@@ -27,51 +27,27 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: Neil Soman neil at eucalyptus.com
-#         Mitch Garnaat mgarnaat at eucalyptus.com
 
-from boto.roboto.awsqueryrequest import AWSQueryRequest
-from boto.roboto.param import Param
-import euca2ools.commands.euare
-import euca2ools.utils
+import json
+from requestbuilder import Arg
 import urllib
-
-
-class GetUserPolicy(AWSQueryRequest):
-
-    ServiceClass = euca2ools.commands.euare.Euare
-
-    Description = """GetUserPolicy"""
-    Params = [Param(
-        name='UserName',
-        short_name='u',
-        long_name='user-name',
-        ptype='string',
-        optional=False,
-        doc=""" Name of the User who the policy is associated with. """ ,
-        ), Param(
-        name='PolicyName',
-        short_name='p',
-        long_name='policy-name',
-        ptype='string',
-        optional=False,
-        doc=""" Name of the policy document to get. """,
-        ), Param(
-        name='DelegateAccount',
-        short_name=None,
-        long_name='delegate',
-        ptype='string',
-        optional=True,
-        doc=""" [Eucalyptus extension] Process this command as if the administrator of the specified account had run it. This option is only usable by cloud administrators. """,
-        )]
-
-    def cli_formatter(self, data):
-        print urllib.unquote(data.PolicyDocument)
-
-    def main(self, **args):
-        return self.send(**args)
-
-    def main_cli(self):
-        euca2ools.utils.print_version_if_necessary()
-        self.do_cli()
+from . import EuareRequest, DELEGATE
+
+
+class GetUserPolicy(EuareRequest):
+    DESCRIPTION = "Display a user's policy"
+    ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
+                required=True,
+                help='user the poilcy is attached to (required)'),
+            Arg('-p', '--policy-name', dest='PolicyName', metavar='POLICY',
+                required=True, help='name of the policy to show (required)'),
+            Arg('--pretty-print', action='store_true', route_to=None,
+                help='reformat the policy for easier reading'),
+            DELEGATE]
+
+    def print_result(self, result):
+        policy_content = urllib.unquote(result['PolicyDocument'])
+        if self.args['pretty_print']:
+            policy_json = json.loads(policy_content)
+            policy_content = json.dumps(policy_json, indent=4)
+        print policy_content

-- 
managing cloud instances for Eucalyptus