diff --git a/awx_collection/plugins/module_utils/controller_api.py b/awx_collection/plugins/module_utils/controller_api.py index 61aad6712c..b63585f618 100644 --- a/awx_collection/plugins/module_utils/controller_api.py +++ b/awx_collection/plugins/module_utils/controller_api.py @@ -163,7 +163,7 @@ class ControllerAPIModule(ControllerModule): if len(sample['json']['results']) > 1: sample['json']['results'] = sample['json']['results'][:2] + ['...more results snipped...'] url = self.build_url(endpoint, query_params) - display_endpoint = url.geturl()[len(self.host) :] # truncate to not include the base URL + display_endpoint = url.geturl()[len(self.host):] # truncate to not include the base URL self.fail_json( msg="Request to {0} returned {1} items, expected 1".format(display_endpoint, response['json']['count']), query=query_params, diff --git a/awx_collection/plugins/modules/credential.py b/awx_collection/plugins/modules/credential.py index a32d656654..dfd9b572fc 100644 --- a/awx_collection/plugins/modules/credential.py +++ b/awx_collection/plugins/modules/credential.py @@ -398,9 +398,15 @@ def main(): # Deprecation warnings for legacy_input in OLD_INPUT_NAMES: if module.params.get(legacy_input) is not None: - module.deprecate(msg='{0} parameter has been deprecated, please use inputs instead'.format(legacy_input), version="ansible.tower:4.0.0") + module.deprecate( + collection_name=DOCUMENTATION.module, + msg='{0} parameter has been deprecated, please use inputs instead'.format(legacy_input), + version="4.0.0") if kind: - module.deprecate(msg='The kind parameter has been deprecated, please use credential_type instead', version="ansible.tower:4.0.0") + module.deprecate( + collection_name=DOCUMENTATION.module, + msg='The kind parameter has been deprecated, please use credential_type instead', + version="4.0.0") cred_type_id = module.resolve_name_to_id('credential_types', credential_type if credential_type else KIND_CHOICES[kind]) if organization: diff --git a/awx_collection/plugins/modules/job_wait.py b/awx_collection/plugins/modules/job_wait.py index 110bffc3c4..b444229ec1 100644 --- a/awx_collection/plugins/modules/job_wait.py +++ b/awx_collection/plugins/modules/job_wait.py @@ -132,6 +132,7 @@ def main(): max_interval = 30 interval = abs((min_interval + max_interval) / 2) module.deprecate( + collection_name=DOCUMENTATION.module, msg="Min and max interval have been deprecated, please use interval instead; interval will be set to {0}".format(interval), version="ansible.tower:4.0.0", ) diff --git a/awx_collection/plugins/modules/notification_template.py b/awx_collection/plugins/modules/notification_template.py index bc3b9b7f19..a3549a54c0 100644 --- a/awx_collection/plugins/modules/notification_template.py +++ b/awx_collection/plugins/modules/notification_template.py @@ -401,7 +401,9 @@ def main(): for legacy_input in OLD_INPUT_NAMES: if module.params.get(legacy_input) is not None: module.deprecate( - msg='{0} parameter has been deprecated, please use notification_configuration instead'.format(legacy_input), version="ansible.tower:4.0.0" + collection_name=DOCUMENTATION.module, + msg='{0} parameter has been deprecated, please use notification_configuration instead'.format(legacy_input), + version="4.0.0" ) # Attempt to look up the related items the user specified (these will fail the module if not found)