diff --git a/example.yml b/example.yml index 6d70719..8dde4aa 100644 --- a/example.yml +++ b/example.yml @@ -96,3 +96,7 @@ notify: restart-xyz when: of_local_json +- name: test user ... expect buildin + user: + name: test + password: '!' diff --git a/exampleconverted.yml b/exampleconverted.yml index 4dc5c30..af2bacb 100644 --- a/exampleconverted.yml +++ b/exampleconverted.yml @@ -99,3 +99,8 @@ notify: restart-xyz when: of_local_json +- name: test user ... expect buildin + # possible ambiguous replacement: user : ansible.builtin.user | awx.awx.user | inspur.sm.user | sensu.sensu_go.user | theforeman.foreman.user + ansible.builtin.user: + name: test + password: '!' diff --git a/fqcn-fixer.py b/fqcn-fixer.py index a4a9378..9da797c 100755 --- a/fqcn-fixer.py +++ b/fqcn-fixer.py @@ -222,7 +222,11 @@ def increase_indent(self, flow=False, *dargs, **dkwargs): # pylint: disable=keyw if nonfqcn not in fqcndict.keys(): fqcndict[nonfqcn] = [] if fqcn not in fqcndict[nonfqcn]: - fqcndict[nonfqcn].append(fqcn) + # this defines the precedence of the replacements made + if fqcn.startswith('ansible.'): + fqcndict[nonfqcn].insert(0, fqcn) + else: + fqcndict[nonfqcn].append(fqcn) print('%s : %s -> %s' % (modname, nonfqcn, fqcn)) with open(args.fqcnmapfile, "w", encoding="utf-8") as fqcnmapfile: fqcnmapfile.write( diff --git a/fqcn.yml b/fqcn.yml index 25c2f41..4a5b7d9 100644 --- a/fqcn.yml +++ b/fqcn.yml @@ -2183,8 +2183,8 @@ cli_config: cli_credential: - cisco.dnac.cli_credential cli_parse: - - ansible.netcommon.cli_parse - ansible.utils.cli_parse + - ansible.netcommon.cli_parse client_detail_info: - cisco.dnac.client_detail_info client_enrichment_details_info: @@ -7491,8 +7491,8 @@ grafana_team: grafana_user: - community.grafana.grafana_user group: - - awx.awx.group - ansible.builtin.group + - awx.awx.group group_assignment: - openstack.cloud.group_assignment group_by: @@ -12687,11 +12687,11 @@ uri: urpmi: - community.general.urpmi user: + - ansible.builtin.user - awx.awx.user - inspur.sm.user - sensu.sensu_go.user - theforeman.foreman.user - - ansible.builtin.user user_enrichment_details_info: - cisco.dnac.user_enrichment_details_info user_group: