mirror of
				https://github.com/ansible-collections/community.general.git
				synced 2025-10-25 05:23:58 -07:00 
			
		
		
		
	Bulk autopep8 (modules)
As agreed in 2017-12-07 Core meeting bulk fix pep8 issues Generated using: autopep8 1.3.3 (pycodestyle: 2.3.1) autopep8 -r --max-line-length 160 --in-place --ignore E305,E402,E722,E741 lib/ansible/modules Manually fix issues that autopep8 has introduced
This commit is contained in:
		
					parent
					
						
							
								d13d7e9404
							
						
					
				
			
			
				commit
				
					
						c57a7f05e1
					
				
			
		
					 314 changed files with 3462 additions and 3383 deletions
				
			
		|  | @ -270,8 +270,8 @@ def user_find(client, user, db_name): | |||
| 
 | ||||
| 
 | ||||
| def user_add(module, client, db_name, user, password, roles): | ||||
|     #pymongo's user_add is a _create_or_update_user so we won't know if it was changed or updated | ||||
|     #without reproducing a lot of the logic in database.py of pymongo | ||||
|     # pymongo's user_add is a _create_or_update_user so we won't know if it was changed or updated | ||||
|     # without reproducing a lot of the logic in database.py of pymongo | ||||
|     db = client[db_name] | ||||
| 
 | ||||
|     if roles is None: | ||||
|  | @ -279,6 +279,7 @@ def user_add(module, client, db_name, user, password, roles): | |||
|     else: | ||||
|         db.add_user(user, password, None, roles=roles) | ||||
| 
 | ||||
| 
 | ||||
| def user_remove(module, client, db_name, user): | ||||
|     exists = user_find(client, user, db_name) | ||||
|     if exists: | ||||
|  | @ -289,6 +290,7 @@ def user_remove(module, client, db_name, user): | |||
|     else: | ||||
|         module.exit_json(changed=False, user=user) | ||||
| 
 | ||||
| 
 | ||||
| def load_mongocnf(): | ||||
|     config = configparser.RawConfigParser() | ||||
|     mongocnf = os.path.expanduser('~/.mongodb.cnf') | ||||
|  | @ -305,7 +307,6 @@ def load_mongocnf(): | |||
|     return creds | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| def check_if_roles_changed(uinfo, roles, db_name): | ||||
|     # We must be aware of users which can read the oplog on a replicaset | ||||
|     # Such users must have access to the local DB, but since this DB does not store users credentials | ||||
|  | @ -327,7 +328,7 @@ def check_if_roles_changed(uinfo, roles, db_name): | |||
|         output = list() | ||||
|         for role in roles: | ||||
|             if isinstance(role, (binary_type, text_type)): | ||||
|                 new_role = { "role": role, "db": db_name } | ||||
|                 new_role = {"role": role, "db": db_name} | ||||
|                 output.append(new_role) | ||||
|             else: | ||||
|                 output.append(role) | ||||
|  | @ -341,14 +342,13 @@ def check_if_roles_changed(uinfo, roles, db_name): | |||
|     return True | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| # ========================================= | ||||
| # Module execution. | ||||
| # | ||||
| 
 | ||||
| def main(): | ||||
|     module = AnsibleModule( | ||||
|         argument_spec = dict( | ||||
|         argument_spec=dict( | ||||
|             login_user=dict(default=None), | ||||
|             login_password=dict(default=None, no_log=True), | ||||
|             login_host=dict(default='localhost'), | ||||
|  | @ -417,7 +417,7 @@ def main(): | |||
|         elif LooseVersion(PyMongoVersion) >= LooseVersion('3.0'): | ||||
|             if db_name != "admin": | ||||
|                 module.fail_json(msg='The localhost login exception only allows the first admin account to be created') | ||||
|             #else: this has to be the first admin user added | ||||
|             # else: this has to be the first admin user added | ||||
| 
 | ||||
|     except Exception as e: | ||||
|         module.fail_json(msg='unable to connect to database: %s' % to_native(e), exception=traceback.format_exc()) | ||||
|  | @ -443,7 +443,7 @@ def main(): | |||
| 
 | ||||
|             # Here we can  check password change if mongo provide a query for that : https://jira.mongodb.org/browse/SERVER-22848 | ||||
|             #newuinfo = user_find(client, user, db_name) | ||||
|             #if uinfo['role'] == newuinfo['role'] and CheckPasswordHere: | ||||
|             # if uinfo['role'] == newuinfo['role'] and CheckPasswordHere: | ||||
|             #    module.exit_json(changed=False, user=user) | ||||
| 
 | ||||
|     elif state == 'absent': | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue