External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-23 05:55:59 -03:30
Code Issues Packages Projects Releases Wiki Activity

Changing scm_credential to credential to match API

Browse Source
This commit is contained in:
John Westcott IV
2020-08-24 11:28:02 -04:00
parent 3b6152a380
commit 41ca20dc99
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx_collection/plugins/modules/tower_project.py
View File

@@ -55,10 +55,12 @@ options:
- The refspec to use for the SCM resource. - The refspec to use for the SCM resource.
type: str type: str
default: '' default: ''
scm_credential: credential:
description: description:
- Name of the credential to use with this SCM resource. - Name of the credential to use with this SCM resource.
type: str type: str
aliases:
- scm_credential
scm_clean: scm_clean:
description: description:
- Remove local modifications before updating. - Remove local modifications before updating.
@@ -190,7 +192,7 @@ def main():
local_path=dict(), local_path=dict(),
scm_branch=dict(default=''), scm_branch=dict(default=''),
scm_refspec=dict(default=''), scm_refspec=dict(default=''),
scm_credential=dict(), credential=dict(aliases=['scm_credential']),
scm_clean=dict(type='bool', default=False), scm_clean=dict(type='bool', default=False),
scm_delete_on_update=dict(type='bool', default=False), scm_delete_on_update=dict(type='bool', default=False),
scm_update_on_launch=dict(type='bool', default=False), scm_update_on_launch=dict(type='bool', default=False),
@@ -219,7 +221,7 @@ def main():
local_path = module.params.get('local_path') local_path = module.params.get('local_path')
scm_branch = module.params.get('scm_branch') scm_branch = module.params.get('scm_branch')
scm_refspec = module.params.get('scm_refspec') scm_refspec = module.params.get('scm_refspec')
scm_credential = module.params.get('scm_credential') credential = module.params.get('credential')
scm_clean = module.params.get('scm_clean') scm_clean = module.params.get('scm_clean')
scm_delete_on_update = module.params.get('scm_delete_on_update') scm_delete_on_update = module.params.get('scm_delete_on_update')
scm_update_on_launch = module.params.get('scm_update_on_launch') scm_update_on_launch = module.params.get('scm_update_on_launch')
@@ -233,8 +235,8 @@ def main():
# Attempt to look up the related items the user specified (these will fail the module if not found) # Attempt to look up the related items the user specified (these will fail the module if not found)
org_id = module.resolve_name_to_id('organizations', organization) org_id = module.resolve_name_to_id('organizations', organization)
if scm_credential is not None: if credential is not None:
scm_credential_id = module.resolve_name_to_id('credentials', scm_credential) credential = module.resolve_name_to_id('credentials', credential)
# Attempt to look up project based on the provided name and org ID # Attempt to look up project based on the provided name and org ID
project = module.get_one('projects', **{ project = module.get_one('projects', **{
@@ -286,8 +288,8 @@ def main():
} }
if description is not None: if description is not None:
project_fields['description'] = description project_fields['description'] = description
if scm_credential is not None: if credential is not None:
project_fields['credential'] = scm_credential_id project_fields['credential'] = credential
if allow_override is not None: if allow_override is not None:
project_fields['allow_override'] = allow_override project_fields['allow_override'] = allow_override
if scm_type == '': if scm_type == '':