Skip to content

Commit

Permalink
Merge pull request #121 from AndrewTwydell/main
Browse files Browse the repository at this point in the history
Linting / Formatting for Ansible Sanity and Lint tests
  • Loading branch information
Tom-Latham authored Jan 18, 2023
2 parents 896451a + f55bd8c commit dd6d0b8
Show file tree
Hide file tree
Showing 43 changed files with 2,559 additions and 2,701 deletions.
3 changes: 3 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
skip_list:
- "name[template]"
10 changes: 5 additions & 5 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ mock==3.0.5
requests_mock==1.8.0
pytest-xdist==1.34.0 # Need this to work around a problem running ansible-test
pytest==4.6.11; python_version < '3'
pytest==6.2.1; python_version >= '3'
pytest==7.2.0; python_version >= '3'
# Non-test requirements (python 3+ only)
pylint==2.5.3; python_version >= '3'
shellcheck-py==0.7.1.1; python_version >= '3'
shellcheck-py==0.9.0.2; python_version >= '3'
rstcheck==3.3.1; python_version >= '3'
yamllint==1.25.0; python_version >= '3'
voluptuous==0.12.1; python_version >= '3'
yamllint==1.29.0; python_version >= '3'
voluptuous==0.13.1; python_version >= '3'
ansible-doc-extractor==0.1.6; python_version >= '3'
ansible-lint==4.3.7; python_version >= '3'
ansible-lint==6.10.2; python_version >= '3'
pycodestyle==2.6.0; python_version >= '3'
Sphinx==3.4.3; python_version >= '3'
sphinx-rtd-theme==0.5.1; python_version >= '3'
9 changes: 5 additions & 4 deletions galaxy.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
# (c) Copyright IBM Corp. 2020,2021

# IBM collection namespace
Expand All @@ -19,14 +20,14 @@ authors:
- Sophie Green
- Ya Qing Chen
# Description
description: The Red Hat Ansible Certified Content for IBM Z CICS collection includes connection plugins, action plugins, modules and sample playbooks to automate tasks for CICS
description:
The Red Hat Ansible Certified Content for IBM Z CICS collection includes connection plugins, action plugins,
modules and sample playbooks to automate tasks for CICS

# License
license: "Apache-2.0"

license: [Apache-2.0]
# Tags
tags: [ibm, z, zos, z_os, cics, cmci]

# Collections that this collection requires to be installed for it to be usable.
# dependencies: {} # This collection depends on no other collections

Expand Down
3 changes: 2 additions & 1 deletion meta/execution-environment.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
dependencies:
python: requirements.txt
version: 1
version: 1
9 changes: 5 additions & 4 deletions meta/ibm_zos_cics_meta.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---
name: ibm_zos_cics
version: "1.0.3"
version: 1.0.3
managed_requirements:
- name: "Python"
- name: Python
version: ">=2.7"
- name: "CICS TS with CICSplex System Manager"
version: ">=4.1"
- name: CICS TS with CICSplex System Manager
version: ">=4.1"
5 changes: 3 additions & 2 deletions meta/runtime.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
requires_ansible: '>=2.10.7'
---
requires_ansible: ">=2.10.7"
action_groups:
cmci_group:
- cmci_action
- cmci_create
- cmci_delete
- cmci_get
- cmci_update
- cmci_update
4 changes: 2 additions & 2 deletions plugins/doc_fragments/cmci.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class ModuleDocFragment(object):
C(and) and C(or) operators, see the C(complex_filter) parameter.
- For more details, see
L(How to build a filter expression,https://www.ibm.com/docs/en/cics-ts/latest?topic=expressions-how-build-filter-expression).
- For examples, see M(cmci_get).
- For examples, see M(ibm.ibm_zos_cics.cmci_get).
- For supported attributes of different resource types, see their
resource table reference, for example,
L(PROGDEF resource table reference,https://www.ibm.com/docs/en/cics-ts/latest?topic=tables-progdef-resource-table).
Expand All @@ -167,7 +167,7 @@ class ModuleDocFragment(object):
- When supplying the C(attribute) option, you must also supply a
C(value) for the filter. You can also override the default
operator of C(=) with the C(operator) option.
- For examples, see "Examples" in M(cmci_get).
- For examples, see "Examples" in M(ibm.ibm_zos_cics.cmci_get).
type: dict
required: false
suboptions:
Expand Down
2 changes: 1 addition & 1 deletion plugins/module_utils/cmci.py
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ def handle_response(self, response_dict): # type: (Dict) -> None
'Could not parse CMCI response: missing node "{0}"'
.format(e.args[0])
)

def get_ok_cpsm_response_codes(self):
return [1024]

Expand Down
Loading

0 comments on commit dd6d0b8

Please sign in to comment.