Skip to content

Commit 000bdd3

Browse files
authored
Merge pull request #10 from zerwes/prefer-builtin
give precedence to ansible modules
2 parents 2dd84ff + fa07744 commit 000bdd3

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

example.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,7 @@
9696
notify: restart-xyz
9797
when: of_local_json
9898

99+
- name: test user ... expect buildin
100+
user:
101+
name: test
102+
password: '!'

exampleconverted.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,8 @@
9999
notify: restart-xyz
100100
when: of_local_json
101101

102+
- name: test user ... expect buildin
103+
# possible ambiguous replacement: user : ansible.builtin.user | awx.awx.user | inspur.sm.user | sensu.sensu_go.user | theforeman.foreman.user
104+
ansible.builtin.user:
105+
name: test
106+
password: '!'

fqcn-fixer.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,11 @@ def increase_indent(self, flow=False, *dargs, **dkwargs): # pylint: disable=keyw
222222
if nonfqcn not in fqcndict.keys():
223223
fqcndict[nonfqcn] = []
224224
if fqcn not in fqcndict[nonfqcn]:
225-
fqcndict[nonfqcn].append(fqcn)
225+
# this defines the precedence of the replacements made
226+
if fqcn.startswith('ansible.'):
227+
fqcndict[nonfqcn].insert(0, fqcn)
228+
else:
229+
fqcndict[nonfqcn].append(fqcn)
226230
print('%s : %s -> %s' % (modname, nonfqcn, fqcn))
227231
with open(args.fqcnmapfile, "w", encoding="utf-8") as fqcnmapfile:
228232
fqcnmapfile.write(

fqcn.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2183,8 +2183,8 @@ cli_config:
21832183
cli_credential:
21842184
- cisco.dnac.cli_credential
21852185
cli_parse:
2186-
- ansible.netcommon.cli_parse
21872186
- ansible.utils.cli_parse
2187+
- ansible.netcommon.cli_parse
21882188
client_detail_info:
21892189
- cisco.dnac.client_detail_info
21902190
client_enrichment_details_info:
@@ -7491,8 +7491,8 @@ grafana_team:
74917491
grafana_user:
74927492
- community.grafana.grafana_user
74937493
group:
7494-
- awx.awx.group
74957494
- ansible.builtin.group
7495+
- awx.awx.group
74967496
group_assignment:
74977497
- openstack.cloud.group_assignment
74987498
group_by:
@@ -12687,11 +12687,11 @@ uri:
1268712687
urpmi:
1268812688
- community.general.urpmi
1268912689
user:
12690+
- ansible.builtin.user
1269012691
- awx.awx.user
1269112692
- inspur.sm.user
1269212693
- sensu.sensu_go.user
1269312694
- theforeman.foreman.user
12694-
- ansible.builtin.user
1269512695
user_enrichment_details_info:
1269612696
- cisco.dnac.user_enrichment_details_info
1269712697
user_group:

0 commit comments

Comments
 (0)