External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 09:57:33 -02:30
Code Issues Packages Projects Releases Wiki Activity

Only use a default password if an import user doesn't already exist

Browse Source
This commit is contained in:
Jeff Bradberry
2020-03-09 16:00:28 -04:00
parent d191edcaf1
commit 2c00d42ced
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awxkit/awxkit/cli/resource.py
View File

@@ -201,8 +201,6 @@ class Import(CustomCommand):
options = self._options[resource] options = self._options[resource]
for asset in assets: for asset in assets:
post_data = {} post_data = {}
if resource == 'users' and 'password' not in asset:
post_data['password'] = 'password'
for field, value in asset.items(): for field, value in asset.items():
if field in ('related', 'natural_key'): if field in ('related', 'natural_key'):
continue continue
@@ -213,6 +211,9 @@ class Import(CustomCommand):
page = self.get_by_natural_key(asset['natural_key'], fetch=False) page = self.get_by_natural_key(asset['natural_key'], fetch=False)
if page is None: if page is None:
if resource == 'users':
# We should only impose a default password if the resource doesn't exist.
post_data.setdefault('password', 'password')
page = endpoint.post(post_data) page = endpoint.post(post_data)
else: else:
page = page.put(post_data) page = page.put(post_data)