[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a
Garrett Holmstrom
gholms at fedoraproject.org
Sun Jun 16 02:31:29 UTC 2013
The following commit has been merged in the master branch:
commit 5cff58c03d228dd45cd6635c16415c09bdd694f0
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Tue May 21 17:31:07 2013 -0700
Handle DelegateAccount propagation properly
Fixes TOOLS-338
diff --git a/euca2ools/commands/euare/addgrouppolicy.py b/euca2ools/commands/euare/addgrouppolicy.py
index 3c374e8..0e7acea 100644
--- a/euca2ools/commands/euare/addgrouppolicy.py
+++ b/euca2ools/commands/euare/addgrouppolicy.py
@@ -61,11 +61,12 @@ class AddGroupPolicy(EuareRequest):
def main(self):
policy_doc = json.dumps(self.build_policy())
- req = PutGroupPolicy(service=self.service,
+ req = PutGroupPolicy(
+ config=self.config, service=self.service,
GroupName=self.args['group_name'],
PolicyName=self.args['policy_name'],
PolicyDocument=policy_doc,
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
response = req.main()
response['PolicyDocument'] = policy_doc
return response
diff --git a/euca2ools/commands/euare/adduserpolicy.py b/euca2ools/commands/euare/adduserpolicy.py
index fe24b04..8aafb12 100644
--- a/euca2ools/commands/euare/adduserpolicy.py
+++ b/euca2ools/commands/euare/adduserpolicy.py
@@ -61,10 +61,11 @@ class AddUserPolicy(EuareRequest):
def main(self):
policy_doc = json.dumps(self.build_policy())
- req = PutUserPolicy(service=self.service,
+ req = PutUserPolicy(
+ config=self.config, service=self.service,
UserName=self.args['user_name'],
PolicyName=self.args['policy_name'], PolicyDocument=policy_doc,
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
response = req.main()
response['PolicyDocument'] = policy_doc
return response
diff --git a/euca2ools/commands/euare/createuser.py b/euca2ools/commands/euare/createuser.py
index 5c8499e..c33c0ed 100644
--- a/euca2ools/commands/euare/createuser.py
+++ b/euca2ools/commands/euare/createuser.py
@@ -52,15 +52,17 @@ class CreateUser(EuareRequest):
def postprocess(self, result):
if self.args.get('group_name'):
- obj = AddUserToGroup(service=self.service,
+ obj = AddUserToGroup(
+ config=self.config, service=self.service,
UserName=self.args['UserName'],
GroupName=self.args['group_name'],
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
obj.main()
if self.args.get('create_accesskey'):
- obj = CreateAccessKey(service=self.service,
+ obj = CreateAccessKey(
+ config=self.config, service=self.service,
UserName=self.args['UserName'],
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
key_result = obj.main()
result.update(key_result)
diff --git a/euca2ools/commands/euare/deletegroup.py b/euca2ools/commands/euare/deletegroup.py
index 1c9ebb1..6cbdc2b 100644
--- a/euca2ools/commands/euare/deletegroup.py
+++ b/euca2ools/commands/euare/deletegroup.py
@@ -54,13 +54,14 @@ class DeleteGroup(EuareRequest):
def main(self):
if self.args['recursive'] or self.args['pretend']:
# Figure out what we'd have to delete
- req = GetGroup(service=self.service,
+ req = GetGroup(config=self.config, service=self.service,
GroupName=self.args['GroupName'],
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
members = req.main().get('Users', [])
- req = ListGroupPolicies(service=self.service,
+ req = ListGroupPolicies(
+ config=self.config, service=self.service,
GroupName=self.args['GroupName'],
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
policies = req.main().get('PolicyNames', [])
if self.args['pretend']:
return {'members': [member['Arn'] for member in members],
@@ -68,15 +69,17 @@ class DeleteGroup(EuareRequest):
else:
if self.args['recursive']:
member_names = [member['UserName'] for member in members]
- req = RemoveUserFromGroup(service=self.service,
+ req = RemoveUserFromGroup(
+ config=self.config, service=self.service,
GroupName=self.args['GroupName'],
user_names=member_names,
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
req.main()
for policy in policies:
- req = DeleteGroupPolicy(service=self.service,
+ req = DeleteGroupPolicy(
+ config=self.config, service=self.service,
GroupName=self.args['GroupName'], PolicyName=policy,
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
req.main()
return self.send()
diff --git a/euca2ools/commands/euare/deleteuser.py b/euca2ools/commands/euare/deleteuser.py
index 44884e4..2ae4cb5 100644
--- a/euca2ools/commands/euare/deleteuser.py
+++ b/euca2ools/commands/euare/deleteuser.py
@@ -61,25 +61,30 @@ class DeleteUser(EuareRequest):
def main(self):
if self.args['recursive'] or self.args['pretend']:
# Figure out what we'd have to delete
- req = ListAccessKeys(service=self.service,
+ req = ListAccessKeys(
+ config=self.config, service=self.service,
UserName=self.args['UserName'],
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
keys = req.main().get('AccessKeyMetadata', [])
- req = ListUserPolicies(service=self.service,
+ req = ListUserPolicies(
+ config=self.config, service=self.service,
UserName=self.args['UserName'],
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
policies = req.main().get('PolicyNames', [])
- req = ListSigningCertificates(service=self.service,
+ req = ListSigningCertificates(
+ config=self.config, service=self.service,
UserName=self.args['UserName'],
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
certs = req.main().get('Certificates', [])
- req = ListGroupsForUser(service=self.service,
+ req = ListGroupsForUser(
+ config=self.config, service=self.service,
UserName=self.args['UserName'],
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
groups = req.main().get('Groups', [])
- req = GetLoginProfile(service=self.service,
+ req = GetLoginProfile(
+ config=self.config, service=self.service,
UserName=self.args['UserName'],
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
try:
# This will raise an exception if no login profile is found.
req.main()
@@ -98,33 +103,38 @@ class DeleteUser(EuareRequest):
else:
if self.args['recursive']:
for key in keys:
- req = DeleteAccessKey(service=self.service,
+ req = DeleteAccessKey(
+ config=self.config, service=self.service,
UserName=self.args['UserName'],
AccessKeyId=key['AccessKeyId'],
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
req.send()
for policy in policies:
- req = DeleteUserPolicy(service=self.service,
+ req = DeleteUserPolicy(
+ config=self.config, service=self.service,
UserName=self.args['UserName'],
PolicyName=policy,
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
req.send()
for cert in certs:
- req = DeleteSigningCertificate(service=self.service,
+ req = DeleteSigningCertificate(
+ config=self.config, service=self.service,
UserName=self.args['UserName'],
CertificateId=cert['CertificateId'],
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
req.send()
for group in groups:
- req = RemoveUserFromGroup(service=self.service,
+ req = RemoveUserFromGroup(
+ config=self.config, service=self.service,
user_names=[self.args['UserName']],
GroupName=group['GroupName'],
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
req.send()
if has_login_profile:
- req = DeleteLoginProfile(service=self.service,
+ req = DeleteLoginProfile(
+ config=self.config, service=self.service,
UserName=self.args['UserName'],
- DelegateAccount=self.args['DelegateAccount'])
+ DelegateAccount=self.params['DelegateAccount'])
req.send()
return self.send()
diff --git a/euca2ools/commands/euare/listgrouppolicies.py b/euca2ools/commands/euare/listgrouppolicies.py
index b2be898..d98f8d1 100644
--- a/euca2ools/commands/euare/listgrouppolicies.py
+++ b/euca2ools/commands/euare/listgrouppolicies.py
@@ -79,9 +79,10 @@ class ListGroupPolicies(EuareRequest):
self.print_policy(policy_name)
def print_policy(self, policy_name):
- req = GetGroupPolicy(service=self.service,
+ req = GetGroupPolicy(
+ config=self.config, service=self.service,
GroupName=self.args['GroupName'], PolicyName=policy_name,
pretty_print=self.args['pretty_print'],
- DelegateAccount=self.args.get('DelegateAccount'))
+ DelegateAccount=self.params.get('DelegateAccount'))
response = req.main()
req.print_result(response)
diff --git a/euca2ools/commands/euare/listuserpolicies.py b/euca2ools/commands/euare/listuserpolicies.py
index 700b3e2..e7426cf 100644
--- a/euca2ools/commands/euare/listuserpolicies.py
+++ b/euca2ools/commands/euare/listuserpolicies.py
@@ -79,9 +79,10 @@ class ListUserPolicies(EuareRequest):
self.print_policy(policy_name)
def print_policy(self, policy_name):
- req = GetUserPolicy(service=self.service,
+ req = GetUserPolicy(
+ config=self.config, service=self.service,
UserName=self.args['UserName'], PolicyName=policy_name,
pretty_print=self.args['pretty_print'],
- DelegateAccount=self.args.get('DelegateAccount'))
+ DelegateAccount=self.params.get('DelegateAccount'))
response = req.main()
req.print_result(response)
--
managing cloud instances for Eucalyptus
More information about the pkg-eucalyptus-commits
mailing list