Skip to content

Commit dd6d0b8

Browse files
authored
Merge pull request #121 from AndrewTwydell/main
Linting / Formatting for Ansible Sanity and Lint tests
2 parents 896451a + f55bd8c commit dd6d0b8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2559
-2701
lines changed

.ansible-lint

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
skip_list:
3+
- "name[template]"

dev-requirements.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ mock==3.0.5
99
requests_mock==1.8.0
1010
pytest-xdist==1.34.0 # Need this to work around a problem running ansible-test
1111
pytest==4.6.11; python_version < '3'
12-
pytest==6.2.1; python_version >= '3'
12+
pytest==7.2.0; python_version >= '3'
1313
# Non-test requirements (python 3+ only)
1414
pylint==2.5.3; python_version >= '3'
15-
shellcheck-py==0.7.1.1; python_version >= '3'
15+
shellcheck-py==0.9.0.2; python_version >= '3'
1616
rstcheck==3.3.1; python_version >= '3'
17-
yamllint==1.25.0; python_version >= '3'
18-
voluptuous==0.12.1; python_version >= '3'
17+
yamllint==1.29.0; python_version >= '3'
18+
voluptuous==0.13.1; python_version >= '3'
1919
ansible-doc-extractor==0.1.6; python_version >= '3'
20-
ansible-lint==4.3.7; python_version >= '3'
20+
ansible-lint==6.10.2; python_version >= '3'
2121
pycodestyle==2.6.0; python_version >= '3'
2222
Sphinx==3.4.3; python_version >= '3'
2323
sphinx-rtd-theme==0.5.1; python_version >= '3'

galaxy.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# (c) Copyright IBM Corp. 2020,2021
23

34
# IBM collection namespace
@@ -19,14 +20,14 @@ authors:
1920
- Sophie Green
2021
- Ya Qing Chen
2122
# Description
22-
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
23+
description:
24+
The Red Hat Ansible Certified Content for IBM Z CICS collection includes connection plugins, action plugins,
25+
modules and sample playbooks to automate tasks for CICS
2326

2427
# License
25-
license: "Apache-2.0"
26-
28+
license: [Apache-2.0]
2729
# Tags
2830
tags: [ibm, z, zos, z_os, cics, cmci]
29-
3031
# Collections that this collection requires to be installed for it to be usable.
3132
# dependencies: {} # This collection depends on no other collections
3233

meta/execution-environment.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
dependencies:
23
python: requirements.txt
3-
version: 1
4+
version: 1

meta/ibm_zos_cics_meta.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
---
12
name: ibm_zos_cics
2-
version: "1.0.3"
3+
version: 1.0.3
34
managed_requirements:
4-
- name: "Python"
5+
- name: Python
56
version: ">=2.7"
6-
- name: "CICS TS with CICSplex System Manager"
7-
version: ">=4.1"
7+
- name: CICS TS with CICSplex System Manager
8+
version: ">=4.1"

meta/runtime.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
requires_ansible: '>=2.10.7'
1+
---
2+
requires_ansible: ">=2.10.7"
23
action_groups:
34
cmci_group:
45
- cmci_action
56
- cmci_create
67
- cmci_delete
78
- cmci_get
8-
- cmci_update
9+
- cmci_update

plugins/doc_fragments/cmci.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class ModuleDocFragment(object):
145145
C(and) and C(or) operators, see the C(complex_filter) parameter.
146146
- For more details, see
147147
L(How to build a filter expression,https://www.ibm.com/docs/en/cics-ts/latest?topic=expressions-how-build-filter-expression).
148-
- For examples, see M(cmci_get).
148+
- For examples, see M(ibm.ibm_zos_cics.cmci_get).
149149
- For supported attributes of different resource types, see their
150150
resource table reference, for example,
151151
L(PROGDEF resource table reference,https://www.ibm.com/docs/en/cics-ts/latest?topic=tables-progdef-resource-table).
@@ -167,7 +167,7 @@ class ModuleDocFragment(object):
167167
- When supplying the C(attribute) option, you must also supply a
168168
C(value) for the filter. You can also override the default
169169
operator of C(=) with the C(operator) option.
170-
- For examples, see "Examples" in M(cmci_get).
170+
- For examples, see "Examples" in M(ibm.ibm_zos_cics.cmci_get).
171171
type: dict
172172
required: false
173173
suboptions:

plugins/module_utils/cmci.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ def handle_response(self, response_dict): # type: (Dict) -> None
436436
'Could not parse CMCI response: missing node "{0}"'
437437
.format(e.args[0])
438438
)
439-
439+
440440
def get_ok_cpsm_response_codes(self):
441441
return [1024]
442442

0 commit comments

Comments
 (0)