From 4fa82b961705155b39a8fbbb6c4335e27a939440 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 20 Apr 2026 20:16:26 +0200 Subject: [PATCH] Make all doc fragments, module utils, and plugin utils private (#11896) * Make all doc fragments private. * Make all plugin utils private. * Make all module utils private. * Reformat. * Changelog fragment. * Update configs and ignores. * Adjust unit test names. --- .github/BOTMETA.yml | 92 +++++++++---------- antsibull-nox.toml | 6 +- changelogs/fragments/11896-private.yml | 5 + docs/docsite/rst/guide_cmdrunner.rst | 12 +-- docs/docsite/rst/guide_deps.rst | 4 +- docs/docsite/rst/guide_modulehelper.rst | 12 +-- docs/docsite/rst/guide_vardict.rst | 4 +- plugins/callback/counter_enabled.py | 2 +- plugins/callback/dense.py | 2 +- plugins/callback/diy.py | 2 +- plugins/callback/loganalytics.py | 2 +- plugins/callback/logstash.py | 2 +- plugins/callback/splunk.py | 2 +- plugins/callback/sumologic.py | 2 +- plugins/callback/unixy.py | 2 +- plugins/connection/wsl.py | 2 +- .../{alicloud.py => _alicloud.py} | 3 + .../{attributes.py => _attributes.py} | 3 + .../{auth_basic.py => _auth_basic.py} | 3 + .../{bitbucket.py => _bitbucket.py} | 3 + .../doc_fragments/{consul.py => _consul.py} | 3 + .../doc_fragments/{django.py => _django.py} | 3 + plugins/doc_fragments/{emc.py => _emc.py} | 3 + .../doc_fragments/{gitlab.py => _gitlab.py} | 3 + .../doc_fragments/{hpe3par.py => _hpe3par.py} | 3 + plugins/doc_fragments/{hwc.py => _hwc.py} | 3 + .../{ibm_storage.py => _ibm_storage.py} | 3 + .../{influxdb.py => _influxdb.py} | 3 + plugins/doc_fragments/{ipa.py => _ipa.py} | 3 + .../{keycloak.py => _keycloak.py} | 3 + plugins/doc_fragments/{ldap.py => _ldap.py} | 3 + .../{lxca_common.py => _lxca_common.py} | 3 + .../{manageiq.py => _manageiq.py} | 3 + plugins/doc_fragments/{nomad.py => _nomad.py} | 3 + .../{onepassword.py => _onepassword.py} | 3 + .../doc_fragments/{oneview.py => _oneview.py} | 4 +- .../doc_fragments/{online.py => _online.py} | 3 + .../{opennebula.py => _opennebula.py} | 3 + .../{openswitch.py => _openswitch.py} | 3 + plugins/doc_fragments/{pipx.py => _pipx.py} | 3 + .../doc_fragments/{pritunl.py => _pritunl.py} | 3 + .../doc_fragments/{redfish.py => _redfish.py} | 3 + plugins/doc_fragments/{redis.py => _redis.py} | 3 + .../doc_fragments/{rundeck.py => _rundeck.py} | 3 + .../{scaleway.py => _scaleway.py} | 3 + ...urce.py => _scaleway_waitable_resource.py} | 3 + plugins/doc_fragments/{utm.py => _utm.py} | 3 + .../doc_fragments/{vexata.py => _vexata.py} | 4 +- .../{xenserver.py => _xenserver.py} | 3 + plugins/filter/from_csv.py | 2 +- plugins/filter/keep_keys.py | 2 +- plugins/filter/remove_keys.py | 2 +- plugins/filter/replace_keys.py | 2 +- plugins/filter/reveal_ansible_type.py | 2 +- plugins/filter/version_sort.py | 2 +- plugins/inventory/cobbler.py | 2 +- plugins/inventory/gitlab_runners.py | 2 +- plugins/inventory/icinga2.py | 2 +- plugins/inventory/linode.py | 2 +- plugins/inventory/lxd.py | 4 +- plugins/inventory/nmap.py | 2 +- plugins/inventory/online.py | 2 +- plugins/inventory/opennebula.py | 2 +- plugins/inventory/scaleway.py | 7 +- plugins/inventory/virtualbox.py | 2 +- plugins/inventory/xen_orchestra.py | 4 +- plugins/lookup/bitwarden_secrets_manager.py | 2 +- plugins/lookup/onepassword.py | 6 +- plugins/lookup/onepassword_doc.py | 4 +- plugins/lookup/onepassword_raw.py | 4 +- plugins/lookup/onepassword_ssh_key.py | 4 +- .../{alicloud_ecs.py => _alicloud_ecs.py} | 3 + ...d_sdkmanager.py => _android_sdkmanager.py} | 5 +- plugins/module_utils/{btrfs.py => _btrfs.py} | 3 + .../{cmd_runner.py => _cmd_runner.py} | 7 +- .../{cmd_runner_fmt.py => _cmd_runner_fmt.py} | 3 + .../module_utils/{consul.py => _consul.py} | 3 + plugins/module_utils/_crypt.py | 3 + plugins/module_utils/{csv.py => _csv.py} | 3 + .../{datetime.py => _datetime.py} | 3 + plugins/module_utils/{deps.py => _deps.py} | 3 + .../module_utils/{django.py => _django.py} | 11 ++- plugins/module_utils/_filelock.py | 3 + ...i_livedns_api.py => _gandi_livedns_api.py} | 3 + .../{gconftool2.py => _gconftool2.py} | 5 +- .../{gio_mime.py => _gio_mime.py} | 5 +- .../module_utils/{gitlab.py => _gitlab.py} | 5 +- .../module_utils/{heroku.py => _heroku.py} | 3 + .../{homebrew.py => _homebrew.py} | 3 + .../{hwc_utils.py => _hwc_utils.py} | 3 + .../{ibm_sa_utils.py => _ibm_sa_utils.py} | 3 + .../keycloak/_keycloak_utils.py | 0 .../keycloak/keycloak.py | 3 + .../keycloak/keycloak_clientsecret.py | 5 +- ...redfish_utils.py => _ilo_redfish_utils.py} | 5 +- .../{influxdb.py => _influxdb.py} | 5 +- plugins/module_utils/{ipa.py => _ipa.py} | 3 + .../module_utils/{jenkins.py => _jenkins.py} | 3 + plugins/module_utils/{ldap.py => _ldap.py} | 3 + .../module_utils/{linode.py => _linode.py} | 3 + .../{locale_gen.py => _locale_gen.py} | 5 +- plugins/module_utils/_lvm.py | 2 +- plugins/module_utils/_lxc.py | 3 + plugins/module_utils/{lxd.py => _lxd.py} | 3 + .../{manageiq.py => _manageiq.py} | 3 + .../module_utils/{memset.py => _memset.py} | 3 + plugins/module_utils/{mh => _mh}/base.py | 7 +- plugins/module_utils/{mh => _mh}/deco.py | 5 +- .../module_utils/{mh => _mh}/exceptions.py | 3 + .../{mh => _mh}/mixins/deprecate_attrs.py | 3 + .../module_utils/{mh => _mh}/mixins/state.py | 3 + .../module_utils/{mh => _mh}/module_helper.py | 11 ++- .../{module_helper.py => _module_helper.py} | 11 ++- .../{net_tools => _net_tools}/pritunl/api.py | 3 + .../{ocapi_utils.py => _ocapi_utils.py} | 3 + .../{onepassword.py => _onepassword.py} | 3 + .../module_utils/{oneview.py => _oneview.py} | 3 + .../module_utils/{online.py => _online.py} | 3 + .../{opennebula.py => _opennebula.py} | 3 + .../{pacemaker.py => _pacemaker.py} | 5 +- plugins/module_utils/{pipx.py => _pipx.py} | 5 +- .../module_utils/{pkg_req.py => _pkg_req.py} | 5 +- .../module_utils/{puppet.py => _puppet.py} | 5 +- .../{python_runner.py => _python_runner.py} | 5 +- .../{redfish_utils.py => _redfish_utils.py} | 3 + plugins/module_utils/{redis.py => _redis.py} | 3 + .../lxca/common.py | 3 + .../module_utils/{rundeck.py => _rundeck.py} | 3 + .../{scaleway.py => _scaleway.py} | 5 +- plugins/module_utils/{snap.py => _snap.py} | 5 +- .../bitbucket.py | 3 + plugins/module_utils/{ssh.py => _ssh.py} | 3 + .../{storage => _storage}/emc/emc_vnx.py | 3 + .../{storage => _storage}/hpe3par/hpe3par.py | 3 + plugins/module_utils/_stormssh.py | 3 + .../module_utils/{systemd.py => _systemd.py} | 5 +- .../{univention_umc.py => _univention_umc.py} | 3 + .../{utm_utils.py => _utm_utils.py} | 3 + .../module_utils/{vardict.py => _vardict.py} | 3 + .../module_utils/{version.py => _version.py} | 3 + .../module_utils/{vexata.py => _vexata.py} | 3 + ...redfish_utils.py => _wdc_redfish_utils.py} | 5 +- .../{xdg_mime.py => _xdg_mime.py} | 5 +- .../{xenserver.py => _xenserver.py} | 3 + .../module_utils/{xfconf.py => _xfconf.py} | 5 +- plugins/modules/aerospike_migrations.py | 2 +- plugins/modules/airbrake_deployment.py | 2 +- plugins/modules/aix_devices.py | 2 +- plugins/modules/aix_filesystem.py | 2 +- plugins/modules/aix_inittab.py | 2 +- plugins/modules/aix_lvg.py | 2 +- plugins/modules/aix_lvol.py | 2 +- plugins/modules/alerta_customer.py | 2 +- plugins/modules/ali_instance.py | 6 +- plugins/modules/ali_instance_info.py | 8 +- plugins/modules/alternatives.py | 2 +- plugins/modules/android_sdk.py | 6 +- plugins/modules/ansible_galaxy_install.py | 9 +- plugins/modules/apache2_mod_proxy.py | 9 +- plugins/modules/apache2_module.py | 2 +- plugins/modules/apk.py | 2 +- plugins/modules/apt_repo.py | 2 +- plugins/modules/apt_rpm.py | 2 +- plugins/modules/archive.py | 2 +- plugins/modules/awall.py | 2 +- plugins/modules/beadm.py | 2 +- plugins/modules/bigpanda.py | 2 +- plugins/modules/bitbucket_access_key.py | 6 +- .../modules/bitbucket_pipeline_key_pair.py | 6 +- .../modules/bitbucket_pipeline_known_host.py | 6 +- .../modules/bitbucket_pipeline_variable.py | 6 +- plugins/modules/bower.py | 2 +- plugins/modules/btrfs_info.py | 6 +- plugins/modules/btrfs_subvolume.py | 4 +- plugins/modules/bundler.py | 2 +- plugins/modules/bzr.py | 2 +- plugins/modules/campfire.py | 2 +- plugins/modules/capabilities.py | 2 +- plugins/modules/cargo.py | 2 +- plugins/modules/circonus_annotation.py | 4 +- plugins/modules/cisco_webex.py | 2 +- plugins/modules/cloud_init_data_facts.py | 6 +- plugins/modules/cloudflare_dns.py | 2 +- plugins/modules/cobbler_sync.py | 4 +- plugins/modules/cobbler_system.py | 4 +- plugins/modules/composer.py | 2 +- plugins/modules/consul.py | 2 +- plugins/modules/consul_acl_bootstrap.py | 6 +- plugins/modules/consul_agent_check.py | 10 +- plugins/modules/consul_agent_service.py | 10 +- plugins/modules/consul_auth_method.py | 10 +- plugins/modules/consul_binding_rule.py | 10 +- plugins/modules/consul_kv.py | 2 +- plugins/modules/consul_policy.py | 10 +- plugins/modules/consul_role.py | 10 +- plugins/modules/consul_session.py | 10 +- plugins/modules/consul_token.py | 10 +- plugins/modules/copr.py | 2 +- plugins/modules/cpanm.py | 6 +- plugins/modules/cronvar.py | 2 +- plugins/modules/crypttab.py | 2 +- plugins/modules/datadog_downtime.py | 2 +- plugins/modules/datadog_event.py | 2 +- plugins/modules/datadog_monitor.py | 2 +- plugins/modules/dconf.py | 4 +- plugins/modules/decompress.py | 6 +- plugins/modules/deploy_helper.py | 2 +- plugins/modules/discord.py | 2 +- plugins/modules/django_check.py | 6 +- plugins/modules/django_command.py | 8 +- plugins/modules/django_createcachetable.py | 8 +- plugins/modules/django_dumpdata.py | 10 +- plugins/modules/django_loaddata.py | 10 +- plugins/modules/django_manage.py | 2 +- plugins/modules/dnf_config_manager.py | 2 +- plugins/modules/dnf_versionlock.py | 2 +- plugins/modules/dnsimple.py | 4 +- plugins/modules/dnsimple_info.py | 6 +- plugins/modules/dnsmadeeasy.py | 2 +- plugins/modules/dpkg_divert.py | 4 +- plugins/modules/easy_install.py | 2 +- plugins/modules/ejabberd_user.py | 4 +- plugins/modules/elasticsearch_plugin.py | 2 +- plugins/modules/emc_vnx_sg_member.py | 6 +- plugins/modules/etcd3.py | 2 +- plugins/modules/facter_facts.py | 6 +- plugins/modules/file_remove.py | 2 +- plugins/modules/filesize.py | 2 +- plugins/modules/filesystem.py | 4 +- plugins/modules/flatpak.py | 4 +- plugins/modules/flatpak_remote.py | 2 +- plugins/modules/gandi_livedns.py | 4 +- plugins/modules/gconftool2.py | 6 +- plugins/modules/gconftool2_info.py | 8 +- plugins/modules/gem.py | 6 +- plugins/modules/gio_mime.py | 6 +- plugins/modules/git_config.py | 2 +- plugins/modules/git_config_info.py | 4 +- plugins/modules/github_deploy_key.py | 2 +- plugins/modules/github_issue.py | 2 +- plugins/modules/github_key.py | 4 +- plugins/modules/github_release.py | 2 +- plugins/modules/github_repo.py | 2 +- plugins/modules/github_secrets.py | 4 +- plugins/modules/github_secrets_info.py | 6 +- plugins/modules/github_webhook.py | 2 +- plugins/modules/github_webhook_info.py | 4 +- plugins/modules/gitlab_branch.py | 10 +- plugins/modules/gitlab_deploy_key.py | 8 +- plugins/modules/gitlab_group.py | 8 +- plugins/modules/gitlab_group_access_token.py | 8 +- plugins/modules/gitlab_group_members.py | 8 +- plugins/modules/gitlab_group_variable.py | 8 +- plugins/modules/gitlab_hook.py | 8 +- plugins/modules/gitlab_instance_variable.py | 8 +- plugins/modules/gitlab_issue.py | 8 +- plugins/modules/gitlab_label.py | 8 +- plugins/modules/gitlab_merge_request.py | 10 +- plugins/modules/gitlab_milestone.py | 8 +- plugins/modules/gitlab_project.py | 10 +- .../modules/gitlab_project_access_token.py | 8 +- plugins/modules/gitlab_project_badge.py | 8 +- plugins/modules/gitlab_project_members.py | 8 +- plugins/modules/gitlab_project_variable.py | 8 +- plugins/modules/gitlab_protected_branch.py | 10 +- plugins/modules/gitlab_runner.py | 10 +- plugins/modules/gitlab_user.py | 8 +- plugins/modules/grove.py | 2 +- plugins/modules/gunicorn.py | 2 +- plugins/modules/haproxy.py | 2 +- plugins/modules/heroku_collaborator.py | 4 +- plugins/modules/hg.py | 2 +- plugins/modules/homebrew.py | 4 +- plugins/modules/homebrew_cask.py | 6 +- plugins/modules/homebrew_services.py | 4 +- plugins/modules/homebrew_tap.py | 2 +- plugins/modules/homectl.py | 4 +- plugins/modules/honeybadger_deployment.py | 2 +- plugins/modules/hpilo_boot.py | 2 +- plugins/modules/hpilo_info.py | 4 +- plugins/modules/hponcfg.py | 6 +- plugins/modules/htpasswd.py | 4 +- plugins/modules/hwc_ecs_instance.py | 6 +- plugins/modules/hwc_evs_disk.py | 6 +- plugins/modules/hwc_network_vpc.py | 6 +- plugins/modules/hwc_smn_topic.py | 6 +- plugins/modules/hwc_vpc_eip.py | 6 +- plugins/modules/hwc_vpc_peering_connect.py | 6 +- plugins/modules/hwc_vpc_port.py | 6 +- plugins/modules/hwc_vpc_private_ip.py | 6 +- plugins/modules/hwc_vpc_route.py | 6 +- plugins/modules/hwc_vpc_security_group.py | 6 +- .../modules/hwc_vpc_security_group_rule.py | 6 +- plugins/modules/hwc_vpc_subnet.py | 6 +- plugins/modules/ibm_sa_domain.py | 6 +- plugins/modules/ibm_sa_host.py | 6 +- plugins/modules/ibm_sa_host_ports.py | 6 +- plugins/modules/ibm_sa_pool.py | 6 +- plugins/modules/ibm_sa_vol.py | 6 +- plugins/modules/ibm_sa_vol_map.py | 6 +- plugins/modules/icinga2_downtime.py | 4 +- plugins/modules/icinga2_feature.py | 2 +- plugins/modules/icinga2_host.py | 2 +- plugins/modules/idrac_redfish_command.py | 6 +- plugins/modules/idrac_redfish_config.py | 6 +- plugins/modules/idrac_redfish_info.py | 8 +- plugins/modules/ilo_redfish_command.py | 8 +- plugins/modules/ilo_redfish_config.py | 8 +- plugins/modules/ilo_redfish_info.py | 10 +- plugins/modules/imc_rest.py | 4 +- plugins/modules/imgadm.py | 2 +- plugins/modules/infinity.py | 2 +- plugins/modules/influxdb_database.py | 6 +- plugins/modules/influxdb_query.py | 6 +- plugins/modules/influxdb_retention_policy.py | 6 +- plugins/modules/influxdb_user.py | 6 +- plugins/modules/influxdb_write.py | 6 +- plugins/modules/ini_file.py | 2 +- plugins/modules/installp.py | 2 +- plugins/modules/interfaces_file.py | 2 +- plugins/modules/ip2location_info.py | 4 +- plugins/modules/ip_netns.py | 2 +- plugins/modules/ipa_config.py | 8 +- plugins/modules/ipa_dnsrecord.py | 8 +- plugins/modules/ipa_dnszone.py | 8 +- plugins/modules/ipa_getkeytab.py | 4 +- plugins/modules/ipa_group.py | 8 +- plugins/modules/ipa_hbacrule.py | 10 +- plugins/modules/ipa_host.py | 8 +- plugins/modules/ipa_hostgroup.py | 8 +- plugins/modules/ipa_otpconfig.py | 8 +- plugins/modules/ipa_otptoken.py | 8 +- plugins/modules/ipa_pwpolicy.py | 8 +- plugins/modules/ipa_role.py | 8 +- plugins/modules/ipa_service.py | 8 +- plugins/modules/ipa_subca.py | 10 +- plugins/modules/ipa_sudocmd.py | 8 +- plugins/modules/ipa_sudocmdgroup.py | 8 +- plugins/modules/ipa_sudorule.py | 10 +- plugins/modules/ipa_user.py | 8 +- plugins/modules/ipa_vault.py | 8 +- plugins/modules/ipbase_info.py | 4 +- plugins/modules/ipify_facts.py | 6 +- plugins/modules/ipinfoio_facts.py | 6 +- plugins/modules/ipmi_boot.py | 2 +- plugins/modules/ipmi_power.py | 2 +- plugins/modules/iptables_state.py | 4 +- plugins/modules/ipwcli_dns.py | 2 +- plugins/modules/irc.py | 2 +- plugins/modules/iso_create.py | 2 +- plugins/modules/iso_customize.py | 4 +- plugins/modules/iso_extract.py | 2 +- plugins/modules/jabber.py | 2 +- plugins/modules/java_cert.py | 2 +- plugins/modules/java_keystore.py | 2 +- plugins/modules/jboss.py | 2 +- plugins/modules/jenkins_build.py | 2 +- plugins/modules/jenkins_build_info.py | 4 +- plugins/modules/jenkins_credential.py | 4 +- plugins/modules/jenkins_job.py | 2 +- plugins/modules/jenkins_job_info.py | 4 +- plugins/modules/jenkins_node.py | 4 +- plugins/modules/jenkins_plugin.py | 4 +- plugins/modules/jenkins_script.py | 2 +- plugins/modules/jira.py | 4 +- plugins/modules/kdeconfig.py | 2 +- plugins/modules/kea_command.py | 4 +- plugins/modules/kernel_blacklist.py | 4 +- plugins/modules/keycloak_authentication.py | 8 +- ...eycloak_authentication_required_actions.py | 8 +- plugins/modules/keycloak_authentication_v2.py | 8 +- .../keycloak_authz_authorization_scope.py | 8 +- .../modules/keycloak_authz_custom_policy.py | 8 +- plugins/modules/keycloak_authz_permission.py | 8 +- .../modules/keycloak_authz_permission_info.py | 10 +- plugins/modules/keycloak_client.py | 10 +- .../modules/keycloak_client_rolemapping.py | 8 +- plugins/modules/keycloak_client_rolescope.py | 8 +- plugins/modules/keycloak_clientscope.py | 8 +- plugins/modules/keycloak_clientscope_type.py | 8 +- plugins/modules/keycloak_clientsecret_info.py | 12 +-- .../keycloak_clientsecret_regenerate.py | 10 +- plugins/modules/keycloak_clienttemplate.py | 8 +- plugins/modules/keycloak_component.py | 8 +- plugins/modules/keycloak_component_info.py | 10 +- plugins/modules/keycloak_group.py | 8 +- plugins/modules/keycloak_identity_provider.py | 8 +- plugins/modules/keycloak_realm.py | 8 +- plugins/modules/keycloak_realm_info.py | 6 +- plugins/modules/keycloak_realm_key.py | 8 +- .../keycloak_realm_keys_metadata_info.py | 10 +- .../modules/keycloak_realm_localization.py | 8 +- plugins/modules/keycloak_realm_rolemapping.py | 8 +- plugins/modules/keycloak_role.py | 8 +- plugins/modules/keycloak_user.py | 8 +- .../keycloak_user_execute_actions_email.py | 8 +- plugins/modules/keycloak_user_federation.py | 8 +- plugins/modules/keycloak_user_rolemapping.py | 8 +- plugins/modules/keycloak_userprofile.py | 8 +- plugins/modules/keyring.py | 2 +- plugins/modules/keyring_info.py | 4 +- plugins/modules/kibana_plugin.py | 4 +- plugins/modules/krb_ticket.py | 4 +- plugins/modules/launchd.py | 2 +- plugins/modules/layman.py | 2 +- plugins/modules/lbu.py | 2 +- plugins/modules/ldap_attrs.py | 6 +- plugins/modules/ldap_entry.py | 6 +- plugins/modules/ldap_inc.py | 8 +- plugins/modules/ldap_passwd.py | 6 +- plugins/modules/ldap_search.py | 6 +- plugins/modules/librato_annotation.py | 2 +- plugins/modules/linode.py | 2 +- plugins/modules/linode_v4.py | 4 +- plugins/modules/listen_ports_facts.py | 6 +- plugins/modules/lldp.py | 2 +- plugins/modules/locale_gen.py | 8 +- plugins/modules/logentries.py | 2 +- plugins/modules/logentries_msg.py | 2 +- plugins/modules/logrotate.py | 2 +- plugins/modules/logstash_plugin.py | 2 +- plugins/modules/lvg.py | 2 +- plugins/modules/lvg_rename.py | 2 +- plugins/modules/lvol.py | 2 +- plugins/modules/lxc_container.py | 2 +- plugins/modules/lxca_cmms.py | 6 +- plugins/modules/lxca_nodes.py | 6 +- plugins/modules/lxd_container.py | 4 +- plugins/modules/lxd_profile.py | 4 +- plugins/modules/lxd_project.py | 4 +- plugins/modules/lxd_storage_pool_info.py | 6 +- plugins/modules/lxd_storage_volume_info.py | 6 +- plugins/modules/macports.py | 2 +- plugins/modules/mail.py | 2 +- plugins/modules/make.py | 2 +- plugins/modules/manageiq_alert_profiles.py | 6 +- plugins/modules/manageiq_alerts.py | 6 +- plugins/modules/manageiq_group.py | 6 +- plugins/modules/manageiq_policies.py | 6 +- plugins/modules/manageiq_policies_info.py | 8 +- plugins/modules/manageiq_provider.py | 6 +- plugins/modules/manageiq_tags.py | 6 +- plugins/modules/manageiq_tags_info.py | 8 +- plugins/modules/manageiq_tenant.py | 6 +- plugins/modules/manageiq_user.py | 6 +- plugins/modules/mas.py | 4 +- plugins/modules/matrix.py | 2 +- plugins/modules/mattermost.py | 2 +- plugins/modules/maven_artifact.py | 2 +- plugins/modules/memset_dns_reload.py | 4 +- plugins/modules/memset_memstore_info.py | 6 +- plugins/modules/memset_server_info.py | 6 +- plugins/modules/memset_zone.py | 4 +- plugins/modules/memset_zone_domain.py | 4 +- plugins/modules/memset_zone_record.py | 4 +- plugins/modules/mksysb.py | 6 +- plugins/modules/modprobe.py | 2 +- plugins/modules/monit.py | 2 +- plugins/modules/mqtt.py | 2 +- plugins/modules/mssql_db.py | 2 +- plugins/modules/mssql_script.py | 2 +- plugins/modules/nagios.py | 2 +- plugins/modules/netcup_dns.py | 2 +- plugins/modules/newrelic_deployment.py | 2 +- plugins/modules/nexmo.py | 2 +- plugins/modules/nginx_status_info.py | 4 +- plugins/modules/nictagadm.py | 2 +- plugins/modules/nmcli.py | 2 +- plugins/modules/nomad_job.py | 4 +- plugins/modules/nomad_job_info.py | 6 +- plugins/modules/nomad_token.py | 4 +- plugins/modules/nosh.py | 2 +- plugins/modules/npm.py | 4 +- plugins/modules/nsupdate.py | 4 +- plugins/modules/ocapi_command.py | 4 +- plugins/modules/ocapi_info.py | 6 +- plugins/modules/odbc.py | 2 +- plugins/modules/office_365_connector_card.py | 2 +- plugins/modules/ohai.py | 2 +- plugins/modules/omapi_host.py | 2 +- plugins/modules/one_host.py | 6 +- plugins/modules/one_image.py | 6 +- plugins/modules/one_image_info.py | 8 +- plugins/modules/one_service.py | 2 +- plugins/modules/one_template.py | 6 +- plugins/modules/one_vm.py | 4 +- plugins/modules/one_vnet.py | 6 +- plugins/modules/onepassword_info.py | 6 +- plugins/modules/oneview_datacenter_info.py | 10 +- plugins/modules/oneview_enclosure_info.py | 10 +- plugins/modules/oneview_ethernet_network.py | 8 +- .../modules/oneview_ethernet_network_info.py | 10 +- plugins/modules/oneview_fc_network.py | 8 +- plugins/modules/oneview_fc_network_info.py | 10 +- plugins/modules/oneview_fcoe_network.py | 8 +- plugins/modules/oneview_fcoe_network_info.py | 10 +- .../oneview_logical_interconnect_group.py | 8 +- ...oneview_logical_interconnect_group_info.py | 10 +- plugins/modules/oneview_network_set.py | 8 +- plugins/modules/oneview_network_set_info.py | 10 +- plugins/modules/oneview_san_manager.py | 8 +- plugins/modules/oneview_san_manager_info.py | 8 +- plugins/modules/online_server_info.py | 8 +- plugins/modules/online_user_info.py | 8 +- plugins/modules/open_iscsi.py | 2 +- plugins/modules/openbsd_pkg.py | 4 +- plugins/modules/opendj_backendprop.py | 4 +- plugins/modules/openwrt_init.py | 2 +- plugins/modules/opkg.py | 6 +- plugins/modules/osx_defaults.py | 2 +- plugins/modules/ovh_ip_failover.py | 2 +- .../modules/ovh_ip_loadbalancing_backend.py | 2 +- plugins/modules/ovh_monthly_billing.py | 2 +- plugins/modules/pacemaker_cluster.py | 6 +- plugins/modules/pacemaker_info.py | 8 +- plugins/modules/pacemaker_resource.py | 6 +- plugins/modules/pacemaker_stonith.py | 6 +- plugins/modules/packet_device.py | 2 +- plugins/modules/packet_ip_subnet.py | 2 +- plugins/modules/packet_project.py | 2 +- plugins/modules/packet_sshkey.py | 2 +- plugins/modules/packet_volume.py | 2 +- plugins/modules/packet_volume_attachment.py | 2 +- plugins/modules/pacman.py | 2 +- plugins/modules/pacman_key.py | 2 +- plugins/modules/pagerduty.py | 4 +- plugins/modules/pagerduty_alert.py | 2 +- plugins/modules/pagerduty_change.py | 4 +- plugins/modules/pagerduty_user.py | 4 +- plugins/modules/pam_limits.py | 2 +- plugins/modules/pamd.py | 2 +- plugins/modules/parted.py | 2 +- plugins/modules/pear.py | 2 +- plugins/modules/pids.py | 6 +- plugins/modules/pingdom.py | 2 +- plugins/modules/pip_package_info.py | 4 +- plugins/modules/pipx.py | 12 +-- plugins/modules/pipx_info.py | 12 +-- plugins/modules/pkg5.py | 2 +- plugins/modules/pkg5_publisher.py | 2 +- plugins/modules/pkgin.py | 2 +- plugins/modules/pkgng.py | 2 +- plugins/modules/pkgutil.py | 2 +- plugins/modules/pmem.py | 2 +- plugins/modules/pnpm.py | 2 +- plugins/modules/portage.py | 2 +- plugins/modules/portinstall.py | 2 +- plugins/modules/pritunl_org.py | 6 +- plugins/modules/pritunl_org_info.py | 8 +- plugins/modules/pritunl_user.py | 6 +- plugins/modules/pritunl_user_info.py | 8 +- plugins/modules/pubnub_blocks.py | 2 +- plugins/modules/pulp_repo.py | 2 +- plugins/modules/puppet.py | 4 +- plugins/modules/pushover.py | 2 +- plugins/modules/python_requirements_info.py | 6 +- plugins/modules/read_csv.py | 4 +- plugins/modules/redfish_command.py | 6 +- plugins/modules/redfish_config.py | 6 +- plugins/modules/redfish_info.py | 8 +- plugins/modules/redhat_subscription.py | 2 +- plugins/modules/redis.py | 6 +- plugins/modules/redis_data.py | 6 +- plugins/modules/redis_data_incr.py | 6 +- plugins/modules/redis_data_info.py | 8 +- plugins/modules/redis_info.py | 8 +- plugins/modules/rhevm.py | 2 +- plugins/modules/rhsm_release.py | 2 +- plugins/modules/rhsm_repository.py | 2 +- plugins/modules/riak.py | 2 +- plugins/modules/rocketchat.py | 2 +- plugins/modules/rollbar_deployment.py | 2 +- plugins/modules/rpm_ostree_pkg.py | 2 +- plugins/modules/rundeck_acl_policy.py | 6 +- .../modules/rundeck_job_executions_info.py | 8 +- plugins/modules/rundeck_job_run.py | 6 +- plugins/modules/rundeck_project.py | 6 +- plugins/modules/runit.py | 2 +- plugins/modules/say.py | 2 +- plugins/modules/scaleway_compute.py | 10 +- .../scaleway_compute_private_network.py | 8 +- plugins/modules/scaleway_container.py | 10 +- plugins/modules/scaleway_container_info.py | 10 +- .../modules/scaleway_container_namespace.py | 10 +- .../scaleway_container_namespace_info.py | 10 +- .../modules/scaleway_container_registry.py | 10 +- .../scaleway_container_registry_info.py | 10 +- plugins/modules/scaleway_database_backup.py | 10 +- plugins/modules/scaleway_function.py | 10 +- plugins/modules/scaleway_function_info.py | 10 +- .../modules/scaleway_function_namespace.py | 10 +- .../scaleway_function_namespace_info.py | 10 +- plugins/modules/scaleway_image_info.py | 10 +- plugins/modules/scaleway_ip.py | 8 +- plugins/modules/scaleway_ip_info.py | 10 +- plugins/modules/scaleway_lb.py | 10 +- plugins/modules/scaleway_organization_info.py | 10 +- plugins/modules/scaleway_private_network.py | 8 +- plugins/modules/scaleway_security_group.py | 8 +- .../modules/scaleway_security_group_info.py | 10 +- .../modules/scaleway_security_group_rule.py | 8 +- plugins/modules/scaleway_server_info.py | 10 +- plugins/modules/scaleway_snapshot_info.py | 10 +- plugins/modules/scaleway_sshkey.py | 8 +- plugins/modules/scaleway_user_data.py | 8 +- plugins/modules/scaleway_volume.py | 8 +- plugins/modules/scaleway_volume_info.py | 10 +- plugins/modules/sefcontext.py | 4 +- plugins/modules/selinux_permissive.py | 2 +- plugins/modules/selogin.py | 2 +- plugins/modules/sendgrid.py | 4 +- plugins/modules/seport.py | 2 +- plugins/modules/serverless.py | 2 +- plugins/modules/shutdown.py | 4 +- plugins/modules/simpleinit_msb.py | 2 +- plugins/modules/sl_vm.py | 2 +- plugins/modules/slack.py | 2 +- plugins/modules/slackpkg.py | 2 +- plugins/modules/smartos_image_info.py | 4 +- plugins/modules/snap.py | 6 +- plugins/modules/snap_alias.py | 6 +- plugins/modules/snap_connect.py | 6 +- plugins/modules/snmp_facts.py | 8 +- plugins/modules/solaris_zone.py | 2 +- plugins/modules/sorcery.py | 2 +- plugins/modules/spectrum_device.py | 2 +- plugins/modules/spectrum_model_attrs.py | 2 +- plugins/modules/ss_3par_cpg.py | 6 +- plugins/modules/ssh_config.py | 4 +- plugins/modules/sssd_info.py | 6 +- plugins/modules/stacki_host.py | 2 +- plugins/modules/statsd.py | 2 +- plugins/modules/statusio_maintenance.py | 4 +- plugins/modules/sudoers.py | 2 +- plugins/modules/supervisorctl.py | 2 +- plugins/modules/svc.py | 2 +- plugins/modules/svr4pkg.py | 2 +- plugins/modules/swdepot.py | 2 +- plugins/modules/swupd.py | 2 +- plugins/modules/syslogger.py | 2 +- plugins/modules/syspatch.py | 2 +- plugins/modules/sysrc.py | 4 +- plugins/modules/systemd_creds_decrypt.py | 2 +- plugins/modules/systemd_creds_encrypt.py | 2 +- plugins/modules/systemd_info.py | 6 +- plugins/modules/sysupgrade.py | 2 +- plugins/modules/taiga_issue.py | 2 +- plugins/modules/telegram.py | 2 +- plugins/modules/terraform.py | 4 +- plugins/modules/timezone.py | 2 +- plugins/modules/twilio.py | 2 +- plugins/modules/udm_dns_record.py | 6 +- plugins/modules/udm_dns_zone.py | 4 +- plugins/modules/udm_group.py | 4 +- plugins/modules/udm_share.py | 4 +- plugins/modules/udm_user.py | 6 +- plugins/modules/ufw.py | 2 +- plugins/modules/uptimerobot.py | 2 +- plugins/modules/urpmi.py | 2 +- plugins/modules/usb_facts.py | 6 +- plugins/modules/utm_aaa_group.py | 6 +- plugins/modules/utm_aaa_group_info.py | 8 +- plugins/modules/utm_ca_host_key_cert.py | 6 +- plugins/modules/utm_ca_host_key_cert_info.py | 8 +- plugins/modules/utm_dns_host.py | 6 +- .../modules/utm_network_interface_address.py | 6 +- .../utm_network_interface_address_info.py | 8 +- plugins/modules/utm_proxy_auth_profile.py | 6 +- plugins/modules/utm_proxy_exception.py | 6 +- plugins/modules/utm_proxy_frontend.py | 6 +- plugins/modules/utm_proxy_frontend_info.py | 8 +- plugins/modules/utm_proxy_location.py | 6 +- plugins/modules/utm_proxy_location_info.py | 8 +- plugins/modules/vdo.py | 2 +- plugins/modules/vertica_configuration.py | 2 +- plugins/modules/vertica_info.py | 4 +- plugins/modules/vertica_role.py | 2 +- plugins/modules/vertica_schema.py | 2 +- plugins/modules/vertica_user.py | 2 +- plugins/modules/vexata_eg.py | 6 +- plugins/modules/vexata_volume.py | 6 +- plugins/modules/vmadm.py | 2 +- plugins/modules/wakeonlan.py | 2 +- plugins/modules/wdc_redfish_command.py | 8 +- plugins/modules/wdc_redfish_info.py | 10 +- plugins/modules/xattr.py | 2 +- plugins/modules/xbps.py | 2 +- plugins/modules/xcc_redfish_command.py | 6 +- plugins/modules/xdg_mime.py | 6 +- plugins/modules/xenserver_facts.py | 6 +- plugins/modules/xenserver_guest.py | 6 +- plugins/modules/xenserver_guest_info.py | 8 +- plugins/modules/xenserver_guest_powerstate.py | 6 +- plugins/modules/xfconf.py | 6 +- plugins/modules/xfconf_info.py | 8 +- plugins/modules/xfs_quota.py | 2 +- plugins/modules/xml.py | 4 +- plugins/modules/yarn.py | 2 +- plugins/modules/yum_versionlock.py | 2 +- plugins/modules/zfs.py | 2 +- plugins/modules/zfs_delegate_admin.py | 2 +- plugins/modules/zfs_facts.py | 6 +- plugins/modules/znode.py | 2 +- plugins/modules/zpool.py | 4 +- plugins/modules/zpool_facts.py | 6 +- plugins/modules/zypper.py | 3 +- plugins/modules/zypper_repository.py | 4 +- plugins/modules/zypper_repository_info.py | 6 +- .../{ansible_type.py => _ansible_type.py} | 3 + .../{keys_filter.py => _keys_filter.py} | 3 + plugins/plugin_utils/_tags.py | 2 +- .../plugin_utils/{unsafe.py => _unsafe.py} | 3 + plugins/test/ansible_type.py | 2 +- .../targets/cmd_runner/library/cmd_echo.py | 4 +- .../targets/module_helper/library/mdepfail.py | 4 +- .../targets/module_helper/library/msimple.py | 4 +- .../module_helper/library/msimpleda.py | 4 +- .../targets/module_helper/library/mstate.py | 2 +- tests/sanity/ignore-2.17.txt | 2 +- tests/sanity/ignore-2.18.txt | 2 +- .../test_dict_comparison.py | 2 +- .../{hwc => _hwc_utils}/test_hwc_utils.py | 2 +- .../keycloak/test_keycloak_connect.py | 10 +- .../keycloak/test_keycloak_module_utils.py | 2 +- .../pritunl/test_api.py | 2 +- .../FakeAnsibleModule.py | 0 .../{xenserver => _xenserver}/FakeXenAPI.py | 0 .../{xenserver => _xenserver}/common.py | 0 .../{xenserver => _xenserver}/conftest.py | 4 +- .../fixtures/ansible-test-vm-1-facts.json | 0 .../ansible-test-vm-1-facts.json.license | 0 .../fixtures/ansible-test-vm-1-params.json | 0 .../ansible-test-vm-1-params.json.license | 0 .../fixtures/ansible-test-vm-2-facts.json | 0 .../ansible-test-vm-2-facts.json.license | 0 .../fixtures/ansible-test-vm-2-params.json | 0 .../ansible-test-vm-2-params.json.license | 0 .../fixtures/ansible-test-vm-3-facts.json | 0 .../ansible-test-vm-3-facts.json.license | 0 .../fixtures/ansible-test-vm-3-params.json | 0 .../ansible-test-vm-3-params.json.license | 0 .../test_gather_vm_params_and_facts.py | 2 +- .../test_get_object_ref.py | 0 .../{xenserver => _xenserver}/test_misc.py | 0 .../test_netaddr_functions.py | 0 .../test_set_vm_power_state.py | 4 +- .../test_wait_for_functions.py | 0 .../{xenserver => _xenserver}/test_xapi.py | 0 .../test_xenserverobject.py | 2 +- ...test_cmd_runner.py => test__cmd_runner.py} | 2 +- .../{test_csv.py => test__csv.py} | 2 +- .../{test_deps.py => test__deps.py} | 2 +- ...odule_helper.py => test__module_helper.py} | 2 +- ...st_ocapi_utils.py => test__ocapi_utils.py} | 2 +- ...st_onepassword.py => test__onepassword.py} | 2 +- ...test_opennebula.py => test__opennebula.py} | 2 +- ...ython_runner.py => test__python_runner.py} | 4 +- .../test_scaleway.py => test__sclaeway.py} | 2 +- .../{test_utm_utils.py => test__utm_utils.py} | 2 +- .../{test_vardict.py => test__vardict.py} | 2 +- tests/unit/plugins/modules/conftest.py | 2 +- .../plugins/modules/oneview_module_loader.py | 4 +- .../modules/test_bitbucket_access_key.py | 2 +- .../test_bitbucket_pipeline_key_pair.py | 2 +- .../test_bitbucket_pipeline_known_host.py | 2 +- .../test_bitbucket_pipeline_variable.py | 2 +- .../modules/test_gitlab_protected_branch.py | 2 +- tests/unit/plugins/modules/test_homebrew.py | 2 +- .../plugins/modules/test_homebrew_cask.py | 2 +- .../plugins/modules/test_icinga2_downtime.py | 2 +- .../modules/test_keycloak_authentication.py | 2 +- ...eycloak_authentication_required_actions.py | 2 +- .../plugins/modules/test_keycloak_client.py | 2 +- .../test_keycloak_client_rolemapping.py | 2 +- .../modules/test_keycloak_clientscope.py | 2 +- .../modules/test_keycloak_component.py | 2 +- .../test_keycloak_identity_provider.py | 2 +- .../plugins/modules/test_keycloak_realm.py | 2 +- .../modules/test_keycloak_realm_info.py | 2 +- .../modules/test_keycloak_realm_keys.py | 2 +- .../test_keycloak_realm_keys_metadata_info.py | 2 +- .../test_keycloak_realm_localization.py | 2 +- .../plugins/modules/test_keycloak_role.py | 2 +- .../plugins/modules/test_keycloak_user.py | 2 +- ...est_keycloak_user_execute_actions_email.py | 2 +- .../modules/test_keycloak_user_federation.py | 2 +- .../modules/test_keycloak_userprofile.py | 2 +- tests/unit/plugins/modules/test_linode_v4.py | 2 +- tests/unit/plugins/modules/test_lxca_cmms.py | 9 +- tests/unit/plugins/modules/test_lxca_nodes.py | 9 +- tests/unit/plugins/modules/test_nsupdate.py | 2 +- .../plugins/modules/test_ocapi_command.py | 48 +++++----- tests/unit/plugins/modules/test_ocapi_info.py | 6 +- .../modules/test_pacemaker_resource.py | 6 +- .../plugins/modules/test_pacemaker_stonith.py | 6 +- .../unit/plugins/modules/test_pritunl_org.py | 8 +- .../plugins/modules/test_pritunl_org_info.py | 4 +- .../unit/plugins/modules/test_pritunl_user.py | 12 +-- .../plugins/modules/test_pritunl_user_info.py | 6 +- .../test_scaleway_compute_private_network.py | 2 +- .../modules/test_scaleway_private_network.py | 2 +- .../unit/plugins/modules/test_ss_3par_cpg.py | 2 +- .../modules/test_wdc_redfish_command.py | 36 ++++---- .../plugins/modules/test_wdc_redfish_info.py | 2 +- .../modules/test_xenserver_guest_info.py | 2 +- .../test_xenserver_guest_powerstate.py | 8 +- .../{test_unsafe.py => test__unsafe.py} | 2 +- 807 files changed, 2041 insertions(+), 1702 deletions(-) create mode 100644 changelogs/fragments/11896-private.yml rename plugins/doc_fragments/{alicloud.py => _alicloud.py} (96%) rename plugins/doc_fragments/{attributes.py => _attributes.py} (92%) rename plugins/doc_fragments/{auth_basic.py => _auth_basic.py} (81%) rename plugins/doc_fragments/{bitbucket.py => _bitbucket.py} (89%) rename plugins/doc_fragments/{consul.py => _consul.py} (88%) rename plugins/doc_fragments/{django.py => _django.py} (93%) rename plugins/doc_fragments/{emc.py => _emc.py} (83%) rename plugins/doc_fragments/{gitlab.py => _gitlab.py} (83%) rename plugins/doc_fragments/{hpe3par.py => _hpe3par.py} (82%) rename plugins/doc_fragments/{hwc.py => _hwc.py} (91%) rename plugins/doc_fragments/{ibm_storage.py => _ibm_storage.py} (83%) rename plugins/doc_fragments/{influxdb.py => _influxdb.py} (92%) rename plugins/doc_fragments/{ipa.py => _ipa.py} (95%) rename plugins/doc_fragments/{keycloak.py => _keycloak.py} (92%) rename plugins/doc_fragments/{ldap.py => _ldap.py} (95%) rename plugins/doc_fragments/{lxca_common.py => _lxca_common.py} (84%) rename plugins/doc_fragments/{manageiq.py => _manageiq.py} (90%) rename plugins/doc_fragments/{nomad.py => _nomad.py} (87%) rename plugins/doc_fragments/{onepassword.py => _onepassword.py} (94%) rename plugins/doc_fragments/{oneview.py => _oneview.py} (93%) rename plugins/doc_fragments/{online.py => _online.py} (87%) rename plugins/doc_fragments/{opennebula.py => _opennebula.py} (88%) rename plugins/doc_fragments/{openswitch.py => _openswitch.py} (94%) rename plugins/doc_fragments/{pipx.py => _pipx.py} (91%) rename plugins/doc_fragments/{pritunl.py => _pritunl.py} (86%) rename plugins/doc_fragments/{redfish.py => _redfish.py} (87%) rename plugins/doc_fragments/{redis.py => _redis.py} (91%) rename plugins/doc_fragments/{rundeck.py => _rundeck.py} (79%) rename plugins/doc_fragments/{scaleway.py => _scaleway.py} (91%) rename plugins/doc_fragments/{scaleway_waitable_resource.py => _scaleway_waitable_resource.py} (81%) rename plugins/doc_fragments/{utm.py => _utm.py} (89%) rename plugins/doc_fragments/{vexata.py => _vexata.py} (88%) rename plugins/doc_fragments/{xenserver.py => _xenserver.py} (89%) rename plugins/module_utils/{alicloud_ecs.py => _alicloud_ecs.py} (98%) rename plugins/module_utils/{android_sdkmanager.py => _android_sdkmanager.py} (95%) rename plugins/module_utils/{btrfs.py => _btrfs.py} (99%) rename plugins/module_utils/{cmd_runner.py => _cmd_runner.py} (97%) rename plugins/module_utils/{cmd_runner_fmt.py => _cmd_runner_fmt.py} (96%) rename plugins/module_utils/{consul.py => _consul.py} (98%) rename plugins/module_utils/{csv.py => _csv.py} (93%) rename plugins/module_utils/{datetime.py => _datetime.py} (79%) rename plugins/module_utils/{deps.py => _deps.py} (94%) rename plugins/module_utils/{django.py => _django.py} (94%) rename plugins/module_utils/{gandi_livedns_api.py => _gandi_livedns_api.py} (97%) rename plugins/module_utils/{gconftool2.py => _gconftool2.py} (83%) rename plugins/module_utils/{gio_mime.py => _gio_mime.py} (84%) rename plugins/module_utils/{gitlab.py => _gitlab.py} (97%) rename plugins/module_utils/{heroku.py => _heroku.py} (88%) rename plugins/module_utils/{homebrew.py => _homebrew.py} (96%) rename plugins/module_utils/{hwc_utils.py => _hwc_utils.py} (98%) rename plugins/module_utils/{ibm_sa_utils.py => _ibm_sa_utils.py} (94%) rename plugins/module_utils/{identity => _identity}/keycloak/_keycloak_utils.py (100%) rename plugins/module_utils/{identity => _identity}/keycloak/keycloak.py (99%) rename plugins/module_utils/{identity => _identity}/keycloak/keycloak_clientsecret.py (91%) rename plugins/module_utils/{ilo_redfish_utils.py => _ilo_redfish_utils.py} (97%) rename plugins/module_utils/{influxdb.py => _influxdb.py} (94%) rename plugins/module_utils/{ipa.py => _ipa.py} (98%) rename plugins/module_utils/{jenkins.py => _jenkins.py} (85%) rename plugins/module_utils/{ldap.py => _ldap.py} (96%) rename plugins/module_utils/{linode.py => _linode.py} (81%) rename plugins/module_utils/{locale_gen.py => _locale_gen.py} (80%) rename plugins/module_utils/{lxd.py => _lxd.py} (96%) rename plugins/module_utils/{manageiq.py => _manageiq.py} (98%) rename plugins/module_utils/{memset.py => _memset.py} (95%) rename plugins/module_utils/{mh => _mh}/base.py (89%) rename plugins/module_utils/{mh => _mh}/deco.py (94%) rename plugins/module_utils/{mh => _mh}/exceptions.py (80%) rename plugins/module_utils/{mh => _mh}/mixins/deprecate_attrs.py (93%) rename plugins/module_utils/{mh => _mh}/mixins/state.py (88%) rename plugins/module_utils/{mh => _mh}/module_helper.py (89%) rename plugins/module_utils/{module_helper.py => _module_helper.py} (66%) rename plugins/module_utils/{net_tools => _net_tools}/pritunl/api.py (98%) rename plugins/module_utils/{ocapi_utils.py => _ocapi_utils.py} (99%) rename plugins/module_utils/{onepassword.py => _onepassword.py} (82%) rename plugins/module_utils/{oneview.py => _oneview.py} (98%) rename plugins/module_utils/{online.py => _online.py} (95%) rename plugins/module_utils/{opennebula.py => _opennebula.py} (98%) rename plugins/module_utils/{pacemaker.py => _pacemaker.py} (94%) rename plugins/module_utils/{pipx.py => _pipx.py} (94%) rename plugins/module_utils/{pkg_req.py => _pkg_req.py} (92%) rename plugins/module_utils/{puppet.py => _puppet.py} (95%) rename plugins/module_utils/{python_runner.py => _python_runner.py} (87%) rename plugins/module_utils/{redfish_utils.py => _redfish_utils.py} (99%) rename plugins/module_utils/{redis.py => _redis.py} (95%) rename plugins/module_utils/{remote_management => _remote_management}/lxca/common.py (92%) rename plugins/module_utils/{rundeck.py => _rundeck.py} (95%) rename plugins/module_utils/{scaleway.py => _scaleway.py} (98%) rename plugins/module_utils/{snap.py => _snap.py} (90%) rename plugins/module_utils/{source_control => _source_control}/bitbucket.py (95%) rename plugins/module_utils/{ssh.py => _ssh.py} (79%) rename plugins/module_utils/{storage => _storage}/emc/emc_vnx.py (72%) rename plugins/module_utils/{storage => _storage}/hpe3par/hpe3par.py (92%) rename plugins/module_utils/{systemd.py => _systemd.py} (84%) rename plugins/module_utils/{univention_umc.py => _univention_umc.py} (97%) rename plugins/module_utils/{utm_utils.py => _utm_utils.py} (98%) rename plugins/module_utils/{vardict.py => _vardict.py} (97%) rename plugins/module_utils/{version.py => _version.py} (69%) rename plugins/module_utils/{vexata.py => _vexata.py} (94%) rename plugins/module_utils/{wdc_redfish_utils.py => _wdc_redfish_utils.py} (99%) rename plugins/module_utils/{xdg_mime.py => _xdg_mime.py} (85%) rename plugins/module_utils/{xenserver.py => _xenserver.py} (99%) rename plugins/module_utils/{xfconf.py => _xfconf.py} (87%) rename plugins/plugin_utils/{ansible_type.py => _ansible_type.py} (92%) rename plugins/plugin_utils/{keys_filter.py => _keys_filter.py} (96%) rename plugins/plugin_utils/{unsafe.py => _unsafe.py} (91%) rename tests/unit/plugins/module_utils/{hwc => _hwc_utils}/test_dict_comparison.py (98%) rename tests/unit/plugins/module_utils/{hwc => _hwc_utils}/test_hwc_utils.py (95%) rename tests/unit/plugins/module_utils/{identity => _identity}/keycloak/test_keycloak_connect.py (96%) rename tests/unit/plugins/module_utils/{identity => _identity}/keycloak/test_keycloak_module_utils.py (98%) rename tests/unit/plugins/module_utils/{net_tools => _net_tools}/pritunl/test_api.py (99%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/FakeAnsibleModule.py (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/FakeXenAPI.py (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/common.py (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/conftest.py (98%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/fixtures/ansible-test-vm-1-facts.json (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/fixtures/ansible-test-vm-1-facts.json.license (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/fixtures/ansible-test-vm-1-params.json (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/fixtures/ansible-test-vm-1-params.json.license (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/fixtures/ansible-test-vm-2-facts.json (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/fixtures/ansible-test-vm-2-facts.json.license (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/fixtures/ansible-test-vm-2-params.json (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/fixtures/ansible-test-vm-2-params.json.license (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/fixtures/ansible-test-vm-3-facts.json (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/fixtures/ansible-test-vm-3-facts.json.license (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/fixtures/ansible-test-vm-3-params.json (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/fixtures/ansible-test-vm-3-params.json.license (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/test_gather_vm_params_and_facts.py (98%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/test_get_object_ref.py (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/test_misc.py (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/test_netaddr_functions.py (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/test_set_vm_power_state.py (99%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/test_wait_for_functions.py (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/test_xapi.py (100%) rename tests/unit/plugins/module_utils/{xenserver => _xenserver}/test_xenserverobject.py (97%) rename tests/unit/plugins/module_utils/{test_cmd_runner.py => test__cmd_runner.py} (99%) rename tests/unit/plugins/module_utils/{test_csv.py => test__csv.py} (99%) rename tests/unit/plugins/module_utils/{test_deps.py => test__deps.py} (98%) rename tests/unit/plugins/module_utils/{test_module_helper.py => test__module_helper.py} (98%) rename tests/unit/plugins/module_utils/{test_ocapi_utils.py => test__ocapi_utils.py} (98%) rename tests/unit/plugins/module_utils/{test_onepassword.py => test__onepassword.py} (96%) rename tests/unit/plugins/module_utils/{test_opennebula.py => test__opennebula.py} (98%) rename tests/unit/plugins/module_utils/{test_python_runner.py => test__python_runner.py} (99%) rename tests/unit/plugins/module_utils/{cloud/test_scaleway.py => test__sclaeway.py} (99%) rename tests/unit/plugins/module_utils/{test_utm_utils.py => test__utm_utils.py} (99%) rename tests/unit/plugins/module_utils/{test_vardict.py => test__vardict.py} (99%) rename tests/unit/plugins/plugin_utils/{test_unsafe.py => test__unsafe.py} (99%) diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml index 61406dcab5..9da4d136ea 100644 --- a/.github/BOTMETA.yml +++ b/.github/BOTMETA.yml @@ -128,21 +128,21 @@ files: maintainers: $team_ansible_core $doc_fragments/: labels: docs_fragments - $doc_fragments/django.py: + $doc_fragments/_django.py: maintainers: russoz - $doc_fragments/hpe3par.py: + $doc_fragments/_hpe3par.py: labels: hpe3par maintainers: farhan7500 gautamphegde - $doc_fragments/hwc.py: + $doc_fragments/_hwc.py: labels: hwc maintainers: $team_huawei $doc_fragments/_icinga2_api.py: maintainers: cfiehe - $doc_fragments/nomad.py: + $doc_fragments/_nomad.py: maintainers: chris93111 apecnascimento - $doc_fragments/pipx.py: + $doc_fragments/_pipx.py: maintainers: russoz - $doc_fragments/xenserver.py: + $doc_fragments/_xenserver.py: labels: xenserver maintainers: bvitnik $filters/accumulate.py: @@ -339,42 +339,42 @@ files: maintainers: delineaKrehl tylerezimmerman $module_utils/: labels: module_utils - $module_utils/android_sdkmanager.py: + $module_utils/_android_sdkmanager.py: maintainers: shamilovstas - $module_utils/btrfs.py: + $module_utils/_btrfs.py: maintainers: gnfzdz - $module_utils/cmd_runner_fmt.py: + $module_utils/_cmd_runner_fmt.py: maintainers: russoz - $module_utils/cmd_runner.py: + $module_utils/_cmd_runner.py: maintainers: russoz - $module_utils/deps.py: + $module_utils/_deps.py: maintainers: russoz - $module_utils/django.py: + $module_utils/_django.py: maintainers: russoz - $module_utils/gconftool2.py: + $module_utils/_gconftool2.py: labels: gconftool2 maintainers: russoz - $module_utils/gio_mime.py: + $module_utils/_gio_mime.py: maintainers: russoz - $module_utils/gitlab.py: + $module_utils/_gitlab.py: keywords: gitlab source_control labels: gitlab maintainers: $team_gitlab notify: jlozadad - $module_utils/hwc_utils.py: + $module_utils/_hwc_utils.py: keywords: cloud huawei hwc labels: huawei hwc_utils networking maintainers: $team_huawei $module_utils/_icinga2.py: maintainers: cfiehe - $module_utils/identity/keycloak/keycloak.py: + $module_utils/_identity/keycloak/keycloak.py: maintainers: $team_keycloak - $module_utils/identity/keycloak/keycloak_clientsecret.py: + $module_utils/_identity/keycloak/keycloak_clientsecret.py: maintainers: $team_keycloak fynncfchen johncant - $module_utils/ipa.py: + $module_utils/_ipa.py: labels: ipa maintainers: $team_ipa - $module_utils/jenkins.py: + $module_utils/_jenkins.py: labels: jenkins maintainers: russoz $module_utils/_crypt.py: @@ -384,63 +384,63 @@ files: $module_utils/_lvm.py: labels: lvm maintainers: russoz - $module_utils/manageiq.py: + $module_utils/_manageiq.py: labels: manageiq maintainers: $team_manageiq - $module_utils/memset.py: + $module_utils/_memset.py: labels: cloud memset - $module_utils/mh/: + $module_utils/_mh/: labels: module_helper maintainers: russoz - $module_utils/module_helper.py: + $module_utils/_module_helper.py: labels: module_helper maintainers: russoz - $module_utils/net_tools/pritunl/: + $module_utils/_net_tools/pritunl/: maintainers: Lowess - $module_utils/pacemaker.py: + $module_utils/_pacemaker.py: maintainers: munchtoast - $module_utils/pipx.py: + $module_utils/_pipx.py: labels: pipx maintainers: russoz - $module_utils/pkg_req.py: + $module_utils/_pkg_req.py: maintainers: russoz - $module_utils/python_runner.py: + $module_utils/_python_runner.py: maintainers: russoz - $module_utils/puppet.py: + $module_utils/_puppet.py: labels: puppet maintainers: russoz - $module_utils/redfish_utils.py: + $module_utils/_redfish_utils.py: labels: redfish_utils maintainers: $team_redfish - $module_utils/remote_management/lxca/common.py: + $module_utils/_remote_management/lxca/common.py: maintainers: navalkp prabhosa - $module_utils/scaleway.py: + $module_utils/_scaleway.py: labels: cloud scaleway maintainers: $team_scaleway - $module_utils/snap.py: + $module_utils/_snap.py: labels: snap maintainers: russoz - $module_utils/ssh.py: + $module_utils/_ssh.py: maintainers: russoz - $module_utils/systemd.py: + $module_utils/_systemd.py: maintainers: NomakCooper - $module_utils/storage/hpe3par/hpe3par.py: + $module_utils/_storage/hpe3par/hpe3par.py: maintainers: farhan7500 gautamphegde - $module_utils/utm_utils.py: + $module_utils/_utm_utils.py: labels: utm_utils maintainers: $team_e_spirit - $module_utils/vardict.py: + $module_utils/_vardict.py: labels: vardict maintainers: russoz - $module_utils/wdc_redfish_utils.py: + $module_utils/_wdc_redfish_utils.py: labels: wdc_redfish_utils maintainers: $team_wdc - $module_utils/xdg_mime.py: + $module_utils/_xdg_mime.py: maintainers: mhalano - $module_utils/xenserver.py: + $module_utils/_xenserver.py: labels: xenserver maintainers: bvitnik - $module_utils/xfconf.py: + $module_utils/_xfconf.py: labels: xfconf maintainers: russoz $modules/aerospike_migrations.py: @@ -1493,11 +1493,11 @@ files: $modules/zypper_repository_info.py: labels: zypper maintainers: $team_suse TobiasZeuch181 - $plugin_utils/ansible_type.py: + $plugin_utils/_ansible_type.py: maintainers: vbotka - $plugin_utils/keys_filter.py: + $plugin_utils/_keys_filter.py: maintainers: vbotka - $plugin_utils/unsafe.py: + $plugin_utils/_unsafe.py: maintainers: felixfontein $plugin_utils/_tags.py: maintainers: felixfontein diff --git a/antsibull-nox.toml b/antsibull-nox.toml index 4c538eaf2c..5fc0e5ec57 100644 --- a/antsibull-nox.toml +++ b/antsibull-nox.toml @@ -98,7 +98,7 @@ exclusions = [ "consul_acl_bootstrap", "consul_kv", ] -doc_fragment = "community.general.consul.actiongroup_consul" +doc_fragment = "community.general._consul.actiongroup_consul" [[sessions.extra_checks.action_groups_config]] name = "keycloak" @@ -106,12 +106,12 @@ pattern = "^keycloak_.*$" exclusions = [ "keycloak_realm_info", ] -doc_fragment = "community.general.keycloak.actiongroup_keycloak" +doc_fragment = "community.general._keycloak.actiongroup_keycloak" [[sessions.extra_checks.action_groups_config]] name = "scaleway" pattern = "^scaleway_.*$" -doc_fragment = "community.general.scaleway.actiongroup_scaleway" +doc_fragment = "community.general._scaleway.actiongroup_scaleway" [sessions.build_import_check] run_galaxy_importer = true diff --git a/changelogs/fragments/11896-private.yml b/changelogs/fragments/11896-private.yml new file mode 100644 index 0000000000..8b69a877e2 --- /dev/null +++ b/changelogs/fragments/11896-private.yml @@ -0,0 +1,5 @@ +breaking_changes: + - "Since community.general 13.0.0, all module utils, plugin utils, and doc fragments contained in this collection are private to the collection. + This means that if another collection wants to use these, there is no longer any guarantee that there are no breaking changes, even in bugfix releases. + This has no practical impact on any other use of the collection, that is, everyone using modules or plugins from the collections will not notice any + difference (https://github.com/ansible-collections/community.general/issues/11312, https://github.com/ansible-collections/community.general/pull/11896)." diff --git a/docs/docsite/rst/guide_cmdrunner.rst b/docs/docsite/rst/guide_cmdrunner.rst index c1514ee340..ac302b0ea2 100644 --- a/docs/docsite/rst/guide_cmdrunner.rst +++ b/docs/docsite/rst/guide_cmdrunner.rst @@ -13,7 +13,7 @@ Command Runner guide Introduction ^^^^^^^^^^^^ -The ``ansible_collections.community.general.plugins.module_utils.cmd_runner`` module util provides the +The ``ansible_collections.community.general.plugins.module_utils._cmd_runner`` module util provides the ``CmdRunner`` class to help execute external commands. The class is a wrapper around the standard ``AnsibleModule.run_command()`` method, handling command arguments, localization setting, output processing output, check mode, and other features. @@ -38,7 +38,7 @@ version of the actual code in :ansplugin:`community.general.ansible_galaxy_insta .. code-block:: python - from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt + from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt runner = CmdRunner( module, @@ -151,7 +151,7 @@ that class: .. code-block:: python - from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt + from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt The same example shows how to make use of some of them in the instantiation of the ``CmdRunner`` object. A description of each one of the convenience methods available and examples of how to use them is found below. @@ -354,7 +354,7 @@ Some additional features are available as decorators: - ``cmd_runner_fmt.unpack args()`` This decorator unpacks the incoming ``value`` as a list of elements. - For example, in ``ansible_collections.community.general.plugins.module_utils.puppet``, it is used as: + For example, in ``ansible_collections.community.general.plugins.module_utils._puppet``, it is used as: .. code-block:: python @@ -492,8 +492,8 @@ Python scripts. It features two extra and mutually exclusive parameters ``pytho .. code-block:: python - from ansible_collections.community.general.plugins.module_utils.python_runner import PythonRunner - from ansible_collections.community.general.plugins.module_utils.cmd_runner import cmd_runner_fmt + from ansible_collections.community.general.plugins.module_utils._python_runner import PythonRunner + from ansible_collections.community.general.plugins.module_utils._cmd_runner import cmd_runner_fmt runner = PythonRunner( module, diff --git a/docs/docsite/rst/guide_deps.rst b/docs/docsite/rst/guide_deps.rst index 1a44051ee4..c13cc60dd6 100644 --- a/docs/docsite/rst/guide_deps.rst +++ b/docs/docsite/rst/guide_deps.rst @@ -12,7 +12,7 @@ Using ``deps`` ^^^^^^^^^^^^^^ -The ``ansible_collections.community.general.plugins.module_utils.deps`` module util simplifies +The ``ansible_collections.community.general.plugins.module_utils._deps`` module util simplifies the importing of code as described in :ref:`Importing and using shared code `. Please notice that ``deps`` is meant to be used specifically with Ansible modules, and not other types of plugins. @@ -20,7 +20,7 @@ The same example from the Developer Guide would become: .. code-block:: python - from ansible_collections.community.general.plugins.module_utils import deps + from ansible_collections.community.general.plugins.module_utils import _deps as deps with deps.declare("foo"): diff --git a/docs/docsite/rst/guide_modulehelper.rst b/docs/docsite/rst/guide_modulehelper.rst index 33c2c41dea..466c72872b 100644 --- a/docs/docsite/rst/guide_modulehelper.rst +++ b/docs/docsite/rst/guide_modulehelper.rst @@ -27,7 +27,7 @@ But bear in mind that it does not showcase all of MH's features: .. code-block:: python - from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper + from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper class MyTest(ModuleHelper): @@ -72,7 +72,7 @@ section above, but there are more elements that will take part in it. .. code-block:: python - from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper + from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper class MyTest(ModuleHelper): @@ -354,7 +354,7 @@ However, you can set output variables specifically for that exception, if you so .. code-block:: python - from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelperException + from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelperException def __init_module__(self): if not complex_validation(): @@ -385,7 +385,7 @@ By using ``StateModuleHelper`` you can make your code like the excerpt from the .. code-block:: python - from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper + from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper class GConftool(StateModuleHelper): ... @@ -501,7 +501,7 @@ The value of ``changed`` in the module output will be set to ``True``: .. code-block:: python - from ansible_collections.community.general.plugins.module_utils.module_helper import cause_changes + from ansible_collections.community.general.plugins.module_utils._module_helper import cause_changes # adapted excerpt from the community.general.jira module class JIRA(StateModuleHelper): @@ -528,7 +528,7 @@ The return value in that case is ``None``. .. code-block:: python - from ansible_collections.community.general.plugins.module_utils.module_helper import check_mode_skip + from ansible_collections.community.general.plugins.module_utils._module_helper import check_mode_skip # adapted excerpt from the community.general.locale_gen module class LocaleGen(StateModuleHelper): diff --git a/docs/docsite/rst/guide_vardict.rst b/docs/docsite/rst/guide_vardict.rst index 1beef0c57f..697e48ad7c 100644 --- a/docs/docsite/rst/guide_vardict.rst +++ b/docs/docsite/rst/guide_vardict.rst @@ -11,7 +11,7 @@ VarDict Guide Introduction ^^^^^^^^^^^^ -The ``ansible_collections.community.general.plugins.module_utils.vardict`` module util provides the +The ``ansible_collections.community.general.plugins.module_utils._vardict`` module util provides the ``VarDict`` class to help manage the module variables. That class is a container for module variables, especially the ones for which the module must keep track of state changes, and the ones that should be published as return values. @@ -26,7 +26,7 @@ The simplest way of using ``VarDict`` is: .. code-block:: python - from ansible_collections.community.general.plugins.module_utils.vardict import VarDict + from ansible_collections.community.general.plugins.module_utils._vardict import VarDict Then in ``main()``, or any other function called from there: diff --git a/plugins/callback/counter_enabled.py b/plugins/callback/counter_enabled.py index c28d6b44d9..f6a961bb09 100644 --- a/plugins/callback/counter_enabled.py +++ b/plugins/callback/counter_enabled.py @@ -17,7 +17,7 @@ description: - You can see how many tasks has the playbook to run, and which one is actually running. - You can see how many hosts may run a task, and which of them is actually running. extends_documentation_fragment: - - default_callback + - ansible.builtin.default_callback requirements: - set as stdout callback in C(ansible.cfg) (C(stdout_callback = counter_enabled)) """ diff --git a/plugins/callback/dense.py b/plugins/callback/dense.py index bf04719de2..4d1a26989e 100644 --- a/plugins/callback/dense.py +++ b/plugins/callback/dense.py @@ -10,7 +10,7 @@ name: dense type: stdout short_description: Minimal stdout output extends_documentation_fragment: - - default_callback + - ansible.builtin.default_callback description: - When in verbose mode it acts the same as the default callback. author: diff --git a/plugins/callback/diy.py b/plugins/callback/diy.py index a199eb5d49..a324d99c49 100644 --- a/plugins/callback/diy.py +++ b/plugins/callback/diy.py @@ -13,7 +13,7 @@ description: - Callback plugin that allows you to supply your own custom callback templates to be output. author: Trevor Highfill (@theque5t) extends_documentation_fragment: - - default_callback + - ansible.builtin.default_callback notes: - Uses the P(ansible.builtin.default#callback) callback plugin output when a custom callback V(message(msg\)) is not provided. - Makes the callback event data available using the C(ansible_callback_diy) dictionary, which can be used in the templating diff --git a/plugins/callback/loganalytics.py b/plugins/callback/loganalytics.py index e31ef19c5d..125bd50067 100644 --- a/plugins/callback/loganalytics.py +++ b/plugins/callback/loganalytics.py @@ -69,7 +69,7 @@ from ansible.module_utils.urls import open_url from ansible.parsing.ajson import AnsibleJSONEncoder from ansible.plugins.callback import CallbackBase -from ansible_collections.community.general.plugins.module_utils.datetime import ( +from ansible_collections.community.general.plugins.module_utils._datetime import ( now, ) diff --git a/plugins/callback/logstash.py b/plugins/callback/logstash.py index 85730d6935..894451460d 100644 --- a/plugins/callback/logstash.py +++ b/plugins/callback/logstash.py @@ -111,7 +111,7 @@ except ImportError: from ansible.plugins.callback import CallbackBase -from ansible_collections.community.general.plugins.module_utils.datetime import ( +from ansible_collections.community.general.plugins.module_utils._datetime import ( now, ) diff --git a/plugins/callback/splunk.py b/plugins/callback/splunk.py index 6340abc1c4..6c5dd74ff3 100644 --- a/plugins/callback/splunk.py +++ b/plugins/callback/splunk.py @@ -94,7 +94,7 @@ from ansible.module_utils.urls import open_url from ansible.parsing.ajson import AnsibleJSONEncoder from ansible.plugins.callback import CallbackBase -from ansible_collections.community.general.plugins.module_utils.datetime import ( +from ansible_collections.community.general.plugins.module_utils._datetime import ( now, ) diff --git a/plugins/callback/sumologic.py b/plugins/callback/sumologic.py index b105e539f0..d8c4c8ebc2 100644 --- a/plugins/callback/sumologic.py +++ b/plugins/callback/sumologic.py @@ -51,7 +51,7 @@ from ansible.module_utils.urls import open_url from ansible.parsing.ajson import AnsibleJSONEncoder from ansible.plugins.callback import CallbackBase -from ansible_collections.community.general.plugins.module_utils.datetime import ( +from ansible_collections.community.general.plugins.module_utils._datetime import ( now, ) diff --git a/plugins/callback/unixy.py b/plugins/callback/unixy.py index f264eb3e0a..612fcd6662 100644 --- a/plugins/callback/unixy.py +++ b/plugins/callback/unixy.py @@ -14,7 +14,7 @@ short_description: Condensed Ansible output description: - Consolidated Ansible output in the style of LINUX/UNIX startup logs. extends_documentation_fragment: - - default_callback + - ansible.builtin.default_callback requirements: - set as stdout in configuration """ diff --git a/plugins/connection/wsl.py b/plugins/connection/wsl.py index 1bdf6bb6f1..81fa978b45 100644 --- a/plugins/connection/wsl.py +++ b/plugins/connection/wsl.py @@ -342,7 +342,7 @@ from ansible.utils.display import Display from ansible.utils.path import makedirs_safe from ansible_collections.community.general.plugins.module_utils._filelock import FileLock, LockTimeout -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion PARAMIKO_IMPORT_ERR: str | None try: diff --git a/plugins/doc_fragments/alicloud.py b/plugins/doc_fragments/_alicloud.py similarity index 96% rename from plugins/doc_fragments/alicloud.py rename to plugins/doc_fragments/_alicloud.py index 204a40ac4c..9c7b00047a 100644 --- a/plugins/doc_fragments/alicloud.py +++ b/plugins/doc_fragments/_alicloud.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/attributes.py b/plugins/doc_fragments/_attributes.py similarity index 92% rename from plugins/doc_fragments/attributes.py rename to plugins/doc_fragments/_attributes.py index 2a864f031e..2a0da1df6c 100644 --- a/plugins/doc_fragments/attributes.py +++ b/plugins/doc_fragments/_attributes.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/auth_basic.py b/plugins/doc_fragments/_auth_basic.py similarity index 81% rename from plugins/doc_fragments/auth_basic.py rename to plugins/doc_fragments/_auth_basic.py index cf95b625da..d634706371 100644 --- a/plugins/doc_fragments/auth_basic.py +++ b/plugins/doc_fragments/_auth_basic.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/bitbucket.py b/plugins/doc_fragments/_bitbucket.py similarity index 89% rename from plugins/doc_fragments/bitbucket.py rename to plugins/doc_fragments/_bitbucket.py index 0a0c6551f1..edb3a45275 100644 --- a/plugins/doc_fragments/bitbucket.py +++ b/plugins/doc_fragments/_bitbucket.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/consul.py b/plugins/doc_fragments/_consul.py similarity index 88% rename from plugins/doc_fragments/consul.py rename to plugins/doc_fragments/_consul.py index fd9c1a6e6c..953349ca97 100644 --- a/plugins/doc_fragments/consul.py +++ b/plugins/doc_fragments/_consul.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/django.py b/plugins/doc_fragments/_django.py similarity index 93% rename from plugins/doc_fragments/django.py rename to plugins/doc_fragments/_django.py index bbe2256993..3385e19d2a 100644 --- a/plugins/doc_fragments/django.py +++ b/plugins/doc_fragments/_django.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/emc.py b/plugins/doc_fragments/_emc.py similarity index 83% rename from plugins/doc_fragments/emc.py rename to plugins/doc_fragments/_emc.py index a491a29742..1b363e8e90 100644 --- a/plugins/doc_fragments/emc.py +++ b/plugins/doc_fragments/_emc.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/gitlab.py b/plugins/doc_fragments/_gitlab.py similarity index 83% rename from plugins/doc_fragments/gitlab.py rename to plugins/doc_fragments/_gitlab.py index 15658a3936..1bb6a1cb3c 100644 --- a/plugins/doc_fragments/gitlab.py +++ b/plugins/doc_fragments/_gitlab.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/hpe3par.py b/plugins/doc_fragments/_hpe3par.py similarity index 82% rename from plugins/doc_fragments/hpe3par.py rename to plugins/doc_fragments/_hpe3par.py index f508e035cd..7985546718 100644 --- a/plugins/doc_fragments/hpe3par.py +++ b/plugins/doc_fragments/_hpe3par.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/hwc.py b/plugins/doc_fragments/_hwc.py similarity index 91% rename from plugins/doc_fragments/hwc.py rename to plugins/doc_fragments/_hwc.py index e89869c8ba..6fad5d334c 100644 --- a/plugins/doc_fragments/hwc.py +++ b/plugins/doc_fragments/_hwc.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/ibm_storage.py b/plugins/doc_fragments/_ibm_storage.py similarity index 83% rename from plugins/doc_fragments/ibm_storage.py rename to plugins/doc_fragments/_ibm_storage.py index 05169c8979..8db0654131 100644 --- a/plugins/doc_fragments/ibm_storage.py +++ b/plugins/doc_fragments/_ibm_storage.py @@ -3,6 +3,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/influxdb.py b/plugins/doc_fragments/_influxdb.py similarity index 92% rename from plugins/doc_fragments/influxdb.py rename to plugins/doc_fragments/_influxdb.py index db48fc9923..4cacc7d136 100644 --- a/plugins/doc_fragments/influxdb.py +++ b/plugins/doc_fragments/_influxdb.py @@ -3,6 +3,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/ipa.py b/plugins/doc_fragments/_ipa.py similarity index 95% rename from plugins/doc_fragments/ipa.py rename to plugins/doc_fragments/_ipa.py index 9ff7d5cfba..a5096e04d4 100644 --- a/plugins/doc_fragments/ipa.py +++ b/plugins/doc_fragments/_ipa.py @@ -3,6 +3,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/keycloak.py b/plugins/doc_fragments/_keycloak.py similarity index 92% rename from plugins/doc_fragments/keycloak.py rename to plugins/doc_fragments/_keycloak.py index e64e3ea8fe..0b9a572b17 100644 --- a/plugins/doc_fragments/keycloak.py +++ b/plugins/doc_fragments/_keycloak.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/ldap.py b/plugins/doc_fragments/_ldap.py similarity index 95% rename from plugins/doc_fragments/ldap.py rename to plugins/doc_fragments/_ldap.py index b666c12c18..acae4a2062 100644 --- a/plugins/doc_fragments/ldap.py +++ b/plugins/doc_fragments/_ldap.py @@ -4,6 +4,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/lxca_common.py b/plugins/doc_fragments/_lxca_common.py similarity index 84% rename from plugins/doc_fragments/lxca_common.py rename to plugins/doc_fragments/_lxca_common.py index 0ae60db0f1..5f586537f8 100644 --- a/plugins/doc_fragments/lxca_common.py +++ b/plugins/doc_fragments/_lxca_common.py @@ -2,6 +2,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/manageiq.py b/plugins/doc_fragments/_manageiq.py similarity index 90% rename from plugins/doc_fragments/manageiq.py rename to plugins/doc_fragments/_manageiq.py index d88237ae0e..a2575d92d1 100644 --- a/plugins/doc_fragments/manageiq.py +++ b/plugins/doc_fragments/_manageiq.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/nomad.py b/plugins/doc_fragments/_nomad.py similarity index 87% rename from plugins/doc_fragments/nomad.py rename to plugins/doc_fragments/_nomad.py index 02ae34eb12..813ffdd067 100644 --- a/plugins/doc_fragments/nomad.py +++ b/plugins/doc_fragments/_nomad.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/onepassword.py b/plugins/doc_fragments/_onepassword.py similarity index 94% rename from plugins/doc_fragments/onepassword.py rename to plugins/doc_fragments/_onepassword.py index ad2777da32..4df7ff93ab 100644 --- a/plugins/doc_fragments/onepassword.py +++ b/plugins/doc_fragments/_onepassword.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/oneview.py b/plugins/doc_fragments/_oneview.py similarity index 93% rename from plugins/doc_fragments/oneview.py rename to plugins/doc_fragments/_oneview.py index b14a38ce0b..12905b32c8 100644 --- a/plugins/doc_fragments/oneview.py +++ b/plugins/doc_fragments/_oneview.py @@ -1,8 +1,10 @@ -# # Copyright (c) 2016-2017, Hewlett Packard Enterprise Development LP # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/online.py b/plugins/doc_fragments/_online.py similarity index 87% rename from plugins/doc_fragments/online.py rename to plugins/doc_fragments/_online.py index a9cbafe7b9..fef7c7a2cf 100644 --- a/plugins/doc_fragments/online.py +++ b/plugins/doc_fragments/_online.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/opennebula.py b/plugins/doc_fragments/_opennebula.py similarity index 88% rename from plugins/doc_fragments/opennebula.py rename to plugins/doc_fragments/_opennebula.py index a35cf1aaf7..5e371d40d6 100644 --- a/plugins/doc_fragments/opennebula.py +++ b/plugins/doc_fragments/_opennebula.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/openswitch.py b/plugins/doc_fragments/_openswitch.py similarity index 94% rename from plugins/doc_fragments/openswitch.py rename to plugins/doc_fragments/_openswitch.py index de78d26d76..d52fa06b15 100644 --- a/plugins/doc_fragments/openswitch.py +++ b/plugins/doc_fragments/_openswitch.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/pipx.py b/plugins/doc_fragments/_pipx.py similarity index 91% rename from plugins/doc_fragments/pipx.py rename to plugins/doc_fragments/_pipx.py index 0edcf42101..6134688a94 100644 --- a/plugins/doc_fragments/pipx.py +++ b/plugins/doc_fragments/_pipx.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/pritunl.py b/plugins/doc_fragments/_pritunl.py similarity index 86% rename from plugins/doc_fragments/pritunl.py rename to plugins/doc_fragments/_pritunl.py index 5e7ada1e9f..68dcadf151 100644 --- a/plugins/doc_fragments/pritunl.py +++ b/plugins/doc_fragments/_pritunl.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/redfish.py b/plugins/doc_fragments/_redfish.py similarity index 87% rename from plugins/doc_fragments/redfish.py rename to plugins/doc_fragments/_redfish.py index de26ffa2a6..2383b5f072 100644 --- a/plugins/doc_fragments/redfish.py +++ b/plugins/doc_fragments/_redfish.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/redis.py b/plugins/doc_fragments/_redis.py similarity index 91% rename from plugins/doc_fragments/redis.py rename to plugins/doc_fragments/_redis.py index ded71a7bc3..51db0b63a8 100644 --- a/plugins/doc_fragments/redis.py +++ b/plugins/doc_fragments/_redis.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/rundeck.py b/plugins/doc_fragments/_rundeck.py similarity index 79% rename from plugins/doc_fragments/rundeck.py rename to plugins/doc_fragments/_rundeck.py index a959128996..6de436ed04 100644 --- a/plugins/doc_fragments/rundeck.py +++ b/plugins/doc_fragments/_rundeck.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/scaleway.py b/plugins/doc_fragments/_scaleway.py similarity index 91% rename from plugins/doc_fragments/scaleway.py rename to plugins/doc_fragments/_scaleway.py index a20cbb1f1a..c3598f2c47 100644 --- a/plugins/doc_fragments/scaleway.py +++ b/plugins/doc_fragments/_scaleway.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/scaleway_waitable_resource.py b/plugins/doc_fragments/_scaleway_waitable_resource.py similarity index 81% rename from plugins/doc_fragments/scaleway_waitable_resource.py rename to plugins/doc_fragments/_scaleway_waitable_resource.py index 5206145036..7e88d6b6dc 100644 --- a/plugins/doc_fragments/scaleway_waitable_resource.py +++ b/plugins/doc_fragments/_scaleway_waitable_resource.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/utm.py b/plugins/doc_fragments/_utm.py similarity index 89% rename from plugins/doc_fragments/utm.py rename to plugins/doc_fragments/_utm.py index e9c2c4dcde..3d1b398ff1 100644 --- a/plugins/doc_fragments/utm.py +++ b/plugins/doc_fragments/_utm.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/vexata.py b/plugins/doc_fragments/_vexata.py similarity index 88% rename from plugins/doc_fragments/vexata.py rename to plugins/doc_fragments/_vexata.py index 4c5cd6e543..be2faaff6b 100644 --- a/plugins/doc_fragments/vexata.py +++ b/plugins/doc_fragments/_vexata.py @@ -1,8 +1,10 @@ -# # Copyright (c) 2019, Sandeep Kasargod # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/doc_fragments/xenserver.py b/plugins/doc_fragments/_xenserver.py similarity index 89% rename from plugins/doc_fragments/xenserver.py rename to plugins/doc_fragments/_xenserver.py index f1abe0be96..c1a2517c6c 100644 --- a/plugins/doc_fragments/xenserver.py +++ b/plugins/doc_fragments/_xenserver.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this doc fragment is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations diff --git a/plugins/filter/from_csv.py b/plugins/filter/from_csv.py index 00238516da..959b98c28a 100644 --- a/plugins/filter/from_csv.py +++ b/plugins/filter/from_csv.py @@ -79,7 +79,7 @@ _value: from ansible.errors import AnsibleFilterError -from ansible_collections.community.general.plugins.module_utils.csv import ( +from ansible_collections.community.general.plugins.module_utils._csv import ( CSVError, CustomDialectFailureError, DialectNotAvailableError, diff --git a/plugins/filter/keep_keys.py b/plugins/filter/keep_keys.py index a2170f973e..850cf7a356 100644 --- a/plugins/filter/keep_keys.py +++ b/plugins/filter/keep_keys.py @@ -99,7 +99,7 @@ _value: elements: dictionary """ -from ansible_collections.community.general.plugins.plugin_utils.keys_filter import ( +from ansible_collections.community.general.plugins.plugin_utils._keys_filter import ( _keys_filter_params, _keys_filter_target_str, ) diff --git a/plugins/filter/remove_keys.py b/plugins/filter/remove_keys.py index 743471127f..adeb24277e 100644 --- a/plugins/filter/remove_keys.py +++ b/plugins/filter/remove_keys.py @@ -99,7 +99,7 @@ _value: elements: dictionary """ -from ansible_collections.community.general.plugins.plugin_utils.keys_filter import ( +from ansible_collections.community.general.plugins.plugin_utils._keys_filter import ( _keys_filter_params, _keys_filter_target_str, ) diff --git a/plugins/filter/replace_keys.py b/plugins/filter/replace_keys.py index c53b31dc91..50a4ad12eb 100644 --- a/plugins/filter/replace_keys.py +++ b/plugins/filter/replace_keys.py @@ -129,7 +129,7 @@ _value: elements: dictionary """ -from ansible_collections.community.general.plugins.plugin_utils.keys_filter import ( +from ansible_collections.community.general.plugins.plugin_utils._keys_filter import ( _keys_filter_params, _keys_filter_target_dict, ) diff --git a/plugins/filter/reveal_ansible_type.py b/plugins/filter/reveal_ansible_type.py index 8b2c956bff..a332bd4825 100644 --- a/plugins/filter/reveal_ansible_type.py +++ b/plugins/filter/reveal_ansible_type.py @@ -129,7 +129,7 @@ _value: type: str """ -from ansible_collections.community.general.plugins.plugin_utils.ansible_type import _ansible_type +from ansible_collections.community.general.plugins.plugin_utils._ansible_type import _ansible_type def reveal_ansible_type(data, alias=None): diff --git a/plugins/filter/version_sort.py b/plugins/filter/version_sort.py index 64c3a3d573..368a54f602 100644 --- a/plugins/filter/version_sort.py +++ b/plugins/filter/version_sort.py @@ -33,7 +33,7 @@ _value: elements: string """ -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion def version_sort(value, reverse=False): diff --git a/plugins/inventory/cobbler.py b/plugins/inventory/cobbler.py index 34facc2922..c96fe3431d 100644 --- a/plugins/inventory/cobbler.py +++ b/plugins/inventory/cobbler.py @@ -135,7 +135,7 @@ import socket from ansible.errors import AnsibleError from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, to_safe_group_name -from ansible_collections.community.general.plugins.plugin_utils.unsafe import make_unsafe +from ansible_collections.community.general.plugins.plugin_utils._unsafe import make_unsafe # xmlrpc try: diff --git a/plugins/inventory/gitlab_runners.py b/plugins/inventory/gitlab_runners.py index 4a7f42db90..9bb72935a3 100644 --- a/plugins/inventory/gitlab_runners.py +++ b/plugins/inventory/gitlab_runners.py @@ -82,7 +82,7 @@ keyed_groups: from ansible.errors import AnsibleError, AnsibleParserError from ansible.plugins.inventory import BaseInventoryPlugin, Constructable -from ansible_collections.community.general.plugins.plugin_utils.unsafe import make_unsafe +from ansible_collections.community.general.plugins.plugin_utils._unsafe import make_unsafe try: import gitlab diff --git a/plugins/inventory/icinga2.py b/plugins/inventory/icinga2.py index 1c805aa46d..0d3104dad8 100644 --- a/plugins/inventory/icinga2.py +++ b/plugins/inventory/icinga2.py @@ -100,7 +100,7 @@ from ansible.errors import AnsibleParserError from ansible.module_utils.urls import open_url from ansible.plugins.inventory import BaseInventoryPlugin, Constructable -from ansible_collections.community.general.plugins.plugin_utils.unsafe import make_unsafe +from ansible_collections.community.general.plugins.plugin_utils._unsafe import make_unsafe class InventoryModule(BaseInventoryPlugin, Constructable): diff --git a/plugins/inventory/linode.py b/plugins/inventory/linode.py index 3d357a3d54..ce18e91583 100644 --- a/plugins/inventory/linode.py +++ b/plugins/inventory/linode.py @@ -127,7 +127,7 @@ compose: from ansible.errors import AnsibleError from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, Constructable -from ansible_collections.community.general.plugins.plugin_utils.unsafe import make_unsafe +from ansible_collections.community.general.plugins.plugin_utils._unsafe import make_unsafe try: from linode_api4 import LinodeClient diff --git a/plugins/inventory/lxd.py b/plugins/inventory/lxd.py index 7cf26f6995..62cf0d3e2f 100644 --- a/plugins/inventory/lxd.py +++ b/plugins/inventory/lxd.py @@ -177,8 +177,8 @@ from ansible.module_utils.common.dict_transformations import dict_merge from ansible.module_utils.common.text.converters import to_native, to_text from ansible.plugins.inventory import BaseInventoryPlugin -from ansible_collections.community.general.plugins.module_utils.lxd import LXDClient, LXDClientException -from ansible_collections.community.general.plugins.plugin_utils.unsafe import make_unsafe +from ansible_collections.community.general.plugins.module_utils._lxd import LXDClient, LXDClientException +from ansible_collections.community.general.plugins.plugin_utils._unsafe import make_unsafe IPADDRESS_IMPORT_ERROR: ImportError | None try: diff --git a/plugins/inventory/nmap.py b/plugins/inventory/nmap.py index 6622ef78de..668b49077d 100644 --- a/plugins/inventory/nmap.py +++ b/plugins/inventory/nmap.py @@ -133,7 +133,7 @@ from ansible.module_utils.common.process import get_bin_path from ansible.module_utils.common.text.converters import to_native, to_text from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, Constructable -from ansible_collections.community.general.plugins.plugin_utils.unsafe import make_unsafe +from ansible_collections.community.general.plugins.plugin_utils._unsafe import make_unsafe class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable): diff --git a/plugins/inventory/online.py b/plugins/inventory/online.py index 202daa8b7f..6594286957 100644 --- a/plugins/inventory/online.py +++ b/plugins/inventory/online.py @@ -69,7 +69,7 @@ from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.urls import open_url from ansible.plugins.inventory import BaseInventoryPlugin -from ansible_collections.community.general.plugins.plugin_utils.unsafe import make_unsafe +from ansible_collections.community.general.plugins.plugin_utils._unsafe import make_unsafe class InventoryModule(BaseInventoryPlugin): diff --git a/plugins/inventory/opennebula.py b/plugins/inventory/opennebula.py index 756e05750b..2dd42a024e 100644 --- a/plugins/inventory/opennebula.py +++ b/plugins/inventory/opennebula.py @@ -95,7 +95,7 @@ from collections import namedtuple from ansible.errors import AnsibleError from ansible.plugins.inventory import BaseInventoryPlugin, Constructable -from ansible_collections.community.general.plugins.plugin_utils.unsafe import make_unsafe +from ansible_collections.community.general.plugins.plugin_utils._unsafe import make_unsafe class InventoryModule(BaseInventoryPlugin, Constructable): diff --git a/plugins/inventory/scaleway.py b/plugins/inventory/scaleway.py index c6deace392..e89433ce08 100644 --- a/plugins/inventory/scaleway.py +++ b/plugins/inventory/scaleway.py @@ -135,8 +135,11 @@ from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.urls import open_url from ansible.plugins.inventory import BaseInventoryPlugin, Constructable -from ansible_collections.community.general.plugins.module_utils.scaleway import SCALEWAY_LOCATION, parse_pagination_link -from ansible_collections.community.general.plugins.plugin_utils.unsafe import make_unsafe +from ansible_collections.community.general.plugins.module_utils._scaleway import ( + SCALEWAY_LOCATION, + parse_pagination_link, +) +from ansible_collections.community.general.plugins.plugin_utils._unsafe import make_unsafe def _fetch_information(token, url): diff --git a/plugins/inventory/virtualbox.py b/plugins/inventory/virtualbox.py index 0e6e61b84c..8922b0abc3 100644 --- a/plugins/inventory/virtualbox.py +++ b/plugins/inventory/virtualbox.py @@ -80,7 +80,7 @@ from ansible.module_utils.common.process import get_bin_path from ansible.module_utils.common.text.converters import to_bytes, to_text from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, Constructable -from ansible_collections.community.general.plugins.plugin_utils.unsafe import make_unsafe +from ansible_collections.community.general.plugins.plugin_utils._unsafe import make_unsafe class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable): diff --git a/plugins/inventory/xen_orchestra.py b/plugins/inventory/xen_orchestra.py index 8cdae58e4c..20668d9100 100644 --- a/plugins/inventory/xen_orchestra.py +++ b/plugins/inventory/xen_orchestra.py @@ -101,8 +101,8 @@ from time import sleep from ansible.errors import AnsibleError from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, Constructable -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion -from ansible_collections.community.general.plugins.plugin_utils.unsafe import make_unsafe +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion +from ansible_collections.community.general.plugins.plugin_utils._unsafe import make_unsafe # 3rd party imports try: diff --git a/plugins/lookup/bitwarden_secrets_manager.py b/plugins/lookup/bitwarden_secrets_manager.py index 8572ca590e..ba2af1a797 100644 --- a/plugins/lookup/bitwarden_secrets_manager.py +++ b/plugins/lookup/bitwarden_secrets_manager.py @@ -74,7 +74,7 @@ from ansible.module_utils.common.text.converters import to_text from ansible.parsing.ajson import AnsibleJSONDecoder from ansible.plugins.lookup import LookupBase -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion class BitwardenSecretsManagerException(AnsibleLookupError): diff --git a/plugins/lookup/onepassword.py b/plugins/lookup/onepassword.py index e57962a141..228f5e92a5 100644 --- a/plugins/lookup/onepassword.py +++ b/plugins/lookup/onepassword.py @@ -34,8 +34,8 @@ options: service_account_token: version_added: 7.1.0 extends_documentation_fragment: - - community.general.onepassword - - community.general.onepassword.lookup + - community.general._onepassword + - community.general._onepassword.lookup """ EXAMPLES = r""" @@ -84,7 +84,7 @@ from ansible.module_utils.common.process import get_bin_path from ansible.module_utils.common.text.converters import to_bytes, to_text from ansible.plugins.lookup import LookupBase -from ansible_collections.community.general.plugins.module_utils.onepassword import OnePasswordConfig +from ansible_collections.community.general.plugins.module_utils._onepassword import OnePasswordConfig def _lower_if_possible(value): diff --git a/plugins/lookup/onepassword_doc.py b/plugins/lookup/onepassword_doc.py index 9bd1a8f3ad..346a6c261d 100644 --- a/plugins/lookup/onepassword_doc.py +++ b/plugins/lookup/onepassword_doc.py @@ -25,8 +25,8 @@ options: elements: string extends_documentation_fragment: - - community.general.onepassword - - community.general.onepassword.lookup + - community.general._onepassword + - community.general._onepassword.lookup """ EXAMPLES = r""" diff --git a/plugins/lookup/onepassword_raw.py b/plugins/lookup/onepassword_raw.py index 101fbd3e8c..025867067a 100644 --- a/plugins/lookup/onepassword_raw.py +++ b/plugins/lookup/onepassword_raw.py @@ -30,8 +30,8 @@ options: service_account_token: version_added: 7.1.0 extends_documentation_fragment: - - community.general.onepassword - - community.general.onepassword.lookup + - community.general._onepassword + - community.general._onepassword.lookup """ EXAMPLES = r""" diff --git a/plugins/lookup/onepassword_ssh_key.py b/plugins/lookup/onepassword_ssh_key.py index 4f1d84df5a..d7b36ea789 100644 --- a/plugins/lookup/onepassword_ssh_key.py +++ b/plugins/lookup/onepassword_ssh_key.py @@ -30,8 +30,8 @@ options: type: bool extends_documentation_fragment: - - community.general.onepassword - - community.general.onepassword.lookup + - community.general._onepassword + - community.general._onepassword.lookup """ EXAMPLES = r""" diff --git a/plugins/module_utils/alicloud_ecs.py b/plugins/module_utils/_alicloud_ecs.py similarity index 98% rename from plugins/module_utils/alicloud_ecs.py rename to plugins/module_utils/_alicloud_ecs.py index 4719402576..60fca85be4 100644 --- a/plugins/module_utils/alicloud_ecs.py +++ b/plugins/module_utils/_alicloud_ecs.py @@ -9,6 +9,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import json diff --git a/plugins/module_utils/android_sdkmanager.py b/plugins/module_utils/_android_sdkmanager.py similarity index 95% rename from plugins/module_utils/android_sdkmanager.py rename to plugins/module_utils/_android_sdkmanager.py index 73658b2ae7..43bc248c6d 100644 --- a/plugins/module_utils/android_sdkmanager.py +++ b/plugins/module_utils/_android_sdkmanager.py @@ -2,12 +2,15 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import re import typing as t -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/btrfs.py b/plugins/module_utils/_btrfs.py similarity index 99% rename from plugins/module_utils/btrfs.py rename to plugins/module_utils/_btrfs.py index fe2cc01c89..3f554fef39 100644 --- a/plugins/module_utils/btrfs.py +++ b/plugins/module_utils/_btrfs.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import os diff --git a/plugins/module_utils/cmd_runner.py b/plugins/module_utils/_cmd_runner.py similarity index 97% rename from plugins/module_utils/cmd_runner.py rename to plugins/module_utils/_cmd_runner.py index cc63ef5c3c..38ba397594 100644 --- a/plugins/module_utils/cmd_runner.py +++ b/plugins/module_utils/_cmd_runner.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import os @@ -10,14 +13,14 @@ import typing as t from ansible.module_utils.common.collections import is_sequence from ansible.module_utils.common.locale import get_best_parsable_locale -from ansible_collections.community.general.plugins.module_utils import cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils import _cmd_runner_fmt as cmd_runner_fmt if t.TYPE_CHECKING: from collections.abc import Callable, Mapping, Sequence from ansible.module_utils.basic import AnsibleModule - from ansible_collections.community.general.plugins.module_utils.cmd_runner_fmt import ArgFormatType + from ansible_collections.community.general.plugins.module_utils._cmd_runner_fmt import ArgFormatType ArgFormatter = t.Union[ArgFormatType, cmd_runner_fmt._ArgFormat] # noqa: UP007 diff --git a/plugins/module_utils/cmd_runner_fmt.py b/plugins/module_utils/_cmd_runner_fmt.py similarity index 96% rename from plugins/module_utils/cmd_runner_fmt.py rename to plugins/module_utils/_cmd_runner_fmt.py index 5791f37ca1..dea4680dd3 100644 --- a/plugins/module_utils/cmd_runner_fmt.py +++ b/plugins/module_utils/_cmd_runner_fmt.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t diff --git a/plugins/module_utils/consul.py b/plugins/module_utils/_consul.py similarity index 98% rename from plugins/module_utils/consul.py rename to plugins/module_utils/_consul.py index 9afd912d15..759fb0cd5b 100644 --- a/plugins/module_utils/consul.py +++ b/plugins/module_utils/_consul.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import copy diff --git a/plugins/module_utils/_crypt.py b/plugins/module_utils/_crypt.py index f362388e65..89a719fa52 100644 --- a/plugins/module_utils/_crypt.py +++ b/plugins/module_utils/_crypt.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations __all__ = ["CryptContext", "has_crypt_context"] diff --git a/plugins/module_utils/csv.py b/plugins/module_utils/_csv.py similarity index 93% rename from plugins/module_utils/csv.py rename to plugins/module_utils/_csv.py index 88d5ed31df..348be6d4c3 100644 --- a/plugins/module_utils/csv.py +++ b/plugins/module_utils/_csv.py @@ -3,6 +3,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import csv diff --git a/plugins/module_utils/datetime.py b/plugins/module_utils/_datetime.py similarity index 79% rename from plugins/module_utils/datetime.py rename to plugins/module_utils/_datetime.py index bf0aff23ea..3c66ae268b 100644 --- a/plugins/module_utils/datetime.py +++ b/plugins/module_utils/_datetime.py @@ -3,6 +3,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import datetime as _datetime diff --git a/plugins/module_utils/deps.py b/plugins/module_utils/_deps.py similarity index 94% rename from plugins/module_utils/deps.py rename to plugins/module_utils/_deps.py index a9a31a8e4f..eb73820b8c 100644 --- a/plugins/module_utils/deps.py +++ b/plugins/module_utils/_deps.py @@ -3,6 +3,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import traceback diff --git a/plugins/module_utils/django.py b/plugins/module_utils/_django.py similarity index 94% rename from plugins/module_utils/django.py rename to plugins/module_utils/_django.py index d2ce1f5c13..b6501c764a 100644 --- a/plugins/module_utils/django.py +++ b/plugins/module_utils/_django.py @@ -2,20 +2,23 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t from ansible.module_utils.common.dict_transformations import dict_merge -from ansible_collections.community.general.plugins.module_utils import cmd_runner_fmt -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper -from ansible_collections.community.general.plugins.module_utils.python_runner import PythonRunner +from ansible_collections.community.general.plugins.module_utils import _cmd_runner_fmt as cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper +from ansible_collections.community.general.plugins.module_utils._python_runner import PythonRunner if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule - from ansible_collections.community.general.plugins.module_utils.cmd_runner import ArgFormatter + from ansible_collections.community.general.plugins.module_utils._cmd_runner import ArgFormatter django_std_args = dict( diff --git a/plugins/module_utils/_filelock.py b/plugins/module_utils/_filelock.py index 3580e84427..49409d1200 100644 --- a/plugins/module_utils/_filelock.py +++ b/plugins/module_utils/_filelock.py @@ -2,6 +2,9 @@ # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + # NOTE: # This has been vendored from ansible.module_utils.common.file. This code has been removed from there for ansible-core 2.16. diff --git a/plugins/module_utils/gandi_livedns_api.py b/plugins/module_utils/_gandi_livedns_api.py similarity index 97% rename from plugins/module_utils/gandi_livedns_api.py rename to plugins/module_utils/_gandi_livedns_api.py index 82d58ad03e..a27b5a83c3 100644 --- a/plugins/module_utils/gandi_livedns_api.py +++ b/plugins/module_utils/_gandi_livedns_api.py @@ -2,6 +2,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import json diff --git a/plugins/module_utils/gconftool2.py b/plugins/module_utils/_gconftool2.py similarity index 83% rename from plugins/module_utils/gconftool2.py rename to plugins/module_utils/_gconftool2.py index c483ba3791..d08839a9c2 100644 --- a/plugins/module_utils/gconftool2.py +++ b/plugins/module_utils/_gconftool2.py @@ -2,11 +2,14 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/gio_mime.py b/plugins/module_utils/_gio_mime.py similarity index 84% rename from plugins/module_utils/gio_mime.py rename to plugins/module_utils/_gio_mime.py index 4bd3a76857..de72b850d7 100644 --- a/plugins/module_utils/gio_mime.py +++ b/plugins/module_utils/_gio_mime.py @@ -2,11 +2,14 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/gitlab.py b/plugins/module_utils/_gitlab.py similarity index 97% rename from plugins/module_utils/gitlab.py rename to plugins/module_utils/_gitlab.py index 16528dce57..2ae46ff24b 100644 --- a/plugins/module_utils/gitlab.py +++ b/plugins/module_utils/_gitlab.py @@ -3,6 +3,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import traceback @@ -11,7 +14,7 @@ from urllib.parse import urljoin from ansible.module_utils.basic import missing_required_lib -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/heroku.py b/plugins/module_utils/_heroku.py similarity index 88% rename from plugins/module_utils/heroku.py rename to plugins/module_utils/_heroku.py index 1ac213872e..f67c50c433 100644 --- a/plugins/module_utils/heroku.py +++ b/plugins/module_utils/_heroku.py @@ -2,6 +2,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import traceback diff --git a/plugins/module_utils/homebrew.py b/plugins/module_utils/_homebrew.py similarity index 96% rename from plugins/module_utils/homebrew.py rename to plugins/module_utils/_homebrew.py index 08fd230d29..05c69a4eb8 100644 --- a/plugins/module_utils/homebrew.py +++ b/plugins/module_utils/_homebrew.py @@ -2,6 +2,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import os diff --git a/plugins/module_utils/hwc_utils.py b/plugins/module_utils/_hwc_utils.py similarity index 98% rename from plugins/module_utils/hwc_utils.py rename to plugins/module_utils/_hwc_utils.py index 78672941b4..39e5547ec0 100644 --- a/plugins/module_utils/hwc_utils.py +++ b/plugins/module_utils/_hwc_utils.py @@ -2,6 +2,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import re diff --git a/plugins/module_utils/ibm_sa_utils.py b/plugins/module_utils/_ibm_sa_utils.py similarity index 94% rename from plugins/module_utils/ibm_sa_utils.py rename to plugins/module_utils/_ibm_sa_utils.py index cad1dde8c7..15aa9d2aa7 100644 --- a/plugins/module_utils/ibm_sa_utils.py +++ b/plugins/module_utils/_ibm_sa_utils.py @@ -4,6 +4,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import traceback diff --git a/plugins/module_utils/identity/keycloak/_keycloak_utils.py b/plugins/module_utils/_identity/keycloak/_keycloak_utils.py similarity index 100% rename from plugins/module_utils/identity/keycloak/_keycloak_utils.py rename to plugins/module_utils/_identity/keycloak/_keycloak_utils.py diff --git a/plugins/module_utils/identity/keycloak/keycloak.py b/plugins/module_utils/_identity/keycloak/keycloak.py similarity index 99% rename from plugins/module_utils/identity/keycloak/keycloak.py rename to plugins/module_utils/_identity/keycloak/keycloak.py index fc9d9e7538..bd2ce7b6e1 100644 --- a/plugins/module_utils/identity/keycloak/keycloak.py +++ b/plugins/module_utils/_identity/keycloak/keycloak.py @@ -2,6 +2,9 @@ # BSD 2-Clause license (see LICENSES/BSD-2-Clause.txt) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import copy diff --git a/plugins/module_utils/identity/keycloak/keycloak_clientsecret.py b/plugins/module_utils/_identity/keycloak/keycloak_clientsecret.py similarity index 91% rename from plugins/module_utils/identity/keycloak/keycloak_clientsecret.py rename to plugins/module_utils/_identity/keycloak/keycloak_clientsecret.py index 1c9e209806..f271e223dd 100644 --- a/plugins/module_utils/identity/keycloak/keycloak_clientsecret.py +++ b/plugins/module_utils/_identity/keycloak/keycloak_clientsecret.py @@ -3,13 +3,16 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, keycloak_argument_spec, ) diff --git a/plugins/module_utils/ilo_redfish_utils.py b/plugins/module_utils/_ilo_redfish_utils.py similarity index 97% rename from plugins/module_utils/ilo_redfish_utils.py rename to plugins/module_utils/_ilo_redfish_utils.py index 64f746989e..f856ae715a 100644 --- a/plugins/module_utils/ilo_redfish_utils.py +++ b/plugins/module_utils/_ilo_redfish_utils.py @@ -2,12 +2,15 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import time import typing as t -from ansible_collections.community.general.plugins.module_utils.redfish_utils import RedfishUtils +from ansible_collections.community.general.plugins.module_utils._redfish_utils import RedfishUtils class iLORedfishUtils(RedfishUtils): diff --git a/plugins/module_utils/influxdb.py b/plugins/module_utils/_influxdb.py similarity index 94% rename from plugins/module_utils/influxdb.py rename to plugins/module_utils/_influxdb.py index b61b8b1b4e..b3f1c5c5d4 100644 --- a/plugins/module_utils/influxdb.py +++ b/plugins/module_utils/_influxdb.py @@ -2,6 +2,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import traceback @@ -9,7 +12,7 @@ import typing as t from ansible.module_utils.basic import missing_required_lib -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/ipa.py b/plugins/module_utils/_ipa.py similarity index 98% rename from plugins/module_utils/ipa.py rename to plugins/module_utils/_ipa.py index 0dfca11cc2..e2292ade70 100644 --- a/plugins/module_utils/ipa.py +++ b/plugins/module_utils/_ipa.py @@ -9,6 +9,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import json diff --git a/plugins/module_utils/jenkins.py b/plugins/module_utils/_jenkins.py similarity index 85% rename from plugins/module_utils/jenkins.py rename to plugins/module_utils/_jenkins.py index 7445f9f868..30b3cb1968 100644 --- a/plugins/module_utils/jenkins.py +++ b/plugins/module_utils/_jenkins.py @@ -3,6 +3,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import os diff --git a/plugins/module_utils/ldap.py b/plugins/module_utils/_ldap.py similarity index 96% rename from plugins/module_utils/ldap.py rename to plugins/module_utils/_ldap.py index 41139d1882..36077a854b 100644 --- a/plugins/module_utils/ldap.py +++ b/plugins/module_utils/_ldap.py @@ -5,6 +5,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import re diff --git a/plugins/module_utils/linode.py b/plugins/module_utils/_linode.py similarity index 81% rename from plugins/module_utils/linode.py rename to plugins/module_utils/_linode.py index 95eeef8aa6..e9734a69f1 100644 --- a/plugins/module_utils/linode.py +++ b/plugins/module_utils/_linode.py @@ -9,6 +9,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations from ansible.module_utils.ansible_release import __version__ as ansible_version diff --git a/plugins/module_utils/locale_gen.py b/plugins/module_utils/_locale_gen.py similarity index 80% rename from plugins/module_utils/locale_gen.py rename to plugins/module_utils/_locale_gen.py index f43337f08b..b92beca4aa 100644 --- a/plugins/module_utils/locale_gen.py +++ b/plugins/module_utils/_locale_gen.py @@ -2,11 +2,14 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/_lvm.py b/plugins/module_utils/_lvm.py index a656a6d350..7a09c97aa4 100644 --- a/plugins/module_utils/_lvm.py +++ b/plugins/module_utils/_lvm.py @@ -9,7 +9,7 @@ from __future__ import annotations import typing as t -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/_lxc.py b/plugins/module_utils/_lxc.py index 8db257c83a..3e59ea4bc8 100644 --- a/plugins/module_utils/_lxc.py +++ b/plugins/module_utils/_lxc.py @@ -3,6 +3,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import os diff --git a/plugins/module_utils/lxd.py b/plugins/module_utils/_lxd.py similarity index 96% rename from plugins/module_utils/lxd.py rename to plugins/module_utils/_lxd.py index ccb0f6fc94..e28f3e3224 100644 --- a/plugins/module_utils/lxd.py +++ b/plugins/module_utils/_lxd.py @@ -2,6 +2,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import http.client as http_client diff --git a/plugins/module_utils/manageiq.py b/plugins/module_utils/_manageiq.py similarity index 98% rename from plugins/module_utils/manageiq.py rename to plugins/module_utils/_manageiq.py index 5d81a9fb1b..a398b0e2d7 100644 --- a/plugins/module_utils/manageiq.py +++ b/plugins/module_utils/_manageiq.py @@ -10,6 +10,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import os diff --git a/plugins/module_utils/memset.py b/plugins/module_utils/_memset.py similarity index 95% rename from plugins/module_utils/memset.py rename to plugins/module_utils/_memset.py index fc0b5e24c2..bba8defd9f 100644 --- a/plugins/module_utils/memset.py +++ b/plugins/module_utils/_memset.py @@ -9,6 +9,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import urllib.error as urllib_error diff --git a/plugins/module_utils/mh/base.py b/plugins/module_utils/_mh/base.py similarity index 89% rename from plugins/module_utils/mh/base.py rename to plugins/module_utils/_mh/base.py index 8d8017855a..00db8e90b3 100644 --- a/plugins/module_utils/mh/base.py +++ b/plugins/module_utils/_mh/base.py @@ -3,14 +3,17 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.mh.deco import module_fails_on_exception -from ansible_collections.community.general.plugins.module_utils.mh.exceptions import ModuleHelperException as _MHE +from ansible_collections.community.general.plugins.module_utils._mh.deco import module_fails_on_exception +from ansible_collections.community.general.plugins.module_utils._mh.exceptions import ModuleHelperException as _MHE class ModuleHelperBase: diff --git a/plugins/module_utils/mh/deco.py b/plugins/module_utils/_mh/deco.py similarity index 94% rename from plugins/module_utils/mh/deco.py rename to plugins/module_utils/_mh/deco.py index 207ccc38dd..cc275f2969 100644 --- a/plugins/module_utils/mh/deco.py +++ b/plugins/module_utils/_mh/deco.py @@ -3,13 +3,16 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import traceback from contextlib import contextmanager from functools import wraps -from ansible_collections.community.general.plugins.module_utils.mh.exceptions import ( +from ansible_collections.community.general.plugins.module_utils._mh.exceptions import ( ModuleHelperException, _UnhandledSentinel, ) diff --git a/plugins/module_utils/mh/exceptions.py b/plugins/module_utils/_mh/exceptions.py similarity index 80% rename from plugins/module_utils/mh/exceptions.py rename to plugins/module_utils/_mh/exceptions.py index 64c0d4b176..d1dca3a1c3 100644 --- a/plugins/module_utils/mh/exceptions.py +++ b/plugins/module_utils/_mh/exceptions.py @@ -3,6 +3,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t diff --git a/plugins/module_utils/mh/mixins/deprecate_attrs.py b/plugins/module_utils/_mh/mixins/deprecate_attrs.py similarity index 93% rename from plugins/module_utils/mh/mixins/deprecate_attrs.py rename to plugins/module_utils/_mh/mixins/deprecate_attrs.py index 81a3683ff8..bbf683b10a 100644 --- a/plugins/module_utils/mh/mixins/deprecate_attrs.py +++ b/plugins/module_utils/_mh/mixins/deprecate_attrs.py @@ -3,6 +3,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t diff --git a/plugins/module_utils/mh/mixins/state.py b/plugins/module_utils/_mh/mixins/state.py similarity index 88% rename from plugins/module_utils/mh/mixins/state.py rename to plugins/module_utils/_mh/mixins/state.py index dbcf1f0a40..ad5d40052f 100644 --- a/plugins/module_utils/mh/mixins/state.py +++ b/plugins/module_utils/_mh/mixins/state.py @@ -3,6 +3,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t diff --git a/plugins/module_utils/mh/module_helper.py b/plugins/module_utils/_mh/module_helper.py similarity index 89% rename from plugins/module_utils/mh/module_helper.py rename to plugins/module_utils/_mh/module_helper.py index b41cf48639..b0bec632bc 100644 --- a/plugins/module_utils/mh/module_helper.py +++ b/plugins/module_utils/_mh/module_helper.py @@ -3,16 +3,19 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t from ansible.module_utils.common.dict_transformations import dict_merge -from ansible_collections.community.general.plugins.module_utils.mh.base import ModuleHelperBase -from ansible_collections.community.general.plugins.module_utils.mh.mixins.deprecate_attrs import DeprecateAttrsMixin -from ansible_collections.community.general.plugins.module_utils.mh.mixins.state import StateMixin -from ansible_collections.community.general.plugins.module_utils.vardict import VarDict +from ansible_collections.community.general.plugins.module_utils._mh.base import ModuleHelperBase +from ansible_collections.community.general.plugins.module_utils._mh.mixins.deprecate_attrs import DeprecateAttrsMixin +from ansible_collections.community.general.plugins.module_utils._mh.mixins.state import StateMixin +from ansible_collections.community.general.plugins.module_utils._vardict import VarDict if t.TYPE_CHECKING: from collections.abc import Sequence diff --git a/plugins/module_utils/module_helper.py b/plugins/module_utils/_module_helper.py similarity index 66% rename from plugins/module_utils/module_helper.py rename to plugins/module_utils/_module_helper.py index d96f44dad5..880877721c 100644 --- a/plugins/module_utils/module_helper.py +++ b/plugins/module_utils/_module_helper.py @@ -3,17 +3,22 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations # pylint: disable=unused-import -from ansible_collections.community.general.plugins.module_utils.mh.deco import ( # noqa: F401 +from ansible_collections.community.general.plugins.module_utils._mh.deco import ( # noqa: F401 cause_changes, check_mode_skip, check_mode_skip_returns, module_fails_on_exception, ) -from ansible_collections.community.general.plugins.module_utils.mh.exceptions import ModuleHelperException # noqa: F401 -from ansible_collections.community.general.plugins.module_utils.mh.module_helper import ( # noqa: F401 +from ansible_collections.community.general.plugins.module_utils._mh.exceptions import ( + ModuleHelperException, # noqa: F401 +) +from ansible_collections.community.general.plugins.module_utils._mh.module_helper import ( # noqa: F401 ModuleHelper, StateModuleHelper, ) diff --git a/plugins/module_utils/net_tools/pritunl/api.py b/plugins/module_utils/_net_tools/pritunl/api.py similarity index 98% rename from plugins/module_utils/net_tools/pritunl/api.py rename to plugins/module_utils/_net_tools/pritunl/api.py index 1c2ebdef31..5f67c22579 100644 --- a/plugins/module_utils/net_tools/pritunl/api.py +++ b/plugins/module_utils/_net_tools/pritunl/api.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + """ Pritunl API that offers CRUD operations on Pritunl Organizations and Users """ diff --git a/plugins/module_utils/ocapi_utils.py b/plugins/module_utils/_ocapi_utils.py similarity index 99% rename from plugins/module_utils/ocapi_utils.py rename to plugins/module_utils/_ocapi_utils.py index a227988c26..2edd4b4f40 100644 --- a/plugins/module_utils/ocapi_utils.py +++ b/plugins/module_utils/_ocapi_utils.py @@ -3,6 +3,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import json diff --git a/plugins/module_utils/onepassword.py b/plugins/module_utils/_onepassword.py similarity index 82% rename from plugins/module_utils/onepassword.py rename to plugins/module_utils/_onepassword.py index 7eabbc7eff..95229abef7 100644 --- a/plugins/module_utils/onepassword.py +++ b/plugins/module_utils/_onepassword.py @@ -2,6 +2,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import os diff --git a/plugins/module_utils/oneview.py b/plugins/module_utils/_oneview.py similarity index 98% rename from plugins/module_utils/oneview.py rename to plugins/module_utils/_oneview.py index a06bb70e79..56b98ddfb7 100644 --- a/plugins/module_utils/oneview.py +++ b/plugins/module_utils/_oneview.py @@ -9,6 +9,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import abc diff --git a/plugins/module_utils/online.py b/plugins/module_utils/_online.py similarity index 95% rename from plugins/module_utils/online.py rename to plugins/module_utils/_online.py index 2e16ea16e3..266704d9c9 100644 --- a/plugins/module_utils/online.py +++ b/plugins/module_utils/_online.py @@ -2,6 +2,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import json diff --git a/plugins/module_utils/opennebula.py b/plugins/module_utils/_opennebula.py similarity index 98% rename from plugins/module_utils/opennebula.py rename to plugins/module_utils/_opennebula.py index 11e814e853..dfaee9046c 100644 --- a/plugins/module_utils/opennebula.py +++ b/plugins/module_utils/_opennebula.py @@ -4,6 +4,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import ssl diff --git a/plugins/module_utils/pacemaker.py b/plugins/module_utils/_pacemaker.py similarity index 94% rename from plugins/module_utils/pacemaker.py rename to plugins/module_utils/_pacemaker.py index 32617623be..5c8497b19b 100644 --- a/plugins/module_utils/pacemaker.py +++ b/plugins/module_utils/_pacemaker.py @@ -2,13 +2,16 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import re import time import typing as t -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/pipx.py b/plugins/module_utils/_pipx.py similarity index 94% rename from plugins/module_utils/pipx.py rename to plugins/module_utils/_pipx.py index 70515cd55b..49f49b581d 100644 --- a/plugins/module_utils/pipx.py +++ b/plugins/module_utils/_pipx.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import json @@ -9,7 +12,7 @@ import typing as t from ansible.module_utils.facts.compat import ansible_facts -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/pkg_req.py b/plugins/module_utils/_pkg_req.py similarity index 92% rename from plugins/module_utils/pkg_req.py rename to plugins/module_utils/_pkg_req.py index 2f0d45f36c..7a067d66b0 100644 --- a/plugins/module_utils/pkg_req.py +++ b/plugins/module_utils/_pkg_req.py @@ -2,11 +2,14 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/puppet.py b/plugins/module_utils/_puppet.py similarity index 95% rename from plugins/module_utils/puppet.py rename to plugins/module_utils/_puppet.py index 7ba556b326..e69ed10c76 100644 --- a/plugins/module_utils/puppet.py +++ b/plugins/module_utils/_puppet.py @@ -2,12 +2,15 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import os import typing as t -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/python_runner.py b/plugins/module_utils/_python_runner.py similarity index 87% rename from plugins/module_utils/python_runner.py rename to plugins/module_utils/_python_runner.py index c8780174db..1b374e25a1 100644 --- a/plugins/module_utils/python_runner.py +++ b/plugins/module_utils/_python_runner.py @@ -2,12 +2,15 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import os import typing as t -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, _ensure_list +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, _ensure_list if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/redfish_utils.py b/plugins/module_utils/_redfish_utils.py similarity index 99% rename from plugins/module_utils/redfish_utils.py rename to plugins/module_utils/_redfish_utils.py index 32033e0df7..063e07cda2 100644 --- a/plugins/module_utils/redfish_utils.py +++ b/plugins/module_utils/_redfish_utils.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import http.client as http_client diff --git a/plugins/module_utils/redis.py b/plugins/module_utils/_redis.py similarity index 95% rename from plugins/module_utils/redis.py rename to plugins/module_utils/_redis.py index 60995e0e1a..23c9071c2d 100644 --- a/plugins/module_utils/redis.py +++ b/plugins/module_utils/_redis.py @@ -3,6 +3,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import traceback diff --git a/plugins/module_utils/remote_management/lxca/common.py b/plugins/module_utils/_remote_management/lxca/common.py similarity index 92% rename from plugins/module_utils/remote_management/lxca/common.py rename to plugins/module_utils/_remote_management/lxca/common.py index 53cb134b4f..26f8a33b71 100644 --- a/plugins/module_utils/remote_management/lxca/common.py +++ b/plugins/module_utils/_remote_management/lxca/common.py @@ -11,6 +11,9 @@ # Contains LXCA common class # Lenovo xClarity Administrator (LXCA) +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import traceback diff --git a/plugins/module_utils/rundeck.py b/plugins/module_utils/_rundeck.py similarity index 95% rename from plugins/module_utils/rundeck.py rename to plugins/module_utils/_rundeck.py index f044a007d0..4344ceb041 100644 --- a/plugins/module_utils/rundeck.py +++ b/plugins/module_utils/_rundeck.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import json diff --git a/plugins/module_utils/scaleway.py b/plugins/module_utils/_scaleway.py similarity index 98% rename from plugins/module_utils/scaleway.py rename to plugins/module_utils/_scaleway.py index ee09b2dd9c..05b45481ef 100644 --- a/plugins/module_utils/scaleway.py +++ b/plugins/module_utils/_scaleway.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import datetime @@ -18,7 +21,7 @@ from urllib.parse import urlencode from ansible.module_utils.basic import env_fallback, missing_required_lib from ansible.module_utils.urls import fetch_url -from ansible_collections.community.general.plugins.module_utils.datetime import ( +from ansible_collections.community.general.plugins.module_utils._datetime import ( now, ) diff --git a/plugins/module_utils/snap.py b/plugins/module_utils/_snap.py similarity index 90% rename from plugins/module_utils/snap.py rename to plugins/module_utils/_snap.py index 23d59350de..fde626387c 100644 --- a/plugins/module_utils/snap.py +++ b/plugins/module_utils/_snap.py @@ -2,11 +2,14 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/source_control/bitbucket.py b/plugins/module_utils/_source_control/bitbucket.py similarity index 95% rename from plugins/module_utils/source_control/bitbucket.py rename to plugins/module_utils/_source_control/bitbucket.py index 170b0f8d96..6f827be57a 100644 --- a/plugins/module_utils/source_control/bitbucket.py +++ b/plugins/module_utils/_source_control/bitbucket.py @@ -2,6 +2,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import json diff --git a/plugins/module_utils/ssh.py b/plugins/module_utils/_ssh.py similarity index 79% rename from plugins/module_utils/ssh.py rename to plugins/module_utils/_ssh.py index 554f549997..48e9df9010 100644 --- a/plugins/module_utils/ssh.py +++ b/plugins/module_utils/_ssh.py @@ -5,6 +5,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import os diff --git a/plugins/module_utils/storage/emc/emc_vnx.py b/plugins/module_utils/_storage/emc/emc_vnx.py similarity index 72% rename from plugins/module_utils/storage/emc/emc_vnx.py rename to plugins/module_utils/_storage/emc/emc_vnx.py index 604a8f8679..8fea22975e 100644 --- a/plugins/module_utils/storage/emc/emc_vnx.py +++ b/plugins/module_utils/_storage/emc/emc_vnx.py @@ -2,6 +2,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations emc_vnx_argument_spec = { diff --git a/plugins/module_utils/storage/hpe3par/hpe3par.py b/plugins/module_utils/_storage/hpe3par/hpe3par.py similarity index 92% rename from plugins/module_utils/storage/hpe3par/hpe3par.py rename to plugins/module_utils/_storage/hpe3par/hpe3par.py index 8ad1ec818e..8f3d11cee1 100644 --- a/plugins/module_utils/storage/hpe3par/hpe3par.py +++ b/plugins/module_utils/_storage/hpe3par/hpe3par.py @@ -2,6 +2,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t diff --git a/plugins/module_utils/_stormssh.py b/plugins/module_utils/_stormssh.py index b69d9c4598..4305395569 100644 --- a/plugins/module_utils/_stormssh.py +++ b/plugins/module_utils/_stormssh.py @@ -4,6 +4,9 @@ # Copyright (C) <2013> # SPDX-License-Identifier: MIT +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import os diff --git a/plugins/module_utils/systemd.py b/plugins/module_utils/_systemd.py similarity index 84% rename from plugins/module_utils/systemd.py rename to plugins/module_utils/_systemd.py index 27f12cf869..83d4eaef59 100644 --- a/plugins/module_utils/systemd.py +++ b/plugins/module_utils/_systemd.py @@ -2,11 +2,14 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/univention_umc.py b/plugins/module_utils/_univention_umc.py similarity index 97% rename from plugins/module_utils/univention_umc.py rename to plugins/module_utils/_univention_umc.py index 1d9ce5189d..90975bbdf0 100644 --- a/plugins/module_utils/univention_umc.py +++ b/plugins/module_utils/_univention_umc.py @@ -10,6 +10,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations """Univention Corporate Server (UCS) access module. diff --git a/plugins/module_utils/utm_utils.py b/plugins/module_utils/_utm_utils.py similarity index 98% rename from plugins/module_utils/utm_utils.py rename to plugins/module_utils/_utm_utils.py index 7cc9486799..cf97acb418 100644 --- a/plugins/module_utils/utm_utils.py +++ b/plugins/module_utils/_utm_utils.py @@ -9,6 +9,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import json diff --git a/plugins/module_utils/vardict.py b/plugins/module_utils/_vardict.py similarity index 97% rename from plugins/module_utils/vardict.py rename to plugins/module_utils/_vardict.py index da01f6fc09..f328ead374 100644 --- a/plugins/module_utils/vardict.py +++ b/plugins/module_utils/_vardict.py @@ -3,6 +3,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import copy diff --git a/plugins/module_utils/version.py b/plugins/module_utils/_version.py similarity index 69% rename from plugins/module_utils/version.py rename to plugins/module_utils/_version.py index e13fb72a33..aeec0c9322 100644 --- a/plugins/module_utils/version.py +++ b/plugins/module_utils/_version.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + """Provide version object to compare version numbers.""" from __future__ import annotations diff --git a/plugins/module_utils/vexata.py b/plugins/module_utils/_vexata.py similarity index 94% rename from plugins/module_utils/vexata.py rename to plugins/module_utils/_vexata.py index b55b67f113..80d472441f 100644 --- a/plugins/module_utils/vexata.py +++ b/plugins/module_utils/_vexata.py @@ -3,6 +3,9 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t diff --git a/plugins/module_utils/wdc_redfish_utils.py b/plugins/module_utils/_wdc_redfish_utils.py similarity index 99% rename from plugins/module_utils/wdc_redfish_utils.py rename to plugins/module_utils/_wdc_redfish_utils.py index afbf412acf..b24f02e4e4 100644 --- a/plugins/module_utils/wdc_redfish_utils.py +++ b/plugins/module_utils/_wdc_redfish_utils.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import datetime @@ -14,7 +17,7 @@ from urllib.parse import urlparse, urlunparse from ansible.module_utils.urls import fetch_file -from ansible_collections.community.general.plugins.module_utils.redfish_utils import RedfishUtils +from ansible_collections.community.general.plugins.module_utils._redfish_utils import RedfishUtils if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/xdg_mime.py b/plugins/module_utils/_xdg_mime.py similarity index 85% rename from plugins/module_utils/xdg_mime.py rename to plugins/module_utils/_xdg_mime.py index 4d48406551..b4ff102e22 100644 --- a/plugins/module_utils/xdg_mime.py +++ b/plugins/module_utils/_xdg_mime.py @@ -3,11 +3,14 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/xenserver.py b/plugins/module_utils/_xenserver.py similarity index 99% rename from plugins/module_utils/xenserver.py rename to plugins/module_utils/_xenserver.py index a9ccc94c22..2cb35fb634 100644 --- a/plugins/module_utils/xenserver.py +++ b/plugins/module_utils/_xenserver.py @@ -3,6 +3,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import atexit diff --git a/plugins/module_utils/xfconf.py b/plugins/module_utils/_xfconf.py similarity index 87% rename from plugins/module_utils/xfconf.py rename to plugins/module_utils/_xfconf.py index 8a85566786..9d32939c01 100644 --- a/plugins/module_utils/xfconf.py +++ b/plugins/module_utils/_xfconf.py @@ -2,13 +2,16 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t from ansible.module_utils.parsing.convert_bool import boolean -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/aerospike_migrations.py b/plugins/modules/aerospike_migrations.py index e893b16f28..7e56a4b1c8 100644 --- a/plugins/modules/aerospike_migrations.py +++ b/plugins/modules/aerospike_migrations.py @@ -16,7 +16,7 @@ description: ok. author: "Albert Autin (@Alb0t)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/airbrake_deployment.py b/plugins/modules/airbrake_deployment.py index ad66794877..bfb3754b6c 100644 --- a/plugins/modules/airbrake_deployment.py +++ b/plugins/modules/airbrake_deployment.py @@ -15,7 +15,7 @@ short_description: Notify airbrake about app deployments description: - Notify airbrake about app deployments (see U(https://airbrake.io/docs/api/#deploys-v4)). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/aix_devices.py b/plugins/modules/aix_devices.py index 93fa95960b..9b1ba585b2 100644 --- a/plugins/modules/aix_devices.py +++ b/plugins/modules/aix_devices.py @@ -20,7 +20,7 @@ deprecated: Use C(ibm.power_aix.devices) instead. See U(https://ibm.github.io/ansible-power-aix/modules/devices.html) for details. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/aix_filesystem.py b/plugins/modules/aix_filesystem.py index 5d10410aad..f157501412 100644 --- a/plugins/modules/aix_filesystem.py +++ b/plugins/modules/aix_filesystem.py @@ -21,7 +21,7 @@ deprecated: Use C(ibm.power_aix.filesystem) instead. See U(https://ibm.github.io/ansible-power-aix/modules/filesystem.html) for details. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/aix_inittab.py b/plugins/modules/aix_inittab.py index 01742801ad..a53ffaeb4a 100644 --- a/plugins/modules/aix_inittab.py +++ b/plugins/modules/aix_inittab.py @@ -20,7 +20,7 @@ deprecated: Use C(ibm.power_aix.inittab) instead. See U(https://ibm.github.io/ansible-power-aix/modules/inittab.html) for details. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/aix_lvg.py b/plugins/modules/aix_lvg.py index 02da4c0a63..df049c5211 100644 --- a/plugins/modules/aix_lvg.py +++ b/plugins/modules/aix_lvg.py @@ -20,7 +20,7 @@ deprecated: Use C(ibm.power_aix.lvg) instead. See U(https://ibm.github.io/ansible-power-aix/modules/lvg.html) for details. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/aix_lvol.py b/plugins/modules/aix_lvol.py index 9d9f2900c7..0d9765ec67 100644 --- a/plugins/modules/aix_lvol.py +++ b/plugins/modules/aix_lvol.py @@ -20,7 +20,7 @@ deprecated: Use C(ibm.power_aix.lvol) instead. See U(https://ibm.github.io/ansible-power-aix/modules/lvol.html) for details. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/alerta_customer.py b/plugins/modules/alerta_customer.py index 95912b0fc4..0d968980d9 100644 --- a/plugins/modules/alerta_customer.py +++ b/plugins/modules/alerta_customer.py @@ -18,7 +18,7 @@ seealso: description: Documentation for Alerta API. link: https://docs.alerta.io/api/reference.html#customers extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/ali_instance.py b/plugins/modules/ali_instance.py index 4b4f96520a..3bf2dcf826 100644 --- a/plugins/modules/ali_instance.py +++ b/plugins/modules/ali_instance.py @@ -246,8 +246,8 @@ requirements: - "Python >= 3.6" - "footmark >= 1.19.0" extends_documentation_fragment: - - community.general.alicloud - - community.general.attributes + - community.general._alicloud + - community.general._attributes """ EXAMPLES = r""" @@ -616,7 +616,7 @@ import time from ansible.module_utils.basic import AnsibleModule, missing_required_lib -from ansible_collections.community.general.plugins.module_utils.alicloud_ecs import ( +from ansible_collections.community.general.plugins.module_utils._alicloud_ecs import ( FOOTMARK_IMP_ERR, HAS_FOOTMARK, ecs_argument_spec, diff --git a/plugins/modules/ali_instance_info.py b/plugins/modules/ali_instance_info.py index a0ba26009a..c4fafa66f1 100644 --- a/plugins/modules/ali_instance_info.py +++ b/plugins/modules/ali_instance_info.py @@ -57,9 +57,9 @@ requirements: - "Python >= 3.6" - "footmark >= 1.13.0" extends_documentation_fragment: - - community.general.alicloud - - community.general.attributes - - community.general.attributes.info_module + - community.general._alicloud + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -343,7 +343,7 @@ ids: from ansible.module_utils.basic import AnsibleModule, missing_required_lib -from ansible_collections.community.general.plugins.module_utils.alicloud_ecs import ( +from ansible_collections.community.general.plugins.module_utils._alicloud_ecs import ( FOOTMARK_IMP_ERR, HAS_FOOTMARK, ecs_argument_spec, diff --git a/plugins/modules/alternatives.py b/plugins/modules/alternatives.py index 12853ac3d8..5f3d47f79a 100644 --- a/plugins/modules/alternatives.py +++ b/plugins/modules/alternatives.py @@ -19,7 +19,7 @@ author: - David Wittman (@DavidWittman) - Gabe Mulley (@mulby) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/android_sdk.py b/plugins/modules/android_sdk.py index f8963d555e..3a35378231 100644 --- a/plugins/modules/android_sdk.py +++ b/plugins/modules/android_sdk.py @@ -15,7 +15,7 @@ description: - Allows installation of packages to a non-default SDK root directory. author: Stanislav Shamilov (@shamilovstas) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -132,8 +132,8 @@ removed: sample: ["build-tools;34.0.0", "platform-tools"] """ -from ansible_collections.community.general.plugins.module_utils.android_sdkmanager import AndroidSdkManager, Package -from ansible_collections.community.general.plugins.module_utils.mh.module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._android_sdkmanager import AndroidSdkManager, Package +from ansible_collections.community.general.plugins.module_utils._mh.module_helper import StateModuleHelper class AndroidSdk(StateModuleHelper): diff --git a/plugins/modules/ansible_galaxy_install.py b/plugins/modules/ansible_galaxy_install.py index 782c245a75..05543f06cf 100644 --- a/plugins/modules/ansible_galaxy_install.py +++ b/plugins/modules/ansible_galaxy_install.py @@ -26,7 +26,7 @@ seealso: requirements: - ansible-core 2.11 or newer extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none @@ -194,8 +194,11 @@ version: import re -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper, ModuleHelperException +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._module_helper import ( + ModuleHelper, + ModuleHelperException, +) class AnsibleGalaxyInstall(ModuleHelper): diff --git a/plugins/modules/apache2_mod_proxy.py b/plugins/modules/apache2_mod_proxy.py index 3187b3fa55..4ee8171967 100644 --- a/plugins/modules/apache2_mod_proxy.py +++ b/plugins/modules/apache2_mod_proxy.py @@ -14,7 +14,7 @@ description: - Set and/or get members' attributes of an Apache httpd 2.4 mod_proxy balancer pool, using HTTP POST and GET requests. The httpd mod_proxy balancer-member status page has to be enabled and accessible, as this module relies on parsing this page. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes requirements: - Python package C(beautifulsoup4) attributes: @@ -210,8 +210,11 @@ import re from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.urls import fetch_url -from ansible_collections.community.general.plugins.module_utils import deps -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper, ModuleHelperException +from ansible_collections.community.general.plugins.module_utils import _deps as deps +from ansible_collections.community.general.plugins.module_utils._module_helper import ( + ModuleHelper, + ModuleHelperException, +) with deps.declare("beautifulsoup4"): from bs4 import BeautifulSoup diff --git a/plugins/modules/apache2_module.py b/plugins/modules/apache2_module.py index 3538463e7f..86bdb80472 100644 --- a/plugins/modules/apache2_module.py +++ b/plugins/modules/apache2_module.py @@ -16,7 +16,7 @@ short_description: Enables/disables a module of the Apache2 webserver description: - Enables or disables a specified module of the Apache2 webserver. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/apk.py b/plugins/modules/apk.py index 604d6bb862..3e263f5f81 100644 --- a/plugins/modules/apk.py +++ b/plugins/modules/apk.py @@ -16,7 +16,7 @@ description: - Manages C(apk) packages for Alpine Linux. author: "Kevin Brebanov (@kbrebanov)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/apt_repo.py b/plugins/modules/apt_repo.py index 4814418224..d23fafaabe 100644 --- a/plugins/modules/apt_repo.py +++ b/plugins/modules/apt_repo.py @@ -17,7 +17,7 @@ notes: - This module works on ALT based distros. - Does NOT support checkmode, due to a limitation in C(apt-repo) tool. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/apt_rpm.py b/plugins/modules/apt_rpm.py index 3e17b9f0a3..b81c71c10c 100644 --- a/plugins/modules/apt_rpm.py +++ b/plugins/modules/apt_rpm.py @@ -15,7 +15,7 @@ short_description: APT-RPM package manager description: - Manages packages with C(apt-rpm). Both low-level (C(rpm)) and high-level (C(apt-get)) package manager binaries required. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/archive.py b/plugins/modules/archive.py index 06e6277e26..5790b9a122 100644 --- a/plugins/modules/archive.py +++ b/plugins/modules/archive.py @@ -13,7 +13,7 @@ module: archive short_description: Creates a compressed archive of one or more files or trees extends_documentation_fragment: - ansible.builtin.files - - community.general.attributes + - community.general._attributes description: - Creates or extends an archive. - The source and archive are on the target host, and the archive I(is not) copied to the controller host. diff --git a/plugins/modules/awall.py b/plugins/modules/awall.py index 2b08d8cf33..013aac73a2 100644 --- a/plugins/modules/awall.py +++ b/plugins/modules/awall.py @@ -15,7 +15,7 @@ description: - Alpine Wall (C(awall)) generates a firewall configuration from the enabled policy files and activates the configuration on the system. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/beadm.py b/plugins/modules/beadm.py index be9d0971d6..4aef553092 100644 --- a/plugins/modules/beadm.py +++ b/plugins/modules/beadm.py @@ -14,7 +14,7 @@ description: - Mount and unmount ZFS boot environments. author: Adam Števko (@xen0l) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/bigpanda.py b/plugins/modules/bigpanda.py index 7816201bf3..fcb815ec47 100644 --- a/plugins/modules/bigpanda.py +++ b/plugins/modules/bigpanda.py @@ -13,7 +13,7 @@ description: - Notify BigPanda when deployments start and end (successfully or not). Returns a deployment object containing all the parameters for future module calls. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/bitbucket_access_key.py b/plugins/modules/bitbucket_access_key.py index b141fb76dd..0bc9f45477 100644 --- a/plugins/modules/bitbucket_access_key.py +++ b/plugins/modules/bitbucket_access_key.py @@ -14,8 +14,8 @@ description: author: - Evgeniy Krysanov (@catcombo) extends_documentation_fragment: - - community.general.bitbucket - - community.general.attributes + - community.general._bitbucket + - community.general._attributes attributes: check_mode: support: full @@ -74,7 +74,7 @@ RETURN = r""" # """ from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper error_messages = { "required_key": "`key` is required when the `state` is `present`", diff --git a/plugins/modules/bitbucket_pipeline_key_pair.py b/plugins/modules/bitbucket_pipeline_key_pair.py index a664e20afe..465bf72864 100644 --- a/plugins/modules/bitbucket_pipeline_key_pair.py +++ b/plugins/modules/bitbucket_pipeline_key_pair.py @@ -14,8 +14,8 @@ description: author: - Evgeniy Krysanov (@catcombo) extends_documentation_fragment: - - community.general.bitbucket - - community.general.attributes + - community.general._bitbucket + - community.general._attributes attributes: check_mode: support: full @@ -71,7 +71,7 @@ RETURN = r""" # """ from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper error_messages = { "invalid_params": "Account, repository or SSH key pair was not found", diff --git a/plugins/modules/bitbucket_pipeline_known_host.py b/plugins/modules/bitbucket_pipeline_known_host.py index c83aa69a04..4568089a2a 100644 --- a/plugins/modules/bitbucket_pipeline_known_host.py +++ b/plugins/modules/bitbucket_pipeline_known_host.py @@ -15,8 +15,8 @@ description: author: - Evgeniy Krysanov (@catcombo) extends_documentation_fragment: - - community.general.bitbucket - - community.general.attributes + - community.general._bitbucket + - community.general._attributes requirements: - paramiko attributes: @@ -95,7 +95,7 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper error_messages = { "invalid_params": "Account or repository was not found", diff --git a/plugins/modules/bitbucket_pipeline_variable.py b/plugins/modules/bitbucket_pipeline_variable.py index 366e413c14..2ab94d24b1 100644 --- a/plugins/modules/bitbucket_pipeline_variable.py +++ b/plugins/modules/bitbucket_pipeline_variable.py @@ -14,8 +14,8 @@ description: author: - Evgeniy Krysanov (@catcombo) extends_documentation_fragment: - - community.general.bitbucket - - community.general.attributes + - community.general._bitbucket + - community.general._attributes attributes: check_mode: support: full @@ -83,7 +83,7 @@ RETURN = r""" # """ from ansible.module_utils.basic import AnsibleModule, _load_params -from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper error_messages = { "required_value": "`value` is required when the `state` is `present`", diff --git a/plugins/modules/bower.py b/plugins/modules/bower.py index e4a64615a7..467385a209 100644 --- a/plugins/modules/bower.py +++ b/plugins/modules/bower.py @@ -13,7 +13,7 @@ description: - Manage bower packages with C(bower). author: "Michael Warkentin (@mwarkentin)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/btrfs_info.py b/plugins/modules/btrfs_info.py index ef345ee7cd..bb341aa5f0 100644 --- a/plugins/modules/btrfs_info.py +++ b/plugins/modules/btrfs_info.py @@ -16,8 +16,8 @@ author: - Gregory Furlong (@gnfzdz) extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -77,7 +77,7 @@ filesystems: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.btrfs import BtrfsFilesystemsProvider +from ansible_collections.community.general.plugins.module_utils._btrfs import BtrfsFilesystemsProvider def run_module(): diff --git a/plugins/modules/btrfs_subvolume.py b/plugins/modules/btrfs_subvolume.py index 6b365db41e..d5ef5a83d1 100644 --- a/plugins/modules/btrfs_subvolume.py +++ b/plugins/modules/btrfs_subvolume.py @@ -82,7 +82,7 @@ notes: only a single btrfs filesystem is mounted, that filesystem is used; otherwise, the module takes no action and returns an error. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: @@ -209,7 +209,7 @@ import tempfile from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.btrfs import ( +from ansible_collections.community.general.plugins.module_utils._btrfs import ( BtrfsCommands, BtrfsFilesystemsProvider, BtrfsModuleException, diff --git a/plugins/modules/bundler.py b/plugins/modules/bundler.py index 049cc504c6..e0953d9c09 100644 --- a/plugins/modules/bundler.py +++ b/plugins/modules/bundler.py @@ -12,7 +12,7 @@ short_description: Manage Ruby Gem dependencies with Bundler description: - Manage installation and Gem version dependencies for Ruby using the Bundler gem. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/bzr.py b/plugins/modules/bzr.py index 61f56a539b..fd96eb5c90 100644 --- a/plugins/modules/bzr.py +++ b/plugins/modules/bzr.py @@ -15,7 +15,7 @@ short_description: Deploy software (or files) from bzr branches description: - Manage C(bzr) branches to deploy files or software. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/campfire.py b/plugins/modules/campfire.py index 8bfd58c275..6736f049e3 100644 --- a/plugins/modules/campfire.py +++ b/plugins/modules/campfire.py @@ -13,7 +13,7 @@ description: - Send a message to Campfire. - Messages with newlines result in a "Paste" message being sent. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/capabilities.py b/plugins/modules/capabilities.py index 035c0a938a..0514537a7c 100644 --- a/plugins/modules/capabilities.py +++ b/plugins/modules/capabilities.py @@ -12,7 +12,7 @@ short_description: Manage Linux capabilities description: - This module manipulates files privileges using the Linux capabilities(7) system. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/cargo.py b/plugins/modules/cargo.py index e53a391956..68c8ad4f55 100644 --- a/plugins/modules/cargo.py +++ b/plugins/modules/cargo.py @@ -14,7 +14,7 @@ description: - Manage Rust packages with cargo. author: "Radek Sprta (@radek-sprta)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/circonus_annotation.py b/plugins/modules/circonus_annotation.py index 26ceb193fe..1489d6a78b 100644 --- a/plugins/modules/circonus_annotation.py +++ b/plugins/modules/circonus_annotation.py @@ -15,7 +15,7 @@ author: "Nick Harring (@NickatEpic)" requirements: - requests >= 2.0.0 extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none @@ -147,7 +147,7 @@ import json import time import traceback -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion REQUESTS_IMP_ERR = None try: diff --git a/plugins/modules/cisco_webex.py b/plugins/modules/cisco_webex.py index e56a65c229..4e56ed29c7 100644 --- a/plugins/modules/cisco_webex.py +++ b/plugins/modules/cisco_webex.py @@ -16,7 +16,7 @@ notes: - The O(recipient_type) must be valid for the supplied O(recipient_id). - Full API documentation can be found at U(https://developer.webex.com/docs/api/basics). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/cloud_init_data_facts.py b/plugins/modules/cloud_init_data_facts.py index fa786cf481..44d885ab94 100644 --- a/plugins/modules/cloud_init_data_facts.py +++ b/plugins/modules/cloud_init_data_facts.py @@ -12,9 +12,9 @@ description: - Gathers facts by reading the C(status.json) and C(result.json) of cloud-init. author: René Moser (@resmo) extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.facts - - community.general.attributes.facts_module + - community.general._attributes + - community.general._attributes.facts + - community.general._attributes.facts_module options: filter: description: diff --git a/plugins/modules/cloudflare_dns.py b/plugins/modules/cloudflare_dns.py index d10fa511d0..9edd1b48c0 100644 --- a/plugins/modules/cloudflare_dns.py +++ b/plugins/modules/cloudflare_dns.py @@ -14,7 +14,7 @@ short_description: Manage Cloudflare DNS records description: - 'Manages DNS records using the Cloudflare API, see the docs: U(https://api.cloudflare.com/).' extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/cobbler_sync.py b/plugins/modules/cobbler_sync.py index 049315d9fe..0f86dd388b 100644 --- a/plugins/modules/cobbler_sync.py +++ b/plugins/modules/cobbler_sync.py @@ -12,7 +12,7 @@ short_description: Sync Cobbler description: - Sync Cobbler to commit changes. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -75,7 +75,7 @@ import xmlrpc.client as xmlrpc_client from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.datetime import ( +from ansible_collections.community.general.plugins.module_utils._datetime import ( now, ) diff --git a/plugins/modules/cobbler_system.py b/plugins/modules/cobbler_system.py index dac885f03d..25eb8aa72d 100644 --- a/plugins/modules/cobbler_system.py +++ b/plugins/modules/cobbler_system.py @@ -12,7 +12,7 @@ short_description: Manage system objects in Cobbler description: - Add, modify or remove systems in Cobbler. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -152,7 +152,7 @@ import xmlrpc.client as xmlrpc_client from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.datetime import ( +from ansible_collections.community.general.plugins.module_utils._datetime import ( now, ) diff --git a/plugins/modules/composer.py b/plugins/modules/composer.py index c7d5cfe67f..4dd48800f9 100644 --- a/plugins/modules/composer.py +++ b/plugins/modules/composer.py @@ -16,7 +16,7 @@ description: - Composer is a tool for dependency management in PHP. It allows you to declare the dependent libraries your project needs and it installs them in your project for you. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/consul.py b/plugins/modules/consul.py index bf6a55e909..8b034b8f03 100644 --- a/plugins/modules/consul.py +++ b/plugins/modules/consul.py @@ -26,7 +26,7 @@ requirements: - requests author: "Steve Gargan (@sgargan)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/consul_acl_bootstrap.py b/plugins/modules/consul_acl_bootstrap.py index c63adecb35..a2e43179ac 100644 --- a/plugins/modules/consul_acl_bootstrap.py +++ b/plugins/modules/consul_acl_bootstrap.py @@ -16,8 +16,8 @@ description: author: - Florian Apolloner (@apollo13) extends_documentation_fragment: - - community.general.consul - - community.general.attributes + - community.general._consul + - community.general._attributes attributes: check_mode: support: none @@ -68,7 +68,7 @@ result: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.consul import ( +from ansible_collections.community.general.plugins.module_utils._consul import ( AUTH_ARGUMENTS_SPEC, RequestError, _ConsulModule, diff --git a/plugins/modules/consul_agent_check.py b/plugins/modules/consul_agent_check.py index 4082c0aff0..3628b3709a 100644 --- a/plugins/modules/consul_agent_check.py +++ b/plugins/modules/consul_agent_check.py @@ -20,10 +20,10 @@ description: author: - Michael Ilg (@Ilgmi) extends_documentation_fragment: - - community.general.consul - - community.general.consul.actiongroup_consul - - community.general.consul.token - - community.general.attributes + - community.general._consul + - community.general._consul.actiongroup_consul + - community.general._consul.token + - community.general._attributes attributes: check_mode: support: full @@ -149,7 +149,7 @@ operation: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.consul import ( +from ansible_collections.community.general.plugins.module_utils._consul import ( AUTH_ARGUMENTS_SPEC, OPERATION_CREATE, OPERATION_DELETE, diff --git a/plugins/modules/consul_agent_service.py b/plugins/modules/consul_agent_service.py index 6a3ea2f90a..53db312bf7 100644 --- a/plugins/modules/consul_agent_service.py +++ b/plugins/modules/consul_agent_service.py @@ -18,10 +18,10 @@ description: author: - Michael Ilg (@Ilgmi) extends_documentation_fragment: - - community.general.consul - - community.general.consul.actiongroup_consul - - community.general.consul.token - - community.general.attributes + - community.general._consul + - community.general._consul.actiongroup_consul + - community.general._consul.token + - community.general._attributes attributes: check_mode: support: full @@ -184,7 +184,7 @@ operation: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.consul import ( +from ansible_collections.community.general.plugins.module_utils._consul import ( AUTH_ARGUMENTS_SPEC, OPERATION_CREATE, OPERATION_DELETE, diff --git a/plugins/modules/consul_auth_method.py b/plugins/modules/consul_auth_method.py index 25b8a237b1..cb0c77e6b7 100644 --- a/plugins/modules/consul_auth_method.py +++ b/plugins/modules/consul_auth_method.py @@ -16,10 +16,10 @@ description: author: - Florian Apolloner (@apollo13) extends_documentation_fragment: - - community.general.consul - - community.general.consul.actiongroup_consul - - community.general.consul.token - - community.general.attributes + - community.general._consul + - community.general._consul.actiongroup_consul + - community.general._consul.token + - community.general._attributes attributes: check_mode: support: full @@ -132,7 +132,7 @@ import re from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.consul import ( +from ansible_collections.community.general.plugins.module_utils._consul import ( AUTH_ARGUMENTS_SPEC, _ConsulModule, camel_case_key, diff --git a/plugins/modules/consul_binding_rule.py b/plugins/modules/consul_binding_rule.py index fcff0336b3..f03ad77a7c 100644 --- a/plugins/modules/consul_binding_rule.py +++ b/plugins/modules/consul_binding_rule.py @@ -16,10 +16,10 @@ description: author: - Florian Apolloner (@apollo13) extends_documentation_fragment: - - community.general.consul - - community.general.consul.actiongroup_consul - - community.general.consul.token - - community.general.attributes + - community.general._consul + - community.general._consul.actiongroup_consul + - community.general._consul.token + - community.general._attributes attributes: check_mode: support: full @@ -112,7 +112,7 @@ operation: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.consul import ( +from ansible_collections.community.general.plugins.module_utils._consul import ( AUTH_ARGUMENTS_SPEC, RequestError, _ConsulModule, diff --git a/plugins/modules/consul_kv.py b/plugins/modules/consul_kv.py index 3387456773..479cbbaaa8 100644 --- a/plugins/modules/consul_kv.py +++ b/plugins/modules/consul_kv.py @@ -23,7 +23,7 @@ author: - Steve Gargan (@sgargan) - Colin Nolan (@colin-nolan) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/consul_policy.py b/plugins/modules/consul_policy.py index ce1cdaae29..e8d6aadbbf 100644 --- a/plugins/modules/consul_policy.py +++ b/plugins/modules/consul_policy.py @@ -16,10 +16,10 @@ description: author: - Håkon Lerring (@Hakon) extends_documentation_fragment: - - community.general.consul - - community.general.consul.actiongroup_consul - - community.general.consul.token - - community.general.attributes + - community.general._consul + - community.general._consul.actiongroup_consul + - community.general._consul.token + - community.general._attributes attributes: check_mode: support: full @@ -122,7 +122,7 @@ operation: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.consul import ( +from ansible_collections.community.general.plugins.module_utils._consul import ( AUTH_ARGUMENTS_SPEC, OPERATION_READ, _ConsulModule, diff --git a/plugins/modules/consul_role.py b/plugins/modules/consul_role.py index 6f6bd47fe1..a4a13457f2 100644 --- a/plugins/modules/consul_role.py +++ b/plugins/modules/consul_role.py @@ -16,10 +16,10 @@ description: author: - Håkon Lerring (@Hakon) extends_documentation_fragment: - - community.general.consul - - community.general.consul.token - - community.general.consul.actiongroup_consul - - community.general.attributes + - community.general._consul + - community.general._consul.token + - community.general._consul.actiongroup_consul + - community.general._attributes attributes: check_mode: support: full @@ -202,7 +202,7 @@ operation: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.consul import ( +from ansible_collections.community.general.plugins.module_utils._consul import ( AUTH_ARGUMENTS_SPEC, OPERATION_READ, _ConsulModule, diff --git a/plugins/modules/consul_session.py b/plugins/modules/consul_session.py index f676421ed7..fca5f9c2fd 100644 --- a/plugins/modules/consul_session.py +++ b/plugins/modules/consul_session.py @@ -17,10 +17,10 @@ author: - Steve Gargan (@sgargan) - Håkon Lerring (@Hakon) extends_documentation_fragment: - - community.general.consul - - community.general.consul.actiongroup_consul - - community.general.consul.token - - community.general.attributes + - community.general._consul + - community.general._consul.actiongroup_consul + - community.general._consul.token + - community.general._attributes attributes: check_mode: support: none @@ -116,7 +116,7 @@ EXAMPLES = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.consul import AUTH_ARGUMENTS_SPEC, _ConsulModule +from ansible_collections.community.general.plugins.module_utils._consul import AUTH_ARGUMENTS_SPEC, _ConsulModule def execute(module, consul_module): diff --git a/plugins/modules/consul_token.py b/plugins/modules/consul_token.py index ec6cdf4e3e..167c21b67b 100644 --- a/plugins/modules/consul_token.py +++ b/plugins/modules/consul_token.py @@ -16,10 +16,10 @@ description: author: - Florian Apolloner (@apollo13) extends_documentation_fragment: - - community.general.consul - - community.general.consul.token - - community.general.consul.actiongroup_consul - - community.general.attributes + - community.general._consul + - community.general._consul.token + - community.general._consul.actiongroup_consul + - community.general._attributes attributes: check_mode: support: full @@ -202,7 +202,7 @@ operation: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.consul import ( +from ansible_collections.community.general.plugins.module_utils._consul import ( AUTH_ARGUMENTS_SPEC, _ConsulModule, ) diff --git a/plugins/modules/copr.py b/plugins/modules/copr.py index 0b8f6bc4c5..c03a830f67 100644 --- a/plugins/modules/copr.py +++ b/plugins/modules/copr.py @@ -18,7 +18,7 @@ requirements: notes: - Supports C(check_mode). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/cpanm.py b/plugins/modules/cpanm.py index 5ff59d4c48..5c08529c73 100644 --- a/plugins/modules/cpanm.py +++ b/plugins/modules/cpanm.py @@ -13,7 +13,7 @@ short_description: Manages Perl library dependencies description: - Manage Perl library dependencies using cpanminus. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none @@ -161,8 +161,8 @@ cpanm_version: import os import re -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper class CPANMinus(ModuleHelper): diff --git a/plugins/modules/cronvar.py b/plugins/modules/cronvar.py index 3ef6f0b0f9..e428656c74 100644 --- a/plugins/modules/cronvar.py +++ b/plugins/modules/cronvar.py @@ -22,7 +22,7 @@ description: - Use this module to manage crontab variables. - This module allows you to create, update, or delete cron variable definitions. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/crypttab.py b/plugins/modules/crypttab.py index 667f2089d3..d64570ca48 100644 --- a/plugins/modules/crypttab.py +++ b/plugins/modules/crypttab.py @@ -12,7 +12,7 @@ short_description: Encrypted Linux block devices description: - Control Linux encrypted block devices that are set up during system boot in C(/etc/crypttab). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/datadog_downtime.py b/plugins/modules/datadog_downtime.py index 66453b3d92..3afbc1d1d8 100644 --- a/plugins/modules/datadog_downtime.py +++ b/plugins/modules/datadog_downtime.py @@ -19,7 +19,7 @@ requirements: - datadog-api-client - Python 3.6+ extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/datadog_event.py b/plugins/modules/datadog_event.py index 4cdcd3b440..55696ddcc1 100644 --- a/plugins/modules/datadog_event.py +++ b/plugins/modules/datadog_event.py @@ -21,7 +21,7 @@ author: - "Artūras 'arturaz' Šlajus (@arturaz)" - "Naoya Nakazawa (@n0ts)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/datadog_monitor.py b/plugins/modules/datadog_monitor.py index 8962f0a1cb..2ef1bca465 100644 --- a/plugins/modules/datadog_monitor.py +++ b/plugins/modules/datadog_monitor.py @@ -15,7 +15,7 @@ description: author: Sebastian Kornehl (@skornehl) requirements: [datadog] extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/dconf.py b/plugins/modules/dconf.py index badd007233..bd8535ddf8 100644 --- a/plugins/modules/dconf.py +++ b/plugins/modules/dconf.py @@ -46,7 +46,7 @@ notes: application affected by the key, and then having a look at value set using commands C(dconf dump /path/to/dir/) or C(dconf read /path/to/key). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -136,7 +136,7 @@ from ansible.module_utils.common.respawn import ( respawn_module, ) -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps glib_module_name = "gi.repository.GLib" diff --git a/plugins/modules/decompress.py b/plugins/modules/decompress.py index a981dd9771..3292c7dfa0 100644 --- a/plugins/modules/decompress.py +++ b/plugins/modules/decompress.py @@ -16,7 +16,7 @@ description: - Source file can be deleted after decompression. extends_documentation_fragment: - ansible.builtin.files - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -94,8 +94,8 @@ import tempfile from ansible.module_utils.common.text.converters import to_bytes -from ansible_collections.community.general.plugins.module_utils import deps -from ansible_collections.community.general.plugins.module_utils.mh.module_helper import ModuleHelper +from ansible_collections.community.general.plugins.module_utils import _deps as deps +from ansible_collections.community.general.plugins.module_utils._mh.module_helper import ModuleHelper with deps.declare("lzma"): import lzma diff --git a/plugins/modules/deploy_helper.py b/plugins/modules/deploy_helper.py index a6e866cffc..ba65936a02 100644 --- a/plugins/modules/deploy_helper.py +++ b/plugins/modules/deploy_helper.py @@ -104,7 +104,7 @@ notes: your own release name with O(release). Due to the nature of deploying software, this should not be much of a problem. extends_documentation_fragment: - ansible.builtin.files - - community.general.attributes + - community.general._attributes """ EXAMPLES = r""" diff --git a/plugins/modules/discord.py b/plugins/modules/discord.py index 1ea54c27a9..0832aeb49b 100644 --- a/plugins/modules/discord.py +++ b/plugins/modules/discord.py @@ -18,7 +18,7 @@ seealso: description: Documentation for Discord API. link: https://discord.com/developers/docs/resources/webhook#execute-webhook extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/django_check.py b/plugins/modules/django_check.py index 55fe109079..3e3541b462 100644 --- a/plugins/modules/django_check.py +++ b/plugins/modules/django_check.py @@ -14,8 +14,8 @@ version_added: 9.1.0 description: - This module is a wrapper for the execution of C(django-admin check). extends_documentation_fragment: - - community.general.attributes - - community.general.django + - community.general._attributes + - community.general._django options: databases: description: @@ -85,7 +85,7 @@ version: version_added: 10.0.0 """ -from ansible_collections.community.general.plugins.module_utils.django import DjangoModuleHelper +from ansible_collections.community.general.plugins.module_utils._django import DjangoModuleHelper class DjangoCheck(DjangoModuleHelper): diff --git a/plugins/modules/django_command.py b/plugins/modules/django_command.py index 057d25c6b4..63adfcdac5 100644 --- a/plugins/modules/django_command.py +++ b/plugins/modules/django_command.py @@ -14,8 +14,8 @@ version_added: 9.0.0 description: - This module allows the execution of arbitrary Django admin commands. extends_documentation_fragment: - - community.general.attributes - - community.general.django + - community.general._attributes + - community.general._django attributes: check_mode: support: none @@ -63,8 +63,8 @@ version: import shlex -from ansible_collections.community.general.plugins.module_utils.cmd_runner import cmd_runner_fmt -from ansible_collections.community.general.plugins.module_utils.django import DjangoModuleHelper +from ansible_collections.community.general.plugins.module_utils._cmd_runner import cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._django import DjangoModuleHelper class DjangoCommand(DjangoModuleHelper): diff --git a/plugins/modules/django_createcachetable.py b/plugins/modules/django_createcachetable.py index b21c70862b..d9286d6955 100644 --- a/plugins/modules/django_createcachetable.py +++ b/plugins/modules/django_createcachetable.py @@ -14,9 +14,9 @@ version_added: 9.1.0 description: - This module is a wrapper for the execution of C(django-admin createcachetable). extends_documentation_fragment: - - community.general.attributes - - community.general.django - - community.general.django.database + - community.general._attributes + - community.general._django + - community.general._django.database attributes: check_mode: support: full @@ -50,7 +50,7 @@ version: version_added: 10.0.0 """ -from ansible_collections.community.general.plugins.module_utils.django import DjangoModuleHelper +from ansible_collections.community.general.plugins.module_utils._django import DjangoModuleHelper class DjangoCreateCacheTable(DjangoModuleHelper): diff --git a/plugins/modules/django_dumpdata.py b/plugins/modules/django_dumpdata.py index d7666de187..f7d3313194 100644 --- a/plugins/modules/django_dumpdata.py +++ b/plugins/modules/django_dumpdata.py @@ -14,10 +14,10 @@ version_added: 11.3.0 description: - This module is a wrapper for the execution of C(django-admin dumpdata). extends_documentation_fragment: - - community.general.attributes - - community.general.django - - community.general.django.database - - community.general.django.data + - community.general._attributes + - community.general._django + - community.general._django.database + - community.general._django.data attributes: check_mode: support: none @@ -91,7 +91,7 @@ version: sample: 5.1.2 """ -from ansible_collections.community.general.plugins.module_utils.django import DjangoModuleHelper +from ansible_collections.community.general.plugins.module_utils._django import DjangoModuleHelper class DjangoDumpData(DjangoModuleHelper): diff --git a/plugins/modules/django_loaddata.py b/plugins/modules/django_loaddata.py index bac94632ef..378f55d358 100644 --- a/plugins/modules/django_loaddata.py +++ b/plugins/modules/django_loaddata.py @@ -14,10 +14,10 @@ version_added: 11.3.0 description: - This module is a wrapper for the execution of C(django-admin loaddata). extends_documentation_fragment: - - community.general.attributes - - community.general.django - - community.general.django.database - - community.general.django.data + - community.general._attributes + - community.general._django + - community.general._django.database + - community.general._django.data attributes: check_mode: support: none @@ -62,7 +62,7 @@ version: sample: 5.1.2 """ -from ansible_collections.community.general.plugins.module_utils.django import DjangoModuleHelper +from ansible_collections.community.general.plugins.module_utils._django import DjangoModuleHelper class DjangoLoadData(DjangoModuleHelper): diff --git a/plugins/modules/django_manage.py b/plugins/modules/django_manage.py index 1c31e6d8f2..206be76686 100644 --- a/plugins/modules/django_manage.py +++ b/plugins/modules/django_manage.py @@ -14,7 +14,7 @@ description: - Manages a Django application using the C(manage.py) application frontend to C(django-admin). With the O(virtualenv) parameter, all management commands are executed by the given C(virtualenv) installation. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/dnf_config_manager.py b/plugins/modules/dnf_config_manager.py index 5c789497aa..7063adae4c 100644 --- a/plugins/modules/dnf_config_manager.py +++ b/plugins/modules/dnf_config_manager.py @@ -16,7 +16,7 @@ requirements: - dnf - dnf-plugins-core extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/dnf_versionlock.py b/plugins/modules/dnf_versionlock.py index c6c15fee1a..219baf7b14 100644 --- a/plugins/modules/dnf_versionlock.py +++ b/plugins/modules/dnf_versionlock.py @@ -14,7 +14,7 @@ description: for packages and excludes all other versions of those packages. This allows you to for example protect packages from being updated by newer versions. The state of the plugin that reflects locking of packages is the C(locklist). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: partial diff --git a/plugins/modules/dnsimple.py b/plugins/modules/dnsimple.py index 6d46210ee5..78f7fef7d7 100644 --- a/plugins/modules/dnsimple.py +++ b/plugins/modules/dnsimple.py @@ -13,7 +13,7 @@ short_description: Interface with dnsimple.com (a DNS hosting service) description: - 'Manages domains and records using the DNSimple API, see the docs: U(http://developer.dnsimple.com/).' extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -168,7 +168,7 @@ RETURN = r"""#""" import re import traceback -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion class DNSimpleV2: diff --git a/plugins/modules/dnsimple_info.py b/plugins/modules/dnsimple_info.py index eb0a36f9e6..7b83c43fa5 100644 --- a/plugins/modules/dnsimple_info.py +++ b/plugins/modules/dnsimple_info.py @@ -16,8 +16,8 @@ version_added: "4.2.0" description: Retrieve existing records and domains from DNSimple API. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: name: @@ -226,7 +226,7 @@ dnsimple_record_info: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps with deps.declare("requests"): from requests import Request, Session diff --git a/plugins/modules/dnsmadeeasy.py b/plugins/modules/dnsmadeeasy.py index f172875d0b..60ad02bae3 100644 --- a/plugins/modules/dnsmadeeasy.py +++ b/plugins/modules/dnsmadeeasy.py @@ -13,7 +13,7 @@ description: - 'Manages DNS records using the v2 REST API of the DNS Made Easy service. It handles records only; there is no manipulation of domains or monitor/account support yet. See: U(https://www.dnsmadeeasy.com/integration/restapi/).' extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/dpkg_divert.py b/plugins/modules/dpkg_divert.py index 19896640e1..8bac6d70ab 100644 --- a/plugins/modules/dpkg_divert.py +++ b/plugins/modules/dpkg_divert.py @@ -21,7 +21,7 @@ description: or remove a diversion for a given file, but also update an existing diversion to modify its O(holder) and/or its O(divert) location. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -145,7 +145,7 @@ import re from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_bytes -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion def diversion_state(module, command, path): diff --git a/plugins/modules/easy_install.py b/plugins/modules/easy_install.py index 81e8c73fb7..45703d8df9 100644 --- a/plugins/modules/easy_install.py +++ b/plugins/modules/easy_install.py @@ -12,7 +12,7 @@ short_description: Installs Python libraries description: - Installs Python libraries, optionally in a C(virtualenv). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/ejabberd_user.py b/plugins/modules/ejabberd_user.py index 093c587503..7cc9842a00 100644 --- a/plugins/modules/ejabberd_user.py +++ b/plugins/modules/ejabberd_user.py @@ -15,7 +15,7 @@ requirements: description: - This module provides user management for ejabberd servers. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -65,7 +65,7 @@ EXAMPLES = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt class EjabberdUser: diff --git a/plugins/modules/elasticsearch_plugin.py b/plugins/modules/elasticsearch_plugin.py index a97295c6b2..bd5f78ca79 100644 --- a/plugins/modules/elasticsearch_plugin.py +++ b/plugins/modules/elasticsearch_plugin.py @@ -15,7 +15,7 @@ author: - Mathew Davies (@ThePixelDeveloper) - Sam Doran (@samdoran) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/emc_vnx_sg_member.py b/plugins/modules/emc_vnx_sg_member.py index a816b81d60..652dbea720 100644 --- a/plugins/modules/emc_vnx_sg_member.py +++ b/plugins/modules/emc_vnx_sg_member.py @@ -17,8 +17,8 @@ short_description: Manage storage group member on EMC VNX description: - This module manages the members of an existing storage group. extends_documentation_fragment: - - community.general.emc.emc_vnx - - community.general.attributes + - community.general._emc.emc_vnx + - community.general._attributes attributes: check_mode: @@ -82,7 +82,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule, missing_required_lib -from ansible_collections.community.general.plugins.module_utils.storage.emc.emc_vnx import emc_vnx_argument_spec +from ansible_collections.community.general.plugins.module_utils._storage.emc.emc_vnx import emc_vnx_argument_spec LIB_IMP_ERR = None try: diff --git a/plugins/modules/etcd3.py b/plugins/modules/etcd3.py index 670698ca83..c23fe0e97a 100644 --- a/plugins/modules/etcd3.py +++ b/plugins/modules/etcd3.py @@ -15,7 +15,7 @@ description: - Sets or deletes values in etcd3 cluster using its v3 API. - Needs python etcd3 lib to work. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/facter_facts.py b/plugins/modules/facter_facts.py index a91d53ba2b..cf0674e0cd 100644 --- a/plugins/modules/facter_facts.py +++ b/plugins/modules/facter_facts.py @@ -15,9 +15,9 @@ description: - Runs the C(facter) discovery program (U(https://github.com/puppetlabs/facter)) on the remote system, returning Ansible facts from the JSON data that can be useful for inventory purposes. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.facts - - community.general.attributes.facts_module + - community.general._attributes + - community.general._attributes.facts + - community.general._attributes.facts_module options: arguments: description: diff --git a/plugins/modules/file_remove.py b/plugins/modules/file_remove.py index e2c12f2a0c..b7e0ae4acb 100644 --- a/plugins/modules/file_remove.py +++ b/plugins/modules/file_remove.py @@ -23,7 +23,7 @@ author: - Shahar Golshani (@shahargolshani) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: diff --git a/plugins/modules/filesize.py b/plugins/modules/filesize.py index 980a1a2a16..c9c96ccd96 100644 --- a/plugins/modules/filesize.py +++ b/plugins/modules/filesize.py @@ -85,7 +85,7 @@ requirements: extends_documentation_fragment: - ansible.builtin.files - - community.general.attributes + - community.general._attributes seealso: - name: dd(1) manpage for Linux diff --git a/plugins/modules/filesystem.py b/plugins/modules/filesystem.py index 3123935e1b..746f1660d0 100644 --- a/plugins/modules/filesystem.py +++ b/plugins/modules/filesystem.py @@ -16,7 +16,7 @@ short_description: Makes a filesystem description: - This module creates a filesystem. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -155,7 +155,7 @@ import stat from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._lvm import pvs_runner -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion class Device: diff --git a/plugins/modules/flatpak.py b/plugins/modules/flatpak.py index fe3659a006..7592d1c519 100644 --- a/plugins/modules/flatpak.py +++ b/plugins/modules/flatpak.py @@ -20,7 +20,7 @@ author: requirements: - flatpak extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: partial @@ -188,7 +188,7 @@ from urllib.parse import urlparse from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion OUTDATED_FLATPAK_VERSION_ERROR_MESSAGE = "Unknown option --columns=application" diff --git a/plugins/modules/flatpak_remote.py b/plugins/modules/flatpak_remote.py index 81c01d0fe1..290573a826 100644 --- a/plugins/modules/flatpak_remote.py +++ b/plugins/modules/flatpak_remote.py @@ -23,7 +23,7 @@ author: requirements: - flatpak extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/gandi_livedns.py b/plugins/modules/gandi_livedns.py index 3827d1020c..30fa11b67b 100644 --- a/plugins/modules/gandi_livedns.py +++ b/plugins/modules/gandi_livedns.py @@ -15,7 +15,7 @@ short_description: Manage Gandi LiveDNS records description: - 'Manages DNS records by the Gandi LiveDNS API, see the docs: U(https://doc.livedns.gandi.net/).' extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -160,7 +160,7 @@ record: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gandi_livedns_api import GandiLiveDNSAPI +from ansible_collections.community.general.plugins.module_utils._gandi_livedns_api import GandiLiveDNSAPI def main(): diff --git a/plugins/modules/gconftool2.py b/plugins/modules/gconftool2.py index 55a3b1c08d..38c3095c82 100644 --- a/plugins/modules/gconftool2.py +++ b/plugins/modules/gconftool2.py @@ -21,7 +21,7 @@ seealso: link: https://help.gnome.org/admin//system-admin-guide/2.32/gconf-6.html.en extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -102,8 +102,8 @@ version: version_added: 10.0.0 """ -from ansible_collections.community.general.plugins.module_utils.gconftool2 import gconftool2_runner -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._gconftool2 import gconftool2_runner +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper class GConftool(StateModuleHelper): diff --git a/plugins/modules/gconftool2_info.py b/plugins/modules/gconftool2_info.py index e37a065b46..cd116621de 100644 --- a/plugins/modules/gconftool2_info.py +++ b/plugins/modules/gconftool2_info.py @@ -14,8 +14,8 @@ version_added: 5.1.0 description: - This module allows retrieving application preferences from the GConf database, with the help of C(gconftool-2). extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: key: description: @@ -53,8 +53,8 @@ version: version_added: 10.0.0 """ -from ansible_collections.community.general.plugins.module_utils.gconftool2 import gconftool2_runner -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper +from ansible_collections.community.general.plugins.module_utils._gconftool2 import gconftool2_runner +from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper class GConftoolInfo(ModuleHelper): diff --git a/plugins/modules/gem.py b/plugins/modules/gem.py index 06f2f2db18..f3e3567a50 100644 --- a/plugins/modules/gem.py +++ b/plugins/modules/gem.py @@ -12,7 +12,7 @@ short_description: Manage Ruby gems description: - Manage installation and uninstallation of Ruby gems. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -126,8 +126,8 @@ import re from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils import cmd_runner_fmt as fmt -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner +from ansible_collections.community.general.plugins.module_utils import _cmd_runner_fmt as fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner RE_VERSION = re.compile(r"^(\d+)\.(\d+)\.(\d+)") RE_INSTALLED = re.compile(r"\S+\s+\((?:default: )?(.+)\)") diff --git a/plugins/modules/gio_mime.py b/plugins/modules/gio_mime.py index f2d3bf43ed..0db233e24b 100644 --- a/plugins/modules/gio_mime.py +++ b/plugins/modules/gio_mime.py @@ -15,7 +15,7 @@ description: - This module allows configuring the default handler for a specific MIME type, to be used by applications built with the Gnome GIO API. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -67,8 +67,8 @@ version: version_added: 10.0.0 """ -from ansible_collections.community.general.plugins.module_utils.gio_mime import gio_mime_get, gio_mime_runner -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper +from ansible_collections.community.general.plugins.module_utils._gio_mime import gio_mime_get, gio_mime_runner +from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper class GioMime(ModuleHelper): diff --git a/plugins/modules/git_config.py b/plugins/modules/git_config.py index 385d5b5f25..d00d96964d 100644 --- a/plugins/modules/git_config.py +++ b/plugins/modules/git_config.py @@ -21,7 +21,7 @@ description: just C(user.email) in C(/etc/.git/config)). Solutions involving M(ansible.builtin.command) are cumbersome or do not work correctly in check mode. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/git_config_info.py b/plugins/modules/git_config_info.py index c648983bea..94ecf66e06 100644 --- a/plugins/modules/git_config_info.py +++ b/plugins/modules/git_config_info.py @@ -17,8 +17,8 @@ short_description: Read git configuration description: - The M(community.general.git_config_info) module reads the git configuration by invoking C(git config). extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: name: description: diff --git a/plugins/modules/github_deploy_key.py b/plugins/modules/github_deploy_key.py index 453d6c3d96..51b2bf20b8 100644 --- a/plugins/modules/github_deploy_key.py +++ b/plugins/modules/github_deploy_key.py @@ -15,7 +15,7 @@ description: password and 2-factor authentication code (OTP), OAuth2 token, or personal access token. Admin rights on the repository are required. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/github_issue.py b/plugins/modules/github_issue.py index 8ae08b213e..e9d7455bfd 100644 --- a/plugins/modules/github_issue.py +++ b/plugins/modules/github_issue.py @@ -13,7 +13,7 @@ short_description: View GitHub issue description: - View GitHub issue for a given repository and organization. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/github_key.py b/plugins/modules/github_key.py index 9f4b3bb81b..91f1691af9 100644 --- a/plugins/modules/github_key.py +++ b/plugins/modules/github_key.py @@ -13,7 +13,7 @@ description: - Creates, removes, or updates GitHub access keys. - Works with both GitHub.com and GitHub Enterprise Server installations. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -134,7 +134,7 @@ import re from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url -from ansible_collections.community.general.plugins.module_utils.datetime import ( +from ansible_collections.community.general.plugins.module_utils._datetime import ( now, ) diff --git a/plugins/modules/github_release.py b/plugins/modules/github_release.py index 8c6ccfa351..bc72cdab30 100644 --- a/plugins/modules/github_release.py +++ b/plugins/modules/github_release.py @@ -12,7 +12,7 @@ short_description: Interact with GitHub Releases description: - Fetch metadata about GitHub Releases. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/github_repo.py b/plugins/modules/github_repo.py index 32367a80cc..f831f7c0e7 100644 --- a/plugins/modules/github_repo.py +++ b/plugins/modules/github_repo.py @@ -14,7 +14,7 @@ description: - Manages Github repositories using PyGithub library. - Authentication can be done with O(access_token) or with O(username) and O(password). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/github_secrets.py b/plugins/modules/github_secrets.py index b990ed75f9..1dae2fe688 100644 --- a/plugins/modules/github_secrets.py +++ b/plugins/modules/github_secrets.py @@ -17,7 +17,7 @@ version_added: '12.5.0' requirements: - pynacl extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -106,7 +106,7 @@ from http import HTTPStatus from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps with deps.declare( "pynacl", diff --git a/plugins/modules/github_secrets_info.py b/plugins/modules/github_secrets_info.py index ace8c4d4c7..eab805e275 100644 --- a/plugins/modules/github_secrets_info.py +++ b/plugins/modules/github_secrets_info.py @@ -15,8 +15,8 @@ author: - Thomas Sjögren (@konstruktoid) version_added: '12.5.0' extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: organization: description: @@ -82,7 +82,7 @@ from http import HTTPStatus from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps def list_secrets( diff --git a/plugins/modules/github_webhook.py b/plugins/modules/github_webhook.py index accee7380a..476820b9e9 100644 --- a/plugins/modules/github_webhook.py +++ b/plugins/modules/github_webhook.py @@ -14,7 +14,7 @@ description: requirements: - "PyGithub >= 1.3.5" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/github_webhook_info.py b/plugins/modules/github_webhook_info.py index f6b93738be..9b6c2a1c48 100644 --- a/plugins/modules/github_webhook_info.py +++ b/plugins/modules/github_webhook_info.py @@ -14,8 +14,8 @@ description: requirements: - "PyGithub >= 1.3.5" extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: repository: description: diff --git a/plugins/modules/gitlab_branch.py b/plugins/modules/gitlab_branch.py index 2d57f30d7e..7c45475b77 100644 --- a/plugins/modules/gitlab_branch.py +++ b/plugins/modules/gitlab_branch.py @@ -16,9 +16,9 @@ author: requirements: - python-gitlab >= 2.3.0 extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -78,12 +78,12 @@ import traceback from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, gitlab, gitlab_authentication, ) -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion class GitlabBranch: diff --git a/plugins/modules/gitlab_deploy_key.py b/plugins/modules/gitlab_deploy_key.py index e66f3d27cf..4607ff1d15 100644 --- a/plugins/modules/gitlab_deploy_key.py +++ b/plugins/modules/gitlab_deploy_key.py @@ -20,9 +20,9 @@ author: requirements: - python-gitlab python module extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -115,7 +115,7 @@ deploy_key: from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, find_project, gitlab, diff --git a/plugins/modules/gitlab_group.py b/plugins/modules/gitlab_group.py index 1e03e4a00e..35a0146ba3 100644 --- a/plugins/modules/gitlab_group.py +++ b/plugins/modules/gitlab_group.py @@ -19,9 +19,9 @@ author: requirements: - python-gitlab python module extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -247,7 +247,7 @@ group: from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, find_group, gitlab, diff --git a/plugins/modules/gitlab_group_access_token.py b/plugins/modules/gitlab_group_access_token.py index d3095c663c..0d951a0cc4 100644 --- a/plugins/modules/gitlab_group_access_token.py +++ b/plugins/modules/gitlab_group_access_token.py @@ -21,9 +21,9 @@ author: requirements: - python-gitlab >= 3.1.0 extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes notes: - Access tokens can not be changed. If a parameter needs to be changed, an acceess token has to be recreated. Whether tokens are recreated or not is controlled by the O(recreate) option, which defaults to V(never). @@ -159,7 +159,7 @@ from datetime import datetime from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, find_group, gitlab, diff --git a/plugins/modules/gitlab_group_members.py b/plugins/modules/gitlab_group_members.py index 83b3dadb87..2c9d12b28d 100644 --- a/plugins/modules/gitlab_group_members.py +++ b/plugins/modules/gitlab_group_members.py @@ -17,9 +17,9 @@ requirements: - python-gitlab python module <= 1.15.0 - administrator rights on the GitLab server extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -156,7 +156,7 @@ RETURN = r""" # """ from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, gitlab, gitlab_authentication, diff --git a/plugins/modules/gitlab_group_variable.py b/plugins/modules/gitlab_group_variable.py index 24308d96f3..199026171d 100644 --- a/plugins/modules/gitlab_group_variable.py +++ b/plugins/modules/gitlab_group_variable.py @@ -22,9 +22,9 @@ author: requirements: - python-gitlab python module extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -220,7 +220,7 @@ group_variable: from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, filter_returned_variables, gitlab_authentication, diff --git a/plugins/modules/gitlab_hook.py b/plugins/modules/gitlab_hook.py index 2ab43e5959..acf13d1ae2 100644 --- a/plugins/modules/gitlab_hook.py +++ b/plugins/modules/gitlab_hook.py @@ -20,9 +20,9 @@ author: requirements: - python-gitlab python module extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -169,7 +169,7 @@ hook: from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, find_project, gitlab_authentication, diff --git a/plugins/modules/gitlab_instance_variable.py b/plugins/modules/gitlab_instance_variable.py index bc14db005f..83ef8ab802 100644 --- a/plugins/modules/gitlab_instance_variable.py +++ b/plugins/modules/gitlab_instance_variable.py @@ -23,9 +23,9 @@ author: requirements: - python-gitlab python module extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -149,7 +149,7 @@ instance_variable: from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, filter_returned_variables, gitlab_authentication, diff --git a/plugins/modules/gitlab_issue.py b/plugins/modules/gitlab_issue.py index 775c6776ac..afb19fc1ce 100644 --- a/plugins/modules/gitlab_issue.py +++ b/plugins/modules/gitlab_issue.py @@ -25,9 +25,9 @@ author: requirements: - python-gitlab >= 2.3.0 extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -141,7 +141,7 @@ from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_text -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, find_group, find_project, diff --git a/plugins/modules/gitlab_label.py b/plugins/modules/gitlab_label.py index 141a5c7286..d894a68189 100644 --- a/plugins/modules/gitlab_label.py +++ b/plugins/modules/gitlab_label.py @@ -18,9 +18,9 @@ author: requirements: - python-gitlab python module extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -215,7 +215,7 @@ labels_obj: from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, ensure_gitlab_package, find_group, diff --git a/plugins/modules/gitlab_merge_request.py b/plugins/modules/gitlab_merge_request.py index cca0be6f47..c84be0e40d 100644 --- a/plugins/modules/gitlab_merge_request.py +++ b/plugins/modules/gitlab_merge_request.py @@ -25,9 +25,9 @@ author: requirements: - python-gitlab >= 2.3.0 extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -146,13 +146,13 @@ from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_text -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, find_project, gitlab, gitlab_authentication, ) -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion class GitlabMergeRequest: diff --git a/plugins/modules/gitlab_milestone.py b/plugins/modules/gitlab_milestone.py index 6a758f60a0..ad3d73873f 100644 --- a/plugins/modules/gitlab_milestone.py +++ b/plugins/modules/gitlab_milestone.py @@ -18,9 +18,9 @@ author: requirements: - python-gitlab python module extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -200,7 +200,7 @@ from datetime import datetime from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, ensure_gitlab_package, find_group, diff --git a/plugins/modules/gitlab_project.py b/plugins/modules/gitlab_project.py index dbce76bf77..80e8b59bc1 100644 --- a/plugins/modules/gitlab_project.py +++ b/plugins/modules/gitlab_project.py @@ -20,9 +20,9 @@ author: requirements: - python-gitlab python module extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -408,14 +408,14 @@ project: from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, find_group, find_project, gitlab, gitlab_authentication, ) -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion class GitLabProject: diff --git a/plugins/modules/gitlab_project_access_token.py b/plugins/modules/gitlab_project_access_token.py index 330881bc8b..ea8f327a44 100644 --- a/plugins/modules/gitlab_project_access_token.py +++ b/plugins/modules/gitlab_project_access_token.py @@ -21,9 +21,9 @@ author: requirements: - python-gitlab >= 3.1.0 extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes notes: - Access tokens can not be changed. If a parameter needs to be changed, an acceess token has to be recreated. Whether tokens are recreated or not is controlled by the O(recreate) option, which defaults to V(never). @@ -157,7 +157,7 @@ from datetime import datetime from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, find_project, gitlab, diff --git a/plugins/modules/gitlab_project_badge.py b/plugins/modules/gitlab_project_badge.py index 64a8978b8e..86388b1976 100644 --- a/plugins/modules/gitlab_project_badge.py +++ b/plugins/modules/gitlab_project_badge.py @@ -16,9 +16,9 @@ author: Guillaume MARTINEZ (@Lunik) requirements: - C(owner) or C(maintainer) rights to project on the GitLab server extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -93,7 +93,7 @@ badge: from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, find_project, gitlab_authentication, diff --git a/plugins/modules/gitlab_project_members.py b/plugins/modules/gitlab_project_members.py index 4c3c9c080e..7a291e6ed6 100644 --- a/plugins/modules/gitlab_project_members.py +++ b/plugins/modules/gitlab_project_members.py @@ -20,9 +20,9 @@ requirements: - python-gitlab python module <= 1.15.0 - owner or maintainer rights to project on the GitLab server extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -161,7 +161,7 @@ RETURN = r""" # """ from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, gitlab, gitlab_authentication, diff --git a/plugins/modules/gitlab_project_variable.py b/plugins/modules/gitlab_project_variable.py index 2eca64da3e..410a12117a 100644 --- a/plugins/modules/gitlab_project_variable.py +++ b/plugins/modules/gitlab_project_variable.py @@ -19,9 +19,9 @@ author: requirements: - python-gitlab python module extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -237,7 +237,7 @@ project_variable: from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, filter_returned_variables, find_project, diff --git a/plugins/modules/gitlab_protected_branch.py b/plugins/modules/gitlab_protected_branch.py index d796854b4c..160d053818 100644 --- a/plugins/modules/gitlab_protected_branch.py +++ b/plugins/modules/gitlab_protected_branch.py @@ -16,9 +16,9 @@ author: requirements: - python-gitlab >= 2.3.0 extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -86,12 +86,12 @@ RETURN = r""" from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, gitlab, gitlab_authentication, ) -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion class GitlabProtectedBranch: diff --git a/plugins/modules/gitlab_runner.py b/plugins/modules/gitlab_runner.py index f8d6c5c42e..6ad77203ea 100644 --- a/plugins/modules/gitlab_runner.py +++ b/plugins/modules/gitlab_runner.py @@ -34,9 +34,9 @@ requirements: - python-gitlab >= 4.0.0 for new runner registration workflow (runner authentication token - U(https://docs.gitlab.com/runner/register/#register-with-a-runner-authentication-token)) extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -252,13 +252,13 @@ runner: from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, gitlab, gitlab_authentication, list_all_kwargs, ) -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion class GitLabRunner: diff --git a/plugins/modules/gitlab_user.py b/plugins/modules/gitlab_user.py index b0701ca684..f069d575bb 100644 --- a/plugins/modules/gitlab_user.py +++ b/plugins/modules/gitlab_user.py @@ -27,9 +27,9 @@ requirements: - python-gitlab python module - administrator rights on the GitLab server extends_documentation_fragment: - - community.general.auth_basic - - community.general.gitlab - - community.general.attributes + - community.general._auth_basic + - community.general._gitlab + - community.general._attributes attributes: check_mode: @@ -220,7 +220,7 @@ user: from ansible.module_utils.api import basic_auth_argument_spec from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.gitlab import ( +from ansible_collections.community.general.plugins.module_utils._gitlab import ( auth_argument_spec, find_group, gitlab, diff --git a/plugins/modules/grove.py b/plugins/modules/grove.py index ca010cf420..0885f6d353 100644 --- a/plugins/modules/grove.py +++ b/plugins/modules/grove.py @@ -12,7 +12,7 @@ short_description: Sends a notification to a grove.io channel description: - The C(grove) module sends a message for a service to a Grove.io channel. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/gunicorn.py b/plugins/modules/gunicorn.py index f63befd30b..e4cbe3e35e 100644 --- a/plugins/modules/gunicorn.py +++ b/plugins/modules/gunicorn.py @@ -17,7 +17,7 @@ requirements: [gunicorn] author: - "Alejandro Gomez (@agmezr)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/haproxy.py b/plugins/modules/haproxy.py index cf02c4edcc..d64a50a9c0 100644 --- a/plugins/modules/haproxy.py +++ b/plugins/modules/haproxy.py @@ -20,7 +20,7 @@ notes: - Depends on netcat (C(nc)) being available; you need to install the appropriate package for your operating system before this module can be used. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/heroku_collaborator.py b/plugins/modules/heroku_collaborator.py index d30ba23a13..e115b69aef 100644 --- a/plugins/modules/heroku_collaborator.py +++ b/plugins/modules/heroku_collaborator.py @@ -19,7 +19,7 @@ author: requirements: - heroku3 extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -82,7 +82,7 @@ RETURN = """ # """ from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.heroku import HerokuHelper +from ansible_collections.community.general.plugins.module_utils._heroku import HerokuHelper def add_or_delete_heroku_collaborator(module, client): diff --git a/plugins/modules/hg.py b/plugins/modules/hg.py index 73eef182a0..5b7a134ebb 100644 --- a/plugins/modules/hg.py +++ b/plugins/modules/hg.py @@ -14,7 +14,7 @@ description: - Manages Mercurial (hg) repositories. Supports SSH, HTTP/S and local address. author: "Yeukhon Wong (@yeukhon)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/homebrew.py b/plugins/modules/homebrew.py index f938e6f3a4..1194da0bd3 100644 --- a/plugins/modules/homebrew.py +++ b/plugins/modules/homebrew.py @@ -23,7 +23,7 @@ short_description: Package manager for Homebrew description: - Manages Homebrew packages. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -179,7 +179,7 @@ import re from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.homebrew import HomebrewValidate +from ansible_collections.community.general.plugins.module_utils._homebrew import HomebrewValidate # exceptions -------------------------------------------------------------- {{{ diff --git a/plugins/modules/homebrew_cask.py b/plugins/modules/homebrew_cask.py index 9677bc65fc..082599256e 100644 --- a/plugins/modules/homebrew_cask.py +++ b/plugins/modules/homebrew_cask.py @@ -18,7 +18,7 @@ short_description: Install and uninstall homebrew casks description: - Manages Homebrew casks. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -156,8 +156,8 @@ import tempfile from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_bytes -from ansible_collections.community.general.plugins.module_utils.homebrew import HomebrewValidate -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._homebrew import HomebrewValidate +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion # exceptions -------------------------------------------------------------- {{{ diff --git a/plugins/modules/homebrew_services.py b/plugins/modules/homebrew_services.py index 8b20a0c747..43ed827463 100644 --- a/plugins/modules/homebrew_services.py +++ b/plugins/modules/homebrew_services.py @@ -21,7 +21,7 @@ version_added: 9.3.0 description: - Manages daemons and services using Homebrew. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -91,7 +91,7 @@ import typing as t from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.homebrew import ( +from ansible_collections.community.general.plugins.module_utils._homebrew import ( HomebrewValidate, parse_brew_path, ) diff --git a/plugins/modules/homebrew_tap.py b/plugins/modules/homebrew_tap.py index 1e9a5092ac..9932c3ee01 100644 --- a/plugins/modules/homebrew_tap.py +++ b/plugins/modules/homebrew_tap.py @@ -19,7 +19,7 @@ short_description: Tap a Homebrew repository description: - Tap external Homebrew repositories. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/homectl.py b/plugins/modules/homectl.py index 470215dad4..b80c1781a1 100644 --- a/plugins/modules/homectl.py +++ b/plugins/modules/homectl.py @@ -21,7 +21,7 @@ requirements: - passlib (Python library, recommended), or legacycrypt on Python 3.13 or newer - It requires no dependency on Python 3.12 and earlier, but then it relies on the deprecated standard library C(crypt). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -273,7 +273,7 @@ import json from ansible.module_utils.basic import AnsibleModule, jsonify from ansible.module_utils.common.text.formatters import human_to_bytes -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps with deps.declare("crypt_context"): from ansible_collections.community.general.plugins.module_utils._crypt import CryptContext, has_crypt_context diff --git a/plugins/modules/honeybadger_deployment.py b/plugins/modules/honeybadger_deployment.py index f95afefc1f..a623f8d09c 100644 --- a/plugins/modules/honeybadger_deployment.py +++ b/plugins/modules/honeybadger_deployment.py @@ -13,7 +13,7 @@ short_description: Notify Honeybadger.io about app deployments description: - Notify Honeybadger.io about app deployments (see U(http://docs.honeybadger.io/article/188-deployment-tracking)). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/hpilo_boot.py b/plugins/modules/hpilo_boot.py index 1f6008d0d0..40003ab007 100644 --- a/plugins/modules/hpilo_boot.py +++ b/plugins/modules/hpilo_boot.py @@ -15,7 +15,7 @@ description: or V(usb).' - This module requires the hpilo python module. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/hpilo_info.py b/plugins/modules/hpilo_info.py index 0b32e4c524..424baec64a 100644 --- a/plugins/modules/hpilo_info.py +++ b/plugins/modules/hpilo_info.py @@ -15,8 +15,8 @@ description: network related information useful for provisioning (for example macaddress, uuid). - This module requires the C(hpilo) python module. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: host: description: diff --git a/plugins/modules/hponcfg.py b/plugins/modules/hponcfg.py index 5269a8dcb1..15510fdec8 100644 --- a/plugins/modules/hponcfg.py +++ b/plugins/modules/hponcfg.py @@ -13,7 +13,7 @@ short_description: Configure HP iLO interface using C(hponcfg) description: - This modules configures the HP iLO interface using C(hponcfg). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none @@ -75,8 +75,8 @@ EXAMPLES = r""" executable: /opt/hp/tools/hponcfg """ -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper class HPOnCfg(ModuleHelper): diff --git a/plugins/modules/htpasswd.py b/plugins/modules/htpasswd.py index bd7daaa832..6d41e64083 100644 --- a/plugins/modules/htpasswd.py +++ b/plugins/modules/htpasswd.py @@ -70,7 +70,7 @@ requirements: [passlib>=1.6] author: "Ansible Core Team" extends_documentation_fragment: - ansible.builtin.files - - community.general.attributes + - community.general._attributes """ EXAMPLES = r""" @@ -103,7 +103,7 @@ import tempfile from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps with deps.declare("passlib"): # Apparently the type infos don't know htpasswd_context, which *does* exist diff --git a/plugins/modules/hwc_ecs_instance.py b/plugins/modules/hwc_ecs_instance.py index e623ed2dd4..8cae53328c 100644 --- a/plugins/modules/hwc_ecs_instance.py +++ b/plugins/modules/hwc_ecs_instance.py @@ -192,8 +192,8 @@ options: is 32 KB. For Linux ECSs, this parameter does not take effect when adminPass is used. type: str extends_documentation_fragment: - - community.general.hwc - - community.general.attributes + - community.general._hwc + - community.general._attributes """ EXAMPLES = r""" @@ -457,7 +457,7 @@ status: returned: success """ -from ansible_collections.community.general.plugins.module_utils.hwc_utils import ( +from ansible_collections.community.general.plugins.module_utils._hwc_utils import ( Config, HwcClientException, HwcModule, diff --git a/plugins/modules/hwc_evs_disk.py b/plugins/modules/hwc_evs_disk.py index 56d52f7b96..fa342deda6 100644 --- a/plugins/modules/hwc_evs_disk.py +++ b/plugins/modules/hwc_evs_disk.py @@ -124,8 +124,8 @@ options: - Specifies the snapshot ID. If this parameter is specified, the disk is created from a snapshot. type: str extends_documentation_fragment: - - community.general.hwc - - community.general.attributes + - community.general._hwc + - community.general._attributes """ EXAMPLES = r""" @@ -284,7 +284,7 @@ tags: returned: success """ -from ansible_collections.community.general.plugins.module_utils.hwc_utils import ( +from ansible_collections.community.general.plugins.module_utils._hwc_utils import ( Config, HwcClientException, HwcModule, diff --git a/plugins/modules/hwc_network_vpc.py b/plugins/modules/hwc_network_vpc.py index 01c8094a96..8bac09f2df 100644 --- a/plugins/modules/hwc_network_vpc.py +++ b/plugins/modules/hwc_network_vpc.py @@ -63,8 +63,8 @@ options: type: str required: true extends_documentation_fragment: - - community.general.hwc - - community.general.attributes + - community.general._hwc + - community.general._attributes """ EXAMPLES = r""" @@ -131,7 +131,7 @@ enable_shared_snat: import re -from ansible_collections.community.general.plugins.module_utils.hwc_utils import ( +from ansible_collections.community.general.plugins.module_utils._hwc_utils import ( Config, HwcClientException, HwcClientException404, diff --git a/plugins/modules/hwc_smn_topic.py b/plugins/modules/hwc_smn_topic.py index 84f94ac341..2267e09474 100644 --- a/plugins/modules/hwc_smn_topic.py +++ b/plugins/modules/hwc_smn_topic.py @@ -43,8 +43,8 @@ options: type: str required: true extends_documentation_fragment: - - community.general.hwc - - community.general.attributes + - community.general._hwc + - community.general._attributes """ EXAMPLES = r""" @@ -102,7 +102,7 @@ update_time: import re -from ansible_collections.community.general.plugins.module_utils.hwc_utils import ( +from ansible_collections.community.general.plugins.module_utils._hwc_utils import ( Config, HwcClientException, HwcModule, diff --git a/plugins/modules/hwc_vpc_eip.py b/plugins/modules/hwc_vpc_eip.py index b981fc4e7f..8d01f28ce0 100644 --- a/plugins/modules/hwc_vpc_eip.py +++ b/plugins/modules/hwc_vpc_eip.py @@ -103,8 +103,8 @@ options: - Specifies the ID of shared bandwidth. type: str extends_documentation_fragment: - - community.general.hwc - - community.general.attributes + - community.general._hwc + - community.general._attributes """ EXAMPLES = r""" @@ -221,7 +221,7 @@ private_ip_address: returned: success """ -from ansible_collections.community.general.plugins.module_utils.hwc_utils import ( +from ansible_collections.community.general.plugins.module_utils._hwc_utils import ( Config, HwcClientException, HwcClientException404, diff --git a/plugins/modules/hwc_vpc_peering_connect.py b/plugins/modules/hwc_vpc_peering_connect.py index 5c5583b1fb..e2cf621b4b 100644 --- a/plugins/modules/hwc_vpc_peering_connect.py +++ b/plugins/modules/hwc_vpc_peering_connect.py @@ -73,8 +73,8 @@ options: - The description of vpc peering connection. type: str extends_documentation_fragment: - - community.general.hwc - - community.general.attributes + - community.general._hwc + - community.general._attributes """ EXAMPLES = r""" @@ -131,7 +131,7 @@ description: returned: success """ -from ansible_collections.community.general.plugins.module_utils.hwc_utils import ( +from ansible_collections.community.general.plugins.module_utils._hwc_utils import ( Config, HwcClientException, HwcClientException404, diff --git a/plugins/modules/hwc_vpc_port.py b/plugins/modules/hwc_vpc_port.py index 0814eaee12..3c802e68ad 100644 --- a/plugins/modules/hwc_vpc_port.py +++ b/plugins/modules/hwc_vpc_port.py @@ -94,8 +94,8 @@ options: type: list elements: str extends_documentation_fragment: - - community.general.hwc - - community.general.attributes + - community.general._hwc + - community.general._attributes """ EXAMPLES = r""" @@ -185,7 +185,7 @@ mac_address: returned: success """ -from ansible_collections.community.general.plugins.module_utils.hwc_utils import ( +from ansible_collections.community.general.plugins.module_utils._hwc_utils import ( Config, HwcClientException, HwcClientException404, diff --git a/plugins/modules/hwc_vpc_private_ip.py b/plugins/modules/hwc_vpc_private_ip.py index f8b9cf5b5f..85cd9fa56f 100644 --- a/plugins/modules/hwc_vpc_private_ip.py +++ b/plugins/modules/hwc_vpc_private_ip.py @@ -48,8 +48,8 @@ options: system automatically assigns an IP address. Cannot be changed after creating the private IP. type: str extends_documentation_fragment: - - community.general.hwc - - community.general.attributes + - community.general._hwc + - community.general._attributes """ EXAMPLES = r""" @@ -87,7 +87,7 @@ ip_address: returned: success """ -from ansible_collections.community.general.plugins.module_utils.hwc_utils import ( +from ansible_collections.community.general.plugins.module_utils._hwc_utils import ( Config, HwcClientException, HwcModule, diff --git a/plugins/modules/hwc_vpc_route.py b/plugins/modules/hwc_vpc_route.py index 44126ec5ba..a19a126f03 100644 --- a/plugins/modules/hwc_vpc_route.py +++ b/plugins/modules/hwc_vpc_route.py @@ -57,8 +57,8 @@ options: type: str default: 'peering' extends_documentation_fragment: - - community.general.hwc - - community.general.attributes + - community.general._hwc + - community.general._attributes """ EXAMPLES = r""" @@ -117,7 +117,7 @@ type: returned: success """ -from ansible_collections.community.general.plugins.module_utils.hwc_utils import ( +from ansible_collections.community.general.plugins.module_utils._hwc_utils import ( Config, HwcClientException, HwcModule, diff --git a/plugins/modules/hwc_vpc_security_group.py b/plugins/modules/hwc_vpc_security_group.py index 9a405b3675..0463502018 100644 --- a/plugins/modules/hwc_vpc_security_group.py +++ b/plugins/modules/hwc_vpc_security_group.py @@ -53,8 +53,8 @@ options: - Specifies the resource ID of the VPC to which the security group belongs. type: str extends_documentation_fragment: - - community.general.hwc - - community.general.attributes + - community.general._hwc + - community.general._attributes """ EXAMPLES = r""" @@ -144,7 +144,7 @@ rules: returned: success """ -from ansible_collections.community.general.plugins.module_utils.hwc_utils import ( +from ansible_collections.community.general.plugins.module_utils._hwc_utils import ( Config, HwcClientException, HwcModule, diff --git a/plugins/modules/hwc_vpc_security_group_rule.py b/plugins/modules/hwc_vpc_security_group_rule.py index 24d986d22d..1fbb493e30 100644 --- a/plugins/modules/hwc_vpc_security_group_rule.py +++ b/plugins/modules/hwc_vpc_security_group_rule.py @@ -82,8 +82,8 @@ options: The value can be in the CIDR format or IP addresses. The parameter is exclusive with parameter remote_group_id. type: str extends_documentation_fragment: - - community.general.hwc - - community.general.attributes + - community.general._hwc + - community.general._attributes """ EXAMPLES = r""" @@ -158,7 +158,7 @@ remote_ip_prefix: returned: success """ -from ansible_collections.community.general.plugins.module_utils.hwc_utils import ( +from ansible_collections.community.general.plugins.module_utils._hwc_utils import ( Config, HwcClientException, HwcModule, diff --git a/plugins/modules/hwc_vpc_subnet.py b/plugins/modules/hwc_vpc_subnet.py index 45ccee9bad..b7faa5b945 100644 --- a/plugins/modules/hwc_vpc_subnet.py +++ b/plugins/modules/hwc_vpc_subnet.py @@ -86,8 +86,8 @@ options: type: list elements: str extends_documentation_fragment: - - community.general.hwc - - community.general.attributes + - community.general._hwc + - community.general._attributes """ EXAMPLES = r""" @@ -148,7 +148,7 @@ dns_address: returned: success """ -from ansible_collections.community.general.plugins.module_utils.hwc_utils import ( +from ansible_collections.community.general.plugins.module_utils._hwc_utils import ( Config, HwcClientException, HwcClientException404, diff --git a/plugins/modules/ibm_sa_domain.py b/plugins/modules/ibm_sa_domain.py index 56823b92a1..0d349783d4 100644 --- a/plugins/modules/ibm_sa_domain.py +++ b/plugins/modules/ibm_sa_domain.py @@ -74,8 +74,8 @@ options: type: str extends_documentation_fragment: - - community.general.ibm_storage - - community.general.attributes + - community.general._ibm_storage + - community.general._attributes author: - Tzur Eliyahu (@tzure) @@ -109,7 +109,7 @@ msg: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ibm_sa_utils import ( +from ansible_collections.community.general.plugins.module_utils._ibm_sa_utils import ( connect_ssl, execute_pyxcli_command, is_pyxcli_installed, diff --git a/plugins/modules/ibm_sa_host.py b/plugins/modules/ibm_sa_host.py index 672dcba5af..5008944ffd 100644 --- a/plugins/modules/ibm_sa_host.py +++ b/plugins/modules/ibm_sa_host.py @@ -51,8 +51,8 @@ options: type: str extends_documentation_fragment: - - community.general.ibm_storage - - community.general.attributes + - community.general._ibm_storage + - community.general._attributes author: - Tzur Eliyahu (@tzure) @@ -80,7 +80,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ibm_sa_utils import ( +from ansible_collections.community.general.plugins.module_utils._ibm_sa_utils import ( connect_ssl, execute_pyxcli_command, is_pyxcli_installed, diff --git a/plugins/modules/ibm_sa_host_ports.py b/plugins/modules/ibm_sa_host_ports.py index d8bf5818b2..b53c460607 100644 --- a/plugins/modules/ibm_sa_host_ports.py +++ b/plugins/modules/ibm_sa_host_ports.py @@ -46,8 +46,8 @@ options: type: str extends_documentation_fragment: - - community.general.ibm_storage - - community.general.attributes + - community.general._ibm_storage + - community.general._attributes author: - Tzur Eliyahu (@tzure) @@ -77,7 +77,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ibm_sa_utils import ( +from ansible_collections.community.general.plugins.module_utils._ibm_sa_utils import ( connect_ssl, execute_pyxcli_command, is_pyxcli_installed, diff --git a/plugins/modules/ibm_sa_pool.py b/plugins/modules/ibm_sa_pool.py index 0d6137d8fc..cb8394559f 100644 --- a/plugins/modules/ibm_sa_pool.py +++ b/plugins/modules/ibm_sa_pool.py @@ -50,8 +50,8 @@ options: type: str extends_documentation_fragment: - - community.general.ibm_storage - - community.general.attributes + - community.general._ibm_storage + - community.general._attributes author: - Tzur Eliyahu (@tzure) @@ -80,7 +80,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ibm_sa_utils import ( +from ansible_collections.community.general.plugins.module_utils._ibm_sa_utils import ( connect_ssl, execute_pyxcli_command, is_pyxcli_installed, diff --git a/plugins/modules/ibm_sa_vol.py b/plugins/modules/ibm_sa_vol.py index abcd7cbfe7..94eb4edc9b 100644 --- a/plugins/modules/ibm_sa_vol.py +++ b/plugins/modules/ibm_sa_vol.py @@ -42,8 +42,8 @@ options: type: str extends_documentation_fragment: - - community.general.ibm_storage - - community.general.attributes + - community.general._ibm_storage + - community.general._attributes author: - Tzur Eliyahu (@tzure) @@ -73,7 +73,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ibm_sa_utils import ( +from ansible_collections.community.general.plugins.module_utils._ibm_sa_utils import ( connect_ssl, execute_pyxcli_command, is_pyxcli_installed, diff --git a/plugins/modules/ibm_sa_vol_map.py b/plugins/modules/ibm_sa_vol_map.py index 4fe55941b6..237adb0dd9 100644 --- a/plugins/modules/ibm_sa_vol_map.py +++ b/plugins/modules/ibm_sa_vol_map.py @@ -51,8 +51,8 @@ options: type: str extends_documentation_fragment: - - community.general.ibm_storage - - community.general.attributes + - community.general._ibm_storage + - community.general._attributes author: - Tzur Eliyahu (@tzure) @@ -92,7 +92,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ibm_sa_utils import ( +from ansible_collections.community.general.plugins.module_utils._ibm_sa_utils import ( connect_ssl, execute_pyxcli_command, is_pyxcli_installed, diff --git a/plugins/modules/icinga2_downtime.py b/plugins/modules/icinga2_downtime.py index dbfd953b62..878066cbb7 100644 --- a/plugins/modules/icinga2_downtime.py +++ b/plugins/modules/icinga2_downtime.py @@ -94,7 +94,7 @@ options: type: str extends_documentation_fragment: - community.general._icinga2_api - - community.general.attributes + - community.general._attributes - ansible.builtin.url """ @@ -190,7 +190,7 @@ from ansible_collections.community.general.plugins.module_utils._icinga2 import Icinga2Client, icinga2_argument_spec, ) -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper class Icinga2Downtime(StateModuleHelper): diff --git a/plugins/modules/icinga2_feature.py b/plugins/modules/icinga2_feature.py index 7901a283e2..1728c52a8f 100644 --- a/plugins/modules/icinga2_feature.py +++ b/plugins/modules/icinga2_feature.py @@ -18,7 +18,7 @@ description: - This module can be used to enable or disable an Icinga2 feature. author: "Loic Blot (@nerzhul)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/icinga2_host.py b/plugins/modules/icinga2_host.py index 4d65c43926..fb61bed9a8 100644 --- a/plugins/modules/icinga2_host.py +++ b/plugins/modules/icinga2_host.py @@ -105,7 +105,7 @@ options: - Dictionary of variables. extends_documentation_fragment: - ansible.builtin.url - - community.general.attributes + - community.general._attributes """ EXAMPLES = r""" diff --git a/plugins/modules/idrac_redfish_command.py b/plugins/modules/idrac_redfish_command.py index 92a97fffc8..a855e52f29 100644 --- a/plugins/modules/idrac_redfish_command.py +++ b/plugins/modules/idrac_redfish_command.py @@ -13,8 +13,8 @@ description: - Builds Redfish URIs locally and sends them to remote OOB controllers to perform an action. - For use with Dell iDRAC operations that require Redfish OEM extensions. extends_documentation_fragment: - - community.general.attributes - - community.general.redfish + - community.general._attributes + - community.general._redfish attributes: check_mode: support: none @@ -99,7 +99,7 @@ import re from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.redfish_utils import ( +from ansible_collections.community.general.plugins.module_utils._redfish_utils import ( REDFISH_COMMON_ARGUMENT_SPEC, RedfishUtils, ) diff --git a/plugins/modules/idrac_redfish_config.py b/plugins/modules/idrac_redfish_config.py index 56a2439c4d..48e5b485fe 100644 --- a/plugins/modules/idrac_redfish_config.py +++ b/plugins/modules/idrac_redfish_config.py @@ -13,8 +13,8 @@ description: - For use with Dell iDRAC operations that require Redfish OEM extensions. - Builds Redfish URIs locally and sends them to remote iDRAC controllers to set or update a configuration attribute. extends_documentation_fragment: - - community.general.attributes - - community.general.redfish + - community.general._attributes + - community.general._redfish attributes: check_mode: support: none @@ -155,7 +155,7 @@ msg: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.validation import check_mutually_exclusive, check_required_arguments -from ansible_collections.community.general.plugins.module_utils.redfish_utils import ( +from ansible_collections.community.general.plugins.module_utils._redfish_utils import ( REDFISH_COMMON_ARGUMENT_SPEC, RedfishUtils, ) diff --git a/plugins/modules/idrac_redfish_info.py b/plugins/modules/idrac_redfish_info.py index 5fb017b1b3..f6c3d47cee 100644 --- a/plugins/modules/idrac_redfish_info.py +++ b/plugins/modules/idrac_redfish_info.py @@ -13,9 +13,9 @@ description: - Builds Redfish URIs locally and sends them to remote iDRAC controllers to get information back. - For use with Dell EMC iDRAC operations that require Redfish OEM extensions. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module - - community.general.redfish + - community.general._attributes + - community.general._attributes.info_module + - community.general._redfish attributes: check_mode: version_added: 3.3.0 @@ -130,7 +130,7 @@ msg: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.redfish_utils import ( +from ansible_collections.community.general.plugins.module_utils._redfish_utils import ( REDFISH_COMMON_ARGUMENT_SPEC, RedfishUtils, ) diff --git a/plugins/modules/ilo_redfish_command.py b/plugins/modules/ilo_redfish_command.py index 6f98782a65..27122395ce 100644 --- a/plugins/modules/ilo_redfish_command.py +++ b/plugins/modules/ilo_redfish_command.py @@ -16,8 +16,8 @@ attributes: diff_mode: support: none extends_documentation_fragment: - - community.general.attributes - - community.general.redfish + - community.general._attributes + - community.general._redfish options: category: required: true @@ -96,8 +96,8 @@ CATEGORY_COMMANDS_ALL = {"Systems": ["WaitforiLORebootCompletion"]} from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ilo_redfish_utils import iLORedfishUtils -from ansible_collections.community.general.plugins.module_utils.redfish_utils import REDFISH_COMMON_ARGUMENT_SPEC +from ansible_collections.community.general.plugins.module_utils._ilo_redfish_utils import iLORedfishUtils +from ansible_collections.community.general.plugins.module_utils._redfish_utils import REDFISH_COMMON_ARGUMENT_SPEC def main(): diff --git a/plugins/modules/ilo_redfish_config.py b/plugins/modules/ilo_redfish_config.py index 04c4b04637..fcf7e36136 100644 --- a/plugins/modules/ilo_redfish_config.py +++ b/plugins/modules/ilo_redfish_config.py @@ -12,8 +12,8 @@ description: - Builds Redfish URIs locally and sends them to iLO to set or update a configuration attribute. - For use with HPE iLO operations that require Redfish OEM extensions. extends_documentation_fragment: - - community.general.attributes - - community.general.redfish + - community.general._attributes + - community.general._redfish attributes: check_mode: support: none @@ -116,8 +116,8 @@ CATEGORY_COMMANDS_ALL = {"Manager": ["SetTimeZone", "SetDNSserver", "SetDomainNa from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ilo_redfish_utils import iLORedfishUtils -from ansible_collections.community.general.plugins.module_utils.redfish_utils import REDFISH_COMMON_ARGUMENT_SPEC +from ansible_collections.community.general.plugins.module_utils._ilo_redfish_utils import iLORedfishUtils +from ansible_collections.community.general.plugins.module_utils._redfish_utils import REDFISH_COMMON_ARGUMENT_SPEC def main(): diff --git a/plugins/modules/ilo_redfish_info.py b/plugins/modules/ilo_redfish_info.py index a3ada3d04a..732e226785 100644 --- a/plugins/modules/ilo_redfish_info.py +++ b/plugins/modules/ilo_redfish_info.py @@ -12,9 +12,9 @@ description: - Builds Redfish URIs locally and sends them to iLO to get information back. - For use with HPE iLO operations that require Redfish OEM extensions. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module - - community.general.redfish + - community.general._attributes + - community.general._attributes.info_module + - community.general._redfish options: category: required: true @@ -109,8 +109,8 @@ CATEGORY_COMMANDS_DEFAULT = {"Sessions": "GetiLOSessions"} from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ilo_redfish_utils import iLORedfishUtils -from ansible_collections.community.general.plugins.module_utils.redfish_utils import REDFISH_COMMON_ARGUMENT_SPEC +from ansible_collections.community.general.plugins.module_utils._ilo_redfish_utils import iLORedfishUtils +from ansible_collections.community.general.plugins.module_utils._redfish_utils import REDFISH_COMMON_ARGUMENT_SPEC def main(): diff --git a/plugins/modules/imc_rest.py b/plugins/modules/imc_rest.py index 3114c3bb63..38cf46eb6d 100644 --- a/plugins/modules/imc_rest.py +++ b/plugins/modules/imc_rest.py @@ -19,7 +19,7 @@ requirements: - lxml - xmljson >= 0.1.8 extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -288,7 +288,7 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.urls import fetch_url -from ansible_collections.community.general.plugins.module_utils.datetime import ( +from ansible_collections.community.general.plugins.module_utils._datetime import ( now, ) diff --git a/plugins/modules/imgadm.py b/plugins/modules/imgadm.py index b6a708044f..2ce242321a 100644 --- a/plugins/modules/imgadm.py +++ b/plugins/modules/imgadm.py @@ -13,7 +13,7 @@ description: - Manage SmartOS virtual machine images through imgadm(8). author: Jasper Lievisse Adriaanse (@jasperla) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/infinity.py b/plugins/modules/infinity.py index c7bcaf0107..035bfedfe4 100644 --- a/plugins/modules/infinity.py +++ b/plugins/modules/infinity.py @@ -14,7 +14,7 @@ description: author: - Meirong Liu (@MeganLiu) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/influxdb_database.py b/plugins/modules/influxdb_database.py index ed67f8f67f..98b9059632 100644 --- a/plugins/modules/influxdb_database.py +++ b/plugins/modules/influxdb_database.py @@ -33,8 +33,8 @@ options: default: present type: str extends_documentation_fragment: - - community.general.influxdb - - community.general.attributes + - community.general._influxdb + - community.general._attributes """ EXAMPLES = r""" @@ -72,7 +72,7 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.influxdb import InfluxDb +from ansible_collections.community.general.plugins.module_utils._influxdb import InfluxDb def find_database(module, client, database_name): diff --git a/plugins/modules/influxdb_query.py b/plugins/modules/influxdb_query.py index 0e84d9621f..e09252b700 100644 --- a/plugins/modules/influxdb_query.py +++ b/plugins/modules/influxdb_query.py @@ -30,8 +30,8 @@ options: required: true type: str extends_documentation_fragment: - - community.general.influxdb - - community.general.attributes + - community.general._influxdb + - community.general._attributes """ EXAMPLES = r""" @@ -66,7 +66,7 @@ query_results: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.influxdb import InfluxDb +from ansible_collections.community.general.plugins.module_utils._influxdb import InfluxDb class AnsibleInfluxDBRead(InfluxDb): diff --git a/plugins/modules/influxdb_retention_policy.py b/plugins/modules/influxdb_retention_policy.py index 6adf7353de..7f1bb2afe6 100644 --- a/plugins/modules/influxdb_retention_policy.py +++ b/plugins/modules/influxdb_retention_policy.py @@ -62,8 +62,8 @@ options: type: str version_added: '2.0.0' extends_documentation_fragment: - - community.general.influxdb - - community.general.attributes + - community.general._influxdb + - community.general._attributes """ EXAMPLES = r""" @@ -143,7 +143,7 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.influxdb import InfluxDb +from ansible_collections.community.general.plugins.module_utils._influxdb import InfluxDb VALID_DURATION_REGEX = re.compile(r"^(INF|(\d+(ns|u|µ|ms|s|m|h|d|w)))+$") diff --git a/plugins/modules/influxdb_user.py b/plugins/modules/influxdb_user.py index 29a2701ba3..757a89cd83 100644 --- a/plugins/modules/influxdb_user.py +++ b/plugins/modules/influxdb_user.py @@ -51,8 +51,8 @@ options: type: list elements: dict extends_documentation_fragment: - - community.general.influxdb - - community.general.attributes + - community.general._influxdb + - community.general._attributes """ EXAMPLES = r""" @@ -104,7 +104,7 @@ import json from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import ConnectionError -import ansible_collections.community.general.plugins.module_utils.influxdb as influx +import ansible_collections.community.general.plugins.module_utils._influxdb as influx def find_user(module, client, user_name): diff --git a/plugins/modules/influxdb_write.py b/plugins/modules/influxdb_write.py index 9340b4347c..5994a38afb 100644 --- a/plugins/modules/influxdb_write.py +++ b/plugins/modules/influxdb_write.py @@ -31,8 +31,8 @@ options: required: true type: str extends_documentation_fragment: - - community.general.influxdb - - community.general.attributes + - community.general._influxdb + - community.general._attributes """ EXAMPLES = r""" @@ -63,7 +63,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.influxdb import InfluxDb +from ansible_collections.community.general.plugins.module_utils._influxdb import InfluxDb class AnsibleInfluxDBWrite(InfluxDb): diff --git a/plugins/modules/ini_file.py b/plugins/modules/ini_file.py index 426891c085..20037b052d 100644 --- a/plugins/modules/ini_file.py +++ b/plugins/modules/ini_file.py @@ -14,7 +14,7 @@ module: ini_file short_description: Tweak settings in INI files extends_documentation_fragment: - ansible.builtin.files - - community.general.attributes + - community.general._attributes description: - Manage (add, remove, change) individual settings in an INI-style file without having to manage the file as a whole with, say, M(ansible.builtin.template) or M(ansible.builtin.assemble). diff --git a/plugins/modules/installp.py b/plugins/modules/installp.py index 75e7fb4b86..8fb53b57f0 100644 --- a/plugins/modules/installp.py +++ b/plugins/modules/installp.py @@ -14,7 +14,7 @@ short_description: Manage packages on AIX description: - Manage packages using 'installp' on AIX. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/interfaces_file.py b/plugins/modules/interfaces_file.py index 1cdd38eb58..9d7d380ffa 100644 --- a/plugins/modules/interfaces_file.py +++ b/plugins/modules/interfaces_file.py @@ -11,7 +11,7 @@ module: interfaces_file short_description: Tweak settings in C(/etc/network/interfaces) files extends_documentation_fragment: - ansible.builtin.files - - community.general.attributes + - community.general._attributes description: - Manage (add, remove, change) individual interface options in an interfaces-style file without having to manage the file as a whole with, say, M(ansible.builtin.template) or M(ansible.builtin.assemble). Interface has to be presented in a file. diff --git a/plugins/modules/ip2location_info.py b/plugins/modules/ip2location_info.py index b129addfcd..1d80b46346 100644 --- a/plugins/modules/ip2location_info.py +++ b/plugins/modules/ip2location_info.py @@ -14,8 +14,8 @@ description: - Gather IP geolocation information of a host's IP address using the keyless U(api.ip2location.io) API. author: "IP2Location (@ip2location)" extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: ip: description: diff --git a/plugins/modules/ip_netns.py b/plugins/modules/ip_netns.py index ee10bcb092..4b90843614 100644 --- a/plugins/modules/ip_netns.py +++ b/plugins/modules/ip_netns.py @@ -13,7 +13,7 @@ requirements: [ip] description: - Create or delete network namespaces using the C(ip) command. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/ipa_config.py b/plugins/modules/ipa_config.py index d62aa060ab..4ef2bf9f4c 100644 --- a/plugins/modules/ipa_config.py +++ b/plugins/modules/ipa_config.py @@ -110,9 +110,9 @@ options: elements: str version_added: '2.5.0' extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -231,7 +231,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class ConfigIPAClient(IPAClient): diff --git a/plugins/modules/ipa_dnsrecord.py b/plugins/modules/ipa_dnsrecord.py index c135fe977d..6f4c626426 100644 --- a/plugins/modules/ipa_dnsrecord.py +++ b/plugins/modules/ipa_dnsrecord.py @@ -94,9 +94,9 @@ options: choices: ["absent", "present"] type: str extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -222,7 +222,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class DNSRecordIPAClient(IPAClient): diff --git a/plugins/modules/ipa_dnszone.py b/plugins/modules/ipa_dnszone.py index 58c045cd98..0b7bb91a17 100644 --- a/plugins/modules/ipa_dnszone.py +++ b/plugins/modules/ipa_dnszone.py @@ -38,9 +38,9 @@ options: type: bool version_added: 4.3.0 extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -85,7 +85,7 @@ zone: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class DNSZoneIPAClient(IPAClient): diff --git a/plugins/modules/ipa_getkeytab.py b/plugins/modules/ipa_getkeytab.py index d98e812798..a98745911a 100644 --- a/plugins/modules/ipa_getkeytab.py +++ b/plugins/modules/ipa_getkeytab.py @@ -91,7 +91,7 @@ requirements: - freeipa-client - Managed host is FreeIPA client extends_documentation_fragment: - - community.general.attributes + - community.general._attributes """ EXAMPLES = r""" @@ -124,7 +124,7 @@ import os from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt class IPAKeytab: diff --git a/plugins/modules/ipa_group.py b/plugins/modules/ipa_group.py index 5d9c5d2aba..112f0367f8 100644 --- a/plugins/modules/ipa_group.py +++ b/plugins/modules/ipa_group.py @@ -84,9 +84,9 @@ options: choices: ["absent", "present"] type: str extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -172,7 +172,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class GroupIPAClient(IPAClient): diff --git a/plugins/modules/ipa_hbacrule.py b/plugins/modules/ipa_hbacrule.py index 39f246a671..6fff109706 100644 --- a/plugins/modules/ipa_hbacrule.py +++ b/plugins/modules/ipa_hbacrule.py @@ -105,9 +105,9 @@ options: type: list elements: str extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -156,8 +156,8 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion class HBACRuleIPAClient(IPAClient): diff --git a/plugins/modules/ipa_host.py b/plugins/modules/ipa_host.py index aeaeeef4cd..38925660ca 100644 --- a/plugins/modules/ipa_host.py +++ b/plugins/modules/ipa_host.py @@ -101,9 +101,9 @@ options: description: Generate a random password to be used in bulk enrollment. type: bool extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -185,7 +185,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class HostIPAClient(IPAClient): diff --git a/plugins/modules/ipa_hostgroup.py b/plugins/modules/ipa_hostgroup.py index 4b965f0e08..975f5355fe 100644 --- a/plugins/modules/ipa_hostgroup.py +++ b/plugins/modules/ipa_hostgroup.py @@ -60,9 +60,9 @@ options: choices: ["absent", "disabled", "enabled", "present"] type: str extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -99,7 +99,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class HostGroupIPAClient(IPAClient): diff --git a/plugins/modules/ipa_otpconfig.py b/plugins/modules/ipa_otpconfig.py index 3280dbab09..4a1141a401 100644 --- a/plugins/modules/ipa_otpconfig.py +++ b/plugins/modules/ipa_otpconfig.py @@ -36,9 +36,9 @@ options: aliases: ["hotpsyncwindow"] type: int extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -82,7 +82,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class OTPConfigIPAClient(IPAClient): diff --git a/plugins/modules/ipa_otptoken.py b/plugins/modules/ipa_otptoken.py index 1579a91112..6483e5042a 100644 --- a/plugins/modules/ipa_otptoken.py +++ b/plugins/modules/ipa_otptoken.py @@ -102,9 +102,9 @@ options: - B(Note:) Cannot be modified after OTP is created. type: int extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -173,7 +173,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule, sanitize_keys -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class OTPTokenIPAClient(IPAClient): diff --git a/plugins/modules/ipa_pwpolicy.py b/plugins/modules/ipa_pwpolicy.py index 9a2534d636..066b7eadbc 100644 --- a/plugins/modules/ipa_pwpolicy.py +++ b/plugins/modules/ipa_pwpolicy.py @@ -84,9 +84,9 @@ options: type: bool version_added: 8.2.0 extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -158,7 +158,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class PwPolicyIPAClient(IPAClient): diff --git a/plugins/modules/ipa_role.py b/plugins/modules/ipa_role.py index 8ebb011177..6b79e4b7f8 100644 --- a/plugins/modules/ipa_role.py +++ b/plugins/modules/ipa_role.py @@ -81,9 +81,9 @@ options: type: list elements: str extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -135,7 +135,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class RoleIPAClient(IPAClient): diff --git a/plugins/modules/ipa_service.py b/plugins/modules/ipa_service.py index daa5875556..5c0f5c0503 100644 --- a/plugins/modules/ipa_service.py +++ b/plugins/modules/ipa_service.py @@ -46,9 +46,9 @@ options: choices: ["absent", "present"] type: str extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -90,7 +90,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class ServiceIPAClient(IPAClient): diff --git a/plugins/modules/ipa_subca.py b/plugins/modules/ipa_subca.py index 240cbef8b4..dc1f919352 100644 --- a/plugins/modules/ipa_subca.py +++ b/plugins/modules/ipa_subca.py @@ -40,9 +40,9 @@ options: choices: ["absent", "disabled", "enabled", "present"] type: str extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -79,8 +79,8 @@ subca: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion class SubCAIPAClient(IPAClient): diff --git a/plugins/modules/ipa_sudocmd.py b/plugins/modules/ipa_sudocmd.py index c6d351ac57..6d2630b4a9 100644 --- a/plugins/modules/ipa_sudocmd.py +++ b/plugins/modules/ipa_sudocmd.py @@ -33,9 +33,9 @@ options: choices: ['absent', 'disabled', 'enabled', 'present'] type: str extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -67,7 +67,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class SudoCmdIPAClient(IPAClient): diff --git a/plugins/modules/ipa_sudocmdgroup.py b/plugins/modules/ipa_sudocmdgroup.py index f5f35b57e8..a861d20c19 100644 --- a/plugins/modules/ipa_sudocmdgroup.py +++ b/plugins/modules/ipa_sudocmdgroup.py @@ -40,9 +40,9 @@ options: type: list elements: str extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -76,7 +76,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class SudoCmdGroupIPAClient(IPAClient): diff --git a/plugins/modules/ipa_sudorule.py b/plugins/modules/ipa_sudorule.py index 1756e504bd..15022d09b2 100644 --- a/plugins/modules/ipa_sudorule.py +++ b/plugins/modules/ipa_sudorule.py @@ -133,9 +133,9 @@ options: choices: ['absent', 'disabled', 'enabled', 'present'] type: str extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -199,8 +199,8 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion class SudoRuleIPAClient(IPAClient): diff --git a/plugins/modules/ipa_user.py b/plugins/modules/ipa_user.py index 7c1d4261ef..29868c85f3 100644 --- a/plugins/modules/ipa_user.py +++ b/plugins/modules/ipa_user.py @@ -107,9 +107,9 @@ options: elements: str version_added: '1.2.0' extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes requirements: - base64 @@ -183,7 +183,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class UserIPAClient(IPAClient): diff --git a/plugins/modules/ipa_vault.py b/plugins/modules/ipa_vault.py index 1ddc15dd5a..67d4c78d31 100644 --- a/plugins/modules/ipa_vault.py +++ b/plugins/modules/ipa_vault.py @@ -76,9 +76,9 @@ options: type: bool default: true extends_documentation_fragment: - - community.general.ipa.documentation - - community.general.ipa.connection_notes - - community.general.attributes + - community.general._ipa.documentation + - community.general._ipa.connection_notes + - community.general._attributes """ EXAMPLES = r""" @@ -138,7 +138,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec +from ansible_collections.community.general.plugins.module_utils._ipa import IPAClient, ipa_argument_spec class VaultIPAClient(IPAClient): diff --git a/plugins/modules/ipbase_info.py b/plugins/modules/ipbase_info.py index bfd11c846e..09c5a9b4f1 100644 --- a/plugins/modules/ipbase_info.py +++ b/plugins/modules/ipbase_info.py @@ -14,8 +14,8 @@ description: - Retrieve IP geolocation and other facts of a host's IP address using the ipbase.com API. author: "Dominik Kukacka (@dominikkukacka)" extends_documentation_fragment: - - "community.general.attributes" - - "community.general.attributes.info_module" + - "community.general._attributes" + - "community.general._attributes.info_module" options: ip: description: diff --git a/plugins/modules/ipify_facts.py b/plugins/modules/ipify_facts.py index 070d5ca231..d44fcc5393 100644 --- a/plugins/modules/ipify_facts.py +++ b/plugins/modules/ipify_facts.py @@ -14,9 +14,9 @@ description: author: - René Moser (@resmo) extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.facts - - community.general.attributes.facts_module + - community.general._attributes + - community.general._attributes.facts + - community.general._attributes.facts_module options: api_url: description: diff --git a/plugins/modules/ipinfoio_facts.py b/plugins/modules/ipinfoio_facts.py index db2f89900d..197ace1d44 100644 --- a/plugins/modules/ipinfoio_facts.py +++ b/plugins/modules/ipinfoio_facts.py @@ -13,9 +13,9 @@ description: - Gather IP geolocation facts of a host's IP address using ipinfo.io API. author: "Aleksei Kostiuk (@akostyuk)" extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.facts - - community.general.attributes.facts_module + - community.general._attributes + - community.general._attributes.facts + - community.general._attributes.facts_module options: timeout: description: diff --git a/plugins/modules/ipmi_boot.py b/plugins/modules/ipmi_boot.py index 08cb9d750d..9026e7a580 100644 --- a/plugins/modules/ipmi_boot.py +++ b/plugins/modules/ipmi_boot.py @@ -12,7 +12,7 @@ short_description: Management of order of boot devices description: - Use this module to manage order of boot devices. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/ipmi_power.py b/plugins/modules/ipmi_power.py index fe61ebeb77..7621f103a2 100644 --- a/plugins/modules/ipmi_power.py +++ b/plugins/modules/ipmi_power.py @@ -12,7 +12,7 @@ short_description: Power management for machine description: - Use this module for power management. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/iptables_state.py b/plugins/modules/iptables_state.py index 5a4136b53d..7e65476b48 100644 --- a/plugins/modules/iptables_state.py +++ b/plugins/modules/iptables_state.py @@ -12,8 +12,8 @@ short_description: Save iptables state into a file or restore it from a file version_added: '1.1.0' author: quidame (@quidame) extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.flow + - community.general._attributes + - community.general._attributes.flow description: - C(iptables) is used to set up, maintain, and inspect the tables of IP packet filter rules in the Linux kernel. - This module handles the saving and/or loading of rules. This is the same as the behaviour of the C(iptables-save) and diff --git a/plugins/modules/ipwcli_dns.py b/plugins/modules/ipwcli_dns.py index 364ccdf271..9ce555f9a4 100644 --- a/plugins/modules/ipwcli_dns.py +++ b/plugins/modules/ipwcli_dns.py @@ -21,7 +21,7 @@ requirements: notes: - To make the DNS record changes effective, you need to run C(update dnsserver) on the ipwcli. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: diff --git a/plugins/modules/irc.py b/plugins/modules/irc.py index dee53018a9..9f99ded679 100644 --- a/plugins/modules/irc.py +++ b/plugins/modules/irc.py @@ -12,7 +12,7 @@ short_description: Send a message to an IRC channel or a nick description: - Send a message to an IRC channel or a nick. This is a very simplistic implementation. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/iso_create.py b/plugins/modules/iso_create.py index b01c5e449a..e51dcb0575 100644 --- a/plugins/modules/iso_create.py +++ b/plugins/modules/iso_create.py @@ -19,7 +19,7 @@ requirements: version_added: '0.2.0' extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: diff --git a/plugins/modules/iso_customize.py b/plugins/modules/iso_customize.py index 80ee71391b..edf51c4c37 100644 --- a/plugins/modules/iso_customize.py +++ b/plugins/modules/iso_customize.py @@ -20,7 +20,7 @@ requirements: version_added: '5.8.0' extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: @@ -102,7 +102,7 @@ import os from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps with deps.declare("pycdlib"): import pycdlib diff --git a/plugins/modules/iso_extract.py b/plugins/modules/iso_extract.py index d45c616237..b6d75bbd69 100644 --- a/plugins/modules/iso_extract.py +++ b/plugins/modules/iso_extract.py @@ -26,7 +26,7 @@ requirements: - Either 7z (from C(7zip) or C(p7zip) package) - Or mount capabilities (root-access, or CAP_SYS_ADMIN capability on Linux) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/jabber.py b/plugins/modules/jabber.py index 05b098c6d3..51a5aec6e8 100644 --- a/plugins/modules/jabber.py +++ b/plugins/modules/jabber.py @@ -12,7 +12,7 @@ short_description: Send a message to jabber user or chat room description: - Send a message to jabber. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/java_cert.py b/plugins/modules/java_cert.py index 2fee900d4d..2a2cd590be 100644 --- a/plugins/modules/java_cert.py +++ b/plugins/modules/java_cert.py @@ -14,7 +14,7 @@ description: - This is a wrapper module around keytool, which can be used to import certificates and optionally private keys to a given java keystore, or remove them from it. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes - ansible.builtin.files attributes: check_mode: diff --git a/plugins/modules/java_keystore.py b/plugins/modules/java_keystore.py index 546c2f802e..917e448b20 100644 --- a/plugins/modules/java_keystore.py +++ b/plugins/modules/java_keystore.py @@ -115,7 +115,7 @@ author: - quidame (@quidame) extends_documentation_fragment: - ansible.builtin.files - - community.general.attributes + - community.general._attributes seealso: - module: community.crypto.openssl_pkcs12 - module: community.general.java_cert diff --git a/plugins/modules/jboss.py b/plugins/modules/jboss.py index 7fada0ef4c..03bb725254 100644 --- a/plugins/modules/jboss.py +++ b/plugins/modules/jboss.py @@ -18,7 +18,7 @@ deprecated: Use the C(middleware_automation.wildfly.wildfly_app_deploy) role to deploy applications in JBoss or WildFly. See U(https://galaxy.ansible.com/ui/repo/published/middleware_automation/wildfly/content/role/wildfly_app_deploy/) for details. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/jenkins_build.py b/plugins/modules/jenkins_build.py index d79438b8e3..a42b080e4d 100644 --- a/plugins/modules/jenkins_build.py +++ b/plugins/modules/jenkins_build.py @@ -19,7 +19,7 @@ author: - Tong He (@unnecessary-username) - Juan Casanova (@juanmcasanova) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/jenkins_build_info.py b/plugins/modules/jenkins_build_info.py index 9f12b2cf12..bbb95d8d85 100644 --- a/plugins/modules/jenkins_build_info.py +++ b/plugins/modules/jenkins_build_info.py @@ -17,8 +17,8 @@ requirements: author: - Juan Casanova (@juanmcasanova) extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: name: description: diff --git a/plugins/modules/jenkins_credential.py b/plugins/modules/jenkins_credential.py index c5bbda7239..522e687b0b 100644 --- a/plugins/modules/jenkins_credential.py +++ b/plugins/modules/jenkins_credential.py @@ -20,7 +20,7 @@ requirements: author: - Youssef Ali (@YoussefKhalidAli) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -324,7 +324,7 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import basic_auth_header, fetch_url -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps with deps.declare("urllib3", reason="urllib3 is required to embed files into requests"): import urllib3 diff --git a/plugins/modules/jenkins_job.py b/plugins/modules/jenkins_job.py index 8349339f91..3ef68142ab 100644 --- a/plugins/modules/jenkins_job.py +++ b/plugins/modules/jenkins_job.py @@ -15,7 +15,7 @@ requirements: - "python-jenkins >= 0.4.12" author: "Sergio Millan Rodriguez (@sermilrod)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/jenkins_job_info.py b/plugins/modules/jenkins_job_info.py index 61360dd8fe..2ada495d11 100644 --- a/plugins/modules/jenkins_job_info.py +++ b/plugins/modules/jenkins_job_info.py @@ -15,8 +15,8 @@ description: requirements: - "python-jenkins >= 0.4.12" extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: name: type: str diff --git a/plugins/modules/jenkins_node.py b/plugins/modules/jenkins_node.py index bf24c09d10..b8fe6bca6b 100644 --- a/plugins/modules/jenkins_node.py +++ b/plugins/modules/jenkins_node.py @@ -17,7 +17,7 @@ requirements: author: - Connor Newton (@phyrwork) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: partial @@ -150,7 +150,7 @@ from xml.etree import ElementTree as et from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps with deps.declare( "python-jenkins", diff --git a/plugins/modules/jenkins_plugin.py b/plugins/modules/jenkins_plugin.py index b8024914fd..14a871188e 100644 --- a/plugins/modules/jenkins_plugin.py +++ b/plugins/modules/jenkins_plugin.py @@ -147,7 +147,7 @@ notes: extends_documentation_fragment: - ansible.builtin.url - ansible.builtin.files - - community.general.attributes + - community.general._attributes """ EXAMPLES = r""" @@ -342,7 +342,7 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule, to_bytes from ansible.module_utils.urls import basic_auth_header, fetch_url, url_argument_spec -from ansible_collections.community.general.plugins.module_utils.jenkins import download_updates_file +from ansible_collections.community.general.plugins.module_utils._jenkins import download_updates_file class FailedInstallingWithPluginManager(Exception): diff --git a/plugins/modules/jenkins_script.py b/plugins/modules/jenkins_script.py index 4098c9a9a5..a8dcebb709 100644 --- a/plugins/modules/jenkins_script.py +++ b/plugins/modules/jenkins_script.py @@ -14,7 +14,7 @@ description: - The C(jenkins_script) module takes a script plus a dict of values to use within the script and returns the result of the script being run. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: diff --git a/plugins/modules/jira.py b/plugins/modules/jira.py index bb65719c53..d48942f30a 100644 --- a/plugins/modules/jira.py +++ b/plugins/modules/jira.py @@ -18,7 +18,7 @@ short_description: Create and modify issues in a JIRA instance description: - Create and modify issues in a JIRA instance. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: @@ -550,7 +550,7 @@ from urllib.request import pathname2url from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text from ansible.module_utils.urls import fetch_url -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper, cause_changes +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper, cause_changes class JIRA(StateModuleHelper): diff --git a/plugins/modules/kdeconfig.py b/plugins/modules/kdeconfig.py index 4c49236d1f..47bb440d3a 100644 --- a/plugins/modules/kdeconfig.py +++ b/plugins/modules/kdeconfig.py @@ -59,7 +59,7 @@ options: default: false extends_documentation_fragment: - ansible.builtin.files - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/kea_command.py b/plugins/modules/kea_command.py index a496172671..8b3ef2b227 100644 --- a/plugins/modules/kea_command.py +++ b/plugins/modules/kea_command.py @@ -58,8 +58,8 @@ options: type: path default: /run/kea/kea4-ctrl-socket extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.platform + - community.general._attributes + - community.general._attributes.platform attributes: check_mode: support: none diff --git a/plugins/modules/kernel_blacklist.py b/plugins/modules/kernel_blacklist.py index 2943380b37..5694de7989 100644 --- a/plugins/modules/kernel_blacklist.py +++ b/plugins/modules/kernel_blacklist.py @@ -15,7 +15,7 @@ short_description: Blacklist kernel modules description: - Add or remove kernel modules from blacklist. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -50,7 +50,7 @@ EXAMPLES = r""" import os import re -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper class Blacklist(StateModuleHelper): diff --git a/plugins/modules/keycloak_authentication.py b/plugins/modules/keycloak_authentication.py index 0c4fba36d5..a0df7901ca 100644 --- a/plugins/modules/keycloak_authentication.py +++ b/plugins/modules/keycloak_authentication.py @@ -98,9 +98,9 @@ options: description: - If V(true), allows to remove the authentication flow and recreate it. extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Philippe Gauthier (@elfelip) @@ -228,7 +228,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_authentication_required_actions.py b/plugins/modules/keycloak_authentication_required_actions.py index c08c1c4787..db0bcc239c 100644 --- a/plugins/modules/keycloak_authentication_required_actions.py +++ b/plugins/modules/keycloak_authentication_required_actions.py @@ -74,9 +74,9 @@ options: type: str extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Skrekulko (@Skrekulko) @@ -174,7 +174,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_authentication_v2.py b/plugins/modules/keycloak_authentication_v2.py index 1bdefbfddc..2f34dc6745 100644 --- a/plugins/modules/keycloak_authentication_v2.py +++ b/plugins/modules/keycloak_authentication_v2.py @@ -271,9 +271,9 @@ options: default: true type: bool extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Thomas Bargetz (@thomasbargetz) @@ -372,7 +372,7 @@ import typing as t from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_authz_authorization_scope.py b/plugins/modules/keycloak_authz_authorization_scope.py index b00becbd52..d691b2fb00 100644 --- a/plugins/modules/keycloak_authz_authorization_scope.py +++ b/plugins/modules/keycloak_authz_authorization_scope.py @@ -66,9 +66,9 @@ options: required: true extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Samuli Seppänen (@mattock) @@ -123,7 +123,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_authz_custom_policy.py b/plugins/modules/keycloak_authz_custom_policy.py index d44bfbd44c..780415924b 100644 --- a/plugins/modules/keycloak_authz_custom_policy.py +++ b/plugins/modules/keycloak_authz_custom_policy.py @@ -65,9 +65,9 @@ options: required: true extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Samuli Seppänen (@mattock) @@ -112,7 +112,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_authz_permission.py b/plugins/modules/keycloak_authz_permission.py index bc45b986e1..1ebdb59630 100644 --- a/plugins/modules/keycloak_authz_permission.py +++ b/plugins/modules/keycloak_authz_permission.py @@ -108,9 +108,9 @@ options: required: true extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Samuli Seppänen (@mattock) @@ -215,7 +215,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_authz_permission_info.py b/plugins/modules/keycloak_authz_permission_info.py index 0e22ec4056..93dea2ad3d 100644 --- a/plugins/modules/keycloak_authz_permission_info.py +++ b/plugins/modules/keycloak_authz_permission_info.py @@ -46,10 +46,10 @@ options: required: true extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes - - community.general.attributes.info_module + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes + - community.general._attributes.info_module author: - Samuli Seppänen (@mattock) @@ -110,7 +110,7 @@ queried_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_client.py b/plugins/modules/keycloak_client.py index abc30edeb3..5b8340836d 100644 --- a/plugins/modules/keycloak_client.py +++ b/plugins/modules/keycloak_client.py @@ -576,9 +576,9 @@ options: version_added: 9.5.0 extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Eike Frost (@eikef) @@ -769,10 +769,10 @@ import copy from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak._keycloak_utils import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak._keycloak_utils import ( merge_settings_without_absent_nulls, ) -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_client_rolemapping.py b/plugins/modules/keycloak_client_rolemapping.py index a199a3dbc4..dc37f6a687 100644 --- a/plugins/modules/keycloak_client_rolemapping.py +++ b/plugins/modules/keycloak_client_rolemapping.py @@ -116,9 +116,9 @@ options: - This parameter is not required for updating or deleting a role_representation but providing it reduces the number of API calls required. extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Gaëtan Daubresse (@Gaetan2907) @@ -240,7 +240,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_client_rolescope.py b/plugins/modules/keycloak_client_rolescope.py index 37fc528f12..c7225cba7f 100644 --- a/plugins/modules/keycloak_client_rolescope.py +++ b/plugins/modules/keycloak_client_rolescope.py @@ -68,9 +68,9 @@ options: - If O(client_scope_id) is present, all roles must be under this client. - If O(client_scope_id) is absent, all roles must be under the realm. extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Andre Desrosiers (@desand01) @@ -149,7 +149,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_clientscope.py b/plugins/modules/keycloak_clientscope.py index 585c9fc81c..18ca95ef9d 100644 --- a/plugins/modules/keycloak_clientscope.py +++ b/plugins/modules/keycloak_clientscope.py @@ -144,9 +144,9 @@ options: - A dict of key/value pairs to set as custom attributes for the client_scope. - Values may be single values (for example a string) or a list of strings. extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Gaëtan Daubresse (@Gaetan2907) @@ -290,7 +290,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_clientscope_type.py b/plugins/modules/keycloak_clientscope_type.py index a8994da49c..da3a1c1003 100644 --- a/plugins/modules/keycloak_clientscope_type.py +++ b/plugins/modules/keycloak_clientscope_type.py @@ -53,9 +53,9 @@ options: elements: str extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Simon Pahl (@simonpahl) @@ -137,7 +137,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_clientsecret_info.py b/plugins/modules/keycloak_clientsecret_info.py index 8c84a9b3c1..42a7af88fe 100644 --- a/plugins/modules/keycloak_clientsecret_info.py +++ b/plugins/modules/keycloak_clientsecret_info.py @@ -49,10 +49,10 @@ options: extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes - - community.general.attributes.info_module + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes + - community.general._attributes.info_module author: - Fynn Chen (@fynncfchen) @@ -126,12 +126,12 @@ clientsecret_info: sample: cUGnX1EIeTtPPAkcyGMv0ncyqDPu68P1 """ -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, ) -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak_clientsecret import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak_clientsecret import ( keycloak_clientsecret_module, keycloak_clientsecret_module_resolve_params, ) diff --git a/plugins/modules/keycloak_clientsecret_regenerate.py b/plugins/modules/keycloak_clientsecret_regenerate.py index 3d7272eb33..f348f04c6d 100644 --- a/plugins/modules/keycloak_clientsecret_regenerate.py +++ b/plugins/modules/keycloak_clientsecret_regenerate.py @@ -53,9 +53,9 @@ options: extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Fynn Chen (@fynncfchen) @@ -129,12 +129,12 @@ end_state: sample: cUGnX1EIeTtPPAkcyGMv0ncyqDPu68P1 """ -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, ) -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak_clientsecret import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak_clientsecret import ( keycloak_clientsecret_module, keycloak_clientsecret_module_resolve_params, ) diff --git a/plugins/modules/keycloak_clienttemplate.py b/plugins/modules/keycloak_clienttemplate.py index f49b1a13de..1864274122 100644 --- a/plugins/modules/keycloak_clienttemplate.py +++ b/plugins/modules/keycloak_clienttemplate.py @@ -156,9 +156,9 @@ notes: with keycloak_client, do not have any effect on Keycloak client-templates and are discarded if supplied with an API request changing client-templates. As such, they are not available through this module. extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Eike Frost (@eikef) @@ -267,7 +267,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_component.py b/plugins/modules/keycloak_component.py index d3ea90aea8..88ca62a22a 100644 --- a/plugins/modules/keycloak_component.py +++ b/plugins/modules/keycloak_component.py @@ -67,9 +67,9 @@ options: type: dict extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Björn Bösel (@fivetide) @@ -133,7 +133,7 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_component_info.py b/plugins/modules/keycloak_component_info.py index 4b77fd9683..3457a71a91 100644 --- a/plugins/modules/keycloak_component_info.py +++ b/plugins/modules/keycloak_component_info.py @@ -42,10 +42,10 @@ options: extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes - - community.general.attributes.info_module + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes + - community.general._attributes.info_module author: - Andre Desrosiers (@desand01) @@ -103,7 +103,7 @@ from urllib.parse import quote from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_group.py b/plugins/modules/keycloak_group.py index 3fb16a33bb..bf13763394 100644 --- a/plugins/modules/keycloak_group.py +++ b/plugins/modules/keycloak_group.py @@ -96,9 +96,9 @@ notes: - Presently, the RV(end_state.realmRoles), RV(end_state.clientRoles), and RV(end_state.access) attributes returned by the Keycloak API are read-only for groups. This limitation will be removed in a later version of this module. extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Adam Goossens (@adamgoossens) @@ -299,7 +299,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_identity_provider.py b/plugins/modules/keycloak_identity_provider.py index 13a1499bfc..451cd6ff38 100644 --- a/plugins/modules/keycloak_identity_provider.py +++ b/plugins/modules/keycloak_identity_provider.py @@ -281,9 +281,9 @@ options: type: dict extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Laurent Paumier (@laurpaum) @@ -487,7 +487,7 @@ from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_realm.py b/plugins/modules/keycloak_realm.py index 1219c0e44b..97d78b0985 100644 --- a/plugins/modules/keycloak_realm.py +++ b/plugins/modules/keycloak_realm.py @@ -755,9 +755,9 @@ options: version_added: 12.1.0 extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Christophe Gilles (@kris2kris) @@ -825,7 +825,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_realm_info.py b/plugins/modules/keycloak_realm_info.py index 91560d34df..d220dfcdc0 100644 --- a/plugins/modules/keycloak_realm_info.py +++ b/plugins/modules/keycloak_realm_info.py @@ -21,8 +21,8 @@ description: by this module. You may pass single values for attributes when calling the module, and this is translated into a list suitable for the API. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: auth_keycloak_url: @@ -97,7 +97,7 @@ realm_info: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import KeycloakAPI +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import KeycloakAPI def main(): diff --git a/plugins/modules/keycloak_realm_key.py b/plugins/modules/keycloak_realm_key.py index 5e83c47b80..4c6cfc2b92 100644 --- a/plugins/modules/keycloak_realm_key.py +++ b/plugins/modules/keycloak_realm_key.py @@ -238,9 +238,9 @@ notes: Keycloak. Therefore comparing their current state to the desired state is not possible. Use O(update_password=on_create) for idempotent playbooks, or use O(update_password=always) (default) if you need to ensure passwords are updated. extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Samuli Seppänen (@mattock) @@ -547,7 +547,7 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_realm_keys_metadata_info.py b/plugins/modules/keycloak_realm_keys_metadata_info.py index 03d54b4ce6..48e1132ce4 100644 --- a/plugins/modules/keycloak_realm_keys_metadata_info.py +++ b/plugins/modules/keycloak_realm_keys_metadata_info.py @@ -29,10 +29,10 @@ options: default: 'master' extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes - - community.general.attributes.info_module + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes + - community.general._attributes.info_module author: - Thomas Bach (@thomasbach-dev) @@ -87,7 +87,7 @@ keys_metadata: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_realm_localization.py b/plugins/modules/keycloak_realm_localization.py index f0df0f78d9..071dc575b7 100644 --- a/plugins/modules/keycloak_realm_localization.py +++ b/plugins/modules/keycloak_realm_localization.py @@ -82,9 +82,9 @@ seealso: description: You can specify list of supported locales using O(community.general.keycloak_realm#module:supported_locales). extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: Jakub Danek (@danekja) """ @@ -198,7 +198,7 @@ from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_realm_rolemapping.py b/plugins/modules/keycloak_realm_rolemapping.py index 872a6a862c..f19714f3d3 100644 --- a/plugins/modules/keycloak_realm_rolemapping.py +++ b/plugins/modules/keycloak_realm_rolemapping.py @@ -103,9 +103,9 @@ options: - This parameter is not required for updating or deleting a role_representation but providing it reduces the number of API calls required. extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Gaëtan Daubresse (@Gaetan2907) @@ -225,7 +225,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_role.py b/plugins/modules/keycloak_role.py index f814e9688d..528ac2dda5 100644 --- a/plugins/modules/keycloak_role.py +++ b/plugins/modules/keycloak_role.py @@ -106,9 +106,9 @@ options: default: present extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Laurent Paumier (@laurpaum) @@ -229,7 +229,7 @@ import copy from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_user.py b/plugins/modules/keycloak_user.py index 405adc24c1..84f58f2048 100644 --- a/plugins/modules/keycloak_user.py +++ b/plugins/modules/keycloak_user.py @@ -201,9 +201,9 @@ options: type: bool default: false extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes attributes: check_mode: support: full @@ -343,7 +343,7 @@ import copy from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_user_execute_actions_email.py b/plugins/modules/keycloak_user_execute_actions_email.py index d63919e751..da74386c36 100644 --- a/plugins/modules/keycloak_user_execute_actions_email.py +++ b/plugins/modules/keycloak_user_execute_actions_email.py @@ -64,9 +64,9 @@ options: - Optional lifespan (in seconds) for the action token (supported on newer Keycloak versions). Forwarded as query parameter if provided. type: int extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Marius Bertram (@mariusbertram) """ @@ -126,7 +126,7 @@ actions: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_user_federation.py b/plugins/modules/keycloak_user_federation.py index 479d4ec015..712b3af806 100644 --- a/plugins/modules/keycloak_user_federation.py +++ b/plugins/modules/keycloak_user_federation.py @@ -484,9 +484,9 @@ options: type: dict extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Laurent Paumier (@laurpaum) @@ -723,7 +723,7 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_user_rolemapping.py b/plugins/modules/keycloak_user_rolemapping.py index 8aef02f778..b0e63d85fa 100644 --- a/plugins/modules/keycloak_user_rolemapping.py +++ b/plugins/modules/keycloak_user_rolemapping.py @@ -99,9 +99,9 @@ options: - This parameter is not required for updating or deleting a role_representation but providing it reduces the number of API calls required. extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Dušan Marković (@bratwurzt) @@ -241,7 +241,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_userprofile.py b/plugins/modules/keycloak_userprofile.py index 669338b090..d9aedd05cc 100644 --- a/plugins/modules/keycloak_userprofile.py +++ b/plugins/modules/keycloak_userprofile.py @@ -318,9 +318,9 @@ notes: - Currently, only a single V(declarative-user-profile) entry is supported for O(provider_id) (design of the Keyckoak API). However, there can be multiple O(config.kc_user_profile_config[].attributes[]) entries. extends_documentation_fragment: - - community.general.keycloak - - community.general.keycloak.actiongroup_keycloak - - community.general.attributes + - community.general._keycloak + - community.general._keycloak.actiongroup_keycloak + - community.general._attributes author: - Eike Waldt (@yeoldegrove) @@ -480,7 +480,7 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keyring.py b/plugins/modules/keyring.py index 6d592356b2..8852006b7a 100644 --- a/plugins/modules/keyring.py +++ b/plugins/modules/keyring.py @@ -23,7 +23,7 @@ requirements: - gnome-keyring (application - required for headless Gnome keyring access) - dbus-run-session (application - required for headless Gnome keyring access) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/keyring_info.py b/plugins/modules/keyring_info.py index e935db8777..8e181f3085 100644 --- a/plugins/modules/keyring_info.py +++ b/plugins/modules/keyring_info.py @@ -23,8 +23,8 @@ requirements: - gnome-keyring (application - required for headless Linux keyring access) - dbus-run-session (application - required for headless Linux keyring access) extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: service: description: The name of the service. diff --git a/plugins/modules/kibana_plugin.py b/plugins/modules/kibana_plugin.py index 02fcc98b94..516f77850b 100644 --- a/plugins/modules/kibana_plugin.py +++ b/plugins/modules/kibana_plugin.py @@ -15,7 +15,7 @@ description: - This module can be used to manage Kibana plugins. author: Thierno IB. BARRY (@barryib) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -116,7 +116,7 @@ import os from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion PACKAGE_STATE_MAP = dict(present="--install", absent="--remove") diff --git a/plugins/modules/krb_ticket.py b/plugins/modules/krb_ticket.py index 975ceca911..7723877de9 100644 --- a/plugins/modules/krb_ticket.py +++ b/plugins/modules/krb_ticket.py @@ -126,7 +126,7 @@ options: requirements: - krb5-user and krb5-config packages extends_documentation_fragment: - - community.general.attributes + - community.general._attributes """ EXAMPLES = r""" @@ -185,7 +185,7 @@ EXAMPLES = r""" from ansible.module_utils.basic import AnsibleModule, env_fallback -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt class IPAKeytab: diff --git a/plugins/modules/launchd.py b/plugins/modules/launchd.py index 4108086c4d..64a1375a40 100644 --- a/plugins/modules/launchd.py +++ b/plugins/modules/launchd.py @@ -15,7 +15,7 @@ version_added: 1.0.0 description: - Manage launchd services on target macOS hosts. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/layman.py b/plugins/modules/layman.py index 3590af6ee2..645e1b590a 100644 --- a/plugins/modules/layman.py +++ b/plugins/modules/layman.py @@ -21,7 +21,7 @@ description: requirements: - layman python module extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/lbu.py b/plugins/modules/lbu.py index 6f2152f7ee..6386694410 100644 --- a/plugins/modules/lbu.py +++ b/plugins/modules/lbu.py @@ -16,7 +16,7 @@ version_added: '0.2.0' description: - Manage Local Backup Utility of Alpine Linux in run-from-RAM mode. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: diff --git a/plugins/modules/ldap_attrs.py b/plugins/modules/ldap_attrs.py index 0414e1fa56..31c4b62090 100644 --- a/plugins/modules/ldap_attrs.py +++ b/plugins/modules/ldap_attrs.py @@ -79,8 +79,8 @@ options: - If V(true), prepend list values with X-ORDERED index numbers in all attributes specified in the current task. This is useful mostly with C(olcAccess) attribute to easily manage LDAP Access Control Lists. extends_documentation_fragment: - - community.general.ldap.documentation - - community.general.attributes + - community.general._ldap.documentation + - community.general._attributes """ @@ -195,7 +195,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.common.text.converters import to_bytes, to_text -from ansible_collections.community.general.plugins.module_utils.ldap import ( +from ansible_collections.community.general.plugins.module_utils._ldap import ( LdapGeneric, gen_specs, ldap_required_together, diff --git a/plugins/modules/ldap_entry.py b/plugins/modules/ldap_entry.py index bf8e4ffe8e..2204265e3b 100644 --- a/plugins/modules/ldap_entry.py +++ b/plugins/modules/ldap_entry.py @@ -74,8 +74,8 @@ options: default: false version_added: 4.6.0 extends_documentation_fragment: - - community.general.ldap.documentation - - community.general.attributes + - community.general._ldap.documentation + - community.general._attributes """ @@ -176,7 +176,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.common.text.converters import to_bytes -from ansible_collections.community.general.plugins.module_utils.ldap import ( +from ansible_collections.community.general.plugins.module_utils._ldap import ( LdapGeneric, gen_specs, ldap_required_together, diff --git a/plugins/modules/ldap_inc.py b/plugins/modules/ldap_inc.py index 693279491e..002b590838 100644 --- a/plugins/modules/ldap_inc.py +++ b/plugins/modules/ldap_inc.py @@ -60,8 +60,8 @@ options: - If V(auto), the module determines automatically the method to use. - If V(rfc4525) or V(legacy) force to use the corresponding method. extends_documentation_fragment: - - community.general.ldap.documentation - - community.general.attributes + - community.general._ldap.documentation + - community.general._attributes """ @@ -116,8 +116,8 @@ rfc4525: from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.common.text.converters import to_bytes -from ansible_collections.community.general.plugins.module_utils import deps -from ansible_collections.community.general.plugins.module_utils.ldap import ( +from ansible_collections.community.general.plugins.module_utils import _deps as deps +from ansible_collections.community.general.plugins.module_utils._ldap import ( LdapGeneric, gen_specs, ldap_required_together, diff --git a/plugins/modules/ldap_passwd.py b/plugins/modules/ldap_passwd.py index 3ecfc8f05f..5deb9a7c14 100644 --- a/plugins/modules/ldap_passwd.py +++ b/plugins/modules/ldap_passwd.py @@ -27,8 +27,8 @@ options: - The (plaintext) password to be set for O(dn). type: str extends_documentation_fragment: - - community.general.ldap.documentation - - community.general.attributes + - community.general._ldap.documentation + - community.general._attributes """ EXAMPLES = r""" @@ -60,7 +60,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule, missing_required_lib -from ansible_collections.community.general.plugins.module_utils.ldap import ( +from ansible_collections.community.general.plugins.module_utils._ldap import ( LdapGeneric, gen_specs, ldap_required_together, diff --git a/plugins/modules/ldap_search.py b/plugins/modules/ldap_search.py index b1c2d697da..8f9ac0fbfb 100644 --- a/plugins/modules/ldap_search.py +++ b/plugins/modules/ldap_search.py @@ -70,8 +70,8 @@ options: elements: str version_added: 7.0.0 extends_documentation_fragment: - - community.general.ldap.documentation - - community.general.attributes + - community.general._ldap.documentation + - community.general._attributes """ EXAMPLES = r""" @@ -109,7 +109,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.common.text.converters import to_bytes, to_text -from ansible_collections.community.general.plugins.module_utils.ldap import ( +from ansible_collections.community.general.plugins.module_utils._ldap import ( LdapGeneric, gen_specs, ldap_required_together, diff --git a/plugins/modules/librato_annotation.py b/plugins/modules/librato_annotation.py index 581735d75f..6d9c36dc05 100644 --- a/plugins/modules/librato_annotation.py +++ b/plugins/modules/librato_annotation.py @@ -15,7 +15,7 @@ description: author: "Seth Edwards (@Sedward)" requirements: [] extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/linode.py b/plugins/modules/linode.py index c56d549203..9cfaac6f9e 100644 --- a/plugins/modules/linode.py +++ b/plugins/modules/linode.py @@ -12,7 +12,7 @@ short_description: Manage instances on the Linode Public Cloud description: - Manage Linode Public Cloud instances and optionally wait for it to be 'running'. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/linode_v4.py b/plugins/modules/linode_v4.py index e0e01a6130..e335e54d43 100644 --- a/plugins/modules/linode_v4.py +++ b/plugins/modules/linode_v4.py @@ -18,7 +18,7 @@ notes: - No Linode resizing is currently implemented. This module aims to replace the current Linode module which uses deprecated API bindings on the Linode side. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none @@ -172,7 +172,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule, env_fallback, missing_required_lib -from ansible_collections.community.general.plugins.module_utils.linode import get_user_agent +from ansible_collections.community.general.plugins.module_utils._linode import get_user_agent LINODE_IMP_ERR = None try: diff --git a/plugins/modules/listen_ports_facts.py b/plugins/modules/listen_ports_facts.py index 96366e9b7c..2eb49acb75 100644 --- a/plugins/modules/listen_ports_facts.py +++ b/plugins/modules/listen_ports_facts.py @@ -20,9 +20,9 @@ notes: - C(ss) returns all processes for each listen address and port. - This plugin returns each of them, so multiple entries for the same listen address and port are likely in results. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.facts - - community.general.attributes.facts_module + - community.general._attributes + - community.general._attributes.facts + - community.general._attributes.facts_module options: command: description: diff --git a/plugins/modules/lldp.py b/plugins/modules/lldp.py index 03131f50f6..4bb1bca678 100644 --- a/plugins/modules/lldp.py +++ b/plugins/modules/lldp.py @@ -13,7 +13,7 @@ short_description: Get details reported by LLDP description: - Reads data out of C(lldpctl). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/locale_gen.py b/plugins/modules/locale_gen.py index d58f3fde7d..a9ffa87c57 100644 --- a/plugins/modules/locale_gen.py +++ b/plugins/modules/locale_gen.py @@ -14,7 +14,7 @@ description: author: - Augustus Kling (@AugustusKling) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -73,9 +73,9 @@ mechanism: import os import re -from ansible_collections.community.general.plugins.module_utils.locale_gen import locale_gen_runner, locale_runner -from ansible_collections.community.general.plugins.module_utils.mh.deco import check_mode_skip -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._locale_gen import locale_gen_runner, locale_runner +from ansible_collections.community.general.plugins.module_utils._mh.deco import check_mode_skip +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper ETC_LOCALE_GEN = "/etc/locale.gen" VAR_LIB_LOCALES = "/var/lib/locales/supported.d" diff --git a/plugins/modules/logentries.py b/plugins/modules/logentries.py index 90ae120234..6d2d0462aa 100644 --- a/plugins/modules/logentries.py +++ b/plugins/modules/logentries.py @@ -13,7 +13,7 @@ short_description: Module for tracking logs using U(logentries.com) description: - Sends logs to LogEntries in realtime. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/logentries_msg.py b/plugins/modules/logentries_msg.py index 111a9f9e08..ad7a197614 100644 --- a/plugins/modules/logentries_msg.py +++ b/plugins/modules/logentries_msg.py @@ -12,7 +12,7 @@ short_description: Send a message to logentries description: - Send a message to logentries. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/logrotate.py b/plugins/modules/logrotate.py index b51779fcef..80d848808d 100644 --- a/plugins/modules/logrotate.py +++ b/plugins/modules/logrotate.py @@ -266,7 +266,7 @@ options: - Send logrotate messages to syslog. type: bool extends_documentation_fragment: - - community.general.attributes + - community.general._attributes """ EXAMPLES = r""" diff --git a/plugins/modules/logstash_plugin.py b/plugins/modules/logstash_plugin.py index 7c121aa21e..13978bf23f 100644 --- a/plugins/modules/logstash_plugin.py +++ b/plugins/modules/logstash_plugin.py @@ -12,7 +12,7 @@ description: - Manages Logstash plugins. author: Loic Blot (@nerzhul) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/lvg.py b/plugins/modules/lvg.py index 9ebedec4da..2d1dd9c7b4 100644 --- a/plugins/modules/lvg.py +++ b/plugins/modules/lvg.py @@ -15,7 +15,7 @@ short_description: Configure LVM volume groups description: - This module creates, removes or resizes volume groups. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/lvg_rename.py b/plugins/modules/lvg_rename.py index 9dd7b6ec58..18f08c9ab3 100644 --- a/plugins/modules/lvg_rename.py +++ b/plugins/modules/lvg_rename.py @@ -14,7 +14,7 @@ short_description: Renames LVM volume groups description: - This module renames volume groups using the C(vgchange) command. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/lvol.py b/plugins/modules/lvol.py index 22085a1ced..a41207b10c 100644 --- a/plugins/modules/lvol.py +++ b/plugins/modules/lvol.py @@ -17,7 +17,7 @@ short_description: Configure LVM logical volumes description: - This module creates, removes or resizes logical volumes. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/lxc_container.py b/plugins/modules/lxc_container.py index facce31f6f..d79b6fa0ae 100644 --- a/plugins/modules/lxc_container.py +++ b/plugins/modules/lxc_container.py @@ -13,7 +13,7 @@ description: - Management of LXC containers. author: "Kevin Carter (@cloudnull)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/lxca_cmms.py b/plugins/modules/lxca_cmms.py index 7adcab6bea..3a80e24273 100644 --- a/plugins/modules/lxca_cmms.py +++ b/plugins/modules/lxca_cmms.py @@ -38,8 +38,8 @@ options: type: str extends_documentation_fragment: - - community.general.lxca_common - - community.general.attributes + - community.general._lxca_common + - community.general._attributes """ EXAMPLES = r""" @@ -93,7 +93,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.remote_management.lxca.common import ( +from ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common import ( LXCA_COMMON_ARGS, connection_object, has_pylxca, diff --git a/plugins/modules/lxca_nodes.py b/plugins/modules/lxca_nodes.py index 6cead65534..de109b0726 100644 --- a/plugins/modules/lxca_nodes.py +++ b/plugins/modules/lxca_nodes.py @@ -40,8 +40,8 @@ options: type: str extends_documentation_fragment: - - community.general.lxca_common - - community.general.attributes + - community.general._lxca_common + - community.general._attributes """ EXAMPLES = r""" @@ -112,7 +112,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.remote_management.lxca.common import ( +from ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common import ( LXCA_COMMON_ARGS, connection_object, has_pylxca, diff --git a/plugins/modules/lxd_container.py b/plugins/modules/lxd_container.py index a752eb2753..4f11a401fd 100644 --- a/plugins/modules/lxd_container.py +++ b/plugins/modules/lxd_container.py @@ -13,7 +13,7 @@ description: - Management of LXD containers and virtual machines. author: "Hiroaki Nakamura (@hnakamur)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -406,7 +406,7 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.lxd import LXDClient, LXDClientException +from ansible_collections.community.general.plugins.module_utils._lxd import LXDClient, LXDClientException # LXD_ANSIBLE_STATES is a map of states that contain values of methods used # when a particular state is evoked. diff --git a/plugins/modules/lxd_profile.py b/plugins/modules/lxd_profile.py index ef371c8d46..705d1c5f8a 100644 --- a/plugins/modules/lxd_profile.py +++ b/plugins/modules/lxd_profile.py @@ -14,7 +14,7 @@ description: - Management of LXD profiles. author: "Hiroaki Nakamura (@hnakamur)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none @@ -214,7 +214,7 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.lxd import LXDClient, LXDClientException +from ansible_collections.community.general.plugins.module_utils._lxd import LXDClient, LXDClientException # ANSIBLE_LXD_DEFAULT_URL is a default value of the lxd endpoint ANSIBLE_LXD_DEFAULT_URL = "unix:/var/lib/lxd/unix.socket" diff --git a/plugins/modules/lxd_project.py b/plugins/modules/lxd_project.py index a84474b270..6d5d729eb1 100644 --- a/plugins/modules/lxd_project.py +++ b/plugins/modules/lxd_project.py @@ -13,7 +13,7 @@ description: - Management of LXD projects. author: "Raymond Chang (@we10710aa)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none @@ -172,7 +172,7 @@ import os from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.lxd import ( +from ansible_collections.community.general.plugins.module_utils._lxd import ( LXDClient, LXDClientException, default_cert_file, diff --git a/plugins/modules/lxd_storage_pool_info.py b/plugins/modules/lxd_storage_pool_info.py index a271be0807..f0fa369bc9 100644 --- a/plugins/modules/lxd_storage_pool_info.py +++ b/plugins/modules/lxd_storage_pool_info.py @@ -14,8 +14,8 @@ description: - This module returns details about all storage pools or a specific storage pool. author: "Sean McAvoy (@smcavoy)" extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module attributes: check_mode: support: full @@ -188,7 +188,7 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.lxd import ( +from ansible_collections.community.general.plugins.module_utils._lxd import ( LXDClient, LXDClientException, default_cert_file, diff --git a/plugins/modules/lxd_storage_volume_info.py b/plugins/modules/lxd_storage_volume_info.py index 4cf08e8fbc..b4152a595b 100644 --- a/plugins/modules/lxd_storage_volume_info.py +++ b/plugins/modules/lxd_storage_volume_info.py @@ -14,8 +14,8 @@ description: - This module returns details about all volumes or a specific volume in a pool. author: "Sean McAvoy (@smcavoy)" extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module attributes: check_mode: support: full @@ -193,7 +193,7 @@ from urllib.parse import quote, urlencode from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.lxd import ( +from ansible_collections.community.general.plugins.module_utils._lxd import ( LXDClient, LXDClientException, default_cert_file, diff --git a/plugins/modules/macports.py b/plugins/modules/macports.py index 815aacf1d9..1cfa9bca16 100644 --- a/plugins/modules/macports.py +++ b/plugins/modules/macports.py @@ -16,7 +16,7 @@ short_description: Package manager for MacPorts description: - Manages MacPorts packages (ports). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/mail.py b/plugins/modules/mail.py index bf4aae03f8..253899f27c 100644 --- a/plugins/modules/mail.py +++ b/plugins/modules/mail.py @@ -20,7 +20,7 @@ description: - Of course sending out a mail can be equally useful as a way to notify one or more people in a team that a specific action has been (successfully) taken. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/make.py b/plugins/modules/make.py index dcc18025bd..7a7c3c8c7a 100644 --- a/plugins/modules/make.py +++ b/plugins/modules/make.py @@ -15,7 +15,7 @@ author: Linus Unnebäck (@LinusU) description: - Run targets in a Makefile. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/manageiq_alert_profiles.py b/plugins/modules/manageiq_alert_profiles.py index 2f9829d31e..a4cd30ac0a 100644 --- a/plugins/modules/manageiq_alert_profiles.py +++ b/plugins/modules/manageiq_alert_profiles.py @@ -10,8 +10,8 @@ module: manageiq_alert_profiles short_description: Configuration of alert profiles for ManageIQ extends_documentation_fragment: - - community.general.manageiq - - community.general.attributes + - community.general._manageiq + - community.general._attributes author: Elad Alfassa (@elad661) description: @@ -83,7 +83,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec +from ansible_collections.community.general.plugins.module_utils._manageiq import ManageIQ, manageiq_argument_spec class ManageIQAlertProfiles: diff --git a/plugins/modules/manageiq_alerts.py b/plugins/modules/manageiq_alerts.py index 4f92efa030..5b3f42f77e 100644 --- a/plugins/modules/manageiq_alerts.py +++ b/plugins/modules/manageiq_alerts.py @@ -10,8 +10,8 @@ module: manageiq_alerts short_description: Configuration of alerts in ManageIQ extends_documentation_fragment: - - community.general.manageiq - - community.general.attributes + - community.general._manageiq + - community.general._attributes author: Elad Alfassa (@elad661) description: @@ -127,7 +127,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec +from ansible_collections.community.general.plugins.module_utils._manageiq import ManageIQ, manageiq_argument_spec class ManageIQAlert: diff --git a/plugins/modules/manageiq_group.py b/plugins/modules/manageiq_group.py index 4c22478a6b..63ca695d96 100644 --- a/plugins/modules/manageiq_group.py +++ b/plugins/modules/manageiq_group.py @@ -10,8 +10,8 @@ module: manageiq_group short_description: Management of groups in ManageIQ extends_documentation_fragment: - - community.general.manageiq - - community.general.attributes + - community.general._manageiq + - community.general._attributes author: Evert Mulder (@evertmulder) description: @@ -200,7 +200,7 @@ group: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec +from ansible_collections.community.general.plugins.module_utils._manageiq import ManageIQ, manageiq_argument_spec class ManageIQgroup: diff --git a/plugins/modules/manageiq_policies.py b/plugins/modules/manageiq_policies.py index a426291239..30742dbe29 100644 --- a/plugins/modules/manageiq_policies.py +++ b/plugins/modules/manageiq_policies.py @@ -11,8 +11,8 @@ module: manageiq_policies short_description: Management of resource policy_profiles in ManageIQ extends_documentation_fragment: - - community.general.manageiq - - community.general.attributes + - community.general._manageiq + - community.general._attributes author: Daniel Korn (@dkorn) description: @@ -134,7 +134,7 @@ manageiq_policies: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.manageiq import ( +from ansible_collections.community.general.plugins.module_utils._manageiq import ( ManageIQ, manageiq_argument_spec, manageiq_entities, diff --git a/plugins/modules/manageiq_policies_info.py b/plugins/modules/manageiq_policies_info.py index d56dfb9f5f..8d3fc86548 100644 --- a/plugins/modules/manageiq_policies_info.py +++ b/plugins/modules/manageiq_policies_info.py @@ -13,9 +13,9 @@ version_added: 5.8.0 short_description: Listing of resource policy_profiles in ManageIQ extends_documentation_fragment: - - community.general.manageiq - - community.general.attributes - - community.general.attributes.info_module + - community.general._manageiq + - community.general._attributes + - community.general._attributes.info_module author: Alexei Znamensky (@russoz) description: @@ -89,7 +89,7 @@ profiles: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.manageiq import ( +from ansible_collections.community.general.plugins.module_utils._manageiq import ( ManageIQ, manageiq_argument_spec, manageiq_entities, diff --git a/plugins/modules/manageiq_provider.py b/plugins/modules/manageiq_provider.py index ef7d697aee..164d05f199 100644 --- a/plugins/modules/manageiq_provider.py +++ b/plugins/modules/manageiq_provider.py @@ -10,8 +10,8 @@ DOCUMENTATION = r""" module: manageiq_provider short_description: Management of provider in ManageIQ extends_documentation_fragment: - - community.general.manageiq - - community.general.attributes + - community.general._manageiq + - community.general._attributes author: Daniel Korn (@dkorn) description: @@ -509,7 +509,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec +from ansible_collections.community.general.plugins.module_utils._manageiq import ManageIQ, manageiq_argument_spec def supported_providers(): diff --git a/plugins/modules/manageiq_tags.py b/plugins/modules/manageiq_tags.py index 9aa8fa1fb5..5c4b102659 100644 --- a/plugins/modules/manageiq_tags.py +++ b/plugins/modules/manageiq_tags.py @@ -11,8 +11,8 @@ module: manageiq_tags short_description: Management of resource tags in ManageIQ extends_documentation_fragment: - - community.general.manageiq - - community.general.attributes + - community.general._manageiq + - community.general._attributes author: Daniel Korn (@dkorn) description: @@ -123,7 +123,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.manageiq import ( +from ansible_collections.community.general.plugins.module_utils._manageiq import ( ManageIQ, ManageIQTags, manageiq_argument_spec, diff --git a/plugins/modules/manageiq_tags_info.py b/plugins/modules/manageiq_tags_info.py index 48d89526af..1186f75fdc 100644 --- a/plugins/modules/manageiq_tags_info.py +++ b/plugins/modules/manageiq_tags_info.py @@ -11,9 +11,9 @@ module: manageiq_tags_info version_added: 5.8.0 short_description: Retrieve resource tags in ManageIQ extends_documentation_fragment: - - community.general.manageiq - - community.general.attributes - - community.general.attributes.info_module + - community.general._manageiq + - community.general._attributes + - community.general._attributes.info_module author: Alexei Znamensky (@russoz) description: @@ -73,7 +73,7 @@ tags: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.manageiq import ( +from ansible_collections.community.general.plugins.module_utils._manageiq import ( ManageIQ, ManageIQTags, manageiq_argument_spec, diff --git a/plugins/modules/manageiq_tenant.py b/plugins/modules/manageiq_tenant.py index 7456b2770e..c5a4e3fe78 100644 --- a/plugins/modules/manageiq_tenant.py +++ b/plugins/modules/manageiq_tenant.py @@ -10,8 +10,8 @@ module: manageiq_tenant short_description: Management of tenants in ManageIQ extends_documentation_fragment: - - community.general.manageiq - - community.general.attributes + - community.general._manageiq + - community.general._attributes author: Evert Mulder (@evertmulder) description: @@ -160,7 +160,7 @@ tenant: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec +from ansible_collections.community.general.plugins.module_utils._manageiq import ManageIQ, manageiq_argument_spec class ManageIQTenant: diff --git a/plugins/modules/manageiq_user.py b/plugins/modules/manageiq_user.py index d0e1291e79..8b05017d3a 100644 --- a/plugins/modules/manageiq_user.py +++ b/plugins/modules/manageiq_user.py @@ -10,8 +10,8 @@ module: manageiq_user short_description: Management of users in ManageIQ extends_documentation_fragment: - - community.general.manageiq - - community.general.attributes + - community.general._manageiq + - community.general._attributes author: Daniel Korn (@dkorn) description: @@ -130,7 +130,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec +from ansible_collections.community.general.plugins.module_utils._manageiq import ManageIQ, manageiq_argument_spec class ManageIQUser: diff --git a/plugins/modules/mas.py b/plugins/modules/mas.py index e9105dfe2e..f26ae86d90 100644 --- a/plugins/modules/mas.py +++ b/plugins/modules/mas.py @@ -17,7 +17,7 @@ author: - Michael Heap (@mheap) - Lukas Bestle (@lukasbestle) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -105,7 +105,7 @@ import platform from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion NOT_WORKING_MAC_VERSION_MAS_ACCOUNT = "12.0" diff --git a/plugins/modules/matrix.py b/plugins/modules/matrix.py index 485d616a81..1dfe425fe5 100644 --- a/plugins/modules/matrix.py +++ b/plugins/modules/matrix.py @@ -13,7 +13,7 @@ short_description: Send notifications to matrix description: - This module sends HTML formatted notifications to matrix rooms. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/mattermost.py b/plugins/modules/mattermost.py index 9be7e60322..b0295cbeb4 100644 --- a/plugins/modules/mattermost.py +++ b/plugins/modules/mattermost.py @@ -19,7 +19,7 @@ description: - Sends notifications to U(http://your.mattermost.url) using the Incoming WebHook integration. author: "Benjamin Jolivot (@bjolivot)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/maven_artifact.py b/plugins/modules/maven_artifact.py index ef9f4620ee..cc6e527799 100644 --- a/plugins/modules/maven_artifact.py +++ b/plugins/modules/maven_artifact.py @@ -166,7 +166,7 @@ options: - Filesystem permission mode applied recursively to O(dest) when it is a directory. extends_documentation_fragment: - ansible.builtin.files - - community.general.attributes + - community.general._attributes """ EXAMPLES = r""" diff --git a/plugins/modules/memset_dns_reload.py b/plugins/modules/memset_dns_reload.py index 50995c266c..14fbb411eb 100644 --- a/plugins/modules/memset_dns_reload.py +++ b/plugins/modules/memset_dns_reload.py @@ -18,7 +18,7 @@ notes: description: - Request a reload of Memset's DNS infrastructure, and optionally poll until it finishes. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none @@ -84,7 +84,7 @@ from time import sleep from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.memset import memset_api_call +from ansible_collections.community.general.plugins.module_utils._memset import memset_api_call def poll_reload_status(api_key=None, job_id=None, payload=None): diff --git a/plugins/modules/memset_memstore_info.py b/plugins/modules/memset_memstore_info.py index d664cf6aa9..d723b995d6 100644 --- a/plugins/modules/memset_memstore_info.py +++ b/plugins/modules/memset_memstore_info.py @@ -15,8 +15,8 @@ notes: description: - Retrieve Memstore product usage information. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module attributes: check_mode: version_added: 3.3.0 @@ -107,7 +107,7 @@ memset_api: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.memset import memset_api_call +from ansible_collections.community.general.plugins.module_utils._memset import memset_api_call def get_facts(args=None): diff --git a/plugins/modules/memset_server_info.py b/plugins/modules/memset_server_info.py index 150346091a..5365980711 100644 --- a/plugins/modules/memset_server_info.py +++ b/plugins/modules/memset_server_info.py @@ -15,8 +15,8 @@ notes: description: - Retrieve server information. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module attributes: check_mode: version_added: 3.3.0 @@ -238,7 +238,7 @@ memset_api: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.memset import memset_api_call +from ansible_collections.community.general.plugins.module_utils._memset import memset_api_call def get_facts(args=None): diff --git a/plugins/modules/memset_zone.py b/plugins/modules/memset_zone.py index 29d49d1150..1c2ac553ca 100644 --- a/plugins/modules/memset_zone.py +++ b/plugins/modules/memset_zone.py @@ -17,7 +17,7 @@ notes: description: - Manage DNS zones in a Memset account. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -109,7 +109,7 @@ memset_api: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.memset import check_zone, get_zone_id, memset_api_call +from ansible_collections.community.general.plugins.module_utils._memset import check_zone, get_zone_id, memset_api_call def api_validation(args=None): diff --git a/plugins/modules/memset_zone_domain.py b/plugins/modules/memset_zone_domain.py index 3c0885c4eb..317c9f13ed 100644 --- a/plugins/modules/memset_zone_domain.py +++ b/plugins/modules/memset_zone_domain.py @@ -18,7 +18,7 @@ notes: description: - Manage DNS zone domains in a Memset account. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -80,7 +80,7 @@ memset_api: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.memset import ( +from ansible_collections.community.general.plugins.module_utils._memset import ( check_zone_domain, get_zone_id, memset_api_call, diff --git a/plugins/modules/memset_zone_record.py b/plugins/modules/memset_zone_record.py index 04eb904bca..cd3bc5e3a5 100644 --- a/plugins/modules/memset_zone_record.py +++ b/plugins/modules/memset_zone_record.py @@ -18,7 +18,7 @@ notes: description: - Manage DNS records in a Memset account. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -165,7 +165,7 @@ memset_api: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.memset import get_zone_id, memset_api_call +from ansible_collections.community.general.plugins.module_utils._memset import get_zone_id, memset_api_call def api_validation(args=None): diff --git a/plugins/modules/mksysb.py b/plugins/modules/mksysb.py index cdfa2fc228..da02e00679 100644 --- a/plugins/modules/mksysb.py +++ b/plugins/modules/mksysb.py @@ -19,7 +19,7 @@ seealso: link: https://www.ibm.com/docs/en/aix/7.3?topic=m-mksysb-command extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -101,8 +101,8 @@ msg: import os -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper class MkSysB(ModuleHelper): diff --git a/plugins/modules/modprobe.py b/plugins/modules/modprobe.py index b438ee4b51..39d4732671 100644 --- a/plugins/modules/modprobe.py +++ b/plugins/modules/modprobe.py @@ -16,7 +16,7 @@ author: description: - Load or unload kernel modules. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/monit.py b/plugins/modules/monit.py index a458029e46..9300732f7c 100644 --- a/plugins/modules/monit.py +++ b/plugins/modules/monit.py @@ -12,7 +12,7 @@ short_description: Manage the state of a program monitored using Monit description: - Manage the state of a program monitored using Monit. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/mqtt.py b/plugins/modules/mqtt.py index 019072cde8..7e41fc53ff 100644 --- a/plugins/modules/mqtt.py +++ b/plugins/modules/mqtt.py @@ -12,7 +12,7 @@ short_description: Publish a message on an MQTT topic for the IoT description: - Publish a message on an MQTT topic. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/mssql_db.py b/plugins/modules/mssql_db.py index 93ff0834bb..e51a147f2a 100644 --- a/plugins/modules/mssql_db.py +++ b/plugins/modules/mssql_db.py @@ -13,7 +13,7 @@ short_description: Add or remove MSSQL databases from a remote host description: - Add or remove MSSQL databases from a remote host. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/mssql_script.py b/plugins/modules/mssql_script.py index 7c014dc09c..e4d0912e8e 100644 --- a/plugins/modules/mssql_script.py +++ b/plugins/modules/mssql_script.py @@ -16,7 +16,7 @@ version_added: "4.0.0" description: - Execute SQL scripts on a MSSQL database. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: diff --git a/plugins/modules/nagios.py b/plugins/modules/nagios.py index ba50f53fb6..f68d566e49 100644 --- a/plugins/modules/nagios.py +++ b/plugins/modules/nagios.py @@ -27,7 +27,7 @@ description: or a I(icinga.cfg) in I(/etc/icinga) and I(/usr/local/icinga/etc). (The Nagios configuration file should be readable by the Ansible user.) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/netcup_dns.py b/plugins/modules/netcup_dns.py index 5a887dd81a..7cb0a2abf6 100644 --- a/plugins/modules/netcup_dns.py +++ b/plugins/modules/netcup_dns.py @@ -13,7 +13,7 @@ short_description: Manage Netcup DNS records description: - Manages DNS records using the Netcup API, see the docs U(https://ccp.netcup.net/run/webservice/servers/endpoint.php). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/newrelic_deployment.py b/plugins/modules/newrelic_deployment.py index cdcf83665e..8bb1e9c086 100644 --- a/plugins/modules/newrelic_deployment.py +++ b/plugins/modules/newrelic_deployment.py @@ -13,7 +13,7 @@ short_description: Notify New Relic about app deployments description: - Notify New Relic about app deployments (see U(https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/record-monitor-deployments/)). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/nexmo.py b/plugins/modules/nexmo.py index f08a7cd48e..e1bb3a7b26 100644 --- a/plugins/modules/nexmo.py +++ b/plugins/modules/nexmo.py @@ -52,7 +52,7 @@ options: default: true extends_documentation_fragment: - ansible.builtin.url - - community.general.attributes + - community.general._attributes """ EXAMPLES = r""" diff --git a/plugins/modules/nginx_status_info.py b/plugins/modules/nginx_status_info.py index 3e4bd82410..9b964c632c 100644 --- a/plugins/modules/nginx_status_info.py +++ b/plugins/modules/nginx_status_info.py @@ -13,8 +13,8 @@ description: - Gathers information from nginx from an URL having C(stub_status) enabled. author: "René Moser (@resmo)" extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: url: type: str diff --git a/plugins/modules/nictagadm.py b/plugins/modules/nictagadm.py index 59cc3427d5..975df56bf8 100644 --- a/plugins/modules/nictagadm.py +++ b/plugins/modules/nictagadm.py @@ -14,7 +14,7 @@ description: author: - Bruce Smith (@SmithX10) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/nmcli.py b/plugins/modules/nmcli.py index 51b57aa658..189b0b77f8 100644 --- a/plugins/modules/nmcli.py +++ b/plugins/modules/nmcli.py @@ -15,7 +15,7 @@ short_description: Manage Networking requirements: - nmcli extends_documentation_fragment: - - community.general.attributes + - community.general._attributes description: - Manage the network devices. Create, modify and manage various connection and device type, for example V(ethernet), V(team), V(bond), V(vlan) and so on. diff --git a/plugins/modules/nomad_job.py b/plugins/modules/nomad_job.py index a3b443401d..d9194c0c4e 100644 --- a/plugins/modules/nomad_job.py +++ b/plugins/modules/nomad_job.py @@ -18,8 +18,8 @@ description: requirements: - python-nomad extends_documentation_fragment: - - community.general.nomad - - community.general.attributes + - community.general._nomad + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/nomad_job_info.py b/plugins/modules/nomad_job_info.py index a094e296a0..8e8ef292cb 100644 --- a/plugins/modules/nomad_job_info.py +++ b/plugins/modules/nomad_job_info.py @@ -17,9 +17,9 @@ description: requirements: - python-nomad extends_documentation_fragment: - - community.general.nomad - - community.general.attributes - - community.general.attributes.info_module + - community.general._nomad + - community.general._attributes + - community.general._attributes.info_module options: name: description: diff --git a/plugins/modules/nomad_token.py b/plugins/modules/nomad_token.py index 5a9ba35530..a29ef4de2c 100644 --- a/plugins/modules/nomad_token.py +++ b/plugins/modules/nomad_token.py @@ -16,8 +16,8 @@ description: requirements: - python-nomad extends_documentation_fragment: - - community.general.nomad - - community.general.attributes + - community.general._nomad + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/nosh.py b/plugins/modules/nosh.py index 319f8d95a9..4a416afeaa 100644 --- a/plugins/modules/nosh.py +++ b/plugins/modules/nosh.py @@ -15,7 +15,7 @@ description: - Control running and enabled state for system-wide or user services. - BSD and Linux systems are supported. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/npm.py b/plugins/modules/npm.py index 48418794ca..2979964cb0 100644 --- a/plugins/modules/npm.py +++ b/plugins/modules/npm.py @@ -12,7 +12,7 @@ description: - Manage node.js packages with Node Package Manager (npm). author: "Chris Hoffman (@chrishoffman)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -150,7 +150,7 @@ import re from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt class Npm: diff --git a/plugins/modules/nsupdate.py b/plugins/modules/nsupdate.py index 483e4f443a..0ef5563f7d 100644 --- a/plugins/modules/nsupdate.py +++ b/plugins/modules/nsupdate.py @@ -22,7 +22,7 @@ requirements: - gssapi (when using GSS-TSIG authentication) author: "Loic Blot (@nerzhul)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -209,7 +209,7 @@ from contextlib import suppress from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps with deps.declare("dnspython", url="https://github.com/rthalley/dnspython"): import dns.message diff --git a/plugins/modules/ocapi_command.py b/plugins/modules/ocapi_command.py index 3d2ecbf9c9..48810d12fb 100644 --- a/plugins/modules/ocapi_command.py +++ b/plugins/modules/ocapi_command.py @@ -14,7 +14,7 @@ description: - Builds OCAPI URIs locally and sends them to remote OOB controllers to perform an action. - Manages OOB controller such as Indicator LED, Reboot, Power Mode, Firmware Update. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -168,7 +168,7 @@ from urllib.parse import urljoin from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.community.general.plugins.module_utils.ocapi_utils import OcapiUtils +from ansible_collections.community.general.plugins.module_utils._ocapi_utils import OcapiUtils # More will be added as module features are expanded CATEGORY_COMMANDS_ALL = { diff --git a/plugins/modules/ocapi_info.py b/plugins/modules/ocapi_info.py index 76a06d6621..f01a292ae4 100644 --- a/plugins/modules/ocapi_info.py +++ b/plugins/modules/ocapi_info.py @@ -13,8 +13,8 @@ short_description: Manages Out-Of-Band controllers using Open Composable API (OC description: - Builds OCAPI URIs locally and sends them to remote OOB controllers to get information back. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: category: required: true @@ -142,7 +142,7 @@ from urllib.parse import urljoin from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.community.general.plugins.module_utils.ocapi_utils import OcapiUtils +from ansible_collections.community.general.plugins.module_utils._ocapi_utils import OcapiUtils # More will be added as module features are expanded CATEGORY_COMMANDS_ALL = {"Jobs": ["JobStatus"]} diff --git a/plugins/modules/odbc.py b/plugins/modules/odbc.py index 883dd60d56..3ca0ef5684 100644 --- a/plugins/modules/odbc.py +++ b/plugins/modules/odbc.py @@ -14,7 +14,7 @@ short_description: Execute SQL using ODBC description: - Read/Write info using ODBC drivers. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/office_365_connector_card.py b/plugins/modules/office_365_connector_card.py index 95b556f558..49b35aac64 100644 --- a/plugins/modules/office_365_connector_card.py +++ b/plugins/modules/office_365_connector_card.py @@ -17,7 +17,7 @@ author: "Marc Sensenich (@marc-sensenich)" notes: - This module is not idempotent, therefore if you run the same task twice then you create two Connector Cards. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/ohai.py b/plugins/modules/ohai.py index 5005f141ed..ad17e6f952 100644 --- a/plugins/modules/ohai.py +++ b/plugins/modules/ohai.py @@ -13,7 +13,7 @@ description: - Similar to the M(community.general.facter_facts) module, this runs the I(Ohai) discovery program (U(https://docs.chef.io/ohai.html)) on the remote host and returns JSON inventory data. I(Ohai) data is a bit more verbose and nested than I(facter). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/omapi_host.py b/plugins/modules/omapi_host.py index a10693fc12..74083b6ac2 100644 --- a/plugins/modules/omapi_host.py +++ b/plugins/modules/omapi_host.py @@ -17,7 +17,7 @@ requirements: author: - Loic Blot (@nerzhul) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/one_host.py b/plugins/modules/one_host.py index 0528714a95..6b57a213b8 100644 --- a/plugins/modules/one_host.py +++ b/plugins/modules/one_host.py @@ -79,8 +79,8 @@ options: type: dict extends_documentation_fragment: - - community.general.opennebula - - community.general.attributes + - community.general._opennebula + - community.general._attributes author: - Rafael del Valle (@rvalle) @@ -111,7 +111,7 @@ RETURN = r""" # TODO: Documentation on valid state transitions is required to properly implement all valid cases # TODO: To be coherent with CLI this module should also provide "flush" functionality -from ansible_collections.community.general.plugins.module_utils.opennebula import OpenNebulaModule +from ansible_collections.community.general.plugins.module_utils._opennebula import OpenNebulaModule try: from pyone import HOST_STATES, HOST_STATUS diff --git a/plugins/modules/one_image.py b/plugins/modules/one_image.py index 97b6681b6b..3a82da231b 100644 --- a/plugins/modules/one_image.py +++ b/plugins/modules/one_image.py @@ -14,8 +14,8 @@ description: requirements: - pyone extends_documentation_fragment: - - community.general.opennebula - - community.general.attributes + - community.general._opennebula + - community.general._attributes attributes: check_mode: support: full @@ -370,7 +370,7 @@ snapshots: import time -from ansible_collections.community.general.plugins.module_utils.opennebula import OpenNebulaModule +from ansible_collections.community.general.plugins.module_utils._opennebula import OpenNebulaModule IMAGE_STATES = [ "INIT", diff --git a/plugins/modules/one_image_info.py b/plugins/modules/one_image_info.py index f94bab4330..0928cda959 100644 --- a/plugins/modules/one_image_info.py +++ b/plugins/modules/one_image_info.py @@ -14,9 +14,9 @@ description: requirements: - pyone extends_documentation_fragment: - - community.general.opennebula - - community.general.attributes - - community.general.attributes.info_module + - community.general._opennebula + - community.general._attributes + - community.general._attributes.info_module options: ids: description: @@ -271,7 +271,7 @@ images: import re -from ansible_collections.community.general.plugins.module_utils.opennebula import OpenNebulaModule +from ansible_collections.community.general.plugins.module_utils._opennebula import OpenNebulaModule IMAGE_STATES = [ "INIT", diff --git a/plugins/modules/one_service.py b/plugins/modules/one_service.py index 622072040e..b4ba1ad5f7 100644 --- a/plugins/modules/one_service.py +++ b/plugins/modules/one_service.py @@ -12,7 +12,7 @@ short_description: Deploy and manage OpenNebula services description: - Manage OpenNebula services. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/one_template.py b/plugins/modules/one_template.py index 7d2a63f42d..6917a18a17 100644 --- a/plugins/modules/one_template.py +++ b/plugins/modules/one_template.py @@ -61,8 +61,8 @@ options: version_added: 10.3.0 extends_documentation_fragment: - - community.general.opennebula - - community.general.attributes + - community.general._opennebula + - community.general._attributes author: - "Jyrki Gadinger (@nilsding)" @@ -155,7 +155,7 @@ owner_name: """ -from ansible_collections.community.general.plugins.module_utils.opennebula import OpenNebulaModule +from ansible_collections.community.general.plugins.module_utils._opennebula import OpenNebulaModule class TemplateModule(OpenNebulaModule): diff --git a/plugins/modules/one_vm.py b/plugins/modules/one_vm.py index 40d108d33a..e090006dda 100644 --- a/plugins/modules/one_vm.py +++ b/plugins/modules/one_vm.py @@ -16,7 +16,7 @@ description: requirements: - pyone extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -691,7 +691,7 @@ from collections import namedtuple from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.dict_transformations import dict_merge -from ansible_collections.community.general.plugins.module_utils.opennebula import flatten, render +from ansible_collections.community.general.plugins.module_utils._opennebula import flatten, render # Updateconf attributes documentation: https://docs.opennebula.io/6.10/integration_and_development/system_interfaces/api.html#one-vm-updateconf UPDATECONF_ATTRIBUTES = { diff --git a/plugins/modules/one_vnet.py b/plugins/modules/one_vnet.py index 5f08d5c064..73598c352b 100644 --- a/plugins/modules/one_vnet.py +++ b/plugins/modules/one_vnet.py @@ -48,8 +48,8 @@ options: type: str extends_documentation_fragment: - - community.general.opennebula - - community.general.attributes + - community.general._opennebula + - community.general._attributes """ EXAMPLES = r""" @@ -254,7 +254,7 @@ ar_pool: """ -from ansible_collections.community.general.plugins.module_utils.opennebula import OpenNebulaModule +from ansible_collections.community.general.plugins.module_utils._opennebula import OpenNebulaModule class NetworksModule(OpenNebulaModule): diff --git a/plugins/modules/onepassword_info.py b/plugins/modules/onepassword_info.py index 72c16c53c7..524fe96196 100644 --- a/plugins/modules/onepassword_info.py +++ b/plugins/modules/onepassword_info.py @@ -24,8 +24,8 @@ description: - A fatal error occurs if any of the items being searched for can not be found. - Recommend using with the C(no_log) option to avoid logging the values of the secrets being retrieved. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: search_terms: type: list @@ -161,7 +161,7 @@ import re from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_bytes, to_native -from ansible_collections.community.general.plugins.module_utils.onepassword import OnePasswordConfig +from ansible_collections.community.general.plugins.module_utils._onepassword import OnePasswordConfig class AnsibleModuleError(Exception): diff --git a/plugins/modules/oneview_datacenter_info.py b/plugins/modules/oneview_datacenter_info.py index 31a486ee09..b891f3e390 100644 --- a/plugins/modules/oneview_datacenter_info.py +++ b/plugins/modules/oneview_datacenter_info.py @@ -33,10 +33,10 @@ options: elements: str extends_documentation_fragment: - - community.general.oneview - - community.general.oneview.factsparams - - community.general.attributes - - community.general.attributes.info_module + - community.general._oneview + - community.general._oneview.factsparams + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -117,7 +117,7 @@ datacenter_visual_content: type: dict """ -from ansible_collections.community.general.plugins.module_utils.oneview import OneViewModuleBase +from ansible_collections.community.general.plugins.module_utils._oneview import OneViewModuleBase class DatacenterInfoModule(OneViewModuleBase): diff --git a/plugins/modules/oneview_enclosure_info.py b/plugins/modules/oneview_enclosure_info.py index 98d7cc2044..15c660048c 100644 --- a/plugins/modules/oneview_enclosure_info.py +++ b/plugins/modules/oneview_enclosure_info.py @@ -34,10 +34,10 @@ options: elements: raw extends_documentation_fragment: - - community.general.oneview - - community.general.oneview.factsparams - - community.general.attributes - - community.general.attributes.info_module + - community.general._oneview + - community.general._oneview.factsparams + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -171,7 +171,7 @@ enclosure_utilization: type: dict """ -from ansible_collections.community.general.plugins.module_utils.oneview import OneViewModuleBase +from ansible_collections.community.general.plugins.module_utils._oneview import OneViewModuleBase class EnclosureInfoModule(OneViewModuleBase): diff --git a/plugins/modules/oneview_ethernet_network.py b/plugins/modules/oneview_ethernet_network.py index fa4a26d99d..478a2726a3 100644 --- a/plugins/modules/oneview_ethernet_network.py +++ b/plugins/modules/oneview_ethernet_network.py @@ -37,9 +37,9 @@ options: type: dict required: true extends_documentation_fragment: - - community.general.oneview - - community.general.oneview.validateetag - - community.general.attributes + - community.general._oneview + - community.general._oneview.validateetag + - community.general._attributes """ EXAMPLES = r""" @@ -122,7 +122,7 @@ ethernet_network_connection_template: type: dict """ -from ansible_collections.community.general.plugins.module_utils.oneview import ( +from ansible_collections.community.general.plugins.module_utils._oneview import ( OneViewModuleBase, OneViewModuleResourceNotFound, ) diff --git a/plugins/modules/oneview_ethernet_network_info.py b/plugins/modules/oneview_ethernet_network_info.py index 79298fa8d4..7729687978 100644 --- a/plugins/modules/oneview_ethernet_network_info.py +++ b/plugins/modules/oneview_ethernet_network_info.py @@ -32,10 +32,10 @@ options: type: list elements: str extends_documentation_fragment: - - community.general.oneview - - community.general.oneview.factsparams - - community.general.attributes - - community.general.attributes.info_module + - community.general._oneview + - community.general._oneview.factsparams + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -111,7 +111,7 @@ enet_associated_uplink_groups: type: dict """ -from ansible_collections.community.general.plugins.module_utils.oneview import OneViewModuleBase +from ansible_collections.community.general.plugins.module_utils._oneview import OneViewModuleBase class EthernetNetworkInfoModule(OneViewModuleBase): diff --git a/plugins/modules/oneview_fc_network.py b/plugins/modules/oneview_fc_network.py index f342aa90c3..a33f3df28b 100644 --- a/plugins/modules/oneview_fc_network.py +++ b/plugins/modules/oneview_fc_network.py @@ -34,9 +34,9 @@ options: required: true extends_documentation_fragment: - - community.general.oneview - - community.general.oneview.validateetag - - community.general.attributes + - community.general._oneview + - community.general._oneview.validateetag + - community.general._attributes """ EXAMPLES = r""" @@ -80,7 +80,7 @@ fc_network: type: dict """ -from ansible_collections.community.general.plugins.module_utils.oneview import OneViewModuleBase +from ansible_collections.community.general.plugins.module_utils._oneview import OneViewModuleBase class FcNetworkModule(OneViewModuleBase): diff --git a/plugins/modules/oneview_fc_network_info.py b/plugins/modules/oneview_fc_network_info.py index 680a12dece..ed2169de5d 100644 --- a/plugins/modules/oneview_fc_network_info.py +++ b/plugins/modules/oneview_fc_network_info.py @@ -27,10 +27,10 @@ options: type: str extends_documentation_fragment: - - community.general.oneview - - community.general.oneview.factsparams - - community.general.attributes - - community.general.attributes.info_module + - community.general._oneview + - community.general._oneview.factsparams + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -78,7 +78,7 @@ fc_networks: type: dict """ -from ansible_collections.community.general.plugins.module_utils.oneview import OneViewModuleBase +from ansible_collections.community.general.plugins.module_utils._oneview import OneViewModuleBase class FcNetworkInfoModule(OneViewModuleBase): diff --git a/plugins/modules/oneview_fcoe_network.py b/plugins/modules/oneview_fcoe_network.py index e62a688246..4d77c002ea 100644 --- a/plugins/modules/oneview_fcoe_network.py +++ b/plugins/modules/oneview_fcoe_network.py @@ -35,9 +35,9 @@ options: required: true extends_documentation_fragment: - - community.general.oneview - - community.general.oneview.validateetag - - community.general.attributes + - community.general._oneview + - community.general._oneview.validateetag + - community.general._attributes """ EXAMPLES = r""" @@ -77,7 +77,7 @@ fcoe_network: type: dict """ -from ansible_collections.community.general.plugins.module_utils.oneview import OneViewModuleBase +from ansible_collections.community.general.plugins.module_utils._oneview import OneViewModuleBase class FcoeNetworkModule(OneViewModuleBase): diff --git a/plugins/modules/oneview_fcoe_network_info.py b/plugins/modules/oneview_fcoe_network_info.py index 3b44a678d3..418b5de92e 100644 --- a/plugins/modules/oneview_fcoe_network_info.py +++ b/plugins/modules/oneview_fcoe_network_info.py @@ -26,10 +26,10 @@ options: - FCoE Network name. type: str extends_documentation_fragment: - - community.general.oneview - - community.general.oneview.factsparams - - community.general.attributes - - community.general.attributes.info_module + - community.general._oneview + - community.general._oneview.factsparams + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -77,7 +77,7 @@ fcoe_networks: type: dict """ -from ansible_collections.community.general.plugins.module_utils.oneview import OneViewModuleBase +from ansible_collections.community.general.plugins.module_utils._oneview import OneViewModuleBase class FcoeNetworkInfoModule(OneViewModuleBase): diff --git a/plugins/modules/oneview_logical_interconnect_group.py b/plugins/modules/oneview_logical_interconnect_group.py index 01f60879d0..492a97cf9c 100644 --- a/plugins/modules/oneview_logical_interconnect_group.py +++ b/plugins/modules/oneview_logical_interconnect_group.py @@ -37,9 +37,9 @@ options: type: dict required: true extends_documentation_fragment: - - community.general.oneview - - community.general.oneview.validateetag - - community.general.attributes + - community.general._oneview + - community.general._oneview.validateetag + - community.general._attributes """ EXAMPLES = r""" @@ -100,7 +100,7 @@ logical_interconnect_group: type: dict """ -from ansible_collections.community.general.plugins.module_utils.oneview import ( +from ansible_collections.community.general.plugins.module_utils._oneview import ( OneViewModuleBase, OneViewModuleResourceNotFound, ) diff --git a/plugins/modules/oneview_logical_interconnect_group_info.py b/plugins/modules/oneview_logical_interconnect_group_info.py index accd6aa330..48cfbab072 100644 --- a/plugins/modules/oneview_logical_interconnect_group_info.py +++ b/plugins/modules/oneview_logical_interconnect_group_info.py @@ -27,10 +27,10 @@ options: - Logical Interconnect Group name. type: str extends_documentation_fragment: - - community.general.oneview - - community.general.oneview.factsparams - - community.general.attributes - - community.general.attributes.info_module + - community.general._oneview + - community.general._oneview.factsparams + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -90,7 +90,7 @@ logical_interconnect_groups: type: dict """ -from ansible_collections.community.general.plugins.module_utils.oneview import OneViewModuleBase +from ansible_collections.community.general.plugins.module_utils._oneview import OneViewModuleBase class LogicalInterconnectGroupInfoModule(OneViewModuleBase): diff --git a/plugins/modules/oneview_network_set.py b/plugins/modules/oneview_network_set.py index 7649d613df..8e9e7ee31d 100644 --- a/plugins/modules/oneview_network_set.py +++ b/plugins/modules/oneview_network_set.py @@ -37,9 +37,9 @@ options: required: true extends_documentation_fragment: - - community.general.oneview - - community.general.oneview.validateetag - - community.general.attributes + - community.general._oneview + - community.general._oneview.validateetag + - community.general._attributes """ EXAMPLES = r""" @@ -92,7 +92,7 @@ network_set: type: dict """ -from ansible_collections.community.general.plugins.module_utils.oneview import ( +from ansible_collections.community.general.plugins.module_utils._oneview import ( OneViewModuleBase, OneViewModuleResourceNotFound, ) diff --git a/plugins/modules/oneview_network_set_info.py b/plugins/modules/oneview_network_set_info.py index b55ae60fa5..eafaab128a 100644 --- a/plugins/modules/oneview_network_set_info.py +++ b/plugins/modules/oneview_network_set_info.py @@ -34,10 +34,10 @@ options: elements: str extends_documentation_fragment: - - community.general.oneview - - community.general.oneview.factsparams - - community.general.attributes - - community.general.attributes.info_module + - community.general._oneview + - community.general._oneview.factsparams + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -130,7 +130,7 @@ network_sets: type: dict """ -from ansible_collections.community.general.plugins.module_utils.oneview import OneViewModuleBase +from ansible_collections.community.general.plugins.module_utils._oneview import OneViewModuleBase class NetworkSetInfoModule(OneViewModuleBase): diff --git a/plugins/modules/oneview_san_manager.py b/plugins/modules/oneview_san_manager.py index 1a4285da54..709465ab7e 100644 --- a/plugins/modules/oneview_san_manager.py +++ b/plugins/modules/oneview_san_manager.py @@ -38,9 +38,9 @@ options: required: true extends_documentation_fragment: - - community.general.oneview - - community.general.oneview.validateetag - - community.general.attributes + - community.general._oneview + - community.general._oneview.validateetag + - community.general._attributes """ EXAMPLES = r""" @@ -128,7 +128,7 @@ san_manager: type: dict """ -from ansible_collections.community.general.plugins.module_utils.oneview import ( +from ansible_collections.community.general.plugins.module_utils._oneview import ( OneViewModuleBase, OneViewModuleValueError, ) diff --git a/plugins/modules/oneview_san_manager_info.py b/plugins/modules/oneview_san_manager_info.py index c3f3692bcd..530df97a2d 100644 --- a/plugins/modules/oneview_san_manager_info.py +++ b/plugins/modules/oneview_san_manager_info.py @@ -35,9 +35,9 @@ options: - 'V(sort): The sort order of the returned data set.' type: dict extends_documentation_fragment: - - community.general.oneview - - community.general.attributes - - community.general.attributes.info_module + - community.general._oneview + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -85,7 +85,7 @@ san_managers: type: dict """ -from ansible_collections.community.general.plugins.module_utils.oneview import OneViewModuleBase +from ansible_collections.community.general.plugins.module_utils._oneview import OneViewModuleBase class SanManagerInfoModule(OneViewModuleBase): diff --git a/plugins/modules/online_server_info.py b/plugins/modules/online_server_info.py index 3a803f3def..7ab91ef932 100644 --- a/plugins/modules/online_server_info.py +++ b/plugins/modules/online_server_info.py @@ -14,9 +14,9 @@ description: author: - "Remy Leone (@remyleone)" extends_documentation_fragment: - - community.general.online - - community.general.attributes - - community.general.attributes.info_module + - community.general._online + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -129,7 +129,7 @@ online_server_info: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.online import ( +from ansible_collections.community.general.plugins.module_utils._online import ( Online, OnlineException, online_argument_spec, diff --git a/plugins/modules/online_user_info.py b/plugins/modules/online_user_info.py index aaedfbee50..bc406db936 100644 --- a/plugins/modules/online_user_info.py +++ b/plugins/modules/online_user_info.py @@ -13,9 +13,9 @@ description: author: - "Remy Leone (@remyleone)" extends_documentation_fragment: - - community.general.online - - community.general.attributes - - community.general.attributes.info_module + - community.general._online + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -47,7 +47,7 @@ online_user_info: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.online import ( +from ansible_collections.community.general.plugins.module_utils._online import ( Online, OnlineException, online_argument_spec, diff --git a/plugins/modules/open_iscsi.py b/plugins/modules/open_iscsi.py index 304be79559..1b5c667da7 100644 --- a/plugins/modules/open_iscsi.py +++ b/plugins/modules/open_iscsi.py @@ -17,7 +17,7 @@ description: requirements: - C(open_iscsi) library and tools C(iscsiadm) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/openbsd_pkg.py b/plugins/modules/openbsd_pkg.py index 2b84c4d422..9da763157d 100644 --- a/plugins/modules/openbsd_pkg.py +++ b/plugins/modules/openbsd_pkg.py @@ -15,7 +15,7 @@ short_description: Manage packages on OpenBSD description: - Manage packages on OpenBSD using the pkg tools. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -153,7 +153,7 @@ import sqlite3 from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion # Function used for executing commands. diff --git a/plugins/modules/opendj_backendprop.py b/plugins/modules/opendj_backendprop.py index 953c501a2b..20e9d3fe7d 100644 --- a/plugins/modules/opendj_backendprop.py +++ b/plugins/modules/opendj_backendprop.py @@ -15,7 +15,7 @@ description: author: - Werner Dijkerman (@dj-wasabi) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -91,7 +91,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt class BackendProp: diff --git a/plugins/modules/openwrt_init.py b/plugins/modules/openwrt_init.py index e7547066ab..d1c256fcca 100644 --- a/plugins/modules/openwrt_init.py +++ b/plugins/modules/openwrt_init.py @@ -13,7 +13,7 @@ short_description: Manage services on OpenWrt description: - Controls OpenWrt services on remote hosts. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/opkg.py b/plugins/modules/opkg.py index 1276b32431..ca1218303b 100644 --- a/plugins/modules/opkg.py +++ b/plugins/modules/opkg.py @@ -15,7 +15,7 @@ short_description: Package manager for OpenWrt and Openembedded/Yocto based Linu description: - Manages ipk packages for OpenWrt and Openembedded/Yocto based Linux distributions. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none @@ -114,8 +114,8 @@ version: import os -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper class Opkg(StateModuleHelper): diff --git a/plugins/modules/osx_defaults.py b/plugins/modules/osx_defaults.py index a65efbb86d..33227658ba 100644 --- a/plugins/modules/osx_defaults.py +++ b/plugins/modules/osx_defaults.py @@ -20,7 +20,7 @@ description: be maintained when the applications are not running (such as default font for new documents, or the position of an Info panel). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/ovh_ip_failover.py b/plugins/modules/ovh_ip_failover.py index f41e64b4af..201be3d342 100644 --- a/plugins/modules/ovh_ip_failover.py +++ b/plugins/modules/ovh_ip_failover.py @@ -19,7 +19,7 @@ notes: requirements: - ovh >= 0.4.8 extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/ovh_ip_loadbalancing_backend.py b/plugins/modules/ovh_ip_loadbalancing_backend.py index a2132cc3ee..9172a23ba5 100644 --- a/plugins/modules/ovh_ip_loadbalancing_backend.py +++ b/plugins/modules/ovh_ip_loadbalancing_backend.py @@ -18,7 +18,7 @@ notes: requirements: - ovh > 0.3.5 extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/ovh_monthly_billing.py b/plugins/modules/ovh_monthly_billing.py index 8498fc8831..f4919d25e9 100644 --- a/plugins/modules/ovh_monthly_billing.py +++ b/plugins/modules/ovh_monthly_billing.py @@ -15,7 +15,7 @@ description: - Enable monthly billing on OVH cloud instances (be aware OVH does not allow to disable it). requirements: ["ovh"] extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/pacemaker_cluster.py b/plugins/modules/pacemaker_cluster.py index 1a1481f258..d64da7138c 100644 --- a/plugins/modules/pacemaker_cluster.py +++ b/plugins/modules/pacemaker_cluster.py @@ -15,7 +15,7 @@ author: description: - This module can manage a pacemaker cluster and nodes from Ansible using the pacemaker CLI. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -65,8 +65,8 @@ out: returned: always """ -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper -from ansible_collections.community.general.plugins.module_utils.pacemaker import ( +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._pacemaker import ( get_pacemaker_maintenance_mode, pacemaker_runner, ) diff --git a/plugins/modules/pacemaker_info.py b/plugins/modules/pacemaker_info.py index c75ef5ec40..86d47b37a7 100644 --- a/plugins/modules/pacemaker_info.py +++ b/plugins/modules/pacemaker_info.py @@ -15,8 +15,8 @@ version_added: 11.2.0 description: - Gather information about a Pacemaker cluster. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -58,8 +58,8 @@ property_info: import json -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper -from ansible_collections.community.general.plugins.module_utils.pacemaker import pacemaker_runner +from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper +from ansible_collections.community.general.plugins.module_utils._pacemaker import pacemaker_runner class PacemakerInfo(ModuleHelper): diff --git a/plugins/modules/pacemaker_resource.py b/plugins/modules/pacemaker_resource.py index dc7c2a7d28..836dd16ef5 100644 --- a/plugins/modules/pacemaker_resource.py +++ b/plugins/modules/pacemaker_resource.py @@ -15,7 +15,7 @@ version_added: 10.5.0 description: - This module can manage resources in a Pacemaker cluster using the pacemaker CLI. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -145,8 +145,8 @@ cluster_resources: returned: always """ -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper -from ansible_collections.community.general.plugins.module_utils.pacemaker import ( +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._pacemaker import ( get_pacemaker_maintenance_mode, pacemaker_runner, wait_for_resource, diff --git a/plugins/modules/pacemaker_stonith.py b/plugins/modules/pacemaker_stonith.py index 7e1d20fecd..9c38df4da9 100644 --- a/plugins/modules/pacemaker_stonith.py +++ b/plugins/modules/pacemaker_stonith.py @@ -19,7 +19,7 @@ seealso: description: Complete documentation for Pacemaker STONITH. link: https://clusterlabs.org/projects/pacemaker/doc/3.0/Pacemaker_Explained/html/resources.html#stonith extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -124,8 +124,8 @@ value: returned: on success """ -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper -from ansible_collections.community.general.plugins.module_utils.pacemaker import pacemaker_runner, wait_for_resource +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._pacemaker import pacemaker_runner, wait_for_resource class PacemakerStonith(StateModuleHelper): diff --git a/plugins/modules/packet_device.py b/plugins/modules/packet_device.py index a252e50305..463607d159 100644 --- a/plugins/modules/packet_device.py +++ b/plugins/modules/packet_device.py @@ -23,7 +23,7 @@ author: - Thibaud Morel l'Horset (@teebes) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: diff --git a/plugins/modules/packet_ip_subnet.py b/plugins/modules/packet_ip_subnet.py index eb8a331e35..f5c185df88 100644 --- a/plugins/modules/packet_ip_subnet.py +++ b/plugins/modules/packet_ip_subnet.py @@ -24,7 +24,7 @@ author: - Nurfet Becirevic (@nurfet-becirevic) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: diff --git a/plugins/modules/packet_project.py b/plugins/modules/packet_project.py index 03149522f3..a19e0b167b 100644 --- a/plugins/modules/packet_project.py +++ b/plugins/modules/packet_project.py @@ -22,7 +22,7 @@ author: - Nurfet Becirevic (@nurfet-becirevic) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: diff --git a/plugins/modules/packet_sshkey.py b/plugins/modules/packet_sshkey.py index 11ab97db85..37bb72dc3d 100644 --- a/plugins/modules/packet_sshkey.py +++ b/plugins/modules/packet_sshkey.py @@ -13,7 +13,7 @@ description: - API is documented at U(https://www.packet.net/help/api/#page:ssh-keys,header:ssh-keys-ssh-keys-post). author: "Tomas Karasek (@t0mk) " extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/packet_volume.py b/plugins/modules/packet_volume.py index 3a75454779..a6ed168345 100644 --- a/plugins/modules/packet_volume.py +++ b/plugins/modules/packet_volume.py @@ -22,7 +22,7 @@ author: - Nurfet Becirevic (@nurfet-becirevic) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: diff --git a/plugins/modules/packet_volume_attachment.py b/plugins/modules/packet_volume_attachment.py index 31cdb32a08..1ecb66fd24 100644 --- a/plugins/modules/packet_volume_attachment.py +++ b/plugins/modules/packet_volume_attachment.py @@ -24,7 +24,7 @@ author: - Nurfet Becirevic (@nurfet-becirevic) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: diff --git a/plugins/modules/pacman.py b/plugins/modules/pacman.py index c7152e3b23..f217427960 100644 --- a/plugins/modules/pacman.py +++ b/plugins/modules/pacman.py @@ -20,7 +20,7 @@ author: - Maxime de Roucy (@tchernomax) - Jean Raby (@jraby) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/pacman_key.py b/plugins/modules/pacman_key.py index dd562009ad..6aba3d53ed 100644 --- a/plugins/modules/pacman_key.py +++ b/plugins/modules/pacman_key.py @@ -24,7 +24,7 @@ requirements: - gpg - pacman-key extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/pagerduty.py b/plugins/modules/pagerduty.py index 21298577de..f8521f32e7 100644 --- a/plugins/modules/pagerduty.py +++ b/plugins/modules/pagerduty.py @@ -19,7 +19,7 @@ author: requirements: - PagerDuty API access extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none @@ -147,7 +147,7 @@ import json from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url -from ansible_collections.community.general.plugins.module_utils.datetime import ( +from ansible_collections.community.general.plugins.module_utils._datetime import ( now, ) diff --git a/plugins/modules/pagerduty_alert.py b/plugins/modules/pagerduty_alert.py index fd93e1365d..5df5c59de8 100644 --- a/plugins/modules/pagerduty_alert.py +++ b/plugins/modules/pagerduty_alert.py @@ -16,7 +16,7 @@ author: requirements: - PagerDuty API access extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/pagerduty_change.py b/plugins/modules/pagerduty_change.py index dc0aeb697b..b849e00529 100644 --- a/plugins/modules/pagerduty_change.py +++ b/plugins/modules/pagerduty_change.py @@ -17,7 +17,7 @@ author: requirements: - PagerDuty integration key extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -101,7 +101,7 @@ EXAMPLES = r""" from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url -from ansible_collections.community.general.plugins.module_utils.datetime import ( +from ansible_collections.community.general.plugins.module_utils._datetime import ( now, ) diff --git a/plugins/modules/pagerduty_user.py b/plugins/modules/pagerduty_user.py index 317d2a1de8..ffac6d5c8c 100644 --- a/plugins/modules/pagerduty_user.py +++ b/plugins/modules/pagerduty_user.py @@ -17,7 +17,7 @@ requirements: - pdpyras python module = 4.1.1 - PagerDuty API Access extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -86,7 +86,7 @@ from os import path from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps with deps.declare("pdpyras", url="https://github.com/PagerDuty/pdpyras"): from pdpyras import APISession, PDClientError diff --git a/plugins/modules/pam_limits.py b/plugins/modules/pam_limits.py index 022f1d58ee..f367cffd65 100644 --- a/plugins/modules/pam_limits.py +++ b/plugins/modules/pam_limits.py @@ -16,7 +16,7 @@ description: - The default file is V(/etc/security/limits.conf). - For the full documentation, see C(man 5 limits.conf). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/pamd.py b/plugins/modules/pamd.py index b7fae88648..617bec8231 100644 --- a/plugins/modules/pamd.py +++ b/plugins/modules/pamd.py @@ -18,7 +18,7 @@ description: notes: - This module does not handle authselect profiles. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/parted.py b/plugins/modules/parted.py index 2ff73a56b1..bf47739134 100644 --- a/plugins/modules/parted.py +++ b/plugins/modules/parted.py @@ -20,7 +20,7 @@ requirements: - If the version of C(parted) is below 3.1, it requires a Linux version running the C(sysfs) file system C(/sys/). - Requires the C(resizepart) command when using the O(resize) parameter. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/pear.py b/plugins/modules/pear.py index 5781c40f32..083a72d7b2 100644 --- a/plugins/modules/pear.py +++ b/plugins/modules/pear.py @@ -17,7 +17,7 @@ description: author: - Jonathan Lestrelin (@jle64) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/pids.py b/plugins/modules/pids.py index de11862716..ad91373f88 100644 --- a/plugins/modules/pids.py +++ b/plugins/modules/pids.py @@ -15,7 +15,7 @@ author: requirements: - psutil(python module) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -68,8 +68,8 @@ from os.path import basename from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.community.general.plugins.module_utils import deps -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils import _deps as deps +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion with deps.declare("psutil"): import psutil diff --git a/plugins/modules/pingdom.py b/plugins/modules/pingdom.py index 243239a4e5..ee2879dc44 100644 --- a/plugins/modules/pingdom.py +++ b/plugins/modules/pingdom.py @@ -16,7 +16,7 @@ author: requirements: - "This pingdom python library: U(https://github.com/mbabineau/pingdom-python)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/pip_package_info.py b/plugins/modules/pip_package_info.py index 20a89c85b1..8cee8e6c01 100644 --- a/plugins/modules/pip_package_info.py +++ b/plugins/modules/pip_package_info.py @@ -13,8 +13,8 @@ short_description: Pip package information description: - Return information about installed pip packages. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: clients: description: diff --git a/plugins/modules/pipx.py b/plugins/modules/pipx.py index 108432d8b6..3ed50bef09 100644 --- a/plugins/modules/pipx.py +++ b/plugins/modules/pipx.py @@ -13,8 +13,8 @@ version_added: 3.8.0 description: - Manage Python applications installed in isolated virtualenvs using pipx. extends_documentation_fragment: - - community.general.attributes - - community.general.pipx + - community.general._attributes + - community.general._pipx attributes: check_mode: support: full @@ -211,14 +211,14 @@ version: """ -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper -from ansible_collections.community.general.plugins.module_utils.pipx import ( +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._pipx import ( make_process_dict, pipx_common_argspec, pipx_runner, ) -from ansible_collections.community.general.plugins.module_utils.pkg_req import PackageRequirement -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._pkg_req import PackageRequirement +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion def make_installed_name(name, suffix): diff --git a/plugins/modules/pipx_info.py b/plugins/modules/pipx_info.py index b315b2c00d..26e9847032 100644 --- a/plugins/modules/pipx_info.py +++ b/plugins/modules/pipx_info.py @@ -13,9 +13,9 @@ version_added: 5.6.0 description: - Retrieve details about Python applications installed in isolated virtualenvs using pipx. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module - - community.general.pipx + - community.general._attributes + - community.general._attributes.info_module + - community.general._pipx options: name: description: @@ -130,13 +130,13 @@ version: version_added: 10.1.0 """ -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper -from ansible_collections.community.general.plugins.module_utils.pipx import ( +from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper +from ansible_collections.community.general.plugins.module_utils._pipx import ( make_process_dict, pipx_common_argspec, pipx_runner, ) -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion class PipXInfo(ModuleHelper): diff --git a/plugins/modules/pkg5.py b/plugins/modules/pkg5.py index f6e81ba700..4798f3d403 100644 --- a/plugins/modules/pkg5.py +++ b/plugins/modules/pkg5.py @@ -16,7 +16,7 @@ description: notes: - The naming of IPS packages is explained at U(http://www.oracle.com/technetwork/articles/servers-storage-admin/ips-package-versioning-2232906.html). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/pkg5_publisher.py b/plugins/modules/pkg5_publisher.py index 910b218b3e..25b9dc7629 100644 --- a/plugins/modules/pkg5_publisher.py +++ b/plugins/modules/pkg5_publisher.py @@ -15,7 +15,7 @@ description: - IPS packages are the native packages in Solaris 11 and higher. - This module configures which publishers a client downloads IPS packages from. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/pkgin.py b/plugins/modules/pkgin.py index d4759b9f14..ff6f734034 100644 --- a/plugins/modules/pkgin.py +++ b/plugins/modules/pkgin.py @@ -26,7 +26,7 @@ notes: - 'Known bug with pkgin < 0.8.0: if a package is removed and another package depends on it, the other package is silently removed as well.' extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/pkgng.py b/plugins/modules/pkgng.py index e7eec1c463..98ca0a6662 100644 --- a/plugins/modules/pkgng.py +++ b/plugins/modules/pkgng.py @@ -17,7 +17,7 @@ short_description: Package manager for FreeBSD >= 9.0 description: - Manage binary packages for FreeBSD using C(pkgng) which is available in versions after 9.0. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/pkgutil.py b/plugins/modules/pkgutil.py index 256a78c5f3..093f621581 100644 --- a/plugins/modules/pkgutil.py +++ b/plugins/modules/pkgutil.py @@ -20,7 +20,7 @@ author: - Alexander Winkler (@dermute) - David Ponessa (@scathatheworm) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/pmem.py b/plugins/modules/pmem.py index b48b02f9f6..cd9afe91be 100644 --- a/plugins/modules/pmem.py +++ b/plugins/modules/pmem.py @@ -18,7 +18,7 @@ requirements: - C(ipmctl) and C(ndctl) command line tools - xmltodict extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/pnpm.py b/plugins/modules/pnpm.py index 55d7d0f8ac..934759b1df 100644 --- a/plugins/modules/pnpm.py +++ b/plugins/modules/pnpm.py @@ -17,7 +17,7 @@ author: - "Aritra Sen (@aretrosen)" - "Chris Hoffman (@chrishoffman), creator of NPM Ansible module" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/portage.py b/plugins/modules/portage.py index 790aaade5b..29cbab4099 100644 --- a/plugins/modules/portage.py +++ b/plugins/modules/portage.py @@ -17,7 +17,7 @@ short_description: Package manager for Gentoo description: - Manages Gentoo packages. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: diff --git a/plugins/modules/portinstall.py b/plugins/modules/portinstall.py index fa0a6261a4..fb98dfe7fd 100644 --- a/plugins/modules/portinstall.py +++ b/plugins/modules/portinstall.py @@ -15,7 +15,7 @@ short_description: Installing packages from FreeBSD's ports system description: - Manage packages for FreeBSD using C(portinstall). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/pritunl_org.py b/plugins/modules/pritunl_org.py index 4caa1d95a3..ccbc70c04a 100644 --- a/plugins/modules/pritunl_org.py +++ b/plugins/modules/pritunl_org.py @@ -13,8 +13,8 @@ short_description: Manages Pritunl Organizations using the Pritunl API description: - A module to manage Pritunl organizations using the Pritunl API. extends_documentation_fragment: - - community.general.pritunl - - community.general.attributes + - community.general._pritunl + - community.general._attributes attributes: check_mode: support: none @@ -78,7 +78,7 @@ response: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.dict_transformations import dict_merge -from ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api import ( +from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api import ( PritunlException, delete_pritunl_organization, get_pritunl_settings, diff --git a/plugins/modules/pritunl_org_info.py b/plugins/modules/pritunl_org_info.py index ac44b18c38..334a06c645 100644 --- a/plugins/modules/pritunl_org_info.py +++ b/plugins/modules/pritunl_org_info.py @@ -13,9 +13,9 @@ short_description: List Pritunl Organizations using the Pritunl API description: - A module to list Pritunl organizations using the Pritunl API. extends_documentation_fragment: - - community.general.pritunl - - community.general.attributes - - community.general.attributes.info_module + - community.general._pritunl + - community.general._attributes + - community.general._attributes.info_module options: organization: type: str @@ -73,7 +73,7 @@ organizations: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.dict_transformations import dict_merge -from ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api import ( +from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api import ( PritunlException, get_pritunl_settings, list_pritunl_organizations, diff --git a/plugins/modules/pritunl_user.py b/plugins/modules/pritunl_user.py index 37eb3bb5e3..16f25cebd7 100644 --- a/plugins/modules/pritunl_user.py +++ b/plugins/modules/pritunl_user.py @@ -13,8 +13,8 @@ short_description: Manage Pritunl Users using the Pritunl API description: - A module to manage Pritunl users using the Pritunl API. extends_documentation_fragment: - - community.general.pritunl - - community.general.attributes + - community.general._pritunl + - community.general._attributes attributes: check_mode: support: none @@ -143,7 +143,7 @@ response: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.dict_transformations import dict_merge -from ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api import ( +from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api import ( PritunlException, delete_pritunl_user, get_pritunl_settings, diff --git a/plugins/modules/pritunl_user_info.py b/plugins/modules/pritunl_user_info.py index 7e61380c10..3620fe35a0 100644 --- a/plugins/modules/pritunl_user_info.py +++ b/plugins/modules/pritunl_user_info.py @@ -13,9 +13,9 @@ short_description: List Pritunl Users using the Pritunl API description: - A module to list Pritunl users using the Pritunl API. extends_documentation_fragment: - - community.general.pritunl - - community.general.attributes - - community.general.attributes.info_module + - community.general._pritunl + - community.general._attributes + - community.general._attributes.info_module options: organization: type: str @@ -91,7 +91,7 @@ users: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.dict_transformations import dict_merge -from ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api import ( +from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api import ( PritunlException, get_pritunl_settings, list_pritunl_organizations, diff --git a/plugins/modules/pubnub_blocks.py b/plugins/modules/pubnub_blocks.py index 0597cb1c83..427605bba4 100644 --- a/plugins/modules/pubnub_blocks.py +++ b/plugins/modules/pubnub_blocks.py @@ -23,7 +23,7 @@ author: requirements: - "pubnub_blocks_client >= 1.0" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/pulp_repo.py b/plugins/modules/pulp_repo.py index 23d5ff137d..453b542cd6 100644 --- a/plugins/modules/pulp_repo.py +++ b/plugins/modules/pulp_repo.py @@ -150,7 +150,7 @@ notes: types are welcome. extends_documentation_fragment: - ansible.builtin.url - - community.general.attributes + - community.general._attributes """ EXAMPLES = r""" diff --git a/plugins/modules/puppet.py b/plugins/modules/puppet.py index 0a88422cbf..36c3371541 100644 --- a/plugins/modules/puppet.py +++ b/plugins/modules/puppet.py @@ -12,7 +12,7 @@ short_description: Runs puppet description: - Runs C(puppet) agent or apply in a reliable manner. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -193,7 +193,7 @@ import stat from ansible.module_utils.basic import AnsibleModule -import ansible_collections.community.general.plugins.module_utils.puppet as puppet_utils +import ansible_collections.community.general.plugins.module_utils._puppet as puppet_utils def _write_structured_data(basedir, basename, data): diff --git a/plugins/modules/pushover.py b/plugins/modules/pushover.py index 5597c9f9f4..441d0a12bf 100644 --- a/plugins/modules/pushover.py +++ b/plugins/modules/pushover.py @@ -14,7 +14,7 @@ description: notes: - You need a pushover.net account to use this module. But no account is required to receive messages. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/python_requirements_info.py b/plugins/modules/python_requirements_info.py index ecf87edb7d..3e60e96979 100644 --- a/plugins/modules/python_requirements_info.py +++ b/plugins/modules/python_requirements_info.py @@ -11,8 +11,8 @@ short_description: Show python path and assert dependency versions description: - Get info about available Python requirements on the target host, including listing required libraries and gathering versions. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: dependencies: type: list @@ -123,7 +123,7 @@ import sys from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion HAS_IMPORTLIB_METADATA = False try: diff --git a/plugins/modules/read_csv.py b/plugins/modules/read_csv.py index 697b996e70..0a441e32d8 100644 --- a/plugins/modules/read_csv.py +++ b/plugins/modules/read_csv.py @@ -14,7 +14,7 @@ description: author: - Dag Wieers (@dagwieers) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -145,7 +145,7 @@ list: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.csv import ( +from ansible_collections.community.general.plugins.module_utils._csv import ( CSVError, CustomDialectFailureError, DialectNotAvailableError, diff --git a/plugins/modules/redfish_command.py b/plugins/modules/redfish_command.py index 0994b27eb8..dde5bc73a5 100644 --- a/plugins/modules/redfish_command.py +++ b/plugins/modules/redfish_command.py @@ -15,8 +15,8 @@ description: - Manages OOB controller users ex. add, remove, update. - Manages system power ex. on, off, graceful and forced reboot. extends_documentation_fragment: - - community.general.attributes - - community.general.redfish + - community.general._attributes + - community.general._redfish attributes: check_mode: support: none @@ -806,7 +806,7 @@ return_values: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.community.general.plugins.module_utils.redfish_utils import ( +from ansible_collections.community.general.plugins.module_utils._redfish_utils import ( REDFISH_COMMON_ARGUMENT_SPEC, RedfishUtils, ) diff --git a/plugins/modules/redfish_config.py b/plugins/modules/redfish_config.py index 3ed36efd84..061c770e6b 100644 --- a/plugins/modules/redfish_config.py +++ b/plugins/modules/redfish_config.py @@ -14,8 +14,8 @@ description: - Manages BIOS configuration settings. - Manages OOB controller configuration settings. extends_documentation_fragment: - - community.general.attributes - - community.general.redfish + - community.general._attributes + - community.general._redfish attributes: check_mode: support: none @@ -376,7 +376,7 @@ msg: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.community.general.plugins.module_utils.redfish_utils import ( +from ansible_collections.community.general.plugins.module_utils._redfish_utils import ( REDFISH_COMMON_ARGUMENT_SPEC, RedfishUtils, ) diff --git a/plugins/modules/redfish_info.py b/plugins/modules/redfish_info.py index 086984281d..b9f8abc9c5 100644 --- a/plugins/modules/redfish_info.py +++ b/plugins/modules/redfish_info.py @@ -13,9 +13,9 @@ description: - Builds Redfish URIs locally and sends them to remote OOB controllers to get information back. - Information retrieved is placed in a location specified by the user. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module - - community.general.redfish + - community.general._attributes + - community.general._attributes.info_module + - community.general._redfish attributes: check_mode: version_added: 3.3.0 @@ -396,7 +396,7 @@ result: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.redfish_utils import ( +from ansible_collections.community.general.plugins.module_utils._redfish_utils import ( REDFISH_COMMON_ARGUMENT_SPEC, RedfishUtils, ) diff --git a/plugins/modules/redhat_subscription.py b/plugins/modules/redhat_subscription.py index 179e5f2b20..e6eba2058b 100644 --- a/plugins/modules/redhat_subscription.py +++ b/plugins/modules/redhat_subscription.py @@ -36,7 +36,7 @@ requirements: - subscription-manager - Optionally the C(dbus) Python library; this is usually included in the OS as it is used by C(subscription-manager). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/redis.py b/plugins/modules/redis.py index 26f2d3e78e..b260b5fcec 100644 --- a/plugins/modules/redis.py +++ b/plugins/modules/redis.py @@ -12,8 +12,8 @@ short_description: Various redis commands, replica and flush description: - Unified utility to interact with redis instances. extends_documentation_fragment: - - community.general.redis - - community.general.attributes + - community.general._redis + - community.general._attributes attributes: check_mode: support: full @@ -153,7 +153,7 @@ import re from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.formatters import human_to_bytes -from ansible_collections.community.general.plugins.module_utils.redis import ( +from ansible_collections.community.general.plugins.module_utils._redis import ( fail_imports, redis_auth_argument_spec, redis_auth_params, diff --git a/plugins/modules/redis_data.py b/plugins/modules/redis_data.py index 285b291221..b5be07c10c 100644 --- a/plugins/modules/redis_data.py +++ b/plugins/modules/redis_data.py @@ -54,8 +54,8 @@ options: - absent extends_documentation_fragment: - - community.general.redis.documentation - - community.general.attributes + - community.general._redis.documentation + - community.general._attributes seealso: - module: community.general.redis_data_incr @@ -129,7 +129,7 @@ msg: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.redis import ( +from ansible_collections.community.general.plugins.module_utils._redis import ( RedisAnsible, fail_imports, redis_auth_argument_spec, diff --git a/plugins/modules/redis_data_incr.py b/plugins/modules/redis_data_incr.py index 5a901bac10..9dca35c8ae 100644 --- a/plugins/modules/redis_data_incr.py +++ b/plugins/modules/redis_data_incr.py @@ -42,8 +42,8 @@ options: extends_documentation_fragment: - - community.general.redis.documentation - - community.general.attributes + - community.general._redis.documentation + - community.general._attributes seealso: - module: community.general.redis_data @@ -87,7 +87,7 @@ msg: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.redis import ( +from ansible_collections.community.general.plugins.module_utils._redis import ( RedisAnsible, fail_imports, redis_auth_argument_spec, diff --git a/plugins/modules/redis_data_info.py b/plugins/modules/redis_data_info.py index 04a48f9fba..eaa4aa34af 100644 --- a/plugins/modules/redis_data_info.py +++ b/plugins/modules/redis_data_info.py @@ -21,9 +21,9 @@ options: required: true extends_documentation_fragment: - - community.general.redis - - community.general.attributes - - community.general.attributes.info_module + - community.general._redis + - community.general._attributes + - community.general._attributes.info_module seealso: - module: community.general.redis_data @@ -68,7 +68,7 @@ msg: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.redis import ( +from ansible_collections.community.general.plugins.module_utils._redis import ( RedisAnsible, fail_imports, redis_auth_argument_spec, diff --git a/plugins/modules/redis_info.py b/plugins/modules/redis_info.py index fce6f03141..2e560f9995 100644 --- a/plugins/modules/redis_info.py +++ b/plugins/modules/redis_info.py @@ -13,9 +13,9 @@ version_added: '0.2.0' description: - Gathers information and statistics about Redis servers. extends_documentation_fragment: - - community.general.redis - - community.general.attributes - - community.general.attributes.info_module + - community.general._redis + - community.general._attributes + - community.general._attributes.info_module options: login_user: version_added: 7.5.0 @@ -224,7 +224,7 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.redis import ( +from ansible_collections.community.general.plugins.module_utils._redis import ( fail_imports, redis_auth_argument_spec, redis_auth_params, diff --git a/plugins/modules/rhevm.py b/plugins/modules/rhevm.py index e45fa4356f..a996ba1c31 100644 --- a/plugins/modules/rhevm.py +++ b/plugins/modules/rhevm.py @@ -18,7 +18,7 @@ requirements: author: - Timothy Vandenbrande (@TimothyVandenbrande) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/rhsm_release.py b/plugins/modules/rhsm_release.py index 03d5e90c85..eb82b5fcc9 100644 --- a/plugins/modules/rhsm_release.py +++ b/plugins/modules/rhsm_release.py @@ -19,7 +19,7 @@ notes: requirements: - Red Hat Enterprise Linux 6+ with subscription-manager installed extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/rhsm_repository.py b/plugins/modules/rhsm_repository.py index 00f644ba6f..a439040e75 100644 --- a/plugins/modules/rhsm_repository.py +++ b/plugins/modules/rhsm_repository.py @@ -21,7 +21,7 @@ notes: requirements: - subscription-manager extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/riak.py b/plugins/modules/riak.py index 3e1d6c3144..f945240a33 100644 --- a/plugins/modules/riak.py +++ b/plugins/modules/riak.py @@ -15,7 +15,7 @@ author: - "James Martin (@jsmartin)" - "Drew Kerrigan (@drewkerrigan)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/rocketchat.py b/plugins/modules/rocketchat.py index 4652dde888..520e66c44f 100644 --- a/plugins/modules/rocketchat.py +++ b/plugins/modules/rocketchat.py @@ -16,7 +16,7 @@ description: - This module sends notifications to Rocket Chat through the Incoming WebHook integration. author: "Ramon de la Fuente (@ramondelafuente)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/rollbar_deployment.py b/plugins/modules/rollbar_deployment.py index f7b99de0aa..1fd5091884 100644 --- a/plugins/modules/rollbar_deployment.py +++ b/plugins/modules/rollbar_deployment.py @@ -13,7 +13,7 @@ short_description: Notify Rollbar about app deployments description: - Notify Rollbar about app deployments (see U(https://rollbar.com/docs/deploys_other/)). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/rpm_ostree_pkg.py b/plugins/modules/rpm_ostree_pkg.py index 64401ce726..6605f6a3e0 100644 --- a/plugins/modules/rpm_ostree_pkg.py +++ b/plugins/modules/rpm_ostree_pkg.py @@ -14,7 +14,7 @@ version_added: "2.0.0" description: - Install or uninstall overlay additional packages using C(rpm-ostree) command. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/rundeck_acl_policy.py b/plugins/modules/rundeck_acl_policy.py index 98e40d6d0b..1fb81b2100 100644 --- a/plugins/modules/rundeck_acl_policy.py +++ b/plugins/modules/rundeck_acl_policy.py @@ -67,8 +67,8 @@ options: version_added: '0.2.0' extends_documentation_fragment: - ansible.builtin.url - - community.general.attributes - - community.general.rundeck + - community.general._attributes + - community.general._rundeck """ EXAMPLES = r""" @@ -118,7 +118,7 @@ import re from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.rundeck import ( +from ansible_collections.community.general.plugins.module_utils._rundeck import ( api_argument_spec, api_request, ) diff --git a/plugins/modules/rundeck_job_executions_info.py b/plugins/modules/rundeck_job_executions_info.py index 4ecd6f7b63..9acce4c8da 100644 --- a/plugins/modules/rundeck_job_executions_info.py +++ b/plugins/modules/rundeck_job_executions_info.py @@ -35,10 +35,10 @@ options: - The start point to return the results. default: 0 extends_documentation_fragment: - - community.general.rundeck + - community.general._rundeck - ansible.builtin.url - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -131,7 +131,7 @@ from urllib.parse import quote from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.rundeck import api_argument_spec, api_request +from ansible_collections.community.general.plugins.module_utils._rundeck import api_argument_spec, api_request class RundeckJobExecutionsInfo: diff --git a/plugins/modules/rundeck_job_run.py b/plugins/modules/rundeck_job_run.py index c36d97744a..f2852c0b00 100644 --- a/plugins/modules/rundeck_job_run.py +++ b/plugins/modules/rundeck_job_run.py @@ -68,9 +68,9 @@ options: - Send a job abort request if exceeded the O(wait_execution_timeout) specified. default: false extends_documentation_fragment: - - community.general.rundeck + - community.general._rundeck - ansible.builtin.url - - community.general.attributes + - community.general._attributes """ EXAMPLES = r""" @@ -183,7 +183,7 @@ from urllib.parse import quote from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.rundeck import api_argument_spec, api_request +from ansible_collections.community.general.plugins.module_utils._rundeck import api_argument_spec, api_request class RundeckJobRun: diff --git a/plugins/modules/rundeck_project.py b/plugins/modules/rundeck_project.py index 05f43c876f..0aeea79b98 100644 --- a/plugins/modules/rundeck_project.py +++ b/plugins/modules/rundeck_project.py @@ -58,8 +58,8 @@ options: version_added: '0.2.0' extends_documentation_fragment: - ansible.builtin.url - - community.general.attributes - - community.general.rundeck + - community.general._attributes + - community.general._rundeck """ EXAMPLES = r""" @@ -99,7 +99,7 @@ after: # import module snippets from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.rundeck import ( +from ansible_collections.community.general.plugins.module_utils._rundeck import ( api_argument_spec, api_request, ) diff --git a/plugins/modules/runit.py b/plugins/modules/runit.py index 9075665a35..4cb8fc03fe 100644 --- a/plugins/modules/runit.py +++ b/plugins/modules/runit.py @@ -14,7 +14,7 @@ short_description: Manage runit services description: - Controls runit services on remote hosts using the sv utility. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/say.py b/plugins/modules/say.py index 4a50d57919..b6c07d803f 100644 --- a/plugins/modules/say.py +++ b/plugins/modules/say.py @@ -17,7 +17,7 @@ notes: - A list of available voices, with language, can be found by running C(say -v ?) on a OSX host and C(espeak --voices) on a Linux host. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/scaleway_compute.py b/plugins/modules/scaleway_compute.py index 77d4fd47c5..166deaaa46 100644 --- a/plugins/modules/scaleway_compute.py +++ b/plugins/modules/scaleway_compute.py @@ -17,9 +17,9 @@ author: Remy Leone (@remyleone) description: - This module manages compute instances on Scaleway. extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway attributes: check_mode: @@ -182,8 +182,8 @@ import time from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.datetime import now -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._datetime import now +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_LOCATION, Scaleway, scaleway_argument_spec, diff --git a/plugins/modules/scaleway_compute_private_network.py b/plugins/modules/scaleway_compute_private_network.py index d1302d5137..1ede10a2c5 100644 --- a/plugins/modules/scaleway_compute_private_network.py +++ b/plugins/modules/scaleway_compute_private_network.py @@ -16,9 +16,9 @@ author: Pascal MANGIN (@pastral) description: - This module add or remove a private network to a compute instance (U(https://developer.scaleway.com)). extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway attributes: check_mode: @@ -122,7 +122,7 @@ scaleway_compute_private_network: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_LOCATION, Scaleway, scaleway_argument_spec, diff --git a/plugins/modules/scaleway_container.py b/plugins/modules/scaleway_container.py index 8db6616e82..79698691e9 100644 --- a/plugins/modules/scaleway_container.py +++ b/plugins/modules/scaleway_container.py @@ -16,10 +16,10 @@ author: Guillaume MARTINEZ (@Lunik) description: - This module manages container on Scaleway account. extends_documentation_fragment: - - community.general.scaleway - - community.general.scaleway_waitable_resource - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._scaleway_waitable_resource + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway requirements: - passlib[argon2] >= 1.7.4 @@ -216,7 +216,7 @@ from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_REGIONS, Scaleway, SecretVariables, diff --git a/plugins/modules/scaleway_container_info.py b/plugins/modules/scaleway_container_info.py index 57134f787f..90046dc22e 100644 --- a/plugins/modules/scaleway_container_info.py +++ b/plugins/modules/scaleway_container_info.py @@ -16,10 +16,10 @@ author: Guillaume MARTINEZ (@Lunik) description: - This module return information about a container on Scaleway account. extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway - - community.general.attributes.info_module + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway + - community.general._attributes.info_module attributes: action_group: @@ -92,7 +92,7 @@ container: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_REGIONS, Scaleway, scaleway_argument_spec, diff --git a/plugins/modules/scaleway_container_namespace.py b/plugins/modules/scaleway_container_namespace.py index 822230867a..ce95e2776b 100644 --- a/plugins/modules/scaleway_container_namespace.py +++ b/plugins/modules/scaleway_container_namespace.py @@ -16,10 +16,10 @@ author: Guillaume MARTINEZ (@Lunik) description: - This module manages container namespaces on Scaleway account. extends_documentation_fragment: - - community.general.scaleway - - community.general.scaleway_waitable_resource - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._scaleway_waitable_resource + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway requirements: - passlib[argon2] >= 1.7.4 @@ -133,7 +133,7 @@ from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_REGIONS, Scaleway, SecretVariables, diff --git a/plugins/modules/scaleway_container_namespace_info.py b/plugins/modules/scaleway_container_namespace_info.py index 098318812a..7b6291c809 100644 --- a/plugins/modules/scaleway_container_namespace_info.py +++ b/plugins/modules/scaleway_container_namespace_info.py @@ -16,10 +16,10 @@ author: Guillaume MARTINEZ (@Lunik) description: - This module return information about a container namespace on Scaleway account. extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway - - community.general.attributes.info_module + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway + - community.general._attributes.info_module attributes: action_group: @@ -83,7 +83,7 @@ container_namespace: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_REGIONS, Scaleway, scaleway_argument_spec, diff --git a/plugins/modules/scaleway_container_registry.py b/plugins/modules/scaleway_container_registry.py index 9a3a768547..75bf8415ae 100644 --- a/plugins/modules/scaleway_container_registry.py +++ b/plugins/modules/scaleway_container_registry.py @@ -16,10 +16,10 @@ author: Guillaume MARTINEZ (@Lunik) description: - This module manages container registries on Scaleway account. extends_documentation_fragment: - - community.general.scaleway - - community.general.scaleway_waitable_resource - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._scaleway_waitable_resource + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway attributes: check_mode: @@ -119,7 +119,7 @@ container_registry: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_REGIONS, Scaleway, resource_attributes_should_be_changed, diff --git a/plugins/modules/scaleway_container_registry_info.py b/plugins/modules/scaleway_container_registry_info.py index 6d4289b3c6..e261eb9cbc 100644 --- a/plugins/modules/scaleway_container_registry_info.py +++ b/plugins/modules/scaleway_container_registry_info.py @@ -16,10 +16,10 @@ author: Guillaume MARTINEZ (@Lunik) description: - This module return information about a container registry on Scaleway account. extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway - - community.general.attributes.info_module + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway + - community.general._attributes.info_module attributes: action_group: @@ -82,7 +82,7 @@ container_registry: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_REGIONS, Scaleway, scaleway_argument_spec, diff --git a/plugins/modules/scaleway_database_backup.py b/plugins/modules/scaleway_database_backup.py index b6224fe6cc..6b9f0b1499 100644 --- a/plugins/modules/scaleway_database_backup.py +++ b/plugins/modules/scaleway_database_backup.py @@ -17,9 +17,9 @@ author: Guillaume Rodriguez (@guillaume_ro_fr) description: - This module manages database backups on Scaleway account U(https://developer.scaleway.com). extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway attributes: check_mode: support: full @@ -166,10 +166,10 @@ import time from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.datetime import ( +from ansible_collections.community.general.plugins.module_utils._datetime import ( now, ) -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_REGIONS, Scaleway, scaleway_argument_spec, diff --git a/plugins/modules/scaleway_function.py b/plugins/modules/scaleway_function.py index b65dd8f2d9..d4ab2c5e17 100644 --- a/plugins/modules/scaleway_function.py +++ b/plugins/modules/scaleway_function.py @@ -16,10 +16,10 @@ author: Guillaume MARTINEZ (@Lunik) description: - This module manages function on Scaleway account. extends_documentation_fragment: - - community.general.scaleway - - community.general.scaleway_waitable_resource - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._scaleway_waitable_resource + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway requirements: - passlib[argon2] >= 1.7.4 @@ -193,7 +193,7 @@ from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_REGIONS, Scaleway, SecretVariables, diff --git a/plugins/modules/scaleway_function_info.py b/plugins/modules/scaleway_function_info.py index 0a7305f170..c46fda1746 100644 --- a/plugins/modules/scaleway_function_info.py +++ b/plugins/modules/scaleway_function_info.py @@ -16,10 +16,10 @@ author: Guillaume MARTINEZ (@Lunik) description: - This module return information about a function on Scaleway account. extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway - - community.general.attributes.info_module + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway + - community.general._attributes.info_module attributes: action_group: @@ -91,7 +91,7 @@ function: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_REGIONS, Scaleway, scaleway_argument_spec, diff --git a/plugins/modules/scaleway_function_namespace.py b/plugins/modules/scaleway_function_namespace.py index ad621cc4ea..c7d8f7ff6d 100644 --- a/plugins/modules/scaleway_function_namespace.py +++ b/plugins/modules/scaleway_function_namespace.py @@ -16,10 +16,10 @@ author: Guillaume MARTINEZ (@Lunik) description: - This module manages function namespaces on Scaleway account. extends_documentation_fragment: - - community.general.scaleway - - community.general.scaleway_waitable_resource - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._scaleway_waitable_resource + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway requirements: - passlib[argon2] >= 1.7.4 @@ -133,7 +133,7 @@ from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_REGIONS, Scaleway, SecretVariables, diff --git a/plugins/modules/scaleway_function_namespace_info.py b/plugins/modules/scaleway_function_namespace_info.py index e3d889ed08..8e50f6e91e 100644 --- a/plugins/modules/scaleway_function_namespace_info.py +++ b/plugins/modules/scaleway_function_namespace_info.py @@ -16,10 +16,10 @@ author: Guillaume MARTINEZ (@Lunik) description: - This module return information about a function namespace on Scaleway account. extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway - - community.general.attributes.info_module + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway + - community.general._attributes.info_module attributes: action_group: @@ -83,7 +83,7 @@ function_namespace: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_REGIONS, Scaleway, scaleway_argument_spec, diff --git a/plugins/modules/scaleway_image_info.py b/plugins/modules/scaleway_image_info.py index 37bf25479a..cca3fcf347 100644 --- a/plugins/modules/scaleway_image_info.py +++ b/plugins/modules/scaleway_image_info.py @@ -15,10 +15,10 @@ author: - "Yanis Guenane (@Spredzy)" - "Remy Leone (@remyleone)" extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway - - community.general.attributes.info_module + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway + - community.general._attributes.info_module attributes: action_group: @@ -101,7 +101,7 @@ scaleway_image_info: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_LOCATION, Scaleway, ScalewayException, diff --git a/plugins/modules/scaleway_ip.py b/plugins/modules/scaleway_ip.py index 121c1bed4a..8edb19468b 100644 --- a/plugins/modules/scaleway_ip.py +++ b/plugins/modules/scaleway_ip.py @@ -15,9 +15,9 @@ author: Remy Leone (@remyleone) description: - This module manages IP on Scaleway account U(https://developer.scaleway.com). extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway attributes: check_mode: @@ -131,7 +131,7 @@ data: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_LOCATION, Scaleway, scaleway_argument_spec, diff --git a/plugins/modules/scaleway_ip_info.py b/plugins/modules/scaleway_ip_info.py index cbe21e2785..51a1c196e5 100644 --- a/plugins/modules/scaleway_ip_info.py +++ b/plugins/modules/scaleway_ip_info.py @@ -15,10 +15,10 @@ author: - "Yanis Guenane (@Spredzy)" - "Remy Leone (@remyleone)" extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway - - community.general.attributes.info_module + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway + - community.general._attributes.info_module attributes: action_group: @@ -81,7 +81,7 @@ scaleway_ip_info: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_LOCATION, Scaleway, ScalewayException, diff --git a/plugins/modules/scaleway_lb.py b/plugins/modules/scaleway_lb.py index 72c85333c5..f1b5869118 100644 --- a/plugins/modules/scaleway_lb.py +++ b/plugins/modules/scaleway_lb.py @@ -17,9 +17,9 @@ author: Remy Leone (@remyleone) description: - This module manages load-balancers on Scaleway. extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway attributes: check_mode: @@ -162,8 +162,8 @@ import time from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.datetime import now -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._datetime import now +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_ENDPOINT, SCALEWAY_REGIONS, Scaleway, diff --git a/plugins/modules/scaleway_organization_info.py b/plugins/modules/scaleway_organization_info.py index e96ec8c1e1..69b050b070 100644 --- a/plugins/modules/scaleway_organization_info.py +++ b/plugins/modules/scaleway_organization_info.py @@ -26,10 +26,10 @@ options: default: 'https://account.scaleway.com' aliases: ['base_url'] extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway - - community.general.attributes.info_module + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -75,7 +75,7 @@ scaleway_organization_info: from ansible.module_utils.basic import AnsibleModule, env_fallback -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( Scaleway, ScalewayException, scaleway_argument_spec, diff --git a/plugins/modules/scaleway_private_network.py b/plugins/modules/scaleway_private_network.py index 4d3bf4ce6e..ade0cc50ae 100644 --- a/plugins/modules/scaleway_private_network.py +++ b/plugins/modules/scaleway_private_network.py @@ -16,9 +16,9 @@ author: Pascal MANGIN (@pastral) description: - This module manages private network on Scaleway account (U(https://developer.scaleway.com)). extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway attributes: check_mode: @@ -118,7 +118,7 @@ scaleway_private_network: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_LOCATION, Scaleway, scaleway_argument_spec, diff --git a/plugins/modules/scaleway_security_group.py b/plugins/modules/scaleway_security_group.py index 4273fecbaa..5cbaf4e8ad 100644 --- a/plugins/modules/scaleway_security_group.py +++ b/plugins/modules/scaleway_security_group.py @@ -16,9 +16,9 @@ author: Antoine Barbare (@abarbare) description: - This module manages Security Group on Scaleway account U(https://developer.scaleway.com). extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway attributes: check_mode: @@ -158,7 +158,7 @@ from uuid import uuid4 from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_LOCATION, Scaleway, scaleway_argument_spec, diff --git a/plugins/modules/scaleway_security_group_info.py b/plugins/modules/scaleway_security_group_info.py index 45444ab2ff..301529f9bd 100644 --- a/plugins/modules/scaleway_security_group_info.py +++ b/plugins/modules/scaleway_security_group_info.py @@ -40,10 +40,10 @@ options: - waw2 - waw3 extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway - - community.general.attributes.info_module + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -85,7 +85,7 @@ scaleway_security_group_info: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_LOCATION, Scaleway, ScalewayException, diff --git a/plugins/modules/scaleway_security_group_rule.py b/plugins/modules/scaleway_security_group_rule.py index 05835b10df..df06018b55 100644 --- a/plugins/modules/scaleway_security_group_rule.py +++ b/plugins/modules/scaleway_security_group_rule.py @@ -16,9 +16,9 @@ author: Antoine Barbare (@abarbare) description: - This module manages Security Group Rule on Scaleway account U(https://developer.scaleway.com). extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway attributes: check_mode: @@ -142,7 +142,7 @@ data: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_LOCATION, Scaleway, payload_from_object, diff --git a/plugins/modules/scaleway_server_info.py b/plugins/modules/scaleway_server_info.py index b2b045b308..b61bcd6808 100644 --- a/plugins/modules/scaleway_server_info.py +++ b/plugins/modules/scaleway_server_info.py @@ -15,10 +15,10 @@ author: - "Yanis Guenane (@Spredzy)" - "Remy Leone (@remyleone)" extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway - - community.general.attributes.info_module + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway + - community.general._attributes.info_module attributes: action_group: @@ -167,7 +167,7 @@ scaleway_server_info: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_LOCATION, Scaleway, ScalewayException, diff --git a/plugins/modules/scaleway_snapshot_info.py b/plugins/modules/scaleway_snapshot_info.py index 129607e5fe..8dd03c09b7 100644 --- a/plugins/modules/scaleway_snapshot_info.py +++ b/plugins/modules/scaleway_snapshot_info.py @@ -15,10 +15,10 @@ author: - "Yanis Guenane (@Spredzy)" - "Remy Leone (@remyleone)" extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway - - community.general.attributes.info_module + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway + - community.general._attributes.info_module attributes: action_group: @@ -85,7 +85,7 @@ scaleway_snapshot_info: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_LOCATION, Scaleway, ScalewayException, diff --git a/plugins/modules/scaleway_sshkey.py b/plugins/modules/scaleway_sshkey.py index f5bb1a1558..5a8ac478f3 100644 --- a/plugins/modules/scaleway_sshkey.py +++ b/plugins/modules/scaleway_sshkey.py @@ -17,9 +17,9 @@ author: Remy Leone (@remyleone) description: - This module manages SSH keys on Scaleway account (U(https://developer.scaleway.com)). extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway attributes: check_mode: @@ -86,7 +86,7 @@ data: from ansible.module_utils.basic import AnsibleModule, env_fallback -from ansible_collections.community.general.plugins.module_utils.scaleway import Scaleway, scaleway_argument_spec +from ansible_collections.community.general.plugins.module_utils._scaleway import Scaleway, scaleway_argument_spec def extract_present_sshkeys(raw_organization_dict): diff --git a/plugins/modules/scaleway_user_data.py b/plugins/modules/scaleway_user_data.py index 25c415afc4..cfac885447 100644 --- a/plugins/modules/scaleway_user_data.py +++ b/plugins/modules/scaleway_user_data.py @@ -18,9 +18,9 @@ description: - This module manages user_data on compute instances on Scaleway. - It can be used to configure cloud-init for instance. extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway attributes: check_mode: @@ -79,7 +79,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_LOCATION, Scaleway, scaleway_argument_spec, diff --git a/plugins/modules/scaleway_volume.py b/plugins/modules/scaleway_volume.py index f9fe5953d4..72e7f83ba8 100644 --- a/plugins/modules/scaleway_volume.py +++ b/plugins/modules/scaleway_volume.py @@ -16,9 +16,9 @@ author: Henryk Konsek (@hekonsek) description: - This module manages volumes on Scaleway account U(https://developer.scaleway.com). extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway attributes: check_mode: @@ -119,7 +119,7 @@ data: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_LOCATION, Scaleway, scaleway_argument_spec, diff --git a/plugins/modules/scaleway_volume_info.py b/plugins/modules/scaleway_volume_info.py index 5d718018ba..8a9c658794 100644 --- a/plugins/modules/scaleway_volume_info.py +++ b/plugins/modules/scaleway_volume_info.py @@ -15,10 +15,10 @@ author: - "Yanis Guenane (@Spredzy)" - "Remy Leone (@remyleone)" extends_documentation_fragment: - - community.general.scaleway - - community.general.attributes - - community.general.scaleway.actiongroup_scaleway - - community.general.attributes.info_module + - community.general._scaleway + - community.general._attributes + - community.general._scaleway.actiongroup_scaleway + - community.general._attributes.info_module attributes: action_group: @@ -83,7 +83,7 @@ scaleway_volume_info: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.scaleway import ( +from ansible_collections.community.general.plugins.module_utils._scaleway import ( SCALEWAY_LOCATION, Scaleway, ScalewayException, diff --git a/plugins/modules/sefcontext.py b/plugins/modules/sefcontext.py index 1e64e21e8d..ca9a172144 100644 --- a/plugins/modules/sefcontext.py +++ b/plugins/modules/sefcontext.py @@ -13,8 +13,8 @@ description: - Manages SELinux file context mapping definitions. - Similar to the C(semanage fcontext) command. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.platform + - community.general._attributes + - community.general._attributes.platform attributes: check_mode: support: full diff --git a/plugins/modules/selinux_permissive.py b/plugins/modules/selinux_permissive.py index 13e9880f1e..243d5c71bd 100644 --- a/plugins/modules/selinux_permissive.py +++ b/plugins/modules/selinux_permissive.py @@ -13,7 +13,7 @@ short_description: Change permissive domain in SELinux policy description: - Add and remove a domain from the list of permissive domains. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/selogin.py b/plugins/modules/selogin.py index fcd24f0a06..cde6898e7c 100644 --- a/plugins/modules/selogin.py +++ b/plugins/modules/selogin.py @@ -12,7 +12,7 @@ short_description: Manages linux user to SELinux user mapping description: - Manages linux user to SELinux user mapping. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/sendgrid.py b/plugins/modules/sendgrid.py index b3cefc0f85..10132bdcba 100644 --- a/plugins/modules/sendgrid.py +++ b/plugins/modules/sendgrid.py @@ -21,7 +21,7 @@ notes: requirements: - sendgrid Python library 1.6.22 or lower (Sendgrid API V2 supported) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -126,7 +126,7 @@ import os import traceback from urllib.parse import urlencode -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion SENDGRID_IMP_ERR = None try: diff --git a/plugins/modules/seport.py b/plugins/modules/seport.py index 888af2bfab..807ada2521 100644 --- a/plugins/modules/seport.py +++ b/plugins/modules/seport.py @@ -12,7 +12,7 @@ short_description: Manages SELinux network port type definitions description: - Manages SELinux network port type definitions. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/serverless.py b/plugins/modules/serverless.py index ebf67460cf..fc9d79af02 100644 --- a/plugins/modules/serverless.py +++ b/plugins/modules/serverless.py @@ -12,7 +12,7 @@ short_description: Manages a Serverless Framework project description: - Provides support for managing Serverless Framework (U(https://serverless.com/)) project deployments and stacks. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/shutdown.py b/plugins/modules/shutdown.py index b2a3cee81f..9f4222efe5 100644 --- a/plugins/modules/shutdown.py +++ b/plugins/modules/shutdown.py @@ -17,8 +17,8 @@ description: - Shut downs a machine. version_added: "1.1.0" extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.flow + - community.general._attributes + - community.general._attributes.flow attributes: check_mode: support: full diff --git a/plugins/modules/simpleinit_msb.py b/plugins/modules/simpleinit_msb.py index a370b99d58..08a774d524 100644 --- a/plugins/modules/simpleinit_msb.py +++ b/plugins/modules/simpleinit_msb.py @@ -15,7 +15,7 @@ description: - Controls services on remote hosts using C(simpleinit-msb). author: "Vlad Glagolev (@vaygr)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/sl_vm.py b/plugins/modules/sl_vm.py index f74ab02513..e0ffa8a1af 100644 --- a/plugins/modules/sl_vm.py +++ b/plugins/modules/sl_vm.py @@ -13,7 +13,7 @@ description: - Creates or cancels SoftLayer instances. - When created, optionally waits for it to be 'running'. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/slack.py b/plugins/modules/slack.py index 0bd0e68e35..bf8d6a2780 100644 --- a/plugins/modules/slack.py +++ b/plugins/modules/slack.py @@ -19,7 +19,7 @@ description: - The M(community.general.slack) module sends notifications to U(http://slack.com) using the Incoming WebHook integration. author: "Ramon de la Fuente (@ramondelafuente)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/slackpkg.py b/plugins/modules/slackpkg.py index b1cc2ddc48..393eddcb3a 100644 --- a/plugins/modules/slackpkg.py +++ b/plugins/modules/slackpkg.py @@ -18,7 +18,7 @@ short_description: Package manager for Slackware >= 12.2 description: - Manage binary packages for Slackware using C(slackpkg) which is available in versions after 12.2. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/smartos_image_info.py b/plugins/modules/smartos_image_info.py index 3c5dafb3c5..0647e23568 100644 --- a/plugins/modules/smartos_image_info.py +++ b/plugins/modules/smartos_image_info.py @@ -13,8 +13,8 @@ description: - Retrieve information about all installed images on SmartOS. author: Adam Števko (@xen0l) extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module attributes: check_mode: version_added: 3.3.0 diff --git a/plugins/modules/snap.py b/plugins/modules/snap.py index 09c6eaf56c..59e464018d 100644 --- a/plugins/modules/snap.py +++ b/plugins/modules/snap.py @@ -17,7 +17,7 @@ short_description: Manages snaps description: - Manages snaps packages. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -174,8 +174,8 @@ import re from ansible.module_utils.common.text.converters import to_native -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper -from ansible_collections.community.general.plugins.module_utils.snap import get_version, snap_runner +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._snap import get_version, snap_runner class Snap(StateModuleHelper): diff --git a/plugins/modules/snap_alias.py b/plugins/modules/snap_alias.py index c9f42e15c2..aa4daa1d76 100644 --- a/plugins/modules/snap_alias.py +++ b/plugins/modules/snap_alias.py @@ -14,7 +14,7 @@ version_added: 4.0.0 description: - Manages snaps aliases. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -88,8 +88,8 @@ version: import re -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper -from ansible_collections.community.general.plugins.module_utils.snap import get_version, snap_runner +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._snap import get_version, snap_runner class SnapAlias(StateModuleHelper): diff --git a/plugins/modules/snap_connect.py b/plugins/modules/snap_connect.py index 91615725d5..b435f32964 100644 --- a/plugins/modules/snap_connect.py +++ b/plugins/modules/snap_connect.py @@ -15,7 +15,7 @@ description: - Snaps run in a sandbox and need explicit interface connections to access system resources or communicate with other snaps. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -88,8 +88,8 @@ version: import re -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper -from ansible_collections.community.general.plugins.module_utils.snap import get_version, snap_runner +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._snap import get_version, snap_runner class SnapConnect(StateModuleHelper): diff --git a/plugins/modules/snmp_facts.py b/plugins/modules/snmp_facts.py index ab2aa1f1bc..654ed9040b 100644 --- a/plugins/modules/snmp_facts.py +++ b/plugins/modules/snmp_facts.py @@ -18,9 +18,9 @@ description: requirements: - pysnmp (either pysnmp < 6.2.4 or pysnmp >= 7.1) extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.facts - - community.general.attributes.facts_module + - community.general._attributes + - community.general._attributes.facts + - community.general._attributes.facts_module attributes: check_mode: version_added: 3.3.0 @@ -199,7 +199,7 @@ from collections import defaultdict from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_text -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps with deps.declare("pysnmp", url="https://pypi.org/project/pysnmp/"): from pysnmp.hlapi.v3arch.asyncio import ( diff --git a/plugins/modules/solaris_zone.py b/plugins/modules/solaris_zone.py index 43e543bb0c..113ad84b21 100644 --- a/plugins/modules/solaris_zone.py +++ b/plugins/modules/solaris_zone.py @@ -17,7 +17,7 @@ author: requirements: - Solaris 10 or 11 extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/sorcery.py b/plugins/modules/sorcery.py index a29934f76c..b6428b584d 100644 --- a/plugins/modules/sorcery.py +++ b/plugins/modules/sorcery.py @@ -20,7 +20,7 @@ notes: requirements: - bash extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/spectrum_device.py b/plugins/modules/spectrum_device.py index aea392e21a..327e3ab5bf 100644 --- a/plugins/modules/spectrum_device.py +++ b/plugins/modules/spectrum_device.py @@ -14,7 +14,7 @@ description: - Tested on CA Spectrum 9.4.2, 10.1.1 and 10.2.1. author: "Renato Orgito (@orgito)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/spectrum_model_attrs.py b/plugins/modules/spectrum_model_attrs.py index 5aff1e9dae..69826d9eb2 100644 --- a/plugins/modules/spectrum_model_attrs.py +++ b/plugins/modules/spectrum_model_attrs.py @@ -19,7 +19,7 @@ notes: - Tested on CA Spectrum version 10.4.2.0.189. - Model creation and deletion are not possible with this module. For that use M(community.general.spectrum_device) instead. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/ss_3par_cpg.py b/plugins/modules/ss_3par_cpg.py index dd896841a3..ffed5142a4 100644 --- a/plugins/modules/ss_3par_cpg.py +++ b/plugins/modules/ss_3par_cpg.py @@ -85,8 +85,8 @@ options: type: bool default: false extends_documentation_fragment: - - community.general.hpe3par - - community.general.attributes + - community.general._hpe3par + - community.general._attributes """ @@ -123,7 +123,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.storage.hpe3par import hpe3par +from ansible_collections.community.general.plugins.module_utils._storage.hpe3par import hpe3par try: from hpe3par_sdk import client diff --git a/plugins/modules/ssh_config.py b/plugins/modules/ssh_config.py index d92d50d797..700a1a64bc 100644 --- a/plugins/modules/ssh_config.py +++ b/plugins/modules/ssh_config.py @@ -18,7 +18,7 @@ author: - Björn Andersson (@gaqzi) - Abhijeet Kasurde (@Akasurde) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -223,12 +223,12 @@ from copy import deepcopy from ansible.module_utils.basic import AnsibleModule, missing_required_lib +from ansible_collections.community.general.plugins.module_utils._ssh import determine_config_file from ansible_collections.community.general.plugins.module_utils._stormssh import ( HAS_PARAMIKO, PARAMIKO_IMPORT_ERROR, ConfigParser, ) -from ansible_collections.community.general.plugins.module_utils.ssh import determine_config_file def convert_bool(value): diff --git a/plugins/modules/sssd_info.py b/plugins/modules/sssd_info.py index c7e303ca0a..afb0b36843 100644 --- a/plugins/modules/sssd_info.py +++ b/plugins/modules/sssd_info.py @@ -40,8 +40,8 @@ options: type: str choices: ['IPA', 'AD'] extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -101,7 +101,7 @@ import typing as t from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps with deps.declare("dbus"): import dbus diff --git a/plugins/modules/stacki_host.py b/plugins/modules/stacki_host.py index 823ed50263..416003ed08 100644 --- a/plugins/modules/stacki_host.py +++ b/plugins/modules/stacki_host.py @@ -13,7 +13,7 @@ description: - Use this module to add or remove hosts to a stacki front-end using API. - Information on stacki can be found at U(https://github.com/StackIQ/stacki). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/statsd.py b/plugins/modules/statsd.py index 824eafc4a3..c8f06ddc8e 100644 --- a/plugins/modules/statsd.py +++ b/plugins/modules/statsd.py @@ -17,7 +17,7 @@ author: "Mark Mercado (@mamercad)" requirements: - statsd extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/statusio_maintenance.py b/plugins/modules/statusio_maintenance.py index 4d014fa82e..2633c33a4e 100644 --- a/plugins/modules/statusio_maintenance.py +++ b/plugins/modules/statusio_maintenance.py @@ -16,7 +16,7 @@ notes: - Use start_date and start_time with minutes to set future maintenance window. author: Benjamin Copeland (@bhcopeland) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -179,7 +179,7 @@ import json from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import open_url -from ansible_collections.community.general.plugins.module_utils.datetime import ( +from ansible_collections.community.general.plugins.module_utils._datetime import ( now, ) diff --git a/plugins/modules/sudoers.py b/plugins/modules/sudoers.py index bf46d26c13..5a6a311a15 100644 --- a/plugins/modules/sudoers.py +++ b/plugins/modules/sudoers.py @@ -16,7 +16,7 @@ description: author: - "Jon Ellis (@JonEllis) " extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/supervisorctl.py b/plugins/modules/supervisorctl.py index e67974d1c3..bf7b6b5825 100644 --- a/plugins/modules/supervisorctl.py +++ b/plugins/modules/supervisorctl.py @@ -12,7 +12,7 @@ short_description: Manage the state of a program or group of programs managed by description: - Manage the state of a program or group of programs managed by C(supervisord). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/svc.py b/plugins/modules/svc.py index 0f71f30072..19f7d97923 100644 --- a/plugins/modules/svc.py +++ b/plugins/modules/svc.py @@ -14,7 +14,7 @@ short_description: Manage C(daemontools) services description: - Controls C(daemontools) services on remote hosts using the C(svc) utility. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/svr4pkg.py b/plugins/modules/svr4pkg.py index c5224d1fb4..c86a949654 100644 --- a/plugins/modules/svr4pkg.py +++ b/plugins/modules/svr4pkg.py @@ -16,7 +16,7 @@ description: - Note that this is a very basic packaging system. It does not enforce dependencies on install or remove. author: "Boyd Adamson (@brontitall)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/swdepot.py b/plugins/modules/swdepot.py index c2d9f29d7a..ed1752a4b5 100644 --- a/plugins/modules/swdepot.py +++ b/plugins/modules/swdepot.py @@ -17,7 +17,7 @@ description: notes: [] author: "Raul Melo (@melodous)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/swupd.py b/plugins/modules/swupd.py index 1886dfd6fb..87d9b7b562 100644 --- a/plugins/modules/swupd.py +++ b/plugins/modules/swupd.py @@ -20,7 +20,7 @@ description: - Manages updates and bundles with the swupd bundle manager, which is used by the Clear Linux Project for Intel Architecture. author: Alberto Murillo (@albertomurillo) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/syslogger.py b/plugins/modules/syslogger.py index 61a09f51ce..bec27aab96 100644 --- a/plugins/modules/syslogger.py +++ b/plugins/modules/syslogger.py @@ -11,7 +11,7 @@ short_description: Log messages in the syslog description: - Uses syslog to add log entries to the host. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/syspatch.py b/plugins/modules/syspatch.py index 15473c3db5..30cbca4795 100644 --- a/plugins/modules/syspatch.py +++ b/plugins/modules/syspatch.py @@ -15,7 +15,7 @@ short_description: Manage OpenBSD system patches description: - Manage OpenBSD system patches using syspatch. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: diff --git a/plugins/modules/sysrc.py b/plugins/modules/sysrc.py index d593b6681c..fa22971fd5 100644 --- a/plugins/modules/sysrc.py +++ b/plugins/modules/sysrc.py @@ -16,7 +16,7 @@ version_added: '2.0.0' description: - Manages C(/etc/rc.conf) for FreeBSD. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -96,7 +96,7 @@ EXAMPLES = r""" import os import re -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper class Sysrc(StateModuleHelper): diff --git a/plugins/modules/systemd_creds_decrypt.py b/plugins/modules/systemd_creds_decrypt.py index 9bd5d9b3d0..a53005d11e 100644 --- a/plugins/modules/systemd_creds_decrypt.py +++ b/plugins/modules/systemd_creds_decrypt.py @@ -15,7 +15,7 @@ author: - Thomas Sjögren (@konstruktoid) version_added: '10.2.0' extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/systemd_creds_encrypt.py b/plugins/modules/systemd_creds_encrypt.py index 13f60832b6..437116786e 100644 --- a/plugins/modules/systemd_creds_encrypt.py +++ b/plugins/modules/systemd_creds_encrypt.py @@ -15,7 +15,7 @@ author: - Thomas Sjögren (@konstruktoid) version_added: '10.2.0' extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/systemd_info.py b/plugins/modules/systemd_info.py index 35ed24bd25..3ddcdb09f1 100644 --- a/plugins/modules/systemd_info.py +++ b/plugins/modules/systemd_info.py @@ -43,8 +43,8 @@ options: author: - Marco Noce (@NomakCooper) extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -220,7 +220,7 @@ import fnmatch from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.systemd import systemd_runner +from ansible_collections.community.general.plugins.module_utils._systemd import systemd_runner def get_version(runner): diff --git a/plugins/modules/sysupgrade.py b/plugins/modules/sysupgrade.py index 99f6a0692b..752e5a9649 100644 --- a/plugins/modules/sysupgrade.py +++ b/plugins/modules/sysupgrade.py @@ -13,7 +13,7 @@ version_added: 1.1.0 description: - Manage OpenBSD system upgrades using C(sysupgrade). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/taiga_issue.py b/plugins/modules/taiga_issue.py index dd0ed32c9e..14e3afd1b6 100644 --- a/plugins/modules/taiga_issue.py +++ b/plugins/modules/taiga_issue.py @@ -14,7 +14,7 @@ description: - An issue is identified by the combination of project, issue subject and issue type. - This module implements the creation or deletion of issues (not the update). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/telegram.py b/plugins/modules/telegram.py index ddcee8b397..acf3dc89e6 100644 --- a/plugins/modules/telegram.py +++ b/plugins/modules/telegram.py @@ -20,7 +20,7 @@ description: notes: - You need a telegram account and create telegram bot to use this module. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py index cc8c3f4ec0..fcbf705b62 100644 --- a/plugins/modules/terraform.py +++ b/plugins/modules/terraform.py @@ -11,7 +11,7 @@ short_description: Manages a Terraform deployment (and plans) description: - Provides support for deploying resources with Terraform and pulling resource information back into Ansible. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -284,7 +284,7 @@ from shlex import quote as shlex_quote from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion module = None diff --git a/plugins/modules/timezone.py b/plugins/modules/timezone.py index a5ef6eb91e..81d59543bf 100644 --- a/plugins/modules/timezone.py +++ b/plugins/modules/timezone.py @@ -20,7 +20,7 @@ description: when not using a minimal installation like Alpine Linux). - Windows and HPUX are not supported, please let us know if you find any other OS/distro in which this fails. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/twilio.py b/plugins/modules/twilio.py index f878518bb2..ce17b2bea8 100644 --- a/plugins/modules/twilio.py +++ b/plugins/modules/twilio.py @@ -17,7 +17,7 @@ notes: - Like the other notification modules, this one requires an external dependency to work. In this case, you need a Twilio account with a purchased or verified phone number to send the text message. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/udm_dns_record.py b/plugins/modules/udm_dns_record.py index c199719fe9..e58d0090bb 100644 --- a/plugins/modules/udm_dns_record.py +++ b/plugins/modules/udm_dns_record.py @@ -19,7 +19,7 @@ requirements: - Univention - ipaddress (for O(type=ptr_record)) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -94,8 +94,8 @@ RETURN = """#""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils import deps -from ansible_collections.community.general.plugins.module_utils.univention_umc import ( +from ansible_collections.community.general.plugins.module_utils import _deps as deps +from ansible_collections.community.general.plugins.module_utils._univention_umc import ( base_dn, config, ldap_search, diff --git a/plugins/modules/udm_dns_zone.py b/plugins/modules/udm_dns_zone.py index 3b61cdb8f8..e63704661f 100644 --- a/plugins/modules/udm_dns_zone.py +++ b/plugins/modules/udm_dns_zone.py @@ -16,7 +16,7 @@ description: - This module allows to manage DNS zones on a univention corporate server (UCS). It uses the Python API of the UCS to create a new object or edit it. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -103,7 +103,7 @@ RETURN = """#""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.univention_umc import ( +from ansible_collections.community.general.plugins.module_utils._univention_umc import ( base_dn, ldap_search, umc_module_for_add, diff --git a/plugins/modules/udm_group.py b/plugins/modules/udm_group.py index 8db4360d71..ac9cc43540 100644 --- a/plugins/modules/udm_group.py +++ b/plugins/modules/udm_group.py @@ -16,7 +16,7 @@ description: - This module allows to manage user groups on a univention corporate server (UCS). It uses the Python API of the UCS to create a new object or edit it. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -81,7 +81,7 @@ RETURN = """#""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.univention_umc import ( +from ansible_collections.community.general.plugins.module_utils._univention_umc import ( base_dn, ldap_search, umc_module_for_add, diff --git a/plugins/modules/udm_share.py b/plugins/modules/udm_share.py index 401b24d20f..f10a735553 100644 --- a/plugins/modules/udm_share.py +++ b/plugins/modules/udm_share.py @@ -16,7 +16,7 @@ description: - This module allows to manage samba shares on a univention corporate server (UCS). It uses the Python API of the UCS to create a new object or edit it. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -338,7 +338,7 @@ RETURN = """#""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.univention_umc import ( +from ansible_collections.community.general.plugins.module_utils._univention_umc import ( base_dn, ldap_search, umc_module_for_add, diff --git a/plugins/modules/udm_user.py b/plugins/modules/udm_user.py index d681c75cfe..f090e730b4 100644 --- a/plugins/modules/udm_user.py +++ b/plugins/modules/udm_user.py @@ -22,7 +22,7 @@ requirements: - passlib (Python library, recommended), or legacycrypt on Python 3.13 or newer - It requires no dependency on Python 3.12 and earlier, but then it relies on the deprecated standard library C(crypt). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -322,7 +322,7 @@ from datetime import date, timedelta from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps with deps.declare("crypt_context"): from ansible_collections.community.general.plugins.module_utils._crypt import CryptContext, has_crypt_context @@ -330,7 +330,7 @@ with deps.declare("crypt_context"): if not has_crypt_context: raise ImportError("Failed to import any of: passlib, crypt, legacycrypt") -from ansible_collections.community.general.plugins.module_utils.univention_umc import ( +from ansible_collections.community.general.plugins.module_utils._univention_umc import ( base_dn, ldap_search, umc_module_for_add, diff --git a/plugins/modules/ufw.py b/plugins/modules/ufw.py index f1d840551c..aa9e7d8d31 100644 --- a/plugins/modules/ufw.py +++ b/plugins/modules/ufw.py @@ -26,7 +26,7 @@ notes: requirements: - C(ufw) package extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/uptimerobot.py b/plugins/modules/uptimerobot.py index 9edeb3d8ec..f44a000b4c 100644 --- a/plugins/modules/uptimerobot.py +++ b/plugins/modules/uptimerobot.py @@ -14,7 +14,7 @@ author: "Nate Kingsley (@nate-kingsley)" requirements: - Valid Uptime Robot API Key extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/urpmi.py b/plugins/modules/urpmi.py index 915b732813..0a6dc06f6a 100644 --- a/plugins/modules/urpmi.py +++ b/plugins/modules/urpmi.py @@ -15,7 +15,7 @@ short_description: Urpmi manager description: - Manages packages with C(urpmi) (such as for Mageia or Mandriva). extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/usb_facts.py b/plugins/modules/usb_facts.py index da6c27ce8b..cfac9715a5 100644 --- a/plugins/modules/usb_facts.py +++ b/plugins/modules/usb_facts.py @@ -16,9 +16,9 @@ description: author: - Max Maxopoly (@maxopoly) extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.facts - - community.general.attributes.facts_module + - community.general._attributes + - community.general._attributes.facts + - community.general._attributes.facts_module requirements: - lsusb binary on PATH (usually installed through the package usbutils and preinstalled on many systems) """ diff --git a/plugins/modules/utm_aaa_group.py b/plugins/modules/utm_aaa_group.py index 0bf1f3f00c..06a64cd501 100644 --- a/plugins/modules/utm_aaa_group.py +++ b/plugins/modules/utm_aaa_group.py @@ -111,8 +111,8 @@ options: default: [] extends_documentation_fragment: - - community.general.utm - - community.general.attributes + - community.general._utm + - community.general._attributes """ EXAMPLES = r""" @@ -195,7 +195,7 @@ result: type: str """ -from ansible_collections.community.general.plugins.module_utils.utm_utils import UTM, UTMModule +from ansible_collections.community.general.plugins.module_utils._utm_utils import UTM, UTMModule def main(): diff --git a/plugins/modules/utm_aaa_group_info.py b/plugins/modules/utm_aaa_group_info.py index 0ed3e2e568..544aed3eec 100644 --- a/plugins/modules/utm_aaa_group_info.py +++ b/plugins/modules/utm_aaa_group_info.py @@ -29,9 +29,9 @@ options: required: true extends_documentation_fragment: - - community.general.utm - - community.general.attributes - - community.general.attributes.info_module + - community.general._utm + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -101,7 +101,7 @@ result: type: str """ -from ansible_collections.community.general.plugins.module_utils.utm_utils import UTM, UTMModule +from ansible_collections.community.general.plugins.module_utils._utm_utils import UTM, UTMModule def main(): diff --git a/plugins/modules/utm_ca_host_key_cert.py b/plugins/modules/utm_ca_host_key_cert.py index 2d53408aa7..60e9ab7a15 100644 --- a/plugins/modules/utm_ca_host_key_cert.py +++ b/plugins/modules/utm_ca_host_key_cert.py @@ -59,8 +59,8 @@ options: type: str extends_documentation_fragment: - - community.general.utm - - community.general.attributes + - community.general._utm + - community.general._attributes """ EXAMPLES = r""" @@ -132,7 +132,7 @@ result: type: str """ -from ansible_collections.community.general.plugins.module_utils.utm_utils import UTM, UTMModule +from ansible_collections.community.general.plugins.module_utils._utm_utils import UTM, UTMModule def main(): diff --git a/plugins/modules/utm_ca_host_key_cert_info.py b/plugins/modules/utm_ca_host_key_cert_info.py index f0f11acd31..83d67e55b3 100644 --- a/plugins/modules/utm_ca_host_key_cert_info.py +++ b/plugins/modules/utm_ca_host_key_cert_info.py @@ -29,9 +29,9 @@ options: required: true extends_documentation_fragment: - - community.general.utm - - community.general.attributes - - community.general.attributes.info_module + - community.general._utm + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -80,7 +80,7 @@ result: type: str """ -from ansible_collections.community.general.plugins.module_utils.utm_utils import UTM, UTMModule +from ansible_collections.community.general.plugins.module_utils._utm_utils import UTM, UTMModule def main(): diff --git a/plugins/modules/utm_dns_host.py b/plugins/modules/utm_dns_host.py index 4ae5904d4f..fcde0f5147 100644 --- a/plugins/modules/utm_dns_host.py +++ b/plugins/modules/utm_dns_host.py @@ -69,8 +69,8 @@ options: default: 0 extends_documentation_fragment: - - community.general.utm - - community.general.attributes + - community.general._utm + - community.general._attributes """ EXAMPLES = r""" @@ -131,7 +131,7 @@ result: type: int """ -from ansible_collections.community.general.plugins.module_utils.utm_utils import UTM, UTMModule +from ansible_collections.community.general.plugins.module_utils._utm_utils import UTM, UTMModule def main(): diff --git a/plugins/modules/utm_network_interface_address.py b/plugins/modules/utm_network_interface_address.py index 04d5b799aa..5ad35b29e4 100644 --- a/plugins/modules/utm_network_interface_address.py +++ b/plugins/modules/utm_network_interface_address.py @@ -51,8 +51,8 @@ options: description: - Whether or not the object is resolved. extends_documentation_fragment: - - community.general.utm - - community.general.attributes + - community.general._utm + - community.general._attributes """ EXAMPLES = r""" @@ -108,7 +108,7 @@ result: type: bool """ -from ansible_collections.community.general.plugins.module_utils.utm_utils import UTM, UTMModule +from ansible_collections.community.general.plugins.module_utils._utm_utils import UTM, UTMModule def main(): diff --git a/plugins/modules/utm_network_interface_address_info.py b/plugins/modules/utm_network_interface_address_info.py index 7e74497bfb..d09cc04131 100644 --- a/plugins/modules/utm_network_interface_address_info.py +++ b/plugins/modules/utm_network_interface_address_info.py @@ -28,9 +28,9 @@ options: required: true extends_documentation_fragment: - - community.general.utm - - community.general.attributes - - community.general.attributes.info_module + - community.general._utm + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -76,7 +76,7 @@ result: type: bool """ -from ansible_collections.community.general.plugins.module_utils.utm_utils import UTM, UTMModule +from ansible_collections.community.general.plugins.module_utils._utm_utils import UTM, UTMModule def main(): diff --git a/plugins/modules/utm_proxy_auth_profile.py b/plugins/modules/utm_proxy_auth_profile.py index 64f5163b73..86ce68d73a 100644 --- a/plugins/modules/utm_proxy_auth_profile.py +++ b/plugins/modules/utm_proxy_auth_profile.py @@ -169,8 +169,8 @@ options: default: false extends_documentation_fragment: - - community.general.utm - - community.general.attributes + - community.general._utm + - community.general._attributes """ EXAMPLES = r""" @@ -292,7 +292,7 @@ result: type: bool """ -from ansible_collections.community.general.plugins.module_utils.utm_utils import UTM, UTMModule +from ansible_collections.community.general.plugins.module_utils._utm_utils import UTM, UTMModule def main(): diff --git a/plugins/modules/utm_proxy_exception.py b/plugins/modules/utm_proxy_exception.py index 572d71fd2d..32e0dbf212 100644 --- a/plugins/modules/utm_proxy_exception.py +++ b/plugins/modules/utm_proxy_exception.py @@ -108,8 +108,8 @@ options: type: bool extends_documentation_fragment: - - community.general.utm - - community.general.attributes + - community.general._utm + - community.general._attributes """ EXAMPLES = r""" @@ -191,7 +191,7 @@ result: type: list """ -from ansible_collections.community.general.plugins.module_utils.utm_utils import UTM, UTMModule +from ansible_collections.community.general.plugins.module_utils._utm_utils import UTM, UTMModule def main(): diff --git a/plugins/modules/utm_proxy_frontend.py b/plugins/modules/utm_proxy_frontend.py index ff56cc6ab2..040256b7d4 100644 --- a/plugins/modules/utm_proxy_frontend.py +++ b/plugins/modules/utm_proxy_frontend.py @@ -137,8 +137,8 @@ options: default: false extends_documentation_fragment: - - community.general.utm - - community.general.attributes + - community.general._utm + - community.general._attributes """ EXAMPLES = r""" @@ -235,7 +235,7 @@ result: type: bool """ -from ansible_collections.community.general.plugins.module_utils.utm_utils import UTM, UTMModule +from ansible_collections.community.general.plugins.module_utils._utm_utils import UTM, UTMModule def main(): diff --git a/plugins/modules/utm_proxy_frontend_info.py b/plugins/modules/utm_proxy_frontend_info.py index 4b6bfe17e2..1d9a5d6029 100644 --- a/plugins/modules/utm_proxy_frontend_info.py +++ b/plugins/modules/utm_proxy_frontend_info.py @@ -30,9 +30,9 @@ options: required: true extends_documentation_fragment: - - community.general.utm - - community.general.attributes - - community.general.attributes.info_module + - community.general._utm + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -121,7 +121,7 @@ result: type: bool """ -from ansible_collections.community.general.plugins.module_utils.utm_utils import UTM, UTMModule +from ansible_collections.community.general.plugins.module_utils._utm_utils import UTM, UTMModule def main(): diff --git a/plugins/modules/utm_proxy_location.py b/plugins/modules/utm_proxy_location.py index 42dcf94880..f34112b902 100644 --- a/plugins/modules/utm_proxy_location.py +++ b/plugins/modules/utm_proxy_location.py @@ -103,8 +103,8 @@ options: default: false extends_documentation_fragment: - - community.general.utm - - community.general.attributes + - community.general._utm + - community.general._attributes """ EXAMPLES = r""" @@ -183,7 +183,7 @@ result: type: bool """ -from ansible_collections.community.general.plugins.module_utils.utm_utils import UTM, UTMModule +from ansible_collections.community.general.plugins.module_utils._utm_utils import UTM, UTMModule def main(): diff --git a/plugins/modules/utm_proxy_location_info.py b/plugins/modules/utm_proxy_location_info.py index 29bee36257..7e44ab0852 100644 --- a/plugins/modules/utm_proxy_location_info.py +++ b/plugins/modules/utm_proxy_location_info.py @@ -30,9 +30,9 @@ options: required: true extends_documentation_fragment: - - community.general.utm - - community.general.attributes - - community.general.attributes.info_module + - community.general._utm + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -102,7 +102,7 @@ result: type: bool """ -from ansible_collections.community.general.plugins.module_utils.utm_utils import UTM, UTMModule +from ansible_collections.community.general.plugins.module_utils._utm_utils import UTM, UTMModule def main(): diff --git a/plugins/modules/vdo.py b/plugins/modules/vdo.py index 0081c68818..2dfe53ff87 100644 --- a/plugins/modules/vdo.py +++ b/plugins/modules/vdo.py @@ -20,7 +20,7 @@ description: - VDO, or Virtual Data Optimizer, is a device-mapper target that provides inline block-level deduplication, compression, and thin provisioning capabilities to primary storage. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: diff --git a/plugins/modules/vertica_configuration.py b/plugins/modules/vertica_configuration.py index 7c2074e947..7c67286503 100644 --- a/plugins/modules/vertica_configuration.py +++ b/plugins/modules/vertica_configuration.py @@ -11,7 +11,7 @@ short_description: Updates Vertica configuration parameters description: - Updates Vertica configuration parameters. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/vertica_info.py b/plugins/modules/vertica_info.py index f1eed0b51c..b61afa5fa1 100644 --- a/plugins/modules/vertica_info.py +++ b/plugins/modules/vertica_info.py @@ -12,8 +12,8 @@ short_description: Gathers Vertica database facts description: - Gathers Vertica database information. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module options: cluster: description: diff --git a/plugins/modules/vertica_role.py b/plugins/modules/vertica_role.py index 43721c3f67..d15951f22c 100644 --- a/plugins/modules/vertica_role.py +++ b/plugins/modules/vertica_role.py @@ -12,7 +12,7 @@ short_description: Adds or removes Vertica database roles and assigns roles to t description: - Adds or removes Vertica database role and, optionally, assign other roles. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/vertica_schema.py b/plugins/modules/vertica_schema.py index 123c1f6cb1..bccd72f11c 100644 --- a/plugins/modules/vertica_schema.py +++ b/plugins/modules/vertica_schema.py @@ -15,7 +15,7 @@ description: - In such a situation, if the module tries to remove the schema it fails and only remove roles created for the schema if they have no dependencies. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/vertica_user.py b/plugins/modules/vertica_user.py index 5172dba9f7..69bca9e8ad 100644 --- a/plugins/modules/vertica_user.py +++ b/plugins/modules/vertica_user.py @@ -13,7 +13,7 @@ description: - A user is not removed until all the dependencies have been dropped. - In such a situation, if the module tries to remove the user it fails and only remove roles granted to the user. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/vexata_eg.py b/plugins/modules/vexata_eg.py index 336868b3b9..1f78372d8d 100644 --- a/plugins/modules/vexata_eg.py +++ b/plugins/modules/vexata_eg.py @@ -45,8 +45,8 @@ options: - Port group name. type: str extends_documentation_fragment: - - community.general.vexata.vx100 - - community.general.attributes + - community.general._vexata.vx100 + - community.general._attributes """ EXAMPLES = r""" @@ -75,7 +75,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.vexata import ( +from ansible_collections.community.general.plugins.module_utils._vexata import ( argument_spec, get_array, required_together, diff --git a/plugins/modules/vexata_volume.py b/plugins/modules/vexata_volume.py index f0a8d74051..31fb5b89f1 100644 --- a/plugins/modules/vexata_volume.py +++ b/plugins/modules/vexata_volume.py @@ -35,8 +35,8 @@ options: - Volume size in M, G, T units. M=2^20, G=2^30, T=2^40 bytes. type: str extends_documentation_fragment: - - community.general.vexata.vx100 - - community.general.attributes + - community.general._vexata.vx100 + - community.general._attributes """ EXAMPLES = r""" @@ -72,7 +72,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.vexata import ( +from ansible_collections.community.general.plugins.module_utils._vexata import ( argument_spec, get_array, required_together, diff --git a/plugins/modules/vmadm.py b/plugins/modules/vmadm.py index a8a100f0cf..a1fcacecbe 100644 --- a/plugins/modules/vmadm.py +++ b/plugins/modules/vmadm.py @@ -13,7 +13,7 @@ description: - Manage SmartOS virtual machines through vmadm(1M). author: Jasper Lievisse Adriaanse (@jasperla) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/wakeonlan.py b/plugins/modules/wakeonlan.py index 4faadd5672..f2568b8e93 100644 --- a/plugins/modules/wakeonlan.py +++ b/plugins/modules/wakeonlan.py @@ -12,7 +12,7 @@ short_description: Send a magic Wake-on-LAN (WoL) broadcast packet description: - The C(wakeonlan) module sends magic Wake-on-LAN (WoL) broadcast packets. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/wdc_redfish_command.py b/plugins/modules/wdc_redfish_command.py index 870db5fc30..96396d9ec2 100644 --- a/plugins/modules/wdc_redfish_command.py +++ b/plugins/modules/wdc_redfish_command.py @@ -14,8 +14,8 @@ description: - Builds Redfish URIs locally and sends them to remote OOB controllers to perform an action. - Manages OOB controller firmware. For example, Firmware Activate, Update and Activate. extends_documentation_fragment: - - community.general.attributes - - community.general.redfish + - community.general._attributes + - community.general._redfish attributes: check_mode: support: full @@ -197,8 +197,8 @@ msg: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.community.general.plugins.module_utils.redfish_utils import REDFISH_COMMON_ARGUMENT_SPEC -from ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils import WdcRedfishUtils +from ansible_collections.community.general.plugins.module_utils._redfish_utils import REDFISH_COMMON_ARGUMENT_SPEC +from ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils import WdcRedfishUtils CATEGORY_COMMANDS_ALL = { "Update": ["FWActivate", "UpdateAndActivate"], diff --git a/plugins/modules/wdc_redfish_info.py b/plugins/modules/wdc_redfish_info.py index d215503d59..67f7213cd5 100644 --- a/plugins/modules/wdc_redfish_info.py +++ b/plugins/modules/wdc_redfish_info.py @@ -13,9 +13,9 @@ version_added: 5.4.0 description: - Builds Redfish URIs locally and sends them to remote OOB controllers to get information back. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module - - community.general.redfish + - community.general._attributes + - community.general._attributes.info_module + - community.general._redfish options: category: required: true @@ -123,8 +123,8 @@ StatusCode: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.community.general.plugins.module_utils.redfish_utils import REDFISH_COMMON_ARGUMENT_SPEC -from ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils import WdcRedfishUtils +from ansible_collections.community.general.plugins.module_utils._redfish_utils import REDFISH_COMMON_ARGUMENT_SPEC +from ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils import WdcRedfishUtils CATEGORY_COMMANDS_ALL = {"Update": ["SimpleUpdateStatus"]} diff --git a/plugins/modules/xattr.py b/plugins/modules/xattr.py index ae2c02c3ad..a01bb5fe1e 100644 --- a/plugins/modules/xattr.py +++ b/plugins/modules/xattr.py @@ -14,7 +14,7 @@ description: - Requires that extended attributes are enabled on the target filesystem and that the C(setfattr)/C(getfattr) utilities are present. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/xbps.py b/plugins/modules/xbps.py index 5bc050bfd8..667a54b98e 100644 --- a/plugins/modules/xbps.py +++ b/plugins/modules/xbps.py @@ -16,7 +16,7 @@ author: - "Dino Occhialini (@dinoocch)" - "Michael Aldridge (@the-maldridge)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/xcc_redfish_command.py b/plugins/modules/xcc_redfish_command.py index 80a9d6c2a8..7b9dbc8d44 100644 --- a/plugins/modules/xcc_redfish_command.py +++ b/plugins/modules/xcc_redfish_command.py @@ -18,8 +18,8 @@ description: - Supports updating a configuration attribute using PATCH method. - Supports performing an action using POST method. extends_documentation_fragment: - - community.general.attributes - - community.general.redfish + - community.general._attributes + - community.general._redfish attributes: check_mode: support: none @@ -300,7 +300,7 @@ redfish_facts: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.community.general.plugins.module_utils.redfish_utils import ( +from ansible_collections.community.general.plugins.module_utils._redfish_utils import ( REDFISH_COMMON_ARGUMENT_SPEC, RedfishUtils, ) diff --git a/plugins/modules/xdg_mime.py b/plugins/modules/xdg_mime.py index dc08a46796..678fb386fb 100644 --- a/plugins/modules/xdg_mime.py +++ b/plugins/modules/xdg_mime.py @@ -20,7 +20,7 @@ version_added: 10.7.0 description: - This module allows configuring the default handler for specific MIME types when you use applications that rely on XDG. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -86,8 +86,8 @@ version: sample: "1.2.1" """ -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper -from ansible_collections.community.general.plugins.module_utils.xdg_mime import xdg_mime_get, xdg_mime_runner +from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper +from ansible_collections.community.general.plugins.module_utils._xdg_mime import xdg_mime_get, xdg_mime_runner class XdgMime(ModuleHelper): diff --git a/plugins/modules/xenserver_facts.py b/plugins/modules/xenserver_facts.py index 6aae7eaba3..a220bbfcc4 100644 --- a/plugins/modules/xenserver_facts.py +++ b/plugins/modules/xenserver_facts.py @@ -16,9 +16,9 @@ author: - Tim Rupp (@caphrim007) - Robin Lee (@cheese) extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.facts - - community.general.attributes.facts_module + - community.general._attributes + - community.general._attributes.facts + - community.general._attributes.facts_module attributes: check_mode: version_added: 3.3.0 diff --git a/plugins/modules/xenserver_guest.py b/plugins/modules/xenserver_guest.py index ccb3f00bf6..39a3b0a917 100644 --- a/plugins/modules/xenserver_guest.py +++ b/plugins/modules/xenserver_guest.py @@ -294,8 +294,8 @@ options: type: bool default: false extends_documentation_fragment: - - community.general.xenserver.documentation - - community.general.attributes + - community.general._xenserver.documentation + - community.general._attributes """ EXAMPLES = r""" @@ -544,7 +544,7 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.network import is_mac -from ansible_collections.community.general.plugins.module_utils.xenserver import ( +from ansible_collections.community.general.plugins.module_utils._xenserver import ( XenServerObject, gather_vm_facts, gather_vm_params, diff --git a/plugins/modules/xenserver_guest_info.py b/plugins/modules/xenserver_guest_info.py index 5feb82be0e..7e84df7eb0 100644 --- a/plugins/modules/xenserver_guest_info.py +++ b/plugins/modules/xenserver_guest_info.py @@ -41,9 +41,9 @@ options: - It is required if name is not unique. type: str extends_documentation_fragment: - - community.general.xenserver.documentation - - community.general.attributes - - community.general.attributes.info_module + - community.general._xenserver.documentation + - community.general._attributes + - community.general._attributes.info_module """ EXAMPLES = r""" @@ -150,7 +150,7 @@ instance: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.xenserver import ( +from ansible_collections.community.general.plugins.module_utils._xenserver import ( XenServerObject, gather_vm_facts, gather_vm_params, diff --git a/plugins/modules/xenserver_guest_powerstate.py b/plugins/modules/xenserver_guest_powerstate.py index a600fdccf3..8d87e3938b 100644 --- a/plugins/modules/xenserver_guest_powerstate.py +++ b/plugins/modules/xenserver_guest_powerstate.py @@ -68,8 +68,8 @@ options: type: int default: 0 extends_documentation_fragment: - - community.general.xenserver.documentation - - community.general.attributes + - community.general._xenserver.documentation + - community.general._attributes """ EXAMPLES = r""" @@ -177,7 +177,7 @@ instance: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.xenserver import ( +from ansible_collections.community.general.plugins.module_utils._xenserver import ( XenServerObject, gather_vm_facts, gather_vm_params, diff --git a/plugins/modules/xfconf.py b/plugins/modules/xfconf.py index 3b3c44d60f..307f7f5985 100644 --- a/plugins/modules/xfconf.py +++ b/plugins/modules/xfconf.py @@ -28,7 +28,7 @@ seealso: link: https://docs.xfce.org/xfce/xfce4-settings/editor#change_properties extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: @@ -176,8 +176,8 @@ version: from ansible.module_utils.parsing.convert_bool import boolean -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper -from ansible_collections.community.general.plugins.module_utils.xfconf import get_xfconf_version, xfconf_runner +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._xfconf import get_xfconf_version, xfconf_runner class XFConfProperty(StateModuleHelper): diff --git a/plugins/modules/xfconf_info.py b/plugins/modules/xfconf_info.py index 61cfc8c66a..1dedc3374a 100644 --- a/plugins/modules/xfconf_info.py +++ b/plugins/modules/xfconf_info.py @@ -14,8 +14,8 @@ version_added: 3.5.0 description: - This module allows retrieving Xfce 4 configurations with the help of C(xfconf-query). extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module attributes: check_mode: version_added: 3.3.0 @@ -125,8 +125,8 @@ version: version_added: 10.2.0 """ -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper -from ansible_collections.community.general.plugins.module_utils.xfconf import get_xfconf_version, xfconf_runner +from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper +from ansible_collections.community.general.plugins.module_utils._xfconf import get_xfconf_version, xfconf_runner class XFConfInfo(ModuleHelper): diff --git a/plugins/modules/xfs_quota.py b/plugins/modules/xfs_quota.py index 1bd1da512a..ed02d9d53a 100644 --- a/plugins/modules/xfs_quota.py +++ b/plugins/modules/xfs_quota.py @@ -17,7 +17,7 @@ description: author: - William Leemans (@bushvin) extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/xml.py b/plugins/modules/xml.py index 514ae13a46..b8207a2c6c 100644 --- a/plugins/modules/xml.py +++ b/plugins/modules/xml.py @@ -15,7 +15,7 @@ short_description: Manage bits and pieces of XML files or strings description: - A CRUD-like interface to managing bits of XML files. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full @@ -363,7 +363,7 @@ import traceback from collections.abc import MutableMapping from io import BytesIO -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion LXML_IMP_ERR = None try: diff --git a/plugins/modules/yarn.py b/plugins/modules/yarn.py index dde26d792f..437104f4b1 100644 --- a/plugins/modules/yarn.py +++ b/plugins/modules/yarn.py @@ -18,7 +18,7 @@ author: - "David Gunter (@verkaufer)" - "Chris Hoffman (@chrishoffman), creator of NPM Ansible module)" extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/yum_versionlock.py b/plugins/modules/yum_versionlock.py index 605505b138..8b1654da4d 100644 --- a/plugins/modules/yum_versionlock.py +++ b/plugins/modules/yum_versionlock.py @@ -13,7 +13,7 @@ short_description: Locks / unlocks a installed package(s) from being updated by description: - This module adds installed packages to yum versionlock to prevent the package(s) from being updated. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/zfs.py b/plugins/modules/zfs.py index cb3d226885..c9b9c96049 100644 --- a/plugins/modules/zfs.py +++ b/plugins/modules/zfs.py @@ -13,7 +13,7 @@ short_description: Manage ZFS description: - Manages ZFS file systems, volumes, clones and snapshots. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: partial diff --git a/plugins/modules/zfs_delegate_admin.py b/plugins/modules/zfs_delegate_admin.py index 27f4f5e74c..4fc91af12e 100644 --- a/plugins/modules/zfs_delegate_admin.py +++ b/plugins/modules/zfs_delegate_admin.py @@ -18,7 +18,7 @@ requirements: - "A ZFS/OpenZFS implementation that supports delegation with C(zfs allow), including: Solaris >= 10, illumos (all versions), FreeBSD >= 8.0R, ZFS on Linux >= 0.7.0." extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none diff --git a/plugins/modules/zfs_facts.py b/plugins/modules/zfs_facts.py index 02cc64e763..0a5b2c4f1e 100644 --- a/plugins/modules/zfs_facts.py +++ b/plugins/modules/zfs_facts.py @@ -13,9 +13,9 @@ description: - Gather facts from ZFS dataset properties. author: Adam Števko (@xen0l) extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.facts - - community.general.attributes.facts_module + - community.general._attributes + - community.general._attributes.facts + - community.general._attributes.facts_module options: name: description: diff --git a/plugins/modules/znode.py b/plugins/modules/znode.py index b9f24858be..9c21f46f71 100644 --- a/plugins/modules/znode.py +++ b/plugins/modules/znode.py @@ -16,7 +16,7 @@ attributes: diff_mode: support: none extends_documentation_fragment: - - community.general.attributes + - community.general._attributes options: hosts: description: diff --git a/plugins/modules/zpool.py b/plugins/modules/zpool.py index acbc76f2b9..a7fb981007 100644 --- a/plugins/modules/zpool.py +++ b/plugins/modules/zpool.py @@ -13,7 +13,7 @@ version_added: 11.0.0 description: - Create, destroy, and modify ZFS zpools and their vdev layouts, pool properties, and filesystem properties. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: partial @@ -139,7 +139,7 @@ import re from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt class Zpool: diff --git a/plugins/modules/zpool_facts.py b/plugins/modules/zpool_facts.py index deda9f5304..a452a3d1bf 100644 --- a/plugins/modules/zpool_facts.py +++ b/plugins/modules/zpool_facts.py @@ -13,9 +13,9 @@ description: - Gather facts from ZFS pool properties. author: Adam Števko (@xen0l) extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.facts - - community.general.attributes.facts_module + - community.general._attributes + - community.general._attributes.facts + - community.general._attributes.facts_module options: name: description: diff --git a/plugins/modules/zypper.py b/plugins/modules/zypper.py index 7b57302f90..181981c771 100644 --- a/plugins/modules/zypper.py +++ b/plugins/modules/zypper.py @@ -29,8 +29,7 @@ description: - Also supports transactional updates, by running zypper inside C(/sbin/transactional-update --continue --drop-if-no-change --quiet run). extends_documentation_fragment: - - community.general.attributes - - community.general.attributes + - community.general._attributes attributes: check_mode: support: full diff --git a/plugins/modules/zypper_repository.py b/plugins/modules/zypper_repository.py index 876f6c366c..fce241d60a 100644 --- a/plugins/modules/zypper_repository.py +++ b/plugins/modules/zypper_repository.py @@ -15,7 +15,7 @@ short_description: Add and remove Zypper repositories description: - Add or remove Zypper repositories on SUSE and openSUSE. extends_documentation_fragment: - - community.general.attributes + - community.general._attributes attributes: check_mode: support: none @@ -143,7 +143,7 @@ from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.urls import fetch_url -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion REPO_OPTS = ["alias", "name", "priority", "enabled", "autorefresh", "gpgcheck"] diff --git a/plugins/modules/zypper_repository_info.py b/plugins/modules/zypper_repository_info.py index ca45fff4fe..c97a41a539 100644 --- a/plugins/modules/zypper_repository_info.py +++ b/plugins/modules/zypper_repository_info.py @@ -16,8 +16,8 @@ short_description: List Zypper repositories description: - List Zypper repositories on SUSE and openSUSE. extends_documentation_fragment: - - community.general.attributes - - community.general.attributes.info_module + - community.general._attributes + - community.general._attributes.info_module requirements: - "zypper >= 1.0 (included in openSUSE >= 11.1 or SUSE Linux Enterprise Server/Desktop >= 11.0)" @@ -71,7 +71,7 @@ repodatalist: """ -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps with deps.declare("parseXML"): from xml.dom.minidom import parseString as parseXML diff --git a/plugins/plugin_utils/ansible_type.py b/plugins/plugin_utils/_ansible_type.py similarity index 92% rename from plugins/plugin_utils/ansible_type.py rename to plugins/plugin_utils/_ansible_type.py index f9683dbfe2..9f20a31604 100644 --- a/plugins/plugin_utils/ansible_type.py +++ b/plugins/plugin_utils/_ansible_type.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this plugin util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import typing as t diff --git a/plugins/plugin_utils/keys_filter.py b/plugins/plugin_utils/_keys_filter.py similarity index 96% rename from plugins/plugin_utils/keys_filter.py rename to plugins/plugin_utils/_keys_filter.py index 9834a83c98..4a4c8e2714 100644 --- a/plugins/plugin_utils/keys_filter.py +++ b/plugins/plugin_utils/_keys_filter.py @@ -3,6 +3,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this plugin util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import re diff --git a/plugins/plugin_utils/_tags.py b/plugins/plugin_utils/_tags.py index 67e233694a..b77ed3fa5b 100644 --- a/plugins/plugin_utils/_tags.py +++ b/plugins/plugin_utils/_tags.py @@ -2,7 +2,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -# Note that this module util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Note that this plugin util is **PRIVATE** to the collection. It can have breaking changes at any time. # Do not use this from other collections or standalone plugins/modules! from __future__ import annotations diff --git a/plugins/plugin_utils/unsafe.py b/plugins/plugin_utils/_unsafe.py similarity index 91% rename from plugins/plugin_utils/unsafe.py rename to plugins/plugin_utils/_unsafe.py index d6224ba29f..3b8c3bdbb4 100644 --- a/plugins/plugin_utils/unsafe.py +++ b/plugins/plugin_utils/_unsafe.py @@ -2,6 +2,9 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +# Note that this plugin util is **PRIVATE** to the collection. It can have breaking changes at any time. +# Do not use this from other collections or standalone plugins/modules! + from __future__ import annotations import re diff --git a/plugins/test/ansible_type.py b/plugins/test/ansible_type.py index fea1772062..1e1feb4d96 100644 --- a/plugins/test/ansible_type.py +++ b/plugins/test/ansible_type.py @@ -227,7 +227,7 @@ from collections.abc import Callable, Sequence from ansible.errors import AnsibleFilterError -from ansible_collections.community.general.plugins.plugin_utils.ansible_type import _ansible_type +from ansible_collections.community.general.plugins.plugin_utils._ansible_type import _ansible_type def ansible_type(data: t.Any, dtype: t.Any, alias: t.Any = None) -> bool: diff --git a/tests/integration/targets/cmd_runner/library/cmd_echo.py b/tests/integration/targets/cmd_runner/library/cmd_echo.py index 339e0201ac..5832a01dfc 100644 --- a/tests/integration/targets/cmd_runner/library/cmd_echo.py +++ b/tests/integration/targets/cmd_runner/library/cmd_echo.py @@ -15,8 +15,8 @@ RETURN = "" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner -from ansible_collections.community.general.plugins.module_utils.cmd_runner import cmd_runner_fmt as fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner +from ansible_collections.community.general.plugins.module_utils._cmd_runner import cmd_runner_fmt as fmt def main(): diff --git a/tests/integration/targets/module_helper/library/mdepfail.py b/tests/integration/targets/module_helper/library/mdepfail.py index 3168a41e11..6a736853fd 100644 --- a/tests/integration/targets/module_helper/library/mdepfail.py +++ b/tests/integration/targets/module_helper/library/mdepfail.py @@ -28,8 +28,8 @@ EXAMPLES = "" RETURN = "" -from ansible_collections.community.general.plugins.module_utils import deps -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper +from ansible_collections.community.general.plugins.module_utils import _deps as deps +from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper with deps.declare("nopackagewiththisname"): import nopackagewiththisname # noqa: F401, pylint: disable=unused-import # type: ignore[import-not-found] diff --git a/tests/integration/targets/module_helper/library/msimple.py b/tests/integration/targets/module_helper/library/msimple.py index f54fea4e21..e24b60e163 100644 --- a/tests/integration/targets/module_helper/library/msimple.py +++ b/tests/integration/targets/module_helper/library/msimple.py @@ -28,8 +28,8 @@ EXAMPLES = "" RETURN = "" -from ansible_collections.community.general.plugins.module_utils.mh.deco import check_mode_skip -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper +from ansible_collections.community.general.plugins.module_utils._mh.deco import check_mode_skip +from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper class MSimple(ModuleHelper): diff --git a/tests/integration/targets/module_helper/library/msimpleda.py b/tests/integration/targets/module_helper/library/msimpleda.py index 8752f75a4a..87d0b379fa 100644 --- a/tests/integration/targets/module_helper/library/msimpleda.py +++ b/tests/integration/targets/module_helper/library/msimpleda.py @@ -22,10 +22,10 @@ EXAMPLES = "" RETURN = "" -from ansible_collections.community.general.plugins.module_utils.mh.mixins.deprecate_attrs import ( # noqa: F401, pylint: disable=unused-import +from ansible_collections.community.general.plugins.module_utils._mh.mixins.deprecate_attrs import ( # noqa: F401, pylint: disable=unused-import DeprecateAttrsMixin, ) -from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper +from ansible_collections.community.general.plugins.module_utils._module_helper import ModuleHelper class MSimpleDA(ModuleHelper): diff --git a/tests/integration/targets/module_helper/library/mstate.py b/tests/integration/targets/module_helper/library/mstate.py index ee46768fc4..c6c0e0a477 100644 --- a/tests/integration/targets/module_helper/library/mstate.py +++ b/tests/integration/targets/module_helper/library/mstate.py @@ -34,7 +34,7 @@ EXAMPLES = "" RETURN = "" -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper +from ansible_collections.community.general.plugins.module_utils._module_helper import StateModuleHelper class MState(StateModuleHelper): diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt index 0aaa630e66..393df844db 100644 --- a/tests/sanity/ignore-2.17.txt +++ b/tests/sanity/ignore-2.17.txt @@ -6,5 +6,5 @@ plugins/modules/osx_defaults.py validate-modules:parameter-state-invalid-choice plugins/modules/parted.py validate-modules:parameter-state-invalid-choice plugins/modules/rhevm.py validate-modules:parameter-state-invalid-choice plugins/modules/xfconf.py validate-modules:return-syntax-error -plugins/plugin_utils/unsafe.py pep8:E704 +plugins/plugin_utils/_unsafe.py pep8:E704 tests/unit/plugins/modules/test_gio_mime.yaml no-smart-quotes diff --git a/tests/sanity/ignore-2.18.txt b/tests/sanity/ignore-2.18.txt index 0aaa630e66..393df844db 100644 --- a/tests/sanity/ignore-2.18.txt +++ b/tests/sanity/ignore-2.18.txt @@ -6,5 +6,5 @@ plugins/modules/osx_defaults.py validate-modules:parameter-state-invalid-choice plugins/modules/parted.py validate-modules:parameter-state-invalid-choice plugins/modules/rhevm.py validate-modules:parameter-state-invalid-choice plugins/modules/xfconf.py validate-modules:return-syntax-error -plugins/plugin_utils/unsafe.py pep8:E704 +plugins/plugin_utils/_unsafe.py pep8:E704 tests/unit/plugins/modules/test_gio_mime.yaml no-smart-quotes diff --git a/tests/unit/plugins/module_utils/hwc/test_dict_comparison.py b/tests/unit/plugins/module_utils/_hwc_utils/test_dict_comparison.py similarity index 98% rename from tests/unit/plugins/module_utils/hwc/test_dict_comparison.py rename to tests/unit/plugins/module_utils/_hwc_utils/test_dict_comparison.py index 34b649d117..2f91e7ae9a 100644 --- a/tests/unit/plugins/module_utils/hwc/test_dict_comparison.py +++ b/tests/unit/plugins/module_utils/_hwc_utils/test_dict_comparison.py @@ -9,7 +9,7 @@ from __future__ import annotations import unittest -from ansible_collections.community.general.plugins.module_utils.hwc_utils import are_different_dicts +from ansible_collections.community.general.plugins.module_utils._hwc_utils import are_different_dicts class HwcDictComparisonTestCase(unittest.TestCase): diff --git a/tests/unit/plugins/module_utils/hwc/test_hwc_utils.py b/tests/unit/plugins/module_utils/_hwc_utils/test_hwc_utils.py similarity index 95% rename from tests/unit/plugins/module_utils/hwc/test_hwc_utils.py rename to tests/unit/plugins/module_utils/_hwc_utils/test_hwc_utils.py index 71cdfd011a..c08f4c22b5 100644 --- a/tests/unit/plugins/module_utils/hwc/test_hwc_utils.py +++ b/tests/unit/plugins/module_utils/_hwc_utils/test_hwc_utils.py @@ -6,7 +6,7 @@ from __future__ import annotations import unittest -from ansible_collections.community.general.plugins.module_utils.hwc_utils import HwcModuleException, navigate_value +from ansible_collections.community.general.plugins.module_utils._hwc_utils import HwcModuleException, navigate_value class HwcUtilsTestCase(unittest.TestCase): diff --git a/tests/unit/plugins/module_utils/identity/keycloak/test_keycloak_connect.py b/tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_connect.py similarity index 96% rename from tests/unit/plugins/module_utils/identity/keycloak/test_keycloak_connect.py rename to tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_connect.py index 7a80d85b93..09a604c286 100644 --- a/tests/unit/plugins/module_utils/identity/keycloak/test_keycloak_connect.py +++ b/tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_connect.py @@ -10,7 +10,7 @@ from urllib.error import HTTPError import pytest -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( KeycloakError, get_token, ) @@ -70,7 +70,7 @@ def mock_good_connection(mocker): ), } return mocker.patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) @@ -98,7 +98,7 @@ def mock_bad_json_returned(mocker): "http://keycloak.url/auth/realms/master/protocol/openid-connect/token": create_wrapper('{"access_token":'), } return mocker.patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) @@ -130,7 +130,7 @@ def mock_401_returned(mocker): ), } return mocker.patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) @@ -154,7 +154,7 @@ def mock_json_without_token_returned(mocker): ), } return mocker.patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/module_utils/identity/keycloak/test_keycloak_module_utils.py b/tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_module_utils.py similarity index 98% rename from tests/unit/plugins/module_utils/identity/keycloak/test_keycloak_module_utils.py rename to tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_module_utils.py index ceaf719b4a..889708328c 100644 --- a/tests/unit/plugins/module_utils/identity/keycloak/test_keycloak_module_utils.py +++ b/tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_module_utils.py @@ -6,7 +6,7 @@ from __future__ import annotations import unittest -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import is_struct_included +from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import is_struct_included class KeycloakIsStructIncludedTestCase(unittest.TestCase): diff --git a/tests/unit/plugins/module_utils/net_tools/pritunl/test_api.py b/tests/unit/plugins/module_utils/_net_tools/pritunl/test_api.py similarity index 99% rename from tests/unit/plugins/module_utils/net_tools/pritunl/test_api.py rename to tests/unit/plugins/module_utils/_net_tools/pritunl/test_api.py index dc339d69fe..864618ae8e 100644 --- a/tests/unit/plugins/module_utils/net_tools/pritunl/test_api.py +++ b/tests/unit/plugins/module_utils/_net_tools/pritunl/test_api.py @@ -10,7 +10,7 @@ from unittest.mock import MagicMock import pytest from ansible.module_utils.common.dict_transformations import dict_merge -from ansible_collections.community.general.plugins.module_utils.net_tools.pritunl import ( +from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl import ( api, ) diff --git a/tests/unit/plugins/module_utils/xenserver/FakeAnsibleModule.py b/tests/unit/plugins/module_utils/_xenserver/FakeAnsibleModule.py similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/FakeAnsibleModule.py rename to tests/unit/plugins/module_utils/_xenserver/FakeAnsibleModule.py diff --git a/tests/unit/plugins/module_utils/xenserver/FakeXenAPI.py b/tests/unit/plugins/module_utils/_xenserver/FakeXenAPI.py similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/FakeXenAPI.py rename to tests/unit/plugins/module_utils/_xenserver/FakeXenAPI.py diff --git a/tests/unit/plugins/module_utils/xenserver/common.py b/tests/unit/plugins/module_utils/_xenserver/common.py similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/common.py rename to tests/unit/plugins/module_utils/_xenserver/common.py diff --git a/tests/unit/plugins/module_utils/xenserver/conftest.py b/tests/unit/plugins/module_utils/_xenserver/conftest.py similarity index 98% rename from tests/unit/plugins/module_utils/xenserver/conftest.py rename to tests/unit/plugins/module_utils/_xenserver/conftest.py index 4a58ec6fcd..66a8c3503f 100644 --- a/tests/unit/plugins/module_utils/xenserver/conftest.py +++ b/tests/unit/plugins/module_utils/_xenserver/conftest.py @@ -42,7 +42,7 @@ def XenAPI(): # First we use importlib.import_module() to import the module and assign # it to a local symbol. fake_xenapi = importlib.import_module( - "ansible_collections.community.general.tests.unit.plugins.module_utils.xenserver.FakeXenAPI" + "ansible_collections.community.general.tests.unit.plugins.module_utils._xenserver.FakeXenAPI" ) # Now we populate Python module cache with imported fake module using the @@ -61,7 +61,7 @@ def xenserver(XenAPI): # that depend on it have to be imported inside a test function. To make # this easier to handle and remove some code repetition, we wrap the import # of xenserver module util with a fixture. - from ansible_collections.community.general.plugins.module_utils import xenserver + from ansible_collections.community.general.plugins.module_utils import _xenserver as xenserver return xenserver diff --git a/tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-1-facts.json b/tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-1-facts.json similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-1-facts.json rename to tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-1-facts.json diff --git a/tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-1-facts.json.license b/tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-1-facts.json.license similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-1-facts.json.license rename to tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-1-facts.json.license diff --git a/tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-1-params.json b/tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-1-params.json similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-1-params.json rename to tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-1-params.json diff --git a/tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-1-params.json.license b/tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-1-params.json.license similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-1-params.json.license rename to tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-1-params.json.license diff --git a/tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-2-facts.json b/tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-2-facts.json similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-2-facts.json rename to tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-2-facts.json diff --git a/tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-2-facts.json.license b/tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-2-facts.json.license similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-2-facts.json.license rename to tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-2-facts.json.license diff --git a/tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-2-params.json b/tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-2-params.json similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-2-params.json rename to tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-2-params.json diff --git a/tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-2-params.json.license b/tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-2-params.json.license similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-2-params.json.license rename to tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-2-params.json.license diff --git a/tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-3-facts.json b/tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-3-facts.json similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-3-facts.json rename to tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-3-facts.json diff --git a/tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-3-facts.json.license b/tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-3-facts.json.license similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-3-facts.json.license rename to tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-3-facts.json.license diff --git a/tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-3-params.json b/tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-3-params.json similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-3-params.json rename to tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-3-params.json diff --git a/tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-3-params.json.license b/tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-3-params.json.license similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/fixtures/ansible-test-vm-3-params.json.license rename to tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-3-params.json.license diff --git a/tests/unit/plugins/module_utils/xenserver/test_gather_vm_params_and_facts.py b/tests/unit/plugins/module_utils/_xenserver/test_gather_vm_params_and_facts.py similarity index 98% rename from tests/unit/plugins/module_utils/xenserver/test_gather_vm_params_and_facts.py rename to tests/unit/plugins/module_utils/_xenserver/test_gather_vm_params_and_facts.py index 32edf3918f..006254479a 100644 --- a/tests/unit/plugins/module_utils/xenserver/test_gather_vm_params_and_facts.py +++ b/tests/unit/plugins/module_utils/_xenserver/test_gather_vm_params_and_facts.py @@ -69,7 +69,7 @@ def test_gather_vm_params_and_facts(mocker, fake_ansible_module, XenAPI, xenserv mocked_xenapi.configure_mock(**mocked_returns) mocker.patch( - "ansible_collections.community.general.plugins.module_utils.xenserver.get_xenserver_version", + "ansible_collections.community.general.plugins.module_utils._xenserver.get_xenserver_version", return_value=[7, 2, 0], ) diff --git a/tests/unit/plugins/module_utils/xenserver/test_get_object_ref.py b/tests/unit/plugins/module_utils/_xenserver/test_get_object_ref.py similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/test_get_object_ref.py rename to tests/unit/plugins/module_utils/_xenserver/test_get_object_ref.py diff --git a/tests/unit/plugins/module_utils/xenserver/test_misc.py b/tests/unit/plugins/module_utils/_xenserver/test_misc.py similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/test_misc.py rename to tests/unit/plugins/module_utils/_xenserver/test_misc.py diff --git a/tests/unit/plugins/module_utils/xenserver/test_netaddr_functions.py b/tests/unit/plugins/module_utils/_xenserver/test_netaddr_functions.py similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/test_netaddr_functions.py rename to tests/unit/plugins/module_utils/_xenserver/test_netaddr_functions.py diff --git a/tests/unit/plugins/module_utils/xenserver/test_set_vm_power_state.py b/tests/unit/plugins/module_utils/_xenserver/test_set_vm_power_state.py similarity index 99% rename from tests/unit/plugins/module_utils/xenserver/test_set_vm_power_state.py rename to tests/unit/plugins/module_utils/_xenserver/test_set_vm_power_state.py index 4f4ffda50f..e3ca831c07 100644 --- a/tests/unit/plugins/module_utils/xenserver/test_set_vm_power_state.py +++ b/tests/unit/plugins/module_utils/_xenserver/test_set_vm_power_state.py @@ -264,7 +264,7 @@ def test_set_vm_power_state_task_timeout(mocker, fake_ansible_module, XenAPI, xe mocked_xenapi.configure_mock(**mocked_returns) mocker.patch( - "ansible_collections.community.general.plugins.module_utils.xenserver.wait_for_task", return_value="timeout" + "ansible_collections.community.general.plugins.module_utils._xenserver.wait_for_task", return_value="timeout" ) with pytest.raises(FailJsonException) as exc_info: @@ -373,7 +373,7 @@ def test_set_vm_power_state_transition_async( mocked_xenapi.configure_mock(**mocked_returns) - mocker.patch("ansible_collections.community.general.plugins.module_utils.xenserver.wait_for_task", return_value="") + mocker.patch("ansible_collections.community.general.plugins.module_utils._xenserver.wait_for_task", return_value="") result = xenserver.set_vm_power_state(fake_ansible_module, fake_xenapi_ref("VM"), power_state_desired, timeout=1) diff --git a/tests/unit/plugins/module_utils/xenserver/test_wait_for_functions.py b/tests/unit/plugins/module_utils/_xenserver/test_wait_for_functions.py similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/test_wait_for_functions.py rename to tests/unit/plugins/module_utils/_xenserver/test_wait_for_functions.py diff --git a/tests/unit/plugins/module_utils/xenserver/test_xapi.py b/tests/unit/plugins/module_utils/_xenserver/test_xapi.py similarity index 100% rename from tests/unit/plugins/module_utils/xenserver/test_xapi.py rename to tests/unit/plugins/module_utils/_xenserver/test_xapi.py diff --git a/tests/unit/plugins/module_utils/xenserver/test_xenserverobject.py b/tests/unit/plugins/module_utils/_xenserver/test_xenserverobject.py similarity index 97% rename from tests/unit/plugins/module_utils/xenserver/test_xenserverobject.py rename to tests/unit/plugins/module_utils/_xenserver/test_xenserverobject.py index 1ff415f2bd..2dcbbd5d5a 100644 --- a/tests/unit/plugins/module_utils/xenserver/test_xenserverobject.py +++ b/tests/unit/plugins/module_utils/_xenserver/test_xenserverobject.py @@ -13,7 +13,7 @@ from .FakeAnsibleModule import FailJsonException def test_xenserverobject_xenapi_lib_detection(mocker, fake_ansible_module, xenserver): """Tests XenAPI lib detection code.""" - mocker.patch("ansible_collections.community.general.plugins.module_utils.xenserver.HAS_XENAPI", new=False) + mocker.patch("ansible_collections.community.general.plugins.module_utils._xenserver.HAS_XENAPI", new=False) with pytest.raises(FailJsonException) as exc_info: xenserver.XenServerObject(fake_ansible_module) diff --git a/tests/unit/plugins/module_utils/test_cmd_runner.py b/tests/unit/plugins/module_utils/test__cmd_runner.py similarity index 99% rename from tests/unit/plugins/module_utils/test_cmd_runner.py rename to tests/unit/plugins/module_utils/test__cmd_runner.py index f79e6cb884..2d244dbb62 100644 --- a/tests/unit/plugins/module_utils/test_cmd_runner.py +++ b/tests/unit/plugins/module_utils/test__cmd_runner.py @@ -9,7 +9,7 @@ from unittest.mock import MagicMock, PropertyMock import pytest -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._cmd_runner import CmdRunner, cmd_runner_fmt TC_FORMATS = dict( simple_boolean__true=(partial(cmd_runner_fmt.as_bool, "--superflag"), True, ["--superflag"], None), diff --git a/tests/unit/plugins/module_utils/test_csv.py b/tests/unit/plugins/module_utils/test__csv.py similarity index 99% rename from tests/unit/plugins/module_utils/test_csv.py rename to tests/unit/plugins/module_utils/test__csv.py index 400ba9446c..82142def48 100644 --- a/tests/unit/plugins/module_utils/test_csv.py +++ b/tests/unit/plugins/module_utils/test__csv.py @@ -8,7 +8,7 @@ import typing as t import pytest -from ansible_collections.community.general.plugins.module_utils import csv +from ansible_collections.community.general.plugins.module_utils import _csv as csv VALID_CSV = [ ( diff --git a/tests/unit/plugins/module_utils/test_deps.py b/tests/unit/plugins/module_utils/test__deps.py similarity index 98% rename from tests/unit/plugins/module_utils/test_deps.py rename to tests/unit/plugins/module_utils/test__deps.py index 88d3e0257f..d27725ca31 100644 --- a/tests/unit/plugins/module_utils/test_deps.py +++ b/tests/unit/plugins/module_utils/test__deps.py @@ -9,7 +9,7 @@ from unittest.mock import MagicMock import pytest -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps @pytest.fixture diff --git a/tests/unit/plugins/module_utils/test_module_helper.py b/tests/unit/plugins/module_utils/test__module_helper.py similarity index 98% rename from tests/unit/plugins/module_utils/test_module_helper.py rename to tests/unit/plugins/module_utils/test__module_helper.py index 454c183457..83b9453f63 100644 --- a/tests/unit/plugins/module_utils/test_module_helper.py +++ b/tests/unit/plugins/module_utils/test__module_helper.py @@ -7,7 +7,7 @@ from __future__ import annotations import pytest -from ansible_collections.community.general.plugins.module_utils.module_helper import cause_changes +from ansible_collections.community.general.plugins.module_utils._module_helper import cause_changes # # DEPRECATION NOTICE diff --git a/tests/unit/plugins/module_utils/test_ocapi_utils.py b/tests/unit/plugins/module_utils/test__ocapi_utils.py similarity index 98% rename from tests/unit/plugins/module_utils/test_ocapi_utils.py rename to tests/unit/plugins/module_utils/test__ocapi_utils.py index 7fb0a491fa..09fb9a7b06 100644 --- a/tests/unit/plugins/module_utils/test_ocapi_utils.py +++ b/tests/unit/plugins/module_utils/test__ocapi_utils.py @@ -10,7 +10,7 @@ import shutil import tempfile import unittest -from ansible_collections.community.general.plugins.module_utils.ocapi_utils import OcapiUtils +from ansible_collections.community.general.plugins.module_utils._ocapi_utils import OcapiUtils class TestOcapiUtils(unittest.TestCase): diff --git a/tests/unit/plugins/module_utils/test_onepassword.py b/tests/unit/plugins/module_utils/test__onepassword.py similarity index 96% rename from tests/unit/plugins/module_utils/test_onepassword.py rename to tests/unit/plugins/module_utils/test__onepassword.py index cc03e41230..ab2b7e9cae 100644 --- a/tests/unit/plugins/module_utils/test_onepassword.py +++ b/tests/unit/plugins/module_utils/test__onepassword.py @@ -8,7 +8,7 @@ import os import pytest -from ansible_collections.community.general.plugins.module_utils.onepassword import OnePasswordConfig +from ansible_collections.community.general.plugins.module_utils._onepassword import OnePasswordConfig @pytest.fixture diff --git a/tests/unit/plugins/module_utils/test_opennebula.py b/tests/unit/plugins/module_utils/test__opennebula.py similarity index 98% rename from tests/unit/plugins/module_utils/test_opennebula.py rename to tests/unit/plugins/module_utils/test__opennebula.py index c07d1589e7..756ba04660 100644 --- a/tests/unit/plugins/module_utils/test_opennebula.py +++ b/tests/unit/plugins/module_utils/test__opennebula.py @@ -8,7 +8,7 @@ import textwrap import pytest -from ansible_collections.community.general.plugins.module_utils.opennebula import flatten, render +from ansible_collections.community.general.plugins.module_utils._opennebula import flatten, render FLATTEN_VALID = [ ([[[1]], [2], 3], False, [1, 2, 3]), diff --git a/tests/unit/plugins/module_utils/test_python_runner.py b/tests/unit/plugins/module_utils/test__python_runner.py similarity index 99% rename from tests/unit/plugins/module_utils/test_python_runner.py rename to tests/unit/plugins/module_utils/test__python_runner.py index fd02f03df7..5be1a026e0 100644 --- a/tests/unit/plugins/module_utils/test_python_runner.py +++ b/tests/unit/plugins/module_utils/test__python_runner.py @@ -9,8 +9,8 @@ from unittest.mock import MagicMock, PropertyMock import pytest -from ansible_collections.community.general.plugins.module_utils.cmd_runner import cmd_runner_fmt -from ansible_collections.community.general.plugins.module_utils.python_runner import PythonRunner +from ansible_collections.community.general.plugins.module_utils._cmd_runner import cmd_runner_fmt +from ansible_collections.community.general.plugins.module_utils._python_runner import PythonRunner TC_RUNNER = dict( # SAMPLE: This shows all possible elements of a test case. It does not actually run. diff --git a/tests/unit/plugins/module_utils/cloud/test_scaleway.py b/tests/unit/plugins/module_utils/test__sclaeway.py similarity index 99% rename from tests/unit/plugins/module_utils/cloud/test_scaleway.py rename to tests/unit/plugins/module_utils/test__sclaeway.py index f8f1103a8c..55cbc79e79 100644 --- a/tests/unit/plugins/module_utils/cloud/test_scaleway.py +++ b/tests/unit/plugins/module_utils/test__sclaeway.py @@ -6,7 +6,7 @@ from __future__ import annotations import unittest -from ansible_collections.community.general.plugins.module_utils.scaleway import SecretVariables, argon2 +from ansible_collections.community.general.plugins.module_utils._scaleway import SecretVariables, argon2 class SecretVariablesTestCase(unittest.TestCase): diff --git a/tests/unit/plugins/module_utils/test_utm_utils.py b/tests/unit/plugins/module_utils/test__utm_utils.py similarity index 99% rename from tests/unit/plugins/module_utils/test_utm_utils.py rename to tests/unit/plugins/module_utils/test__utm_utils.py index 56d7c69764..72fe9c8e79 100644 --- a/tests/unit/plugins/module_utils/test_utm_utils.py +++ b/tests/unit/plugins/module_utils/test__utm_utils.py @@ -11,7 +11,7 @@ from __future__ import annotations -from ansible_collections.community.general.plugins.module_utils.utm_utils import UTM +from ansible_collections.community.general.plugins.module_utils._utm_utils import UTM class FakeModule: diff --git a/tests/unit/plugins/module_utils/test_vardict.py b/tests/unit/plugins/module_utils/test__vardict.py similarity index 99% rename from tests/unit/plugins/module_utils/test_vardict.py rename to tests/unit/plugins/module_utils/test__vardict.py index f51943a582..58e33e158d 100644 --- a/tests/unit/plugins/module_utils/test_vardict.py +++ b/tests/unit/plugins/module_utils/test__vardict.py @@ -5,7 +5,7 @@ from __future__ import annotations -from ansible_collections.community.general.plugins.module_utils.vardict import VarDict +from ansible_collections.community.general.plugins.module_utils._vardict import VarDict def test_var_simple(): diff --git a/tests/unit/plugins/modules/conftest.py b/tests/unit/plugins/modules/conftest.py index aa9312d446..fc185904b8 100644 --- a/tests/unit/plugins/modules/conftest.py +++ b/tests/unit/plugins/modules/conftest.py @@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args as _set_module_args, ) -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps def _fix_ansible_args(args): diff --git a/tests/unit/plugins/modules/oneview_module_loader.py b/tests/unit/plugins/modules/oneview_module_loader.py index 707e3d3bab..272bef7306 100644 --- a/tests/unit/plugins/modules/oneview_module_loader.py +++ b/tests/unit/plugins/modules/oneview_module_loader.py @@ -13,8 +13,8 @@ if "hpOneView" not in sys.modules: sys.modules["hpOneView"] = Mock() sys.modules["hpOneView.oneview_client"] = Mock() -ONEVIEW_MODULE_UTILS_PATH = "ansible_collections.community.general.plugins.module_utils.oneview" -from ansible_collections.community.general.plugins.module_utils.oneview import ( # noqa: F401, pylint: disable=unused-import +ONEVIEW_MODULE_UTILS_PATH = "ansible_collections.community.general.plugins.module_utils._oneview" +from ansible_collections.community.general.plugins.module_utils._oneview import ( # noqa: F401, pylint: disable=unused-import OneViewModuleBase, OneViewModuleException, OneViewModuleResourceNotFound, diff --git a/tests/unit/plugins/modules/test_bitbucket_access_key.py b/tests/unit/plugins/modules/test_bitbucket_access_key.py index 20ce1a1c21..c87e760948 100644 --- a/tests/unit/plugins/modules/test_bitbucket_access_key.py +++ b/tests/unit/plugins/modules/test_bitbucket_access_key.py @@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) -from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper from ansible_collections.community.general.plugins.modules import bitbucket_access_key diff --git a/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py b/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py index a8c3281cde..b69bc4d9cc 100644 --- a/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py +++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py @@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) -from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_key_pair diff --git a/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py b/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py index b365617d5b..5f991e2f1a 100644 --- a/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py +++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py @@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) -from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_known_host from ansible_collections.community.general.plugins.modules.bitbucket_pipeline_known_host import HAS_PARAMIKO diff --git a/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py b/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py index 7ab977b4e0..a3a5aab1a1 100644 --- a/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py +++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py @@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) -from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_variable diff --git a/tests/unit/plugins/modules/test_gitlab_protected_branch.py b/tests/unit/plugins/modules/test_gitlab_protected_branch.py index 4ec80f430b..f16840b3d8 100644 --- a/tests/unit/plugins/modules/test_gitlab_protected_branch.py +++ b/tests/unit/plugins/modules/test_gitlab_protected_branch.py @@ -6,7 +6,7 @@ from __future__ import annotations import pytest -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible_collections.community.general.plugins.module_utils._version import LooseVersion from ansible_collections.community.general.plugins.modules.gitlab_protected_branch import GitlabProtectedBranch diff --git a/tests/unit/plugins/modules/test_homebrew.py b/tests/unit/plugins/modules/test_homebrew.py index e768d0d06f..70ccd6a9ea 100644 --- a/tests/unit/plugins/modules/test_homebrew.py +++ b/tests/unit/plugins/modules/test_homebrew.py @@ -6,7 +6,7 @@ from __future__ import annotations import unittest -from ansible_collections.community.general.plugins.module_utils.homebrew import HomebrewValidate +from ansible_collections.community.general.plugins.module_utils._homebrew import HomebrewValidate class TestHomebrewModule(unittest.TestCase): diff --git a/tests/unit/plugins/modules/test_homebrew_cask.py b/tests/unit/plugins/modules/test_homebrew_cask.py index 60dab6e459..dd825ff965 100644 --- a/tests/unit/plugins/modules/test_homebrew_cask.py +++ b/tests/unit/plugins/modules/test_homebrew_cask.py @@ -4,7 +4,7 @@ from __future__ import annotations -from ansible_collections.community.general.plugins.module_utils.homebrew import ( +from ansible_collections.community.general.plugins.module_utils._homebrew import ( HomebrewValidate, ) from ansible_collections.community.general.plugins.modules.homebrew_cask import ( diff --git a/tests/unit/plugins/modules/test_icinga2_downtime.py b/tests/unit/plugins/modules/test_icinga2_downtime.py index dc678bd6ec..053a534e93 100644 --- a/tests/unit/plugins/modules/test_icinga2_downtime.py +++ b/tests/unit/plugins/modules/test_icinga2_downtime.py @@ -15,7 +15,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) -from ansible_collections.community.general.plugins.module_utils.mh.deco import no_handle_exceptions +from ansible_collections.community.general.plugins.module_utils._mh.deco import no_handle_exceptions from ansible_collections.community.general.plugins.modules import icinga2_downtime diff --git a/tests/unit/plugins/modules/test_keycloak_authentication.py b/tests/unit/plugins/modules/test_keycloak_authentication.py index 5a9f1bc524..64e2d6810e 100644 --- a/tests/unit/plugins/modules/test_keycloak_authentication.py +++ b/tests/unit/plugins/modules/test_keycloak_authentication.py @@ -102,7 +102,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py b/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py index 410460c952..6b13a2215c 100644 --- a/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py +++ b/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py @@ -98,7 +98,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_client.py b/tests/unit/plugins/modules/test_keycloak_client.py index d472ef4284..417f224c7a 100644 --- a/tests/unit/plugins/modules/test_keycloak_client.py +++ b/tests/unit/plugins/modules/test_keycloak_client.py @@ -90,7 +90,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py b/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py index 0be5589391..49f743e735 100644 --- a/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py +++ b/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py @@ -119,7 +119,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_clientscope.py b/tests/unit/plugins/modules/test_keycloak_clientscope.py index 76df2bf4ca..f5d505b7e4 100644 --- a/tests/unit/plugins/modules/test_keycloak_clientscope.py +++ b/tests/unit/plugins/modules/test_keycloak_clientscope.py @@ -124,7 +124,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_component.py b/tests/unit/plugins/modules/test_keycloak_component.py index 0d9ee42519..96f94be943 100644 --- a/tests/unit/plugins/modules/test_keycloak_component.py +++ b/tests/unit/plugins/modules/test_keycloak_component.py @@ -69,7 +69,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_identity_provider.py b/tests/unit/plugins/modules/test_keycloak_identity_provider.py index 4680230bb5..33917d7275 100644 --- a/tests/unit/plugins/modules/test_keycloak_identity_provider.py +++ b/tests/unit/plugins/modules/test_keycloak_identity_provider.py @@ -122,7 +122,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_realm.py b/tests/unit/plugins/modules/test_keycloak_realm.py index a5ff89306a..9e6ceed7f6 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm.py +++ b/tests/unit/plugins/modules/test_keycloak_realm.py @@ -81,7 +81,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_realm_info.py b/tests/unit/plugins/modules/test_keycloak_realm_info.py index a5751248f8..29c9341f29 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm_info.py +++ b/tests/unit/plugins/modules/test_keycloak_realm_info.py @@ -78,7 +78,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_realm_keys.py b/tests/unit/plugins/modules/test_keycloak_realm_keys.py index 9c71116394..6c6a35018a 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm_keys.py +++ b/tests/unit/plugins/modules/test_keycloak_realm_keys.py @@ -78,7 +78,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py b/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py index 1b3045d165..6309719526 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py +++ b/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py @@ -78,7 +78,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_realm_localization.py b/tests/unit/plugins/modules/test_keycloak_realm_localization.py index 686f601a55..723e0961af 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm_localization.py +++ b/tests/unit/plugins/modules/test_keycloak_realm_localization.py @@ -72,7 +72,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_role.py b/tests/unit/plugins/modules/test_keycloak_role.py index 5ff597bc7d..f0845dd908 100644 --- a/tests/unit/plugins/modules/test_keycloak_role.py +++ b/tests/unit/plugins/modules/test_keycloak_role.py @@ -119,7 +119,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_user.py b/tests/unit/plugins/modules/test_keycloak_user.py index ae6925eff2..58d9e0e124 100644 --- a/tests/unit/plugins/modules/test_keycloak_user.py +++ b/tests/unit/plugins/modules/test_keycloak_user.py @@ -91,7 +91,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_user_execute_actions_email.py b/tests/unit/plugins/modules/test_keycloak_user_execute_actions_email.py index dc411f4fee..5f05ae8aad 100644 --- a/tests/unit/plugins/modules/test_keycloak_user_execute_actions_email.py +++ b/tests/unit/plugins/modules/test_keycloak_user_execute_actions_email.py @@ -46,7 +46,7 @@ def _mock_good_connection(): ) } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=_build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_user_federation.py b/tests/unit/plugins/modules/test_keycloak_user_federation.py index 0283d195eb..72b4e1f00f 100644 --- a/tests/unit/plugins/modules/test_keycloak_user_federation.py +++ b/tests/unit/plugins/modules/test_keycloak_user_federation.py @@ -78,7 +78,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_userprofile.py b/tests/unit/plugins/modules/test_keycloak_userprofile.py index 4f559ee096..b8a2d45101 100644 --- a/tests/unit/plugins/modules/test_keycloak_userprofile.py +++ b/tests/unit/plugins/modules/test_keycloak_userprofile.py @@ -79,7 +79,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_linode_v4.py b/tests/unit/plugins/modules/test_linode_v4.py index a0272bdb7a..759c48f9d2 100644 --- a/tests/unit/plugins/modules/test_linode_v4.py +++ b/tests/unit/plugins/modules/test_linode_v4.py @@ -16,7 +16,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from linode_api4 import LinodeClient from linode_api4.errors import ApiError as LinodeApiError -from ansible_collections.community.general.plugins.module_utils.linode import get_user_agent +from ansible_collections.community.general.plugins.module_utils._linode import get_user_agent from ansible_collections.community.general.plugins.modules import linode_v4 from .linode_conftest import ( # noqa: F401, pylint: disable=unused-import diff --git a/tests/unit/plugins/modules/test_lxca_cmms.py b/tests/unit/plugins/modules/test_lxca_cmms.py index 2a0882ee48..087dfc4648 100644 --- a/tests/unit/plugins/modules/test_lxca_cmms.py +++ b/tests/unit/plugins/modules/test_lxca_cmms.py @@ -14,7 +14,8 @@ from ansible_collections.community.general.plugins.modules import lxca_cmms @pytest.fixture(scope="module") @mock.patch( - "ansible_collections.community.general.plugins.module_utils.remote_management.lxca.common.close_conn", autospec=True + "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.close_conn", + autospec=True, ) def setup_module(close_conn): close_conn.return_value = True @@ -42,7 +43,7 @@ class TestMyModule: ) @pytest.mark.usefixtures("patch_ansible_module") @mock.patch( - "ansible_collections.community.general.plugins.module_utils.remote_management.lxca.common.setup_conn", + "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn", autospec=True, ) @mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms.execute_module", autospec=True) @@ -58,7 +59,7 @@ class TestMyModule: assert "missing required arguments" in results["msg"] @mock.patch( - "ansible_collections.community.general.plugins.module_utils.remote_management.lxca.common.setup_conn", + "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn", autospec=True, ) @mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms.execute_module", autospec=True) @@ -86,7 +87,7 @@ class TestMyModule: assert mock.call(argument_spec=expected_arguments_spec, supports_check_mode=False) == ansible_mod_cls.call_args @mock.patch( - "ansible_collections.community.general.plugins.module_utils.remote_management.lxca.common.setup_conn", + "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn", autospec=True, ) @mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms._cmms_by_uuid", autospec=True) diff --git a/tests/unit/plugins/modules/test_lxca_nodes.py b/tests/unit/plugins/modules/test_lxca_nodes.py index 8edd533102..25204709a7 100644 --- a/tests/unit/plugins/modules/test_lxca_nodes.py +++ b/tests/unit/plugins/modules/test_lxca_nodes.py @@ -14,7 +14,8 @@ from ansible_collections.community.general.plugins.modules import lxca_nodes @pytest.fixture(scope="module") @mock.patch( - "ansible_collections.community.general.plugins.module_utils.remote_management.lxca.common.close_conn", autospec=True + "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.close_conn", + autospec=True, ) def setup_module(close_conn): close_conn.return_value = True @@ -42,7 +43,7 @@ class TestMyModule: ) @pytest.mark.usefixtures("patch_ansible_module") @mock.patch( - "ansible_collections.community.general.plugins.module_utils.remote_management.lxca.common.setup_conn", + "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn", autospec=True, ) @mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes.execute_module", autospec=True) @@ -58,7 +59,7 @@ class TestMyModule: assert "missing required arguments" in results["msg"] @mock.patch( - "ansible_collections.community.general.plugins.module_utils.remote_management.lxca.common.setup_conn", + "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn", autospec=True, ) @mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes.execute_module", autospec=True) @@ -95,7 +96,7 @@ class TestMyModule: assert mock.call(argument_spec=expected_arguments_spec, supports_check_mode=False) == ansible_mod_cls.call_args @mock.patch( - "ansible_collections.community.general.plugins.module_utils.remote_management.lxca.common.setup_conn", + "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn", autospec=True, ) @mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes._nodes_by_uuid", autospec=True) diff --git a/tests/unit/plugins/modules/test_nsupdate.py b/tests/unit/plugins/modules/test_nsupdate.py index b43e9c0eeb..4cde1db926 100644 --- a/tests/unit/plugins/modules/test_nsupdate.py +++ b/tests/unit/plugins/modules/test_nsupdate.py @@ -21,7 +21,7 @@ import dns.update from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args import ansible_collections.community.general.plugins.modules.nsupdate as nsupdate_module -from ansible_collections.community.general.plugins.module_utils import deps +from ansible_collections.community.general.plugins.module_utils import _deps as deps # --------------------------------------------------------------------------- # Fixtures diff --git a/tests/unit/plugins/modules/test_ocapi_command.py b/tests/unit/plugins/modules/test_ocapi_command.py index 76888f7d7f..9d67454c23 100644 --- a/tests/unit/plugins/modules/test_ocapi_command.py +++ b/tests/unit/plugins/modules/test_ocapi_command.py @@ -171,7 +171,7 @@ class TestOcapiCommand(unittest.TestCase): def test_set_power_mode(self): """Test that we can set chassis power mode""" with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_put_request, ): @@ -192,7 +192,7 @@ class TestOcapiCommand(unittest.TestCase): def test_set_chassis_led_indicator(self): """Test that we can set chassis LED indicator.""" with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_put_request, ): @@ -213,7 +213,7 @@ class TestOcapiCommand(unittest.TestCase): def test_set_power_mode_already_set(self): """Test that if we set Power Mode to normal when it's already normal, we get changed=False.""" with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_invalid_http_request, ): @@ -234,7 +234,7 @@ class TestOcapiCommand(unittest.TestCase): def test_set_power_mode_check_mode(self): """Test check mode when setting chassis Power Mode.""" with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_invalid_http_request, ): @@ -256,7 +256,7 @@ class TestOcapiCommand(unittest.TestCase): def test_set_chassis_led_indicator_check_mode(self): """Test check mode when setting chassis LED indicator""" with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_invalid_http_request, ): @@ -278,7 +278,7 @@ class TestOcapiCommand(unittest.TestCase): def test_set_chassis_led_indicator_already_set(self): """Test that if we set LED Indicator to off when it's already off, we get changed=False.""" with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_invalid_http_request, ): @@ -299,7 +299,7 @@ class TestOcapiCommand(unittest.TestCase): def test_set_chassis_led_indicator_already_set_check_mode(self): """Test that if we set LED Indicator to off when it's already off, we get changed=False even in check mode.""" with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_invalid_http_request, ): @@ -320,7 +320,7 @@ class TestOcapiCommand(unittest.TestCase): def test_set_chassis_invalid_indicator_command(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_put_request, ): @@ -339,7 +339,7 @@ class TestOcapiCommand(unittest.TestCase): def test_reset_enclosure(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_put_request, ): @@ -359,7 +359,7 @@ class TestOcapiCommand(unittest.TestCase): def test_reset_enclosure_check_mode(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_invalid_http_request, ): @@ -380,7 +380,7 @@ class TestOcapiCommand(unittest.TestCase): def test_firmware_upload_missing_update_image_path(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_put_request, ): @@ -399,7 +399,7 @@ class TestOcapiCommand(unittest.TestCase): def test_firmware_upload_file_not_found(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_invalid_http_request, ): @@ -425,7 +425,7 @@ class TestOcapiCommand(unittest.TestCase): f.write(file_contents) with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_put_request, post_request=mock_post_request, @@ -453,7 +453,7 @@ class TestOcapiCommand(unittest.TestCase): f.write(file_contents) with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_put_request, post_request=mock_invalid_http_request, @@ -476,7 +476,7 @@ class TestOcapiCommand(unittest.TestCase): def test_firmware_update(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_put_request, post_request=mock_invalid_http_request, @@ -497,7 +497,7 @@ class TestOcapiCommand(unittest.TestCase): def test_firmware_update_check_mode(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_invalid_http_request, post_request=mock_invalid_http_request, @@ -519,7 +519,7 @@ class TestOcapiCommand(unittest.TestCase): def test_firmware_activate(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_put_request, post_request=mock_invalid_http_request, @@ -540,7 +540,7 @@ class TestOcapiCommand(unittest.TestCase): def test_firmware_activate_check_mode(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_invalid_http_request, post_request=mock_invalid_http_request, @@ -562,7 +562,7 @@ class TestOcapiCommand(unittest.TestCase): def test_delete_job(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request_job_complete, delete_request=mock_delete_request, put_request=mock_invalid_http_request, @@ -585,7 +585,7 @@ class TestOcapiCommand(unittest.TestCase): def test_delete_job_in_progress(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request_job_in_progress, delete_request=mock_invalid_http_request, put_request=mock_invalid_http_request, @@ -607,7 +607,7 @@ class TestOcapiCommand(unittest.TestCase): def test_delete_job_in_progress_only_on_delete(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request_job_complete, delete_request=mock_http_request_conflict, put_request=mock_invalid_http_request, @@ -629,7 +629,7 @@ class TestOcapiCommand(unittest.TestCase): def test_delete_job_check_mode(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request_job_complete, delete_request=mock_delete_request, put_request=mock_invalid_http_request, @@ -653,7 +653,7 @@ class TestOcapiCommand(unittest.TestCase): def test_delete_job_check_mode_job_not_found(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request_job_does_not_exist, delete_request=mock_delete_request, put_request=mock_invalid_http_request, @@ -677,7 +677,7 @@ class TestOcapiCommand(unittest.TestCase): def test_delete_job_check_mode_job_in_progress(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request_job_in_progress, delete_request=mock_delete_request, put_request=mock_invalid_http_request, diff --git a/tests/unit/plugins/modules/test_ocapi_info.py b/tests/unit/plugins/modules/test_ocapi_info.py index e74e907d48..1f2e9c4582 100644 --- a/tests/unit/plugins/modules/test_ocapi_info.py +++ b/tests/unit/plugins/modules/test_ocapi_info.py @@ -138,7 +138,7 @@ class TestOcapiInfo(unittest.TestCase): def test_job_status_in_progress(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_put_request, delete_request=mock_delete_request, @@ -182,7 +182,7 @@ class TestOcapiInfo(unittest.TestCase): def test_job_status_complete(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_put_request, delete_request=mock_delete_request, @@ -224,7 +224,7 @@ class TestOcapiInfo(unittest.TestCase): def test_job_status_not_found(self): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.ocapi_utils.OcapiUtils", + "ansible_collections.community.general.plugins.module_utils._ocapi_utils.OcapiUtils", get_request=mock_get_request, put_request=mock_put_request, delete_request=mock_delete_request, diff --git a/tests/unit/plugins/modules/test_pacemaker_resource.py b/tests/unit/plugins/modules/test_pacemaker_resource.py index a0fe178298..c7dfbe9e98 100644 --- a/tests/unit/plugins/modules/test_pacemaker_resource.py +++ b/tests/unit/plugins/modules/test_pacemaker_resource.py @@ -45,7 +45,7 @@ def patch_bin(mocker): @pytest.mark.usefixtures("patch_bin") def test_present_race_condition_stopped_then_started(mocker, capfd): """Resource reports Stopped on the first poll then Started on the second — must succeed.""" - mocker.patch("ansible_collections.community.general.plugins.module_utils.pacemaker.time.sleep") + mocker.patch("ansible_collections.community.general.plugins.module_utils._pacemaker.time.sleep") # Sequence of run_command calls: # 1. initial _get(): resource status → not found (rc=1) @@ -99,12 +99,12 @@ def test_present_race_condition_stopped_then_started(mocker, capfd): @pytest.mark.usefixtures("patch_bin") def test_present_wait_timeout_raises(mocker, capfd): """Resource never starts within the wait window — must fail with a timeout message.""" - mocker.patch("ansible_collections.community.general.plugins.module_utils.pacemaker.time.sleep") + mocker.patch("ansible_collections.community.general.plugins.module_utils._pacemaker.time.sleep") # Simulate time advancing past the deadline immediately on the first poll monotonic_values = iter([0.0, 999.0]) mocker.patch( - "ansible_collections.community.general.plugins.module_utils.pacemaker.time.monotonic", + "ansible_collections.community.general.plugins.module_utils._pacemaker.time.monotonic", side_effect=lambda: next(monotonic_values), ) diff --git a/tests/unit/plugins/modules/test_pacemaker_stonith.py b/tests/unit/plugins/modules/test_pacemaker_stonith.py index 891c9ac90a..a79544af4a 100644 --- a/tests/unit/plugins/modules/test_pacemaker_stonith.py +++ b/tests/unit/plugins/modules/test_pacemaker_stonith.py @@ -37,7 +37,7 @@ def patch_bin(mocker): @pytest.mark.usefixtures("patch_bin") def test_present_race_condition_stopped_then_started(mocker, capfd): """Resource reports Stopped on the first poll then Started on the second — must succeed.""" - mocker.patch("ansible_collections.community.general.plugins.module_utils.pacemaker.time.sleep") + mocker.patch("ansible_collections.community.general.plugins.module_utils._pacemaker.time.sleep") # Sequence of run_command calls: # 1. initial _get(): stonith status → not found (rc=1) @@ -87,12 +87,12 @@ def test_present_race_condition_stopped_then_started(mocker, capfd): @pytest.mark.usefixtures("patch_bin") def test_present_wait_timeout_raises(mocker, capfd): """Resource never starts within the wait window — must fail with a timeout message.""" - mocker.patch("ansible_collections.community.general.plugins.module_utils.pacemaker.time.sleep") + mocker.patch("ansible_collections.community.general.plugins.module_utils._pacemaker.time.sleep") # Simulate time advancing past the deadline immediately on the first poll monotonic_values = iter([0.0, 999.0]) mocker.patch( - "ansible_collections.community.general.plugins.module_utils.pacemaker.time.monotonic", + "ansible_collections.community.general.plugins.module_utils._pacemaker.time.monotonic", side_effect=lambda: next(monotonic_values), ) diff --git a/tests/unit/plugins/modules/test_pritunl_org.py b/tests/unit/plugins/modules/test_pritunl_org.py index 5b02cc1918..5cf9cc9a9f 100644 --- a/tests/unit/plugins/modules/test_pritunl_org.py +++ b/tests/unit/plugins/modules/test_pritunl_org.py @@ -17,7 +17,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import ( pritunl_org, ) -from ansible_collections.community.general.tests.unit.plugins.module_utils.net_tools.pritunl.test_api import ( +from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import ( PritunlDeleteOrganizationMock, PritunlListOrganizationAfterPostMock, PritunlListOrganizationMock, @@ -35,21 +35,21 @@ class TestPritunlOrg(ModuleTestCase): def patch_add_pritunl_organization(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api._post_pritunl_organization", + "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._post_pritunl_organization", autospec=True, **kwds, ) def patch_delete_pritunl_organization(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api._delete_pritunl_organization", + "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._delete_pritunl_organization", autospec=True, **kwds, ) def patch_get_pritunl_organizations(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api._get_pritunl_organizations", + "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations", autospec=True, **kwds, ) diff --git a/tests/unit/plugins/modules/test_pritunl_org_info.py b/tests/unit/plugins/modules/test_pritunl_org_info.py index ae9a6dc6d7..f23d77f2ec 100644 --- a/tests/unit/plugins/modules/test_pritunl_org_info.py +++ b/tests/unit/plugins/modules/test_pritunl_org_info.py @@ -16,7 +16,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import ( pritunl_org_info, ) -from ansible_collections.community.general.tests.unit.plugins.module_utils.net_tools.pritunl.test_api import ( +from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import ( PritunlEmptyOrganizationMock, PritunlListOrganizationMock, ) @@ -32,7 +32,7 @@ class TestPritunlOrgInfo(ModuleTestCase): def patch_get_pritunl_organizations(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api._get_pritunl_organizations", + "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations", autospec=True, **kwds, ) diff --git a/tests/unit/plugins/modules/test_pritunl_user.py b/tests/unit/plugins/modules/test_pritunl_user.py index c40dc4d395..092ce61b4d 100644 --- a/tests/unit/plugins/modules/test_pritunl_user.py +++ b/tests/unit/plugins/modules/test_pritunl_user.py @@ -17,7 +17,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import ( pritunl_user, ) -from ansible_collections.community.general.tests.unit.plugins.module_utils.net_tools.pritunl.test_api import ( +from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import ( PritunlDeleteUserMock, PritunlListOrganizationMock, PritunlListUserMock, @@ -47,35 +47,35 @@ class TestPritunlUser(ModuleTestCase): def patch_get_pritunl_users(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api._get_pritunl_users", + "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_users", autospec=True, **kwds, ) def patch_add_pritunl_users(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api._post_pritunl_user", + "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._post_pritunl_user", autospec=True, **kwds, ) def patch_update_pritunl_users(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api._put_pritunl_user", + "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._put_pritunl_user", autospec=True, **kwds, ) def patch_delete_pritunl_users(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api._delete_pritunl_user", + "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._delete_pritunl_user", autospec=True, **kwds, ) def patch_get_pritunl_organizations(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api._get_pritunl_organizations", + "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations", autospec=True, **kwds, ) diff --git a/tests/unit/plugins/modules/test_pritunl_user_info.py b/tests/unit/plugins/modules/test_pritunl_user_info.py index 5ff0b6eefd..e36bc85ad1 100644 --- a/tests/unit/plugins/modules/test_pritunl_user_info.py +++ b/tests/unit/plugins/modules/test_pritunl_user_info.py @@ -16,7 +16,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import ( pritunl_user_info, ) -from ansible_collections.community.general.tests.unit.plugins.module_utils.net_tools.pritunl.test_api import ( +from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import ( PritunlListOrganizationMock, PritunlListUserMock, ) @@ -32,14 +32,14 @@ class TestPritunlUserInfo(ModuleTestCase): def patch_get_pritunl_users(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api._get_pritunl_users", + "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_users", autospec=True, **kwds, ) def patch_get_pritunl_organizations(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils.net_tools.pritunl.api._get_pritunl_organizations", + "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations", autospec=True, **kwds, ) diff --git a/tests/unit/plugins/modules/test_scaleway_compute_private_network.py b/tests/unit/plugins/modules/test_scaleway_compute_private_network.py index 7120179786..4c88d1944e 100644 --- a/tests/unit/plugins/modules/test_scaleway_compute_private_network.py +++ b/tests/unit/plugins/modules/test_scaleway_compute_private_network.py @@ -10,7 +10,7 @@ from unittest.mock import patch import pytest from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args -from ansible_collections.community.general.plugins.module_utils.scaleway import Response, Scaleway +from ansible_collections.community.general.plugins.module_utils._scaleway import Response, Scaleway from ansible_collections.community.general.plugins.modules import scaleway_compute_private_network diff --git a/tests/unit/plugins/modules/test_scaleway_private_network.py b/tests/unit/plugins/modules/test_scaleway_private_network.py index 47129ea7d2..142f321470 100644 --- a/tests/unit/plugins/modules/test_scaleway_private_network.py +++ b/tests/unit/plugins/modules/test_scaleway_private_network.py @@ -10,7 +10,7 @@ from unittest.mock import patch import pytest from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args -from ansible_collections.community.general.plugins.module_utils.scaleway import Response, Scaleway +from ansible_collections.community.general.plugins.module_utils._scaleway import Response, Scaleway from ansible_collections.community.general.plugins.modules import scaleway_private_network diff --git a/tests/unit/plugins/modules/test_ss_3par_cpg.py b/tests/unit/plugins/modules/test_ss_3par_cpg.py index 2410940e23..fe219fa54a 100644 --- a/tests/unit/plugins/modules/test_ss_3par_cpg.py +++ b/tests/unit/plugins/modules/test_ss_3par_cpg.py @@ -11,7 +11,7 @@ sys.modules["hpe3par_sdk"] = mock.Mock() sys.modules["hpe3par_sdk.client"] = mock.Mock() sys.modules["hpe3parclient"] = mock.Mock() sys.modules["hpe3parclient.exceptions"] = mock.Mock() -from ansible_collections.community.general.plugins.module_utils.storage.hpe3par import hpe3par +from ansible_collections.community.general.plugins.module_utils._storage.hpe3par import hpe3par from ansible_collections.community.general.plugins.modules import ss_3par_cpg diff --git a/tests/unit/plugins/modules/test_wdc_redfish_command.py b/tests/unit/plugins/modules/test_wdc_redfish_command.py index 75c0718ad5..f03aa8a36e 100644 --- a/tests/unit/plugins/modules/test_wdc_redfish_command.py +++ b/tests/unit/plugins/modules/test_wdc_redfish_command.py @@ -262,7 +262,7 @@ class TestWdcRedfishCommand(unittest.TestCase): } with set_module_args(module_args): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.WdcRedfishUtils", + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.WdcRedfishUtils", get_request=mock_get_request, post_request=mock_post_request, ): @@ -283,7 +283,7 @@ class TestWdcRedfishCommand(unittest.TestCase): } with set_module_args(module_args): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.WdcRedfishUtils", + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.WdcRedfishUtils", get_request=mock_get_request, ): with self.assertRaises(AnsibleExitJson) as ansible_exit_json: @@ -303,7 +303,7 @@ class TestWdcRedfishCommand(unittest.TestCase): } with set_module_args(module_args): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.WdcRedfishUtils", + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.WdcRedfishUtils", get_request=mock_get_request, ): with self.assertRaises(AnsibleFailJson) as ansible_fail_json: @@ -323,7 +323,7 @@ class TestWdcRedfishCommand(unittest.TestCase): } with set_module_args(module_args): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.WdcRedfishUtils", + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.WdcRedfishUtils", get_request=mock_get_request, post_request=mock_post_request, ): @@ -344,7 +344,7 @@ class TestWdcRedfishCommand(unittest.TestCase): } with set_module_args(module_args): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.WdcRedfishUtils", + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.WdcRedfishUtils", get_request=mock_get_request, post_request=mock_post_request, ): @@ -365,7 +365,7 @@ class TestWdcRedfishCommand(unittest.TestCase): } with set_module_args(module_args): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.WdcRedfishUtils", + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.WdcRedfishUtils", get_request=mock_get_request, ): with self.assertRaises(AnsibleExitJson) as ansible_exit_json: @@ -420,7 +420,7 @@ class TestWdcRedfishCommand(unittest.TestCase): module_args.update(uri_specifier) with set_module_args(module_args): with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.WdcRedfishUtils", + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.WdcRedfishUtils", _firmware_activate_uri=mock_fw_activate_url, _update_uri=mock_update_url, _find_updateservice_resource=empty_return, @@ -538,7 +538,7 @@ class TestWdcRedfishCommand(unittest.TestCase): } ): with patch( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.fetch_file" + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.fetch_file" ) as mock_fetch_file: mock_fetch_file.return_value = mock_filename with patch.multiple( @@ -571,7 +571,7 @@ class TestWdcRedfishCommand(unittest.TestCase): empty_tarfile = tarfile.open(os.path.join(self.tempdir, tar_name), "w") empty_tarfile.close() with patch( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.fetch_file" + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.fetch_file" ) as mock_fetch_file: mock_fetch_file.return_value = os.path.join(self.tempdir, tar_name) with patch.multiple( @@ -603,7 +603,7 @@ class TestWdcRedfishCommand(unittest.TestCase): ): tar_name = self.generate_temp_bundlefile(mock_firmware_version=mock_firmware_version, is_multi_tenant=False) with patch( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.fetch_file" + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.fetch_file" ) as mock_fetch_file: mock_fetch_file.return_value = os.path.join(self.tempdir, tar_name) with patch.multiple( @@ -638,7 +638,7 @@ class TestWdcRedfishCommand(unittest.TestCase): ): tar_name = self.generate_temp_bundlefile(mock_firmware_version=mock_firmware_version, is_multi_tenant=True) with patch( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.fetch_file" + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.fetch_file" ) as mock_fetch_file: mock_fetch_file.return_value = os.path.join(self.tempdir, tar_name) with patch.multiple( @@ -673,11 +673,11 @@ class TestWdcRedfishCommand(unittest.TestCase): tar_name = self.generate_temp_bundlefile(mock_firmware_version=mock_firmware_version, is_multi_tenant=False) with patch( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.fetch_file" + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.fetch_file" ) as mock_fetch_file: mock_fetch_file.return_value = os.path.join(self.tempdir, tar_name) with patch.multiple( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.WdcRedfishUtils", + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.WdcRedfishUtils", get_firmware_inventory=mock_get_firmware_inventory_version_1_2_3, simple_update=mock_simple_update, _simple_update_status_uri=mocked_url_response, @@ -687,7 +687,7 @@ class TestWdcRedfishCommand(unittest.TestCase): post_request=mock_post_request, ): with patch( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.WdcRedfishUtils.get_simple_update_status" + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.WdcRedfishUtils.get_simple_update_status" ) as mock_get_simple_update_status: mock_get_simple_update_status.side_effect = MOCK_SIMPLE_UPDATE_STATUS_LIST with self.assertRaises(AnsibleExitJson) as ansible_exit_json: @@ -712,7 +712,7 @@ class TestWdcRedfishCommand(unittest.TestCase): tar_name = self.generate_temp_bundlefile(mock_firmware_version=mock_firmware_version, is_multi_tenant=True) with patch( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.fetch_file" + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.fetch_file" ) as mock_fetch_file: mock_fetch_file.return_value = os.path.join(self.tempdir, tar_name) with patch.multiple( @@ -726,7 +726,7 @@ class TestWdcRedfishCommand(unittest.TestCase): post_request=mock_post_request, ): with patch( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.WdcRedfishUtils.get_simple_update_status" + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.WdcRedfishUtils.get_simple_update_status" ) as mock_get_simple_update_status: mock_get_simple_update_status.side_effect = MOCK_SIMPLE_UPDATE_STATUS_LIST with self.assertRaises(AnsibleExitJson) as ansible_exit_json: @@ -751,7 +751,7 @@ class TestWdcRedfishCommand(unittest.TestCase): ): tar_name = self.generate_temp_bundlefile(mock_firmware_version=mock_firmware_version, is_multi_tenant=True) with patch( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.fetch_file" + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.fetch_file" ) as mock_fetch_file: mock_fetch_file.return_value = os.path.join(self.tempdir, tar_name) with patch.multiple( @@ -785,7 +785,7 @@ class TestWdcRedfishCommand(unittest.TestCase): ): tar_name = self.generate_temp_bundlefile(mock_firmware_version=mock_firmware_version, is_multi_tenant=False) with patch( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.fetch_file" + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.fetch_file" ) as mock_fetch_file: mock_fetch_file.return_value = os.path.join(self.tempdir, tar_name) with patch.multiple( diff --git a/tests/unit/plugins/modules/test_wdc_redfish_info.py b/tests/unit/plugins/modules/test_wdc_redfish_info.py index b3557ec9c6..3fe998f5bf 100644 --- a/tests/unit/plugins/modules/test_wdc_redfish_info.py +++ b/tests/unit/plugins/modules/test_wdc_redfish_info.py @@ -205,7 +205,7 @@ class TestWdcRedfishInfo(unittest.TestCase): raise RuntimeError(f"Illegal call to get_request in test: {uri}") with patch( - "ansible_collections.community.general.plugins.module_utils.wdc_redfish_utils.WdcRedfishUtils.get_request" + "ansible_collections.community.general.plugins.module_utils._wdc_redfish_utils.WdcRedfishUtils.get_request" ) as mock_get_request: mock_get_request.side_effect = mock_get_request_function with self.assertRaises(AnsibleFailJson) as ansible_exit_json: diff --git a/tests/unit/plugins/modules/test_xenserver_guest_info.py b/tests/unit/plugins/modules/test_xenserver_guest_info.py index c2ba75eb01..92e09233b7 100644 --- a/tests/unit/plugins/modules/test_xenserver_guest_info.py +++ b/tests/unit/plugins/modules/test_xenserver_guest_info.py @@ -79,7 +79,7 @@ def test_xenserver_guest_info(mocker, capfd, XenAPI, xenserver_guest_info): mocked_xenapi.configure_mock(**mocked_returns) mocker.patch( - "ansible_collections.community.general.plugins.module_utils.xenserver.get_xenserver_version", + "ansible_collections.community.general.plugins.module_utils._xenserver.get_xenserver_version", return_value=[7, 2, 0], ) diff --git a/tests/unit/plugins/modules/test_xenserver_guest_powerstate.py b/tests/unit/plugins/modules/test_xenserver_guest_powerstate.py index 7d32e8a840..0c38c95d3b 100644 --- a/tests/unit/plugins/modules/test_xenserver_guest_powerstate.py +++ b/tests/unit/plugins/modules/test_xenserver_guest_powerstate.py @@ -158,7 +158,7 @@ def test_xenserver_guest_powerstate_set_power_state( mocked_xenapi.configure_mock(**mocked_returns) mocker.patch( - "ansible_collections.community.general.plugins.module_utils.xenserver.get_xenserver_version", + "ansible_collections.community.general.plugins.module_utils._xenserver.get_xenserver_version", return_value=[7, 2, 0], ) @@ -222,7 +222,7 @@ def test_xenserver_guest_powerstate_present(mocker, patch_ansible_module, capfd, mocked_xenapi.configure_mock(**mocked_returns) mocker.patch( - "ansible_collections.community.general.plugins.module_utils.xenserver.get_xenserver_version", + "ansible_collections.community.general.plugins.module_utils._xenserver.get_xenserver_version", return_value=[7, 2, 0], ) @@ -283,7 +283,7 @@ def test_xenserver_guest_powerstate_other(mocker, patch_ansible_module, capfd, X mocked_xenapi.configure_mock(**mocked_returns) mocker.patch( - "ansible_collections.community.general.plugins.module_utils.xenserver.get_xenserver_version", + "ansible_collections.community.general.plugins.module_utils._xenserver.get_xenserver_version", return_value=[7, 2, 0], ) @@ -343,7 +343,7 @@ def test_xenserver_guest_powerstate_wait(mocker, patch_ansible_module, capfd, Xe mocked_xenapi.configure_mock(**mocked_returns) mocker.patch( - "ansible_collections.community.general.plugins.module_utils.xenserver.get_xenserver_version", + "ansible_collections.community.general.plugins.module_utils._xenserver.get_xenserver_version", return_value=[7, 2, 0], ) diff --git a/tests/unit/plugins/plugin_utils/test_unsafe.py b/tests/unit/plugins/plugin_utils/test__unsafe.py similarity index 99% rename from tests/unit/plugins/plugin_utils/test_unsafe.py rename to tests/unit/plugins/plugin_utils/test__unsafe.py index d5f029ed92..c3bb80f02e 100644 --- a/tests/unit/plugins/plugin_utils/test_unsafe.py +++ b/tests/unit/plugins/plugin_utils/test__unsafe.py @@ -19,7 +19,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.utils.trust im make_untrusted as _make_untrusted, ) -from ansible_collections.community.general.plugins.plugin_utils.unsafe import ( +from ansible_collections.community.general.plugins.plugin_utils._unsafe import ( make_unsafe, )