From 236b9c0e0473f064d421f8af74f058e5a8970379 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 9 Jan 2026 07:40:58 +0100 Subject: [PATCH] Sort imports with ruff check --fix (#11400) Sort imports with ruff check --fix. --- plugins/action/iptables_state.py | 4 +- plugins/action/shutdown.py | 5 +-- plugins/become/machinectl.py | 3 +- plugins/become/pmrun.py | 1 + plugins/become/run0.py | 3 +- plugins/cache/memcached.py | 4 +- plugins/cache/redis.py | 6 +-- plugins/cache/yaml.py | 3 +- plugins/callback/cgroup_memory_recap.py | 2 +- plugins/callback/counter_enabled.py | 2 +- plugins/callback/dense.py | 4 +- plugins/callback/diy.py | 5 ++- plugins/callback/elastic.py | 3 +- plugins/callback/log_plays.py | 9 ++-- plugins/callback/loganalytics.py | 7 ++- plugins/callback/logdna.py | 5 ++- plugins/callback/logentries.py | 2 +- plugins/callback/logstash.py | 7 +-- plugins/callback/mail.py | 2 +- plugins/callback/opentelemetry.py | 6 +-- plugins/callback/print_task.py | 2 +- plugins/callback/say.py | 2 +- plugins/callback/selective.py | 3 +- plugins/callback/splunk.py | 7 ++- plugins/callback/sumologic.py | 7 ++- plugins/callback/syslog_json.py | 1 - plugins/callback/timestamp.py | 10 ++--- plugins/callback/unixy.py | 3 +- plugins/connection/chroot.py | 2 +- plugins/connection/funcd.py | 2 +- plugins/connection/incus.py | 4 +- plugins/connection/iocage.py | 5 ++- plugins/connection/jail.py | 2 +- plugins/connection/lxc.py | 6 +-- plugins/connection/lxd.py | 4 +- plugins/connection/qubes.py | 3 +- plugins/connection/saltstack.py | 2 +- plugins/connection/wsl.py | 9 ++-- plugins/connection/zone.py | 2 +- plugins/filter/accumulate.py | 2 +- plugins/filter/counter.py | 5 ++- plugins/filter/crc32.py | 2 +- plugins/filter/from_csv.py | 6 +-- plugins/filter/from_ini.py | 2 +- plugins/filter/groupby_as_dict.py | 3 +- plugins/filter/hashids.py | 1 - plugins/filter/jc.py | 3 +- plugins/filter/json_patch.py | 4 +- plugins/filter/lists_mergeby.py | 8 ++-- plugins/filter/time.py | 2 +- plugins/filter/to_ini.py | 1 + plugins/filter/to_yaml.py | 2 +- plugins/inventory/gitlab_runners.py | 1 - plugins/inventory/icinga2.py | 3 +- plugins/inventory/incus.py | 5 ++- plugins/inventory/iocage.py | 6 +-- plugins/inventory/linode.py | 5 +-- plugins/inventory/lxd.py | 9 ++-- plugins/inventory/nmap.py | 7 ++- plugins/inventory/online.py | 4 +- plugins/inventory/opennebula.py | 7 ++- plugins/inventory/scaleway.py | 12 +++--- plugins/inventory/virtualbox.py | 9 ++-- plugins/inventory/xen_orchestra.py | 2 +- plugins/lookup/binary_file.py | 1 - plugins/lookup/bitwarden.py | 2 +- plugins/lookup/bitwarden_secrets_manager.py | 3 +- plugins/lookup/chef_databag.py | 2 +- plugins/lookup/collection_version.py | 2 - plugins/lookup/consul_kv.py | 5 +-- plugins/lookup/cyberarkpassword.py | 5 +-- plugins/lookup/dependent.py | 3 +- plugins/lookup/dig.py | 13 +++--- plugins/lookup/dsv.py | 4 +- plugins/lookup/etcd.py | 2 +- plugins/lookup/filetree.py | 6 +-- plugins/lookup/github_app_access_token.py | 6 +-- plugins/lookup/hiera.py | 2 +- plugins/lookup/lastpass.py | 2 +- plugins/lookup/lmdb_kv.py | 2 +- plugins/lookup/onepassword.py | 4 +- plugins/lookup/onepassword_doc.py | 3 +- plugins/lookup/onepassword_raw.py | 3 +- plugins/lookup/onepassword_ssh_key.py | 5 ++- plugins/lookup/passwordstore.py | 11 +++-- plugins/lookup/random_pet.py | 1 - plugins/lookup/random_string.py | 3 +- plugins/lookup/random_words.py | 1 - plugins/lookup/redis.py | 2 +- plugins/lookup/revbitspss.py | 3 +- plugins/lookup/shelvefile.py | 4 +- plugins/lookup/tss.py | 14 +++--- plugins/module_utils/_filelock.py | 3 +- plugins/module_utils/_lxc.py | 1 - plugins/module_utils/_stormssh.py | 2 +- plugins/module_utils/alicloud_ecs.py | 16 +++---- plugins/module_utils/android_sdkmanager.py | 1 - plugins/module_utils/btrfs.py | 5 ++- plugins/module_utils/cloud.py | 3 +- plugins/module_utils/cmd_runner.py | 3 ++ plugins/module_utils/cmd_runner_fmt.py | 1 - plugins/module_utils/consul.py | 1 - plugins/module_utils/csv.py | 1 - plugins/module_utils/deps.py | 1 - plugins/module_utils/dimensiondata.py | 14 +++--- plugins/module_utils/django.py | 4 +- plugins/module_utils/homebrew.py | 1 - plugins/module_utils/hwc_utils.py | 2 +- plugins/module_utils/ibm_sa_utils.py | 2 +- .../identity/keycloak/keycloak.py | 5 ++- .../keycloak/keycloak_clientsecret.py | 2 +- plugins/module_utils/influxdb.py | 6 ++- plugins/module_utils/ipa.py | 6 +-- plugins/module_utils/jenkins.py | 1 - plugins/module_utils/known_hosts.py | 3 +- plugins/module_utils/lxd.py | 1 - plugins/module_utils/manageiq.py | 1 - plugins/module_utils/memset.py | 7 +-- plugins/module_utils/mh/base.py | 3 +- plugins/module_utils/mh/module_helper.py | 5 ++- plugins/module_utils/module_helper.py | 15 +++---- plugins/module_utils/net_tools/pritunl/api.py | 2 +- plugins/module_utils/ocapi_utils.py | 6 +-- plugins/module_utils/opennebula.py | 5 +-- plugins/module_utils/oracle/oci_utils.py | 16 +++---- plugins/module_utils/pkg_req.py | 3 +- plugins/module_utils/redfish_utils.py | 10 ++--- plugins/module_utils/redis.py | 2 +- plugins/module_utils/scaleway.py | 5 ++- .../module_utils/source_control/bitbucket.py | 2 +- plugins/module_utils/ssh.py | 1 - plugins/module_utils/storage/emc/emc_vnx.py | 1 - plugins/module_utils/univention_umc.py | 6 +-- plugins/module_utils/version.py | 1 - plugins/module_utils/wdc_redfish_utils.py | 3 +- plugins/module_utils/xenserver.py | 4 +- plugins/module_utils/xfconf.py | 1 + plugins/modules/aerospike_migrations.py | 6 +-- plugins/modules/airbrake_deployment.py | 2 - plugins/modules/aix_filesystem.py | 6 +-- plugins/modules/aix_lvol.py | 1 - plugins/modules/alerta_customer.py | 2 +- plugins/modules/ali_instance.py | 7 +-- plugins/modules/ali_instance_info.py | 6 +-- plugins/modules/alternatives.py | 1 - plugins/modules/android_sdk.py | 3 +- plugins/modules/apache2_mod_proxy.py | 7 ++- plugins/modules/apache2_module.py | 1 - plugins/modules/apk.py | 1 - plugins/modules/archive.py | 1 - plugins/modules/atomic_container.py | 1 - plugins/modules/awall.py | 2 +- plugins/modules/beadm.py | 2 +- plugins/modules/bigpanda.py | 1 - plugins/modules/bitbucket_access_key.py | 1 + .../modules/bitbucket_pipeline_key_pair.py | 1 + .../modules/bitbucket_pipeline_known_host.py | 1 + .../modules/bitbucket_pipeline_variable.py | 1 + plugins/modules/bower.py | 1 - plugins/modules/btrfs_info.py | 3 +- plugins/modules/btrfs_subvolume.py | 16 ++++--- plugins/modules/bundler.py | 1 - plugins/modules/campfire.py | 1 - plugins/modules/catapult.py | 1 - plugins/modules/circonus_annotation.py | 1 - plugins/modules/cisco_webex.py | 1 - plugins/modules/cloud_init_data_facts.py | 2 - plugins/modules/composer.py | 2 +- plugins/modules/consul.py | 2 +- plugins/modules/consul_acl_bootstrap.py | 2 +- plugins/modules/consul_agent_check.py | 4 +- plugins/modules/consul_agent_service.py | 4 +- plugins/modules/consul_auth_method.py | 2 +- plugins/modules/consul_binding_rule.py | 2 +- plugins/modules/consul_kv.py | 1 - plugins/modules/consul_policy.py | 2 +- plugins/modules/consul_role.py | 2 +- plugins/modules/consul_session.py | 1 + plugins/modules/consul_token.py | 2 +- plugins/modules/copr.py | 7 ++- plugins/modules/cpanm.py | 1 - plugins/modules/datadog_downtime.py | 4 +- plugins/modules/datadog_event.py | 3 +- plugins/modules/datadog_monitor.py | 3 +- plugins/modules/dconf.py | 4 +- plugins/modules/decompress.py | 4 +- plugins/modules/deploy_helper.py | 1 - plugins/modules/dimensiondata_network.py | 4 +- plugins/modules/dimensiondata_vlan.py | 3 +- plugins/modules/discord.py | 2 +- plugins/modules/django_command.py | 2 +- plugins/modules/django_manage.py | 3 +- plugins/modules/dnf_config_manager.py | 3 +- plugins/modules/dnf_versionlock.py | 3 +- plugins/modules/dnsimple.py | 7 ++- plugins/modules/dnsimple_info.py | 2 +- plugins/modules/dnsmadeeasy.py | 5 +-- plugins/modules/dpkg_divert.py | 3 +- plugins/modules/easy_install.py | 2 +- plugins/modules/ejabberd_user.py | 2 +- plugins/modules/elasticsearch_plugin.py | 2 - plugins/modules/emc_vnx_sg_member.py | 5 ++- plugins/modules/etcd3.py | 2 - plugins/modules/file_remove.py | 3 +- plugins/modules/filesize.py | 6 +-- plugins/modules/filesystem.py | 1 - plugins/modules/gandi_livedns.py | 1 + plugins/modules/gconftool2.py | 2 +- plugins/modules/gconftool2_info.py | 2 +- plugins/modules/gem.py | 1 - plugins/modules/gio_mime.py | 2 +- plugins/modules/git_config.py | 1 - plugins/modules/git_config_info.py | 1 - plugins/modules/github_deploy_key.py | 4 +- plugins/modules/github_issue.py | 1 - plugins/modules/github_key.py | 1 - plugins/modules/github_release.py | 1 - plugins/modules/github_repo.py | 1 + plugins/modules/gitlab_branch.py | 6 +-- plugins/modules/gitlab_deploy_key.py | 2 +- plugins/modules/gitlab_group.py | 2 +- plugins/modules/gitlab_group_access_token.py | 2 +- plugins/modules/gitlab_group_members.py | 2 +- plugins/modules/gitlab_group_variable.py | 7 +-- plugins/modules/gitlab_instance_variable.py | 5 ++- plugins/modules/gitlab_issue.py | 8 ++-- plugins/modules/gitlab_label.py | 4 +- plugins/modules/gitlab_merge_request.py | 8 ++-- plugins/modules/gitlab_milestone.py | 7 +-- plugins/modules/gitlab_project.py | 3 +- .../modules/gitlab_project_access_token.py | 2 +- plugins/modules/gitlab_project_badge.py | 2 +- plugins/modules/gitlab_project_members.py | 2 +- plugins/modules/gitlab_project_variable.py | 7 ++- plugins/modules/gitlab_protected_branch.py | 7 ++- plugins/modules/gitlab_runner.py | 4 +- plugins/modules/gitlab_user.py | 2 +- plugins/modules/grove.py | 2 - plugins/modules/gunicorn.py | 1 - plugins/modules/haproxy.py | 1 - plugins/modules/heroku_collaborator.py | 1 + plugins/modules/homebrew.py | 5 +-- plugins/modules/homebrew_cask.py | 9 ++-- plugins/modules/homebrew_services.py | 1 + plugins/modules/homebrew_tap.py | 1 - plugins/modules/homectl.py | 4 +- plugins/modules/honeybadger_deployment.py | 1 - plugins/modules/hpilo_boot.py | 2 - plugins/modules/hpilo_info.py | 2 - plugins/modules/hponcfg.py | 1 - plugins/modules/htpasswd.py | 3 +- plugins/modules/hwc_network_vpc.py | 9 ++-- plugins/modules/hwc_smn_topic.py | 7 +-- plugins/modules/ibm_sa_domain.py | 5 ++- plugins/modules/ibm_sa_host.py | 5 ++- plugins/modules/ibm_sa_host_ports.py | 5 ++- plugins/modules/ibm_sa_pool.py | 5 ++- plugins/modules/ibm_sa_vol.py | 5 ++- plugins/modules/ibm_sa_vol_map.py | 5 ++- plugins/modules/icinga2_feature.py | 2 +- plugins/modules/icinga2_host.py | 1 - plugins/modules/idrac_redfish_command.py | 4 +- plugins/modules/idrac_redfish_config.py | 3 +- plugins/modules/idrac_redfish_info.py | 3 +- plugins/modules/ilo_redfish_command.py | 3 +- plugins/modules/ilo_redfish_config.py | 3 +- plugins/modules/ilo_redfish_info.py | 1 + plugins/modules/imc_rest.py | 1 - plugins/modules/imgadm.py | 1 - plugins/modules/influxdb_database.py | 2 +- plugins/modules/influxdb_query.py | 2 +- plugins/modules/influxdb_retention_policy.py | 3 +- plugins/modules/influxdb_user.py | 4 +- plugins/modules/influxdb_write.py | 2 +- plugins/modules/ini_file.py | 1 - plugins/modules/interfaces_file.py | 1 - plugins/modules/ipa_config.py | 1 + plugins/modules/ipa_dnsrecord.py | 3 +- plugins/modules/ipa_dnszone.py | 1 + plugins/modules/ipa_getkeytab.py | 2 +- plugins/modules/ipa_group.py | 1 + plugins/modules/ipa_hbacrule.py | 1 + plugins/modules/ipa_host.py | 1 + plugins/modules/ipa_hostgroup.py | 1 + plugins/modules/ipa_otpconfig.py | 1 + plugins/modules/ipa_otptoken.py | 1 + plugins/modules/ipa_pwpolicy.py | 1 + plugins/modules/ipa_role.py | 1 + plugins/modules/ipa_service.py | 1 + plugins/modules/ipa_subca.py | 2 +- plugins/modules/ipa_sudocmd.py | 1 + plugins/modules/ipa_sudocmdgroup.py | 1 + plugins/modules/ipa_sudorule.py | 1 + plugins/modules/ipa_user.py | 1 + plugins/modules/ipa_vault.py | 1 + plugins/modules/ipbase_info.py | 4 +- plugins/modules/ipify_facts.py | 3 +- plugins/modules/ipinfoio_facts.py | 3 -- plugins/modules/ipmi_boot.py | 3 +- plugins/modules/ipmi_power.py | 3 +- plugins/modules/iptables_state.py | 4 +- plugins/modules/irc.py | 3 +- plugins/modules/iso_customize.py | 3 +- plugins/modules/jabber.py | 1 - plugins/modules/java_cert.py | 2 +- plugins/modules/java_keystore.py | 13 +++--- plugins/modules/jboss.py | 3 +- plugins/modules/jenkins_credential.py | 14 +++--- plugins/modules/jenkins_job_info.py | 2 +- plugins/modules/jenkins_node.py | 1 + plugins/modules/jenkins_plugin.py | 3 +- plugins/modules/jenkins_script.py | 3 +- plugins/modules/jira.py | 6 +-- plugins/modules/kdeconfig.py | 1 - plugins/modules/kea_command.py | 1 - plugins/modules/keycloak_authentication.py | 7 +-- ...eycloak_authentication_required_actions.py | 7 +-- .../keycloak_authz_authorization_scope.py | 7 +-- .../modules/keycloak_authz_custom_policy.py | 7 +-- plugins/modules/keycloak_authz_permission.py | 7 +-- .../modules/keycloak_authz_permission_info.py | 7 +-- plugins/modules/keycloak_client.py | 17 ++++---- .../modules/keycloak_client_rolemapping.py | 7 +-- plugins/modules/keycloak_client_rolescope.py | 7 +-- plugins/modules/keycloak_clientscope.py | 9 ++-- plugins/modules/keycloak_clientscope_type.py | 4 +- plugins/modules/keycloak_clientsecret_info.py | 1 - .../keycloak_clientsecret_regenerate.py | 1 - plugins/modules/keycloak_clienttemplate.py | 9 ++-- plugins/modules/keycloak_component.py | 14 +++--- plugins/modules/keycloak_component_info.py | 10 +++-- plugins/modules/keycloak_group.py | 9 ++-- plugins/modules/keycloak_identity_provider.py | 12 +++--- plugins/modules/keycloak_realm.py | 9 ++-- plugins/modules/keycloak_realm_info.py | 3 +- plugins/modules/keycloak_realm_key.py | 14 +++--- .../keycloak_realm_keys_metadata_info.py | 2 +- plugins/modules/keycloak_realm_rolemapping.py | 7 +-- plugins/modules/keycloak_role.py | 12 +++--- plugins/modules/keycloak_user.py | 13 +++--- .../keycloak_user_execute_actions_email.py | 7 +-- plugins/modules/keycloak_user_federation.py | 14 +++--- plugins/modules/keycloak_user_rolemapping.py | 7 +-- plugins/modules/keycloak_userprofile.py | 20 +++++---- plugins/modules/keyring.py | 3 +- plugins/modules/keyring_info.py | 3 +- plugins/modules/kibana_plugin.py | 3 +- plugins/modules/krb_ticket.py | 2 +- plugins/modules/layman.py | 3 -- plugins/modules/lbu.py | 4 +- plugins/modules/ldap_attrs.py | 5 +-- plugins/modules/ldap_entry.py | 4 +- plugins/modules/ldap_inc.py | 2 +- plugins/modules/ldap_passwd.py | 2 +- plugins/modules/ldap_search.py | 1 + plugins/modules/librato_annotation.py | 1 - plugins/modules/linode.py | 2 +- plugins/modules/linode_v4.py | 1 + plugins/modules/listen_ports_facts.py | 3 +- plugins/modules/lldp.py | 1 - plugins/modules/locale_gen.py | 6 +-- plugins/modules/logentries.py | 1 - plugins/modules/logentries_msg.py | 1 - plugins/modules/logstash_plugin.py | 2 - plugins/modules/lvm_pv.py | 2 +- plugins/modules/lvm_pv_move_data.py | 3 +- plugins/modules/lxc_container.py | 5 +-- plugins/modules/lxca_cmms.py | 5 ++- plugins/modules/lxca_nodes.py | 5 ++- plugins/modules/lxd_container.py | 2 +- plugins/modules/lxd_profile.py | 1 + plugins/modules/lxd_project.py | 8 ++-- plugins/modules/lxd_storage_pool_info.py | 1 + plugins/modules/lxd_storage_volume_info.py | 1 + plugins/modules/macports.py | 1 - plugins/modules/mail.py | 5 +-- plugins/modules/make.py | 1 + plugins/modules/manageiq_alert_profiles.py | 2 +- plugins/modules/manageiq_alerts.py | 2 +- plugins/modules/manageiq_group.py | 2 +- plugins/modules/manageiq_policies.py | 2 +- plugins/modules/manageiq_policies_info.py | 2 +- plugins/modules/manageiq_provider.py | 2 +- plugins/modules/manageiq_tags.py | 2 +- plugins/modules/manageiq_tags_info.py | 2 +- plugins/modules/manageiq_tenant.py | 2 +- plugins/modules/manageiq_user.py | 2 +- plugins/modules/mas.py | 7 ++- plugins/modules/mattermost.py | 1 - plugins/modules/maven_artifact.py | 10 ++--- plugins/modules/memset_dns_reload.py | 1 + plugins/modules/memset_memstore_info.py | 1 + plugins/modules/memset_server_info.py | 1 + plugins/modules/memset_zone.py | 5 +-- plugins/modules/memset_zone_domain.py | 9 ++-- plugins/modules/memset_zone_record.py | 4 +- plugins/modules/mksysb.py | 1 - plugins/modules/modprobe.py | 2 +- plugins/modules/monit.py | 5 +-- plugins/modules/mqtt.py | 3 +- plugins/modules/mssql_db.py | 1 - plugins/modules/mssql_script.py | 5 ++- plugins/modules/nagios.py | 3 +- plugins/modules/netcup_dns.py | 1 - plugins/modules/newrelic_deployment.py | 6 +-- plugins/modules/nexmo.py | 2 - plugins/modules/nginx_status_info.py | 4 +- plugins/modules/nmcli.py | 3 +- plugins/modules/nomad_token.py | 1 - plugins/modules/nosh.py | 1 - plugins/modules/npm.py | 2 +- plugins/modules/nsupdate.py | 8 ++-- plugins/modules/ocapi_command.py | 4 +- plugins/modules/ocapi_info.py | 3 +- plugins/modules/oci_vcn.py | 5 +-- plugins/modules/office_365_connector_card.py | 2 +- plugins/modules/ohai.py | 1 - plugins/modules/omapi_host.py | 15 +++++-- plugins/modules/one_host.py | 1 - plugins/modules/one_image.py | 1 - plugins/modules/one_image_info.py | 1 - plugins/modules/one_vm.py | 2 - plugins/modules/oneandone_firewall_policy.py | 4 +- plugins/modules/oneandone_load_balancer.py | 6 ++- .../modules/oneandone_monitoring_policy.py | 4 +- plugins/modules/oneandone_private_network.py | 6 ++- plugins/modules/oneandone_public_ip.py | 4 +- plugins/modules/oneandone_server.py | 18 ++++---- plugins/modules/onepassword_info.py | 3 +- plugins/modules/online_server_info.py | 2 +- plugins/modules/online_user_info.py | 1 + plugins/modules/openbsd_pkg.py | 1 - plugins/modules/openwrt_init.py | 2 +- plugins/modules/opkg.py | 2 +- plugins/modules/osx_defaults.py | 2 +- plugins/modules/ovh_ip_failover.py | 1 - .../modules/ovh_ip_loadbalancing_backend.py | 1 - plugins/modules/ovh_monthly_billing.py | 1 - plugins/modules/pacemaker_cluster.py | 2 +- plugins/modules/pacemaker_resource.py | 2 +- plugins/modules/packet_device.py | 3 +- plugins/modules/packet_ip_subnet.py | 3 +- plugins/modules/packet_project.py | 1 - plugins/modules/packet_sshkey.py | 1 - plugins/modules/packet_volume_attachment.py | 1 - plugins/modules/pacman.py | 4 +- plugins/modules/pacman_key.py | 3 +- plugins/modules/pagerduty.py | 1 - plugins/modules/pagerduty_alert.py | 5 +-- plugins/modules/pagerduty_change.py | 3 +- plugins/modules/pagerduty_user.py | 2 + plugins/modules/pamd.py | 5 +-- plugins/modules/parted.py | 5 +-- plugins/modules/pear.py | 3 +- plugins/modules/pids.py | 2 +- plugins/modules/pingdom.py | 1 - plugins/modules/pipx.py | 9 ++-- plugins/modules/pipx_info.py | 9 ++-- plugins/modules/pkg5_publisher.py | 1 - plugins/modules/pkgin.py | 1 - plugins/modules/pkgng.py | 4 +- plugins/modules/pkgutil.py | 1 - plugins/modules/pmem.py | 3 +- plugins/modules/portage.py | 2 - plugins/modules/portinstall.py | 3 +- plugins/modules/pritunl_org.py | 6 +-- plugins/modules/pritunl_org_info.py | 2 +- plugins/modules/pritunl_user.py | 2 +- plugins/modules/pritunl_user_info.py | 2 +- plugins/modules/pubnub_blocks.py | 5 +-- plugins/modules/pulp_repo.py | 4 +- plugins/modules/puppet.py | 4 +- plugins/modules/pushbullet.py | 2 - plugins/modules/pushover.py | 2 +- plugins/modules/python_requirements_info.py | 3 +- plugins/modules/read_csv.py | 6 +-- plugins/modules/redfish_command.py | 8 ++-- plugins/modules/redfish_config.py | 8 ++-- plugins/modules/redfish_info.py | 3 +- plugins/modules/redhat_subscription.py | 10 ++--- plugins/modules/redis.py | 4 +- plugins/modules/redis_data.py | 3 +- plugins/modules/redis_data_incr.py | 3 +- plugins/modules/redis_data_info.py | 3 +- plugins/modules/redis_info.py | 2 +- plugins/modules/rhevm.py | 1 - plugins/modules/rhsm_release.py | 4 +- plugins/modules/rhsm_repository.py | 3 +- plugins/modules/riak.py | 1 - plugins/modules/rocketchat.py | 2 - plugins/modules/rollbar_deployment.py | 1 - plugins/modules/rpm_ostree_pkg.py | 1 - plugins/modules/rundeck_acl_policy.py | 2 +- .../modules/rundeck_job_executions_info.py | 3 +- plugins/modules/rundeck_job_run.py | 2 +- plugins/modules/rundeck_project.py | 2 +- plugins/modules/say.py | 1 - plugins/modules/scaleway_compute.py | 4 +- .../scaleway_compute_private_network.py | 6 +-- plugins/modules/scaleway_container.py | 10 ++--- plugins/modules/scaleway_container_info.py | 6 +-- .../modules/scaleway_container_namespace.py | 10 ++--- .../scaleway_container_namespace_info.py | 6 +-- .../modules/scaleway_container_registry.py | 8 ++-- .../scaleway_container_registry_info.py | 6 +-- plugins/modules/scaleway_database_backup.py | 4 +- plugins/modules/scaleway_function.py | 10 ++--- plugins/modules/scaleway_function_info.py | 6 +-- .../modules/scaleway_function_namespace.py | 17 ++++---- .../scaleway_function_namespace_info.py | 6 +-- plugins/modules/scaleway_image_info.py | 3 +- plugins/modules/scaleway_ip.py | 6 +-- plugins/modules/scaleway_ip_info.py | 3 +- plugins/modules/scaleway_lb.py | 7 +-- plugins/modules/scaleway_organization_info.py | 1 + plugins/modules/scaleway_private_network.py | 6 +-- plugins/modules/scaleway_security_group.py | 9 ++-- .../modules/scaleway_security_group_info.py | 3 +- .../modules/scaleway_security_group_rule.py | 6 +-- plugins/modules/scaleway_server_info.py | 3 +- plugins/modules/scaleway_snapshot_info.py | 3 +- plugins/modules/scaleway_sshkey.py | 4 +- plugins/modules/scaleway_user_data.py | 4 +- plugins/modules/scaleway_volume.py | 6 +-- plugins/modules/scaleway_volume_info.py | 3 +- plugins/modules/sendgrid.py | 1 - plugins/modules/sensu_check.py | 1 - plugins/modules/sensu_silence.py | 1 - plugins/modules/sensu_subscription.py | 1 - plugins/modules/shutdown.py | 1 - plugins/modules/sl_vm.py | 1 - plugins/modules/slack.py | 4 +- plugins/modules/slackpkg.py | 3 +- plugins/modules/smartos_image_info.py | 2 +- plugins/modules/snap.py | 4 +- plugins/modules/snap_alias.py | 2 +- plugins/modules/snmp_facts.py | 4 +- plugins/modules/sorcery.py | 2 - plugins/modules/spectrum_device.py | 3 +- plugins/modules/spectrum_model_attrs.py | 7 +-- plugins/modules/spotinst_aws_elastigroup.py | 1 + plugins/modules/ss_3par_cpg.py | 2 +- plugins/modules/ssh_config.py | 5 +-- plugins/modules/sssd_info.py | 5 ++- plugins/modules/stacki_host.py | 2 +- plugins/modules/statusio_maintenance.py | 1 - plugins/modules/sudoers.py | 2 +- plugins/modules/supervisorctl.py | 2 +- plugins/modules/svr4pkg.py | 1 - plugins/modules/swdepot.py | 1 - plugins/modules/swupd.py | 2 +- plugins/modules/sysrc.py | 5 +-- plugins/modules/systemd_creds_decrypt.py | 1 - plugins/modules/systemd_info.py | 2 + plugins/modules/taiga_issue.py | 3 +- plugins/modules/telegram.py | 1 - plugins/modules/terraform.py | 3 +- plugins/modules/timezone.py | 2 +- plugins/modules/twilio.py | 2 +- plugins/modules/typetalk.py | 3 +- plugins/modules/udm_dns_record.py | 9 ++-- plugins/modules/udm_dns_zone.py | 6 +-- plugins/modules/udm_group.py | 6 +-- plugins/modules/udm_share.py | 6 +-- plugins/modules/udm_user.py | 8 ++-- plugins/modules/ufw.py | 1 - plugins/modules/uptimerobot.py | 4 +- plugins/modules/usb_facts.py | 2 +- plugins/modules/utm_aaa_group.py | 1 - plugins/modules/utm_ca_host_key_cert.py | 1 - plugins/modules/utm_ca_host_key_cert_info.py | 1 - plugins/modules/utm_dns_host.py | 1 - .../modules/utm_network_interface_address.py | 1 - .../utm_network_interface_address_info.py | 1 - plugins/modules/utm_proxy_auth_profile.py | 1 - plugins/modules/utm_proxy_exception.py | 1 - plugins/modules/utm_proxy_frontend.py | 1 - plugins/modules/utm_proxy_frontend_info.py | 1 - plugins/modules/utm_proxy_location.py | 1 - plugins/modules/utm_proxy_location_info.py | 1 - plugins/modules/vdo.py | 3 +- plugins/modules/vertica_configuration.py | 1 - plugins/modules/vertica_info.py | 1 - plugins/modules/vertica_role.py | 1 - plugins/modules/vertica_schema.py | 1 - plugins/modules/vertica_user.py | 1 - plugins/modules/vexata_eg.py | 2 +- plugins/modules/vexata_volume.py | 2 +- plugins/modules/vmadm.py | 2 - plugins/modules/wakeonlan.py | 1 - plugins/modules/wdc_redfish_command.py | 5 ++- plugins/modules/wdc_redfish_info.py | 3 +- plugins/modules/xbps.py | 1 - plugins/modules/xcc_redfish_command.py | 3 +- plugins/modules/xdg_mime.py | 2 +- plugins/modules/xenserver_facts.py | 1 - plugins/modules/xenserver_guest.py | 19 ++++---- plugins/modules/xenserver_guest_info.py | 7 +-- plugins/modules/xenserver_guest_powerstate.py | 7 +-- plugins/modules/xfconf.py | 2 +- plugins/modules/xfconf_info.py | 2 +- plugins/modules/xfs_quota.py | 1 - plugins/modules/xml.py | 1 - plugins/modules/yarn.py | 3 +- plugins/modules/yum_versionlock.py | 3 +- plugins/modules/zfs_facts.py | 2 - plugins/modules/znode.py | 1 - plugins/modules/zpool.py | 2 + plugins/modules/zpool_facts.py | 1 - plugins/modules/zypper.py | 3 +- plugins/modules/zypper_repository.py | 9 ++-- plugins/plugin_utils/keys_filter.py | 1 - plugins/plugin_utils/unsafe.py | 4 +- plugins/test/a_module.py | 2 +- plugins/test/ansible_type.py | 1 + plugins/test/fqdn_valid.py | 1 - .../targets/cmd_runner/library/cmd_echo.py | 5 ++- .../targets/flatpak/files/serve.py | 4 +- .../targets/java_cert/files/setupSSLServer.py | 3 +- .../launchd/files/ansible_test_service.py | 3 +- .../targets/lookup_lmdb_kv/test_db.py | 1 + .../targets/module_helper/library/msimple.py | 2 +- .../module_helper/library/msimpleda.py | 2 +- .../targets/monit/files/httpd_echo.py | 4 +- .../supervisorctl/files/sendProcessStdin.py | 3 +- tests/sanity/extra/botmeta.py | 4 +- tests/unit/plugins/become/conftest.py | 1 - tests/unit/plugins/become/test_run0.py | 1 - tests/unit/plugins/cache/test_memcached.py | 1 + tests/unit/plugins/cache/test_redis.py | 1 + tests/unit/plugins/callback/test_elastic.py | 5 ++- .../plugins/callback/test_loganalytics.py | 3 +- .../plugins/callback/test_opentelemetry.py | 5 ++- tests/unit/plugins/callback/test_splunk.py | 13 +++--- tests/unit/plugins/connection/test_lxc.py | 3 +- tests/unit/plugins/connection/test_wsl.py | 14 +++--- tests/unit/plugins/filter/test_json_patch.py | 5 ++- tests/unit/plugins/inventory/test_icinga2.py | 2 +- tests/unit/plugins/inventory/test_incus.py | 2 +- tests/unit/plugins/inventory/test_iocage.py | 4 +- tests/unit/plugins/inventory/test_linode.py | 1 + tests/unit/plugins/inventory/test_lxd.py | 3 +- .../unit/plugins/inventory/test_opennebula.py | 5 +-- .../plugins/inventory/test_xen_orchestra.py | 2 +- .../unit/plugins/lookup/onepassword_common.py | 2 +- tests/unit/plugins/lookup/test_bitwarden.py | 5 ++- .../lookup/test_bitwarden_secrets_manager.py | 2 +- tests/unit/plugins/lookup/test_dependent.py | 1 - tests/unit/plugins/lookup/test_dsv.py | 5 ++- tests/unit/plugins/lookup/test_etcd3.py | 5 ++- .../lookup/test_github_app_access_token.py | 2 +- tests/unit/plugins/lookup/test_lastpass.py | 2 +- .../plugins/lookup/test_merge_variables.py | 6 +-- tests/unit/plugins/lookup/test_onepassword.py | 8 ++-- .../lookup/test_onepassword_ssh_key.py | 4 +- tests/unit/plugins/lookup/test_revbitspss.py | 5 ++- tests/unit/plugins/lookup/test_tss.py | 4 +- .../keycloak/test_keycloak_connect.py | 5 ++- .../net_tools/pritunl/test_api.py | 3 +- .../plugins/module_utils/test_cmd_runner.py | 1 - tests/unit/plugins/module_utils/test_csv.py | 1 - .../plugins/module_utils/test_database.py | 2 +- .../plugins/module_utils/test_known_hosts.py | 1 - .../module_utils/test_module_helper.py | 1 - .../plugins/module_utils/test_opennebula.py | 1 - .../module_utils/test_python_runner.py | 1 - .../plugins/module_utils/test_saslprep.py | 1 - .../unit/plugins/module_utils/test_vardict.py | 1 - .../module_utils/xenserver/conftest.py | 5 +-- .../test_gather_vm_params_and_facts.py | 2 - .../xenserver/test_get_object_ref.py | 3 +- .../xenserver/test_netaddr_functions.py | 2 - .../xenserver/test_set_vm_power_state.py | 4 +- .../xenserver/test_wait_for_functions.py | 4 +- .../module_utils/xenserver/test_xapi.py | 5 +-- .../xenserver/test_xenserverobject.py | 3 +- tests/unit/plugins/modules/conftest.py | 4 +- tests/unit/plugins/modules/gitlab.py | 7 +-- tests/unit/plugins/modules/hpe_test_utils.py | 9 ++-- .../interfaces_file/test_interfaces_file.py | 5 ++- .../unit/plugins/modules/oneview_conftest.py | 7 ++- .../plugins/modules/oneview_module_loader.py | 43 +++++++++++++------ .../plugins/modules/test_alerta_customer.py | 3 +- tests/unit/plugins/modules/test_apk.py | 2 +- tests/unit/plugins/modules/test_archive.py | 5 ++- .../modules/test_bitbucket_access_key.py | 7 +-- .../test_bitbucket_pipeline_key_pair.py | 7 +-- .../test_bitbucket_pipeline_known_host.py | 8 ++-- .../test_bitbucket_pipeline_variable.py | 7 +-- .../unit/plugins/modules/test_bootc_manage.py | 4 +- tests/unit/plugins/modules/test_campfire.py | 6 ++- .../modules/test_circonus_annotation.py | 5 ++- tests/unit/plugins/modules/test_composer.py | 3 +- tests/unit/plugins/modules/test_cpanm.py | 3 +- .../plugins/modules/test_datadog_downtime.py | 6 +-- tests/unit/plugins/modules/test_discord.py | 4 +- .../unit/plugins/modules/test_django_check.py | 3 +- .../plugins/modules/test_django_command.py | 3 +- .../modules/test_django_createcachetable.py | 3 +- .../plugins/modules/test_django_dumpdata.py | 3 +- .../plugins/modules/test_django_loaddata.py | 3 +- .../modules/test_dnf_config_manager.py | 6 ++- tests/unit/plugins/modules/test_dnsimple.py | 8 ++-- .../plugins/modules/test_dnsimple_info.py | 10 ++--- .../unit/plugins/modules/test_facter_facts.py | 3 +- tests/unit/plugins/modules/test_gconftool2.py | 3 +- .../plugins/modules/test_gconftool2_info.py | 3 +- tests/unit/plugins/modules/test_gem.py | 4 +- tests/unit/plugins/modules/test_gio_mime.py | 3 +- .../unit/plugins/modules/test_github_repo.py | 9 ++-- .../plugins/modules/test_gitlab_deploy_key.py | 16 +++---- .../unit/plugins/modules/test_gitlab_group.py | 10 ++--- .../modules/test_gitlab_group_access_token.py | 8 ++-- .../unit/plugins/modules/test_gitlab_hook.py | 16 +++---- .../plugins/modules/test_gitlab_project.py | 20 ++++----- .../test_gitlab_project_access_token.py | 8 ++-- .../modules/test_gitlab_protected_branch.py | 13 +++--- .../plugins/modules/test_gitlab_runner.py | 19 ++++---- .../unit/plugins/modules/test_gitlab_user.py | 29 ++++++------- tests/unit/plugins/modules/test_homebrew.py | 1 + .../plugins/modules/test_homebrew_cask.py | 7 ++- .../plugins/modules/test_icinga2_feature.py | 6 ++- .../plugins/modules/test_ip2location_info.py | 1 - .../plugins/modules/test_ipa_getkeytab.py | 4 +- tests/unit/plugins/modules/test_ipbase.py | 3 +- .../plugins/modules/test_java_keystore.py | 5 ++- .../plugins/modules/test_jenkins_build.py | 5 ++- .../modules/test_jenkins_build_info.py | 5 ++- .../modules/test_jenkins_credential.py | 15 +++---- .../unit/plugins/modules/test_jenkins_node.py | 13 +++--- .../plugins/modules/test_jenkins_plugin.py | 5 ++- .../modules/test_keycloak_authentication.py | 7 ++- ...eycloak_authentication_required_actions.py | 5 +-- .../plugins/modules/test_keycloak_client.py | 8 ++-- .../test_keycloak_client_rolemapping.py | 5 +-- .../modules/test_keycloak_clientscope.py | 5 +-- .../modules/test_keycloak_component.py | 3 +- .../test_keycloak_identity_provider.py | 7 ++- .../plugins/modules/test_keycloak_realm.py | 5 +-- .../modules/test_keycloak_realm_info.py | 5 +-- .../modules/test_keycloak_realm_keys.py | 5 +-- .../test_keycloak_realm_keys_metadata_info.py | 3 +- .../plugins/modules/test_keycloak_role.py | 5 +-- .../plugins/modules/test_keycloak_user.py | 8 ++-- ...est_keycloak_user_execute_actions_email.py | 5 +-- .../modules/test_keycloak_user_federation.py | 5 +-- .../modules/test_keycloak_userprofile.py | 8 ++-- tests/unit/plugins/modules/test_krb_ticket.py | 3 +- tests/unit/plugins/modules/test_linode.py | 2 +- tests/unit/plugins/modules/test_linode_v4.py | 17 +++++--- tests/unit/plugins/modules/test_lvg_rename.py | 5 ++- tests/unit/plugins/modules/test_lxca_cmms.py | 1 + tests/unit/plugins/modules/test_lxca_nodes.py | 1 + .../modules/test_lxd_storage_pool_info.py | 3 +- .../modules/test_lxd_storage_volume_info.py | 3 +- tests/unit/plugins/modules/test_macports.py | 4 +- .../plugins/modules/test_maven_artifact.py | 3 +- tests/unit/plugins/modules/test_modprobe.py | 4 +- tests/unit/plugins/modules/test_monit.py | 3 +- tests/unit/plugins/modules/test_nmcli.py | 6 +-- .../unit/plugins/modules/test_nomad_token.py | 3 +- tests/unit/plugins/modules/test_npm.py | 3 +- .../plugins/modules/test_ocapi_command.py | 6 +-- tests/unit/plugins/modules/test_ocapi_info.py | 7 ++- tests/unit/plugins/modules/test_one_vm.py | 1 - .../modules/test_oneview_datacenter_info.py | 5 ++- .../modules/test_oneview_enclosure_info.py | 7 +-- .../modules/test_oneview_ethernet_network.py | 2 +- .../test_oneview_ethernet_network_info.py | 2 +- .../modules/test_oneview_fc_network.py | 3 +- .../modules/test_oneview_fc_network_info.py | 3 +- .../modules/test_oneview_fcoe_network.py | 3 +- .../modules/test_oneview_fcoe_network_info.py | 2 +- ...test_oneview_logical_interconnect_group.py | 5 ++- ...oneview_logical_interconnect_group_info.py | 6 ++- .../modules/test_oneview_network_set.py | 1 + .../modules/test_oneview_network_set_info.py | 3 +- .../modules/test_oneview_san_manager.py | 2 +- .../modules/test_oneview_san_manager_info.py | 3 +- tests/unit/plugins/modules/test_opkg.py | 3 +- .../plugins/modules/test_pacemaker_cluster.py | 4 +- .../plugins/modules/test_pacemaker_info.py | 4 +- .../modules/test_pacemaker_resource.py | 4 +- .../plugins/modules/test_pacemaker_stonith.py | 4 +- tests/unit/plugins/modules/test_pacman.py | 6 +-- tests/unit/plugins/modules/test_pacman_key.py | 8 ++-- tests/unit/plugins/modules/test_pagerduty.py | 6 +-- .../plugins/modules/test_pagerduty_alert.py | 4 +- .../plugins/modules/test_pagerduty_change.py | 4 +- tests/unit/plugins/modules/test_pamd.py | 12 +++--- tests/unit/plugins/modules/test_parted.py | 8 ++-- tests/unit/plugins/modules/test_pmem.py | 7 +-- .../unit/plugins/modules/test_pritunl_org.py | 19 ++++---- .../plugins/modules/test_pritunl_org_info.py | 15 ++++--- .../unit/plugins/modules/test_pritunl_user.py | 13 +++--- .../plugins/modules/test_pritunl_user_info.py | 13 +++--- tests/unit/plugins/modules/test_puppet.py | 3 +- .../modules/test_redhat_subscription.py | 6 +-- tests/unit/plugins/modules/test_redis_data.py | 4 +- .../plugins/modules/test_redis_data_incr.py | 5 +-- .../plugins/modules/test_redis_data_info.py | 5 +-- tests/unit/plugins/modules/test_redis_info.py | 6 ++- .../unit/plugins/modules/test_rhsm_release.py | 4 +- .../plugins/modules/test_rhsm_repository.py | 6 +-- .../plugins/modules/test_rpm_ostree_pkg.py | 4 +- .../modules/test_rundeck_acl_policy.py | 7 +-- .../test_scaleway_compute_private_network.py | 8 ++-- .../modules/test_scaleway_private_network.py | 8 ++-- .../plugins/modules/test_simpleinit_msb.py | 1 - tests/unit/plugins/modules/test_slack.py | 6 ++- tests/unit/plugins/modules/test_snap.py | 2 +- .../unit/plugins/modules/test_solaris_zone.py | 2 +- .../unit/plugins/modules/test_ss_3par_cpg.py | 2 +- tests/unit/plugins/modules/test_statsd.py | 5 ++- tests/unit/plugins/modules/test_sysupgrade.py | 4 +- tests/unit/plugins/modules/test_terraform.py | 2 +- tests/unit/plugins/modules/test_ufw.py | 4 +- tests/unit/plugins/modules/test_usb_facts.py | 6 ++- .../modules/test_wdc_redfish_command.py | 11 +++-- .../plugins/modules/test_wdc_redfish_info.py | 7 ++- .../modules/test_xcc_redfish_command.py | 7 ++- tests/unit/plugins/modules/test_xdg_mime.py | 3 +- .../modules/test_xenserver_guest_info.py | 2 +- .../test_xenserver_guest_powerstate.py | 8 +++- tests/unit/plugins/modules/test_xfconf.py | 3 +- .../unit/plugins/modules/test_xfconf_info.py | 3 +- tests/unit/plugins/modules/uthelper.py | 4 +- .../plugins/modules/xenserver_conftest.py | 4 +- .../unit/plugins/plugin_utils/test_unsafe.py | 14 +++--- 829 files changed, 1644 insertions(+), 1692 deletions(-) diff --git a/plugins/action/iptables_state.py b/plugins/action/iptables_state.py index e745e48c8f..43b9537f0c 100644 --- a/plugins/action/iptables_state.py +++ b/plugins/action/iptables_state.py @@ -7,10 +7,10 @@ from __future__ import annotations import time import typing as t -from ansible.plugins.action import ActionBase from ansible.errors import AnsibleActionFail, AnsibleConnectionFailure -from ansible.utils.vars import merge_hash +from ansible.plugins.action import ActionBase from ansible.utils.display import Display +from ansible.utils.vars import merge_hash display = Display() diff --git a/plugins/action/shutdown.py b/plugins/action/shutdown.py index 46067e462c..669ba62323 100644 --- a/plugins/action/shutdown.py +++ b/plugins/action/shutdown.py @@ -6,12 +6,11 @@ from __future__ import annotations - import typing as t -from ansible.errors import AnsibleError, AnsibleConnectionFailure -from ansible.module_utils.common.text.converters import to_native, to_text +from ansible.errors import AnsibleConnectionFailure, AnsibleError from ansible.module_utils.common.collections import is_string +from ansible.module_utils.common.text.converters import to_native, to_text from ansible.plugins.action import ActionBase from ansible.utils.display import Display diff --git a/plugins/become/machinectl.py b/plugins/become/machinectl.py index 9130ca146d..26a8f2bc5a 100644 --- a/plugins/become/machinectl.py +++ b/plugins/become/machinectl.py @@ -92,9 +92,8 @@ EXAMPLES = r""" from re import compile as re_compile -from ansible.plugins.become import BecomeBase from ansible.module_utils.common.text.converters import to_bytes - +from ansible.plugins.become import BecomeBase ansi_color_codes = re_compile(to_bytes(r"\x1B\[[0-9;]+m")) diff --git a/plugins/become/pmrun.py b/plugins/become/pmrun.py index 0f29396a52..d23e95dca3 100644 --- a/plugins/become/pmrun.py +++ b/plugins/become/pmrun.py @@ -59,6 +59,7 @@ notes: """ from shlex import quote as shlex_quote + from ansible.plugins.become import BecomeBase diff --git a/plugins/become/run0.py b/plugins/become/run0.py index d2780337a8..171be87958 100644 --- a/plugins/become/run0.py +++ b/plugins/become/run0.py @@ -4,7 +4,6 @@ from __future__ import annotations - DOCUMENTATION = r""" name: run0 short_description: Systemd's run0 @@ -78,8 +77,8 @@ EXAMPLES = r""" from re import compile as re_compile -from ansible.plugins.become import BecomeBase from ansible.module_utils.common.text.converters import to_bytes +from ansible.plugins.become import BecomeBase ansi_color_codes = re_compile(to_bytes(r"\x1B\[[0-9;]+m")) diff --git a/plugins/cache/memcached.py b/plugins/cache/memcached.py index a2151c1d44..05ff166b4c 100644 --- a/plugins/cache/memcached.py +++ b/plugins/cache/memcached.py @@ -49,11 +49,11 @@ options: import collections import os import time -from multiprocessing import Lock +from collections.abc import MutableSet from itertools import chain +from multiprocessing import Lock from ansible.errors import AnsibleError -from collections.abc import MutableSet from ansible.plugins.cache import BaseCacheModule from ansible.utils.display import Display diff --git a/plugins/cache/redis.py b/plugins/cache/redis.py index 1465695513..4e8a7602f6 100644 --- a/plugins/cache/redis.py +++ b/plugins/cache/redis.py @@ -66,17 +66,17 @@ options: section: defaults """ +import json import re import time -import json from ansible.errors import AnsibleError -from ansible.parsing.ajson import AnsibleJSONEncoder, AnsibleJSONDecoder +from ansible.parsing.ajson import AnsibleJSONDecoder, AnsibleJSONEncoder from ansible.plugins.cache import BaseCacheModule from ansible.utils.display import Display try: - from redis import StrictRedis, VERSION + from redis import VERSION, StrictRedis HAS_REDIS = True except ImportError: diff --git a/plugins/cache/yaml.py b/plugins/cache/yaml.py index cfcb2111bf..1a694f48ed 100644 --- a/plugins/cache/yaml.py +++ b/plugins/cache/yaml.py @@ -46,9 +46,8 @@ options: import os import yaml - -from ansible.parsing.yaml.loader import AnsibleLoader from ansible.parsing.yaml.dumper import AnsibleDumper +from ansible.parsing.yaml.loader import AnsibleLoader from ansible.plugins.cache import BaseFileCacheModule diff --git a/plugins/callback/cgroup_memory_recap.py b/plugins/callback/cgroup_memory_recap.py index 9315960a26..1873baddd3 100644 --- a/plugins/callback/cgroup_memory_recap.py +++ b/plugins/callback/cgroup_memory_recap.py @@ -41,8 +41,8 @@ options: key: cur_mem_file """ -import time import threading +import time from ansible.plugins.callback import CallbackBase diff --git a/plugins/callback/counter_enabled.py b/plugins/callback/counter_enabled.py index b02429581a..b8c34e6f6e 100644 --- a/plugins/callback/counter_enabled.py +++ b/plugins/callback/counter_enabled.py @@ -23,9 +23,9 @@ requirements: """ from ansible import constants as C +from ansible.playbook.task_include import TaskInclude from ansible.plugins.callback import CallbackBase from ansible.utils.color import colorize, hostcolor -from ansible.playbook.task_include import TaskInclude class CallbackModule(CallbackBase): diff --git a/plugins/callback/dense.py b/plugins/callback/dense.py index 63ff88b4d6..bf04719de2 100644 --- a/plugins/callback/dense.py +++ b/plugins/callback/dense.py @@ -27,13 +27,13 @@ try: except ImportError: pass +import sys from collections.abc import MutableMapping, MutableSequence + from ansible.plugins.callback.default import CallbackModule as CallbackModule_default from ansible.utils.color import colorize, hostcolor from ansible.utils.display import Display -import sys - display = Display() diff --git a/plugins/callback/diy.py b/plugins/callback/diy.py index bf80da33ce..a199eb5d49 100644 --- a/plugins/callback/diy.py +++ b/plugins/callback/diy.py @@ -778,10 +778,11 @@ playbook.yml: >- import sys from contextlib import contextmanager + +from ansible.module_utils.common.text.converters import to_text +from ansible.plugins.callback.default import CallbackModule as Default from ansible.template import Templar from ansible.vars.manager import VariableManager -from ansible.plugins.callback.default import CallbackModule as Default -from ansible.module_utils.common.text.converters import to_text try: from ansible.template import trust_as_template # noqa: F401, pylint: disable=unused-import diff --git a/plugins/callback/elastic.py b/plugins/callback/elastic.py index ad1a748c71..79bf84775e 100644 --- a/plugins/callback/elastic.py +++ b/plugins/callback/elastic.py @@ -81,7 +81,6 @@ import getpass import socket import time import uuid - from collections import OrderedDict from contextlib import closing from os.path import basename @@ -92,7 +91,7 @@ from ansible.plugins.callback import CallbackBase ELASTIC_LIBRARY_IMPORT_ERROR: ImportError | None try: - from elasticapm import Client, capture_span, trace_parent_from_string, instrument, label + from elasticapm import Client, capture_span, instrument, label, trace_parent_from_string except ImportError as imp_exc: ELASTIC_LIBRARY_IMPORT_ERROR = imp_exc else: diff --git a/plugins/callback/log_plays.py b/plugins/callback/log_plays.py index 5666153d2f..2b32a27994 100644 --- a/plugins/callback/log_plays.py +++ b/plugins/callback/log_plays.py @@ -27,16 +27,15 @@ options: key: log_folder """ +import json import os import time -import json - -from ansible.utils.path import makedirs_safe -from ansible.module_utils.common.text.converters import to_bytes from collections.abc import MutableMapping + +from ansible.module_utils.common.text.converters import to_bytes from ansible.parsing.ajson import AnsibleJSONEncoder from ansible.plugins.callback import CallbackBase - +from ansible.utils.path import makedirs_safe # NOTE: in Ansible 1.2 or later general logging is available without # this plugin, just set ANSIBLE_LOG_PATH as an environment variable diff --git a/plugins/callback/loganalytics.py b/plugins/callback/loganalytics.py index 6bf7fa0fc1..feacb59680 100644 --- a/plugins/callback/loganalytics.py +++ b/plugins/callback/loganalytics.py @@ -51,14 +51,13 @@ examples: |- shared_key = dZD0kCbKl3ehZG6LHFMuhtE0yHiFCmetzFMc2u+roXIUQuatqU924SsAAAAPemhjbGlAemhjbGktTUJQAQIDBA== """ +import base64 +import getpass import hashlib import hmac -import base64 import json -import uuid import socket -import getpass - +import uuid from os.path import basename from ansible.module_utils.ansible_release import __version__ as ansible_version diff --git a/plugins/callback/logdna.py b/plugins/callback/logdna.py index 6aed1796f8..1be3558d27 100644 --- a/plugins/callback/logdna.py +++ b/plugins/callback/logdna.py @@ -55,12 +55,13 @@ options: default: ansible """ -import logging import json +import logging import socket from uuid import getnode -from ansible.plugins.callback import CallbackBase + from ansible.parsing.ajson import AnsibleJSONEncoder +from ansible.plugins.callback import CallbackBase try: from logdna import LogDNAHandler diff --git a/plugins/callback/logentries.py b/plugins/callback/logentries.py index 769512c17b..dd85b0440f 100644 --- a/plugins/callback/logentries.py +++ b/plugins/callback/logentries.py @@ -96,8 +96,8 @@ examples: >- """ import os -import socket import random +import socket import time import uuid diff --git a/plugins/callback/logstash.py b/plugins/callback/logstash.py index c17f319172..85730d6935 100644 --- a/plugins/callback/logstash.py +++ b/plugins/callback/logstash.py @@ -94,12 +94,13 @@ ansible.cfg: | } """ -import os import json -from ansible import context +import logging +import os import socket import uuid -import logging + +from ansible import context try: import logstash diff --git a/plugins/callback/mail.py b/plugins/callback/mail.py index 400aade4b7..8795d7cafb 100644 --- a/plugins/callback/mail.py +++ b/plugins/callback/mail.py @@ -79,10 +79,10 @@ options: version_added: 8.2.0 """ +import email.utils import json import os import re -import email.utils import smtplib from ansible.module_utils.common.text.converters import to_bytes diff --git a/plugins/callback/opentelemetry.py b/plugins/callback/opentelemetry.py index ed2961b9b3..990006f42d 100644 --- a/plugins/callback/opentelemetry.py +++ b/plugins/callback/opentelemetry.py @@ -148,15 +148,15 @@ from ansible.plugins.callback import CallbackBase OTEL_LIBRARY_IMPORT_ERROR: ImportError | None try: from opentelemetry import trace - from opentelemetry.trace import SpanKind from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter as GRPCOTLPSpanExporter from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter as HTTPOTLPSpanExporter from opentelemetry.sdk.resources import SERVICE_NAME, Resource - from opentelemetry.trace.status import Status, StatusCode - from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor, SimpleSpanProcessor from opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporter + from opentelemetry.trace import SpanKind + from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator + from opentelemetry.trace.status import Status, StatusCode except ImportError as imp_exc: OTEL_LIBRARY_IMPORT_ERROR = imp_exc else: diff --git a/plugins/callback/print_task.py b/plugins/callback/print_task.py index 6caeee2556..3f7e7a294a 100644 --- a/plugins/callback/print_task.py +++ b/plugins/callback/print_task.py @@ -22,7 +22,7 @@ ansible.cfg: |- callbacks_enabled=community.general.print_task """ -from yaml import load, dump +from yaml import dump, load try: from yaml import CSafeDumper as SafeDumper diff --git a/plugins/callback/say.py b/plugins/callback/say.py index 28748c3269..4172c073fb 100644 --- a/plugins/callback/say.py +++ b/plugins/callback/say.py @@ -18,9 +18,9 @@ description: - This plugin uses C(say) or C(espeak) to "speak" about play events. """ +import os import platform import subprocess -import os from ansible.module_utils.common.process import get_bin_path from ansible.plugins.callback import CallbackBase diff --git a/plugins/callback/selective.py b/plugins/callback/selective.py index 863f131842..ba9a9f939a 100644 --- a/plugins/callback/selective.py +++ b/plugins/callback/selective.py @@ -39,9 +39,8 @@ EXAMPLES = r""" import difflib from ansible import constants as C -from ansible.plugins.callback import CallbackBase from ansible.module_utils.common.text.converters import to_text - +from ansible.plugins.callback import CallbackBase DONT_COLORIZE = False COLORS = { diff --git a/plugins/callback/splunk.py b/plugins/callback/splunk.py index 0cf23b70dc..877ac15aaf 100644 --- a/plugins/callback/splunk.py +++ b/plugins/callback/splunk.py @@ -83,11 +83,10 @@ examples: >- authtoken = f23blad6-5965-4537-bf69-5b5a545blabla88 """ -import json -import uuid -import socket import getpass - +import json +import socket +import uuid from os.path import basename from ansible.module_utils.ansible_release import __version__ as ansible_version diff --git a/plugins/callback/sumologic.py b/plugins/callback/sumologic.py index ea2bb9c91e..b105e539f0 100644 --- a/plugins/callback/sumologic.py +++ b/plugins/callback/sumologic.py @@ -40,11 +40,10 @@ examples: |- url = https://endpoint1.collection.us2.sumologic.com/receiver/v1/http/R8moSv1d8EW9LAUFZJ6dbxCFxwLH6kfCdcBfddlfxCbLuL-BN5twcTpMk__pYy_cDmp== """ -import json -import uuid -import socket import getpass - +import json +import socket +import uuid from os.path import basename from ansible.module_utils.ansible_release import __version__ as ansible_version diff --git a/plugins/callback/syslog_json.py b/plugins/callback/syslog_json.py index 96903b46a0..577aeda859 100644 --- a/plugins/callback/syslog_json.py +++ b/plugins/callback/syslog_json.py @@ -56,7 +56,6 @@ options: import logging import logging.handlers - import socket from ansible.plugins.callback import CallbackBase diff --git a/plugins/callback/timestamp.py b/plugins/callback/timestamp.py index ba4e48f0de..385a3e97c1 100644 --- a/plugins/callback/timestamp.py +++ b/plugins/callback/timestamp.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" name: timestamp type: stdout @@ -49,12 +48,13 @@ extends_documentation_fragment: """ +import sys +import types +from datetime import datetime + +from ansible.module_utils.common.text.converters import to_text from ansible.plugins.callback.default import CallbackModule as Default from ansible.utils.display import get_text_width -from ansible.module_utils.common.text.converters import to_text -from datetime import datetime -import types -import sys # Store whether the zoneinfo module is available _ZONEINFO_AVAILABLE = sys.version_info >= (3, 9) diff --git a/plugins/callback/unixy.py b/plugins/callback/unixy.py index 4d478d0f77..f264eb3e0a 100644 --- a/plugins/callback/unixy.py +++ b/plugins/callback/unixy.py @@ -20,11 +20,12 @@ requirements: """ from os.path import basename + from ansible import constants as C from ansible import context from ansible.module_utils.common.text.converters import to_text -from ansible.utils.color import colorize, hostcolor from ansible.plugins.callback.default import CallbackModule as CallbackModule_default +from ansible.utils.color import colorize, hostcolor class CallbackModule(CallbackModule_default): diff --git a/plugins/connection/chroot.py b/plugins/connection/chroot.py index 4dfb30a703..00e6516a39 100644 --- a/plugins/connection/chroot.py +++ b/plugins/connection/chroot.py @@ -80,7 +80,7 @@ from ansible.errors import AnsibleError from ansible.module_utils.basic import is_executable from ansible.module_utils.common.process import get_bin_path from ansible.module_utils.common.text.converters import to_bytes -from ansible.plugins.connection import ConnectionBase, BUFSIZE +from ansible.plugins.connection import BUFSIZE, ConnectionBase from ansible.utils.display import Display display = Display() diff --git a/plugins/connection/funcd.py b/plugins/connection/funcd.py index 3af5720216..668f15cc6f 100644 --- a/plugins/connection/funcd.py +++ b/plugins/connection/funcd.py @@ -35,8 +35,8 @@ except ImportError: pass import os -import tempfile import shutil +import tempfile from ansible.errors import AnsibleError from ansible.plugins.connection import ConnectionBase diff --git a/plugins/connection/incus.py b/plugins/connection/incus.py index fe0c577296..51376514b3 100644 --- a/plugins/connection/incus.py +++ b/plugins/connection/incus.py @@ -79,9 +79,9 @@ options: import os import re -from subprocess import call, Popen, PIPE +from subprocess import PIPE, Popen, call -from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound +from ansible.errors import AnsibleConnectionFailure, AnsibleError, AnsibleFileNotFound 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.connection import ConnectionBase diff --git a/plugins/connection/iocage.py b/plugins/connection/iocage.py index 200797eb2b..a1ab8a85b0 100644 --- a/plugins/connection/iocage.py +++ b/plugins/connection/iocage.py @@ -33,11 +33,12 @@ options: import subprocess -from ansible_collections.community.general.plugins.connection.jail import Connection as Jail -from ansible.module_utils.common.text.converters import to_native from ansible.errors import AnsibleError +from ansible.module_utils.common.text.converters import to_native from ansible.utils.display import Display +from ansible_collections.community.general.plugins.connection.jail import Connection as Jail + display = Display() diff --git a/plugins/connection/jail.py b/plugins/connection/jail.py index 5a22e964b6..bd9f5aab46 100644 --- a/plugins/connection/jail.py +++ b/plugins/connection/jail.py @@ -42,7 +42,7 @@ from shlex import quote as shlex_quote from ansible.errors import AnsibleError from ansible.module_utils.common.process import get_bin_path from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text -from ansible.plugins.connection import ConnectionBase, BUFSIZE +from ansible.plugins.connection import BUFSIZE, ConnectionBase from ansible.utils.display import Display display = Display() diff --git a/plugins/connection/lxc.py b/plugins/connection/lxc.py index 8bd6e65363..d6c4de656c 100644 --- a/plugins/connection/lxc.py +++ b/plugins/connection/lxc.py @@ -31,12 +31,12 @@ options: - name: ansible_lxc_executable """ +import errno +import fcntl import os +import select import shutil import traceback -import select -import fcntl -import errno HAS_LIBLXC = False try: diff --git a/plugins/connection/lxd.py b/plugins/connection/lxd.py index 4956b7df55..5a5dd59e19 100644 --- a/plugins/connection/lxd.py +++ b/plugins/connection/lxd.py @@ -74,9 +74,9 @@ options: """ import os -from subprocess import Popen, PIPE +from subprocess import PIPE, Popen -from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound +from ansible.errors import AnsibleConnectionFailure, AnsibleError, AnsibleFileNotFound 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.connection import ConnectionBase diff --git a/plugins/connection/qubes.py b/plugins/connection/qubes.py index 8456071349..3a54a9e13c 100644 --- a/plugins/connection/qubes.py +++ b/plugins/connection/qubes.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" name: qubes short_description: Interact with an existing QubesOS AppVM @@ -40,9 +39,9 @@ options: import subprocess +from ansible.errors import AnsibleConnectionFailure from ansible.module_utils.common.text.converters import to_bytes from ansible.plugins.connection import ConnectionBase, ensure_connect -from ansible.errors import AnsibleConnectionFailure from ansible.utils.display import Display display = Display() diff --git a/plugins/connection/saltstack.py b/plugins/connection/saltstack.py index 5e67c5b1aa..c3a2aa5fa8 100644 --- a/plugins/connection/saltstack.py +++ b/plugins/connection/saltstack.py @@ -16,8 +16,8 @@ description: - This allows you to use existing Saltstack infrastructure to connect to targets. """ -import os import base64 +import os from ansible import errors from ansible.plugins.connection import ConnectionBase diff --git a/plugins/connection/wsl.py b/plugins/connection/wsl.py index f5e0f0cdef..0b33f12cb4 100644 --- a/plugins/connection/wsl.py +++ b/plugins/connection/wsl.py @@ -315,21 +315,22 @@ import shlex import tempfile import traceback import typing as t +from binascii import hexlify +from subprocess import list2cmdline from ansible.errors import ( AnsibleAuthenticationFailure, AnsibleConnectionFailure, AnsibleError, ) -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.module_utils.common.text.converters import to_bytes, to_native, to_text from ansible.playbook.play_context import PlayContext from ansible.plugins.connection import ConnectionBase from ansible.utils.display import Display from ansible.utils.path import makedirs_safe -from binascii import hexlify -from subprocess import list2cmdline + +from ansible_collections.community.general.plugins.module_utils._filelock import FileLock, LockTimeout +from ansible_collections.community.general.plugins.module_utils.version import LooseVersion PARAMIKO_IMPORT_ERR: str | None try: diff --git a/plugins/connection/zone.py b/plugins/connection/zone.py index e631f1f9dc..bdb38bd1d8 100644 --- a/plugins/connection/zone.py +++ b/plugins/connection/zone.py @@ -35,7 +35,7 @@ from shlex import quote as shlex_quote from ansible.errors import AnsibleError from ansible.module_utils.common.process import get_bin_path from ansible.module_utils.common.text.converters import to_bytes -from ansible.plugins.connection import ConnectionBase, BUFSIZE +from ansible.plugins.connection import BUFSIZE, ConnectionBase from ansible.utils.display import Display display = Display() diff --git a/plugins/filter/accumulate.py b/plugins/filter/accumulate.py index 8b4b70015b..7653a0bf91 100644 --- a/plugins/filter/accumulate.py +++ b/plugins/filter/accumulate.py @@ -41,8 +41,8 @@ EXAMPLES = r""" # Produces ['a', 'ab', 'abc'] """ -from itertools import accumulate from collections.abc import Sequence +from itertools import accumulate from ansible.errors import AnsibleFilterError diff --git a/plugins/filter/counter.py b/plugins/filter/counter.py index 5f425daf69..d30a933f6c 100644 --- a/plugins/filter/counter.py +++ b/plugins/filter/counter.py @@ -34,9 +34,10 @@ _value: type: dictionary """ -from ansible.errors import AnsibleFilterError -from collections.abc import Sequence from collections import Counter +from collections.abc import Sequence + +from ansible.errors import AnsibleFilterError def counter(sequence): diff --git a/plugins/filter/crc32.py b/plugins/filter/crc32.py index 76922d8562..740d812e2b 100644 --- a/plugins/filter/crc32.py +++ b/plugins/filter/crc32.py @@ -4,8 +4,8 @@ from __future__ import annotations from ansible.errors import AnsibleFilterError -from ansible.module_utils.common.text.converters import to_bytes from ansible.module_utils.common.collections import is_string +from ansible.module_utils.common.text.converters import to_bytes try: from zlib import crc32 diff --git a/plugins/filter/from_csv.py b/plugins/filter/from_csv.py index d565eee9a0..00238516da 100644 --- a/plugins/filter/from_csv.py +++ b/plugins/filter/from_csv.py @@ -80,11 +80,11 @@ _value: from ansible.errors import AnsibleFilterError from ansible_collections.community.general.plugins.module_utils.csv import ( + CSVError, + CustomDialectFailureError, + DialectNotAvailableError, initialize_dialect, read_csv, - CSVError, - DialectNotAvailableError, - CustomDialectFailureError, ) diff --git a/plugins/filter/from_ini.py b/plugins/filter/from_ini.py index 91f1349d43..1d3a2f1cec 100644 --- a/plugins/filter/from_ini.py +++ b/plugins/filter/from_ini.py @@ -49,8 +49,8 @@ _value: """ -from io import StringIO from configparser import ConfigParser +from io import StringIO from ansible.errors import AnsibleFilterError diff --git a/plugins/filter/groupby_as_dict.py b/plugins/filter/groupby_as_dict.py index f73fd52b74..41b689e367 100644 --- a/plugins/filter/groupby_as_dict.py +++ b/plugins/filter/groupby_as_dict.py @@ -52,9 +52,10 @@ _value: type: dictionary """ -from ansible.errors import AnsibleFilterError from collections.abc import Mapping, Sequence +from ansible.errors import AnsibleFilterError + def groupby_as_dict(sequence, attribute): """ diff --git a/plugins/filter/hashids.py b/plugins/filter/hashids.py index 57d2f06f05..81a6be802b 100644 --- a/plugins/filter/hashids.py +++ b/plugins/filter/hashids.py @@ -8,7 +8,6 @@ from ansible.errors import ( AnsibleError, AnsibleFilterError, ) - from ansible.module_utils.common.collections import is_sequence try: diff --git a/plugins/filter/jc.py b/plugins/filter/jc.py index 076c705f6f..d897698a26 100644 --- a/plugins/filter/jc.py +++ b/plugins/filter/jc.py @@ -74,9 +74,10 @@ _value: type: any """ -from ansible.errors import AnsibleError, AnsibleFilterError import importlib +from ansible.errors import AnsibleError, AnsibleFilterError + try: import jc diff --git a/plugins/filter/json_patch.py b/plugins/filter/json_patch.py index 66540dd8a5..1d1e4eeeee 100644 --- a/plugins/filter/json_patch.py +++ b/plugins/filter/json_patch.py @@ -6,12 +6,12 @@ from __future__ import annotations import typing as t from json import loads + from ansible.errors import AnsibleFilterError - if t.TYPE_CHECKING: - from typing import Any from collections.abc import Callable + from typing import Any JSONPATCH_IMPORT_ERROR: ImportError | None try: diff --git a/plugins/filter/lists_mergeby.py b/plugins/filter/lists_mergeby.py index 0ca1d7bc6f..06b02bd531 100644 --- a/plugins/filter/lists_mergeby.py +++ b/plugins/filter/lists_mergeby.py @@ -194,13 +194,13 @@ _value: elements: dictionary """ -from ansible.errors import AnsibleFilterError -from collections.abc import Mapping, Sequence -from ansible.utils.vars import merge_hash - from collections import defaultdict +from collections.abc import Mapping, Sequence from operator import itemgetter +from ansible.errors import AnsibleFilterError +from ansible.utils.vars import merge_hash + def list_mergeby(x, y, index, recursive=False, list_merge="replace"): """Merge 2 lists by attribute 'index'. The function 'merge_hash' diff --git a/plugins/filter/time.py b/plugins/filter/time.py index c3f6a07a23..7db386989f 100644 --- a/plugins/filter/time.py +++ b/plugins/filter/time.py @@ -5,8 +5,8 @@ from __future__ import annotations import re -from ansible.errors import AnsibleFilterError +from ansible.errors import AnsibleFilterError UNIT_FACTORS = { "ms": [], diff --git a/plugins/filter/to_ini.py b/plugins/filter/to_ini.py index 387143fb2a..5a664740ff 100644 --- a/plugins/filter/to_ini.py +++ b/plugins/filter/to_ini.py @@ -56,6 +56,7 @@ _value: from collections.abc import Mapping from configparser import ConfigParser from io import StringIO + from ansible.errors import AnsibleFilterError diff --git a/plugins/filter/to_yaml.py b/plugins/filter/to_yaml.py index 1fef077c64..b042cbd80f 100644 --- a/plugins/filter/to_yaml.py +++ b/plugins/filter/to_yaml.py @@ -18,8 +18,8 @@ from ansible.module_utils.common.collections import is_sequence try: # This is ansible-core 2.19+ - from ansible.utils.vars import transform_to_native_types from ansible.parsing.vault import VaultHelper, VaultLib + from ansible.utils.vars import transform_to_native_types HAS_TRANSFORM_TO_NATIVE_TYPES = True except ImportError: diff --git a/plugins/inventory/gitlab_runners.py b/plugins/inventory/gitlab_runners.py index e9a6ac010b..31e67b2031 100644 --- a/plugins/inventory/gitlab_runners.py +++ b/plugins/inventory/gitlab_runners.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" name: gitlab_runners author: diff --git a/plugins/inventory/icinga2.py b/plugins/inventory/icinga2.py index 5357408558..11ee8aa966 100644 --- a/plugins/inventory/icinga2.py +++ b/plugins/inventory/icinga2.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" name: icinga2 short_description: Icinga2 inventory source @@ -97,8 +96,8 @@ import json from urllib.error import HTTPError from ansible.errors import AnsibleParserError -from ansible.plugins.inventory import BaseInventoryPlugin, Constructable 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 diff --git a/plugins/inventory/incus.py b/plugins/inventory/incus.py index 04eb34a7f0..a3725ac45e 100644 --- a/plugins/inventory/incus.py +++ b/plugins/inventory/incus.py @@ -83,11 +83,12 @@ remotes: - remote-2:default """ -from ansible.plugins.inventory import BaseInventoryPlugin, Constructable -from ansible.utils.display import Display from json import loads from subprocess import check_output +from ansible.plugins.inventory import BaseInventoryPlugin, Constructable +from ansible.utils.display import Display + display = Display() diff --git a/plugins/inventory/iocage.py b/plugins/inventory/iocage.py index 18300f5e4e..96d08736d0 100644 --- a/plugins/inventory/iocage.py +++ b/plugins/inventory/iocage.py @@ -170,13 +170,13 @@ groups: test: inventory_hostname.startswith('test') """ -import re import os -from subprocess import Popen, PIPE +import re +from subprocess import PIPE, Popen from ansible.errors import AnsibleError, AnsibleParserError from ansible.module_utils.common.text.converters import to_native, to_text -from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable +from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, Constructable from ansible.utils.display import Display display = Display() diff --git a/plugins/inventory/linode.py b/plugins/inventory/linode.py index bec4525a6d..8af8924d81 100644 --- a/plugins/inventory/linode.py +++ b/plugins/inventory/linode.py @@ -125,15 +125,14 @@ compose: """ from ansible.errors import AnsibleError -from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable +from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, Constructable from ansible_collections.community.general.plugins.plugin_utils.unsafe import make_unsafe - try: from linode_api4 import LinodeClient - from linode_api4.objects.linode import Instance from linode_api4.errors import ApiError as LinodeApiError + from linode_api4.objects.linode import Instance HAS_LINODE = True except ImportError: diff --git a/plugins/inventory/lxd.py b/plugins/inventory/lxd.py index 603c68fb3d..7cf26f6995 100644 --- a/plugins/inventory/lxd.py +++ b/plugins/inventory/lxd.py @@ -167,15 +167,16 @@ groupby: """ import json +import os import re import time -import os from urllib.parse import urlencode -from ansible.plugins.inventory import BaseInventoryPlugin -from ansible.module_utils.common.text.converters import to_native, to_text -from ansible.module_utils.common.dict_transformations import dict_merge from ansible.errors import AnsibleError, AnsibleParserError +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 diff --git a/plugins/inventory/nmap.py b/plugins/inventory/nmap.py index f22622d895..c47d4228ab 100644 --- a/plugins/inventory/nmap.py +++ b/plugins/inventory/nmap.py @@ -125,14 +125,13 @@ groups: import os import re - -from subprocess import Popen, PIPE +from subprocess import PIPE, Popen from ansible import constants as C from ansible.errors import AnsibleParserError -from ansible.module_utils.common.text.converters import to_native, to_text -from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable 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 diff --git a/plugins/inventory/online.py b/plugins/inventory/online.py index 19c6369ecf..202daa8b7f 100644 --- a/plugins/inventory/online.py +++ b/plugins/inventory/online.py @@ -64,10 +64,10 @@ from sys import version as python_version from urllib.parse import urljoin from ansible.errors import AnsibleError +from ansible.module_utils.ansible_release import __version__ as ansible_version +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.module_utils.common.text.converters import to_text -from ansible.module_utils.ansible_release import __version__ as ansible_version from ansible_collections.community.general.plugins.plugin_utils.unsafe import make_unsafe diff --git a/plugins/inventory/opennebula.py b/plugins/inventory/opennebula.py index c9224752b0..2421d55dbc 100644 --- a/plugins/inventory/opennebula.py +++ b/plugins/inventory/opennebula.py @@ -4,7 +4,6 @@ from __future__ import annotations - DOCUMENTATION = r""" name: opennebula author: @@ -90,14 +89,14 @@ try: except ImportError: HAS_PYONE = False +import os +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 collections import namedtuple -import os - class InventoryModule(BaseInventoryPlugin, Constructable): NAME = "community.general.opennebula" diff --git a/plugins/inventory/scaleway.py b/plugins/inventory/scaleway.py index 289ee893cd..c6deace392 100644 --- a/plugins/inventory/scaleway.py +++ b/plugins/inventory/scaleway.py @@ -4,7 +4,6 @@ from __future__ import annotations - DOCUMENTATION = r""" name: scaleway author: @@ -118,8 +117,8 @@ variables: ansible_user: "'admin'" """ -import os import json +import os YAML_IMPORT_ERROR: ImportError | None try: @@ -129,14 +128,15 @@ except ImportError as exc: else: YAML_IMPORT_ERROR = None +import urllib.parse as urllib_parse + from ansible.errors import AnsibleError +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.module_utils.urls import open_url -from ansible.module_utils.common.text.converters import to_text - -import urllib.parse as urllib_parse def _fetch_information(token, url): diff --git a/plugins/inventory/virtualbox.py b/plugins/inventory/virtualbox.py index 3fc53b9e32..6639200d42 100644 --- a/plugins/inventory/virtualbox.py +++ b/plugins/inventory/virtualbox.py @@ -72,14 +72,13 @@ groups: """ import os - -from subprocess import Popen, PIPE +from collections.abc import MutableMapping +from subprocess import PIPE, Popen from ansible.errors import AnsibleParserError -from ansible.module_utils.common.text.converters import to_bytes, to_text -from collections.abc import MutableMapping -from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable 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 diff --git a/plugins/inventory/xen_orchestra.py b/plugins/inventory/xen_orchestra.py index adb8a4c5bd..0f6343c891 100644 --- a/plugins/inventory/xen_orchestra.py +++ b/plugins/inventory/xen_orchestra.py @@ -99,7 +99,7 @@ import ssl from time import sleep from ansible.errors import AnsibleError -from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable +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 diff --git a/plugins/lookup/binary_file.py b/plugins/lookup/binary_file.py index 2857ed2e20..4fbc35263a 100644 --- a/plugins/lookup/binary_file.py +++ b/plugins/lookup/binary_file.py @@ -77,7 +77,6 @@ import base64 from ansible.errors import AnsibleLookupError from ansible.plugins.lookup import LookupBase - from ansible.utils.display import Display display = Display() diff --git a/plugins/lookup/bitwarden.py b/plugins/lookup/bitwarden.py index 388e8428f3..f086ac1f07 100644 --- a/plugins/lookup/bitwarden.py +++ b/plugins/lookup/bitwarden.py @@ -118,7 +118,7 @@ _raw: elements: list """ -from subprocess import Popen, PIPE +from subprocess import PIPE, Popen from ansible.errors import AnsibleError, AnsibleOptionsError from ansible.module_utils.common.text.converters import to_bytes, to_text diff --git a/plugins/lookup/bitwarden_secrets_manager.py b/plugins/lookup/bitwarden_secrets_manager.py index b8077c8b38..8572ca590e 100644 --- a/plugins/lookup/bitwarden_secrets_manager.py +++ b/plugins/lookup/bitwarden_secrets_manager.py @@ -3,7 +3,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" name: bitwarden_secrets_manager author: @@ -67,7 +66,7 @@ _raw: elements: dict """ -from subprocess import Popen, PIPE +from subprocess import PIPE, Popen from time import sleep from ansible.errors import AnsibleLookupError diff --git a/plugins/lookup/chef_databag.py b/plugins/lookup/chef_databag.py index 0f5425e7e0..185735fbc4 100644 --- a/plugins/lookup/chef_databag.py +++ b/plugins/lookup/chef_databag.py @@ -42,8 +42,8 @@ _raw: """ from ansible.errors import AnsibleError -from ansible.plugins.lookup import LookupBase from ansible.parsing.splitter import parse_kv +from ansible.plugins.lookup import LookupBase try: import chef diff --git a/plugins/lookup/collection_version.py b/plugins/lookup/collection_version.py index ab43d1b79c..6ccee7ee58 100644 --- a/plugins/lookup/collection_version.py +++ b/plugins/lookup/collection_version.py @@ -61,11 +61,9 @@ import re from importlib import import_module import yaml - from ansible.errors import AnsibleLookupError from ansible.plugins.lookup import LookupBase - FQCN_RE = re.compile(r"^[A-Za-z0-9_]+\.[A-Za-z0-9_]+$") diff --git a/plugins/lookup/consul_kv.py b/plugins/lookup/consul_kv.py index c52c52b872..0a9eb0cd7a 100644 --- a/plugins/lookup/consul_kv.py +++ b/plugins/lookup/consul_kv.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" author: Unknown (!UNKNOWN) name: consul_kv @@ -112,9 +111,9 @@ _raw: from urllib.parse import urlparse -from ansible.errors import AnsibleError, AnsibleAssertionError -from ansible.plugins.lookup import LookupBase +from ansible.errors import AnsibleAssertionError, AnsibleError from ansible.module_utils.common.text.converters import to_text +from ansible.plugins.lookup import LookupBase try: import consul diff --git a/plugins/lookup/cyberarkpassword.py b/plugins/lookup/cyberarkpassword.py index ac48187819..6c6acae150 100644 --- a/plugins/lookup/cyberarkpassword.py +++ b/plugins/lookup/cyberarkpassword.py @@ -79,12 +79,11 @@ _result: import os import subprocess -from subprocess import PIPE -from subprocess import Popen +from subprocess import PIPE, Popen from ansible.errors import AnsibleError -from ansible.plugins.lookup import LookupBase from ansible.module_utils.common.text.converters import to_bytes, to_native +from ansible.plugins.lookup import LookupBase from ansible.utils.display import Display display = Display() diff --git a/plugins/lookup/dependent.py b/plugins/lookup/dependent.py index 10decf191c..a91633be6d 100644 --- a/plugins/lookup/dependent.py +++ b/plugins/lookup/dependent.py @@ -118,8 +118,9 @@ _list: key2: bar """ -from ansible.errors import AnsibleLookupError from collections.abc import Mapping, Sequence + +from ansible.errors import AnsibleLookupError from ansible.plugins.lookup import LookupBase from ansible.template import Templar diff --git a/plugins/lookup/dig.py b/plugins/lookup/dig.py index aa11cc78f1..3302e29ec1 100644 --- a/plugins/lookup/dig.py +++ b/plugins/lookup/dig.py @@ -240,20 +240,20 @@ _list: - C(strings). """ -from ansible.errors import AnsibleError -from ansible.plugins.lookup import LookupBase -from ansible.module_utils.parsing.convert_bool import boolean -from ansible.utils.display import Display import socket +from ansible.errors import AnsibleError +from ansible.module_utils.parsing.convert_bool import boolean +from ansible.plugins.lookup import LookupBase +from ansible.utils.display import Display + try: import dns.exception import dns.name + import dns.rdataclass import dns.resolver import dns.reversename - import dns.rdataclass from dns.rdatatype import ( - A, AAAA, CAA, CNAME, @@ -274,6 +274,7 @@ try: SSHFP, TLSA, TXT, + A, ) HAVE_DNS = True diff --git a/plugins/lookup/dsv.py b/plugins/lookup/dsv.py index 92cc8b8136..b5f0cd9c55 100644 --- a/plugins/lookup/dsv.py +++ b/plugins/lookup/dsv.py @@ -3,7 +3,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" name: dsv author: Adam Migus (@amigus) @@ -96,9 +95,8 @@ try: except ImportError: sdk_is_missing = True -from ansible.utils.display import Display from ansible.plugins.lookup import LookupBase - +from ansible.utils.display import Display display = Display() diff --git a/plugins/lookup/etcd.py b/plugins/lookup/etcd.py index 87d479422a..67a681ead6 100644 --- a/plugins/lookup/etcd.py +++ b/plugins/lookup/etcd.py @@ -69,8 +69,8 @@ _raw: import json -from ansible.plugins.lookup import LookupBase from ansible.module_utils.urls import open_url +from ansible.plugins.lookup import LookupBase # this can be made configurable, not should not use ansible.cfg # diff --git a/plugins/lookup/filetree.py b/plugins/lookup/filetree.py index 5dda5583d4..3df799213e 100644 --- a/plugins/lookup/filetree.py +++ b/plugins/lookup/filetree.py @@ -124,11 +124,11 @@ _raw: description: Time of last metadata update or creation (depends on OS). type: float """ +import grp import os import pwd -import grp -import stat import re +import stat HAVE_SELINUX = False try: @@ -138,8 +138,8 @@ try: except ImportError: pass -from ansible.plugins.lookup import LookupBase from ansible.module_utils.common.text.converters import to_native, to_text +from ansible.plugins.lookup import LookupBase from ansible.utils.display import Display display = Display() diff --git a/plugins/lookup/github_app_access_token.py b/plugins/lookup/github_app_access_token.py index b209e24852..94da5ed2b4 100644 --- a/plugins/lookup/github_app_access_token.py +++ b/plugins/lookup/github_app_access_token.py @@ -83,7 +83,7 @@ except ImportError: HAS_PYTHON_JWT = False # vs pyjwt if HAS_JWT and hasattr(jwt, "JWT"): HAS_PYTHON_JWT = True - from jwt import jwk_from_pem, JWT # type: ignore[attr-defined] + from jwt import JWT, jwk_from_pem # type: ignore[attr-defined] jwt_instance = JWT() @@ -95,12 +95,12 @@ except ImportError: HAS_CRYPTOGRAPHY = False -import time import json +import time from urllib.error import HTTPError -from ansible.module_utils.urls import open_url from ansible.errors import AnsibleError, AnsibleOptionsError +from ansible.module_utils.urls import open_url from ansible.plugins.lookup import LookupBase from ansible.utils.display import Display diff --git a/plugins/lookup/hiera.py b/plugins/lookup/hiera.py index f6837baa1e..225ae4aaa3 100644 --- a/plugins/lookup/hiera.py +++ b/plugins/lookup/hiera.py @@ -67,9 +67,9 @@ _raw: elements: str """ +from ansible.module_utils.common.text.converters import to_text from ansible.plugins.lookup import LookupBase from ansible.utils.cmd_functions import run_cmd -from ansible.module_utils.common.text.converters import to_text class Hiera: diff --git a/plugins/lookup/lastpass.py b/plugins/lookup/lastpass.py index 18b13bb05b..d1bae18b68 100644 --- a/plugins/lookup/lastpass.py +++ b/plugins/lookup/lastpass.py @@ -39,7 +39,7 @@ _raw: elements: str """ -from subprocess import Popen, PIPE +from subprocess import PIPE, Popen from ansible.errors import AnsibleError from ansible.module_utils.common.text.converters import to_bytes, to_text diff --git a/plugins/lookup/lmdb_kv.py b/plugins/lookup/lmdb_kv.py index d5dbde56cb..2f9996ef4e 100644 --- a/plugins/lookup/lmdb_kv.py +++ b/plugins/lookup/lmdb_kv.py @@ -59,8 +59,8 @@ _raw: from ansible.errors import AnsibleError -from ansible.plugins.lookup import LookupBase from ansible.module_utils.common.text.converters import to_native, to_text +from ansible.plugins.lookup import LookupBase HAVE_LMDB = True try: diff --git a/plugins/lookup/onepassword.py b/plugins/lookup/onepassword.py index 680e802aa2..e57962a141 100644 --- a/plugins/lookup/onepassword.py +++ b/plugins/lookup/onepassword.py @@ -75,14 +75,14 @@ _raw: """ import abc -import os import json +import os import subprocess -from ansible.plugins.lookup import LookupBase from ansible.errors import AnsibleLookupError, AnsibleOptionsError 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 diff --git a/plugins/lookup/onepassword_doc.py b/plugins/lookup/onepassword_doc.py index e62db6d1e2..9bd1a8f3ad 100644 --- a/plugins/lookup/onepassword_doc.py +++ b/plugins/lookup/onepassword_doc.py @@ -43,9 +43,10 @@ _raw: elements: string """ -from ansible_collections.community.general.plugins.lookup.onepassword import OnePass, OnePassCLIv2 from ansible.plugins.lookup import LookupBase +from ansible_collections.community.general.plugins.lookup.onepassword import OnePass, OnePassCLIv2 + class OnePassCLIv2Doc(OnePassCLIv2): def get_raw(self, item_id, vault=None, token=None): diff --git a/plugins/lookup/onepassword_raw.py b/plugins/lookup/onepassword_raw.py index 7639cb76b4..101fbd3e8c 100644 --- a/plugins/lookup/onepassword_raw.py +++ b/plugins/lookup/onepassword_raw.py @@ -54,9 +54,10 @@ _raw: import json -from ansible_collections.community.general.plugins.lookup.onepassword import OnePass from ansible.plugins.lookup import LookupBase +from ansible_collections.community.general.plugins.lookup.onepassword import OnePass + class LookupModule(LookupBase): def run(self, terms, variables=None, **kwargs): diff --git a/plugins/lookup/onepassword_ssh_key.py b/plugins/lookup/onepassword_ssh_key.py index 2828dd8aa8..4f1d84df5a 100644 --- a/plugins/lookup/onepassword_ssh_key.py +++ b/plugins/lookup/onepassword_ssh_key.py @@ -49,12 +49,13 @@ _raw: """ import json +from ansible.errors import AnsibleLookupError +from ansible.plugins.lookup import LookupBase + from ansible_collections.community.general.plugins.lookup.onepassword import ( OnePass, OnePassCLIv2, ) -from ansible.errors import AnsibleLookupError -from ansible.plugins.lookup import LookupBase class LookupModule(LookupBase): diff --git a/plugins/lookup/passwordstore.py b/plugins/lookup/passwordstore.py index f0ff9fdea5..6acc985e1f 100644 --- a/plugins/lookup/passwordstore.py +++ b/plugins/lookup/passwordstore.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" name: passwordstore author: @@ -240,20 +239,20 @@ _raw: elements: str """ -from contextlib import contextmanager import os import re import subprocess import time -import yaml +from contextlib import contextmanager -from ansible.errors import AnsibleError, AnsibleAssertionError +import yaml +from ansible import constants as C +from ansible.errors import AnsibleAssertionError, AnsibleError from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text from ansible.module_utils.parsing.convert_bool import boolean +from ansible.plugins.lookup import LookupBase from ansible.utils.display import Display from ansible.utils.encrypt import random_password -from ansible.plugins.lookup import LookupBase -from ansible import constants as C from ansible_collections.community.general.plugins.module_utils._filelock import FileLock diff --git a/plugins/lookup/random_pet.py b/plugins/lookup/random_pet.py index cdb06794a7..36fb213084 100644 --- a/plugins/lookup/random_pet.py +++ b/plugins/lookup/random_pet.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" name: random_pet author: diff --git a/plugins/lookup/random_string.py b/plugins/lookup/random_string.py index a00dfc1997..baa6c70785 100644 --- a/plugins/lookup/random_string.py +++ b/plugins/lookup/random_string.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" name: random_string author: @@ -171,8 +170,8 @@ import secrets import string from ansible.errors import AnsibleLookupError -from ansible.plugins.lookup import LookupBase from ansible.module_utils.common.text.converters import to_bytes, to_text +from ansible.plugins.lookup import LookupBase class LookupModule(LookupBase): diff --git a/plugins/lookup/random_words.py b/plugins/lookup/random_words.py index cd5558cf58..c42bfb678d 100644 --- a/plugins/lookup/random_words.py +++ b/plugins/lookup/random_words.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" name: random_words author: diff --git a/plugins/lookup/redis.py b/plugins/lookup/redis.py index 2de4d65ba4..a24957c947 100644 --- a/plugins/lookup/redis.py +++ b/plugins/lookup/redis.py @@ -81,8 +81,8 @@ try: except ImportError: pass -from ansible.module_utils.common.text.converters import to_text from ansible.errors import AnsibleError +from ansible.module_utils.common.text.converters import to_text from ansible.plugins.lookup import LookupBase diff --git a/plugins/lookup/revbitspss.py b/plugins/lookup/revbitspss.py index 134c2df443..0ee04a77a5 100644 --- a/plugins/lookup/revbitspss.py +++ b/plugins/lookup/revbitspss.py @@ -3,7 +3,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" name: revbitspss author: RevBits (@RevBits) @@ -61,9 +60,9 @@ EXAMPLES = r""" UUIDPAM is {{ (secret['UUIDPAM']) }} and DB_PASS is {{ (secret['DB_PASS']) }} """ +from ansible.errors import AnsibleError from ansible.plugins.lookup import LookupBase from ansible.utils.display import Display -from ansible.errors import AnsibleError ANOTHER_LIBRARY_IMPORT_ERROR: ImportError | None try: diff --git a/plugins/lookup/shelvefile.py b/plugins/lookup/shelvefile.py index 158657e07e..2442c0868f 100644 --- a/plugins/lookup/shelvefile.py +++ b/plugins/lookup/shelvefile.py @@ -40,9 +40,9 @@ _list: """ import shelve -from ansible.errors import AnsibleError, AnsibleAssertionError -from ansible.plugins.lookup import LookupBase +from ansible.errors import AnsibleAssertionError, AnsibleError from ansible.module_utils.common.text.converters import to_bytes, to_text +from ansible.plugins.lookup import LookupBase class LookupModule(LookupBase): diff --git a/plugins/lookup/tss.py b/plugins/lookup/tss.py index f3bddcfe6f..bd3c645c5a 100644 --- a/plugins/lookup/tss.py +++ b/plugins/lookup/tss.py @@ -3,7 +3,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" name: tss author: Adam Migus (@amigus) @@ -301,17 +300,18 @@ EXAMPLES = r""" import abc import os + from ansible.errors import AnsibleError, AnsibleOptionsError from ansible.plugins.lookup import LookupBase from ansible.utils.display import Display try: from delinea.secrets.server import ( + AccessTokenAuthorizer, + DomainPasswordGrantAuthorizer, + PasswordGrantAuthorizer, SecretServer, SecretServerError, - PasswordGrantAuthorizer, - DomainPasswordGrantAuthorizer, - AccessTokenAuthorizer, ) HAS_TSS_SDK = True @@ -320,11 +320,11 @@ try: except ImportError: try: from thycotic.secrets.server import ( + AccessTokenAuthorizer, + DomainPasswordGrantAuthorizer, + PasswordGrantAuthorizer, SecretServer, SecretServerError, - PasswordGrantAuthorizer, - DomainPasswordGrantAuthorizer, - AccessTokenAuthorizer, ) HAS_TSS_SDK = True diff --git a/plugins/module_utils/_filelock.py b/plugins/module_utils/_filelock.py index 3821bba4a2..3580e84427 100644 --- a/plugins/module_utils/_filelock.py +++ b/plugins/module_utils/_filelock.py @@ -7,12 +7,11 @@ from __future__ import annotations +import fcntl import os import stat import time -import fcntl import typing as t - from contextlib import contextmanager if t.TYPE_CHECKING: diff --git a/plugins/module_utils/_lxc.py b/plugins/module_utils/_lxc.py index 4e7e0ef759..8db257c83a 100644 --- a/plugins/module_utils/_lxc.py +++ b/plugins/module_utils/_lxc.py @@ -12,7 +12,6 @@ import tempfile from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_bytes - # This is used to attach to a running container and execute commands from # within the container on the host. This will provide local access to a # container without using SSH. The template will attempt to work within the diff --git a/plugins/module_utils/_stormssh.py b/plugins/module_utils/_stormssh.py index a298b406c0..b69d9c4598 100644 --- a/plugins/module_utils/_stormssh.py +++ b/plugins/module_utils/_stormssh.py @@ -5,12 +5,12 @@ # SPDX-License-Identifier: MIT from __future__ import annotations + import os import re import traceback from operator import itemgetter - PARAMIKO_IMPORT_ERROR: str | None try: from paramiko.config import SSHConfig diff --git a/plugins/module_utils/alicloud_ecs.py b/plugins/module_utils/alicloud_ecs.py index 071ccce469..4719402576 100644 --- a/plugins/module_utils/alicloud_ecs.py +++ b/plugins/module_utils/alicloud_ecs.py @@ -11,8 +11,8 @@ from __future__ import annotations -import os import json +import os import traceback import typing as t @@ -23,15 +23,15 @@ if t.TYPE_CHECKING: try: import footmark - import footmark.ecs - import footmark.slb - import footmark.vpc - import footmark.rds - import footmark.ess - import footmark.sts import footmark.dns - import footmark.ram + import footmark.ecs + import footmark.ess import footmark.market + import footmark.ram + import footmark.rds + import footmark.slb + import footmark.sts + import footmark.vpc FOOTMARK_IMP_ERR = None HAS_FOOTMARK = True diff --git a/plugins/module_utils/android_sdkmanager.py b/plugins/module_utils/android_sdkmanager.py index 8396179f2d..73658b2ae7 100644 --- a/plugins/module_utils/android_sdkmanager.py +++ b/plugins/module_utils/android_sdkmanager.py @@ -4,7 +4,6 @@ from __future__ import annotations - import re import typing as t diff --git a/plugins/module_utils/btrfs.py b/plugins/module_utils/btrfs.py index 91acecba4b..6b7d7691e0 100644 --- a/plugins/module_utils/btrfs.py +++ b/plugins/module_utils/btrfs.py @@ -4,11 +4,12 @@ from __future__ import annotations -from ansible.module_utils.common.text.converters import to_bytes -import re import os +import re import typing as t +from ansible.module_utils.common.text.converters import to_bytes + if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/cloud.py b/plugins/module_utils/cloud.py index de61a8095d..cdffe689ce 100644 --- a/plugins/module_utils/cloud.py +++ b/plugins/module_utils/cloud.py @@ -7,7 +7,6 @@ from __future__ import annotations - """ This module adds shared support for generic cloud modules @@ -32,9 +31,9 @@ The 'cloud' module provides the following common classes: """ import random -from functools import wraps import syslog import time +from functools import wraps def _exponential_backoff(retries=10, delay=2, backoff=2, max_delay=60): diff --git a/plugins/module_utils/cmd_runner.py b/plugins/module_utils/cmd_runner.py index e7ed48cb3a..cc63ef5c3c 100644 --- a/plugins/module_utils/cmd_runner.py +++ b/plugins/module_utils/cmd_runner.py @@ -9,11 +9,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 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 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 index b91e2ef92d..5791f37ca1 100644 --- a/plugins/module_utils/cmd_runner_fmt.py +++ b/plugins/module_utils/cmd_runner_fmt.py @@ -5,7 +5,6 @@ from __future__ import annotations import typing as t - from functools import wraps from ansible.module_utils.common.collections import is_sequence diff --git a/plugins/module_utils/consul.py b/plugins/module_utils/consul.py index f3f18bacf6..c6cee5a6fe 100644 --- a/plugins/module_utils/consul.py +++ b/plugins/module_utils/consul.py @@ -4,7 +4,6 @@ from __future__ import annotations - import copy import json import re diff --git a/plugins/module_utils/csv.py b/plugins/module_utils/csv.py index 99c03ad825..88d5ed31df 100644 --- a/plugins/module_utils/csv.py +++ b/plugins/module_utils/csv.py @@ -11,7 +11,6 @@ from io import StringIO from ansible.module_utils.common.text.converters import to_native - if t.TYPE_CHECKING: from collections.abc import Sequence diff --git a/plugins/module_utils/deps.py b/plugins/module_utils/deps.py index 30d27f76c6..a9a31a8e4f 100644 --- a/plugins/module_utils/deps.py +++ b/plugins/module_utils/deps.py @@ -5,7 +5,6 @@ from __future__ import annotations - import traceback import typing as t from contextlib import contextmanager diff --git a/plugins/module_utils/dimensiondata.py b/plugins/module_utils/dimensiondata.py index 605e7a9c75..b6b5012be0 100644 --- a/plugins/module_utils/dimensiondata.py +++ b/plugins/module_utils/dimensiondata.py @@ -18,25 +18,27 @@ from __future__ import annotations # # This module utils is deprecated and will be removed in community.general 13.0.0 # - import configparser import os import re import traceback - -from ansible.module_utils.basic import AnsibleModule, missing_required_lib # noqa: F401, pylint: disable=unused-import from os.path import expanduser from uuid import UUID +from ansible.module_utils.basic import AnsibleModule, missing_required_lib # noqa: F401, pylint: disable=unused-import + LIBCLOUD_IMP_ERR = None try: - from libcloud.common.dimensiondata import API_ENDPOINTS, DimensionDataAPIException, DimensionDataStatus # noqa: F401, pylint: disable=unused-import + import libcloud.security + from libcloud.common.dimensiondata import ( # noqa: F401, pylint: disable=unused-import + API_ENDPOINTS, + DimensionDataAPIException, + DimensionDataStatus, + ) from libcloud.compute.base import Node, NodeLocation # noqa: F401, pylint: disable=unused-import from libcloud.compute.providers import get_driver from libcloud.compute.types import Provider - import libcloud.security - HAS_LIBCLOUD = True except ImportError: LIBCLOUD_IMP_ERR = traceback.format_exc() diff --git a/plugins/module_utils/django.py b/plugins/module_utils/django.py index 0e3f258baf..1a11b547a9 100644 --- a/plugins/module_utils/django.py +++ b/plugins/module_utils/django.py @@ -7,12 +7,14 @@ 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.python_runner import PythonRunner 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 diff --git a/plugins/module_utils/homebrew.py b/plugins/module_utils/homebrew.py index 06ca5fb4f3..08fd230d29 100644 --- a/plugins/module_utils/homebrew.py +++ b/plugins/module_utils/homebrew.py @@ -4,7 +4,6 @@ from __future__ import annotations - import os import re import typing as t diff --git a/plugins/module_utils/hwc_utils.py b/plugins/module_utils/hwc_utils.py index 64ce4b59ea..ab84f732a6 100644 --- a/plugins/module_utils/hwc_utils.py +++ b/plugins/module_utils/hwc_utils.py @@ -11,9 +11,9 @@ import typing as t THIRD_LIBRARIES_IMP_ERR = None try: + from keystoneauth1 import session from keystoneauth1.adapter import Adapter from keystoneauth1.identity import v3 - from keystoneauth1 import session HAS_THIRD_LIBRARIES = True except ImportError: diff --git a/plugins/module_utils/ibm_sa_utils.py b/plugins/module_utils/ibm_sa_utils.py index df339ec6fb..cad1dde8c7 100644 --- a/plugins/module_utils/ibm_sa_utils.py +++ b/plugins/module_utils/ibm_sa_utils.py @@ -8,8 +8,8 @@ from __future__ import annotations import traceback import typing as t - from functools import wraps + from ansible.module_utils.basic import missing_required_lib if t.TYPE_CHECKING: diff --git a/plugins/module_utils/identity/keycloak/keycloak.py b/plugins/module_utils/identity/keycloak/keycloak.py index 681d2417f3..1482f9693b 100644 --- a/plugins/module_utils/identity/keycloak/keycloak.py +++ b/plugins/module_utils/identity/keycloak/keycloak.py @@ -8,14 +8,15 @@ import copy import json import traceback import typing as t -from urllib.parse import urlencode, quote from urllib.error import HTTPError +from urllib.parse import quote, urlencode -from ansible.module_utils.urls import open_url from ansible.module_utils.common.text.converters import to_native, to_text +from ansible.module_utils.urls import open_url if t.TYPE_CHECKING: from collections.abc import Sequence + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/identity/keycloak/keycloak_clientsecret.py b/plugins/module_utils/identity/keycloak/keycloak_clientsecret.py index b8d6674a4c..1c9e209806 100644 --- a/plugins/module_utils/identity/keycloak/keycloak_clientsecret.py +++ b/plugins/module_utils/identity/keycloak/keycloak_clientsecret.py @@ -10,8 +10,8 @@ import typing as t from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( - keycloak_argument_spec, KeycloakAPI, + keycloak_argument_spec, ) diff --git a/plugins/module_utils/influxdb.py b/plugins/module_utils/influxdb.py index 3a9677f7c4..b61b8b1b4e 100644 --- a/plugins/module_utils/influxdb.py +++ b/plugins/module_utils/influxdb.py @@ -25,9 +25,11 @@ except ImportError: INFLUXDB_IMP_ERR = None try: - from influxdb import InfluxDBClient + from influxdb import ( # pylint: disable=unused-import + InfluxDBClient, + exceptions, # noqa: F401 + ) from influxdb import __version__ as influxdb_version - from influxdb import exceptions # noqa: F401, pylint: disable=unused-import HAS_INFLUXDB = True except ImportError: diff --git a/plugins/module_utils/ipa.py b/plugins/module_utils/ipa.py index ed8c180f8c..d925692ab0 100644 --- a/plugins/module_utils/ipa.py +++ b/plugins/module_utils/ipa.py @@ -15,13 +15,13 @@ import json import os import re import socket -import uuid import typing as t +import uuid from urllib.parse import quote -from ansible.module_utils.basic import env_fallback, AnsibleFallbackNotFound +from ansible.module_utils.basic import AnsibleFallbackNotFound, env_fallback from ansible.module_utils.common.text.converters import to_bytes, to_text -from ansible.module_utils.urls import fetch_url, HAS_GSSAPI +from ansible.module_utils.urls import HAS_GSSAPI, fetch_url if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/jenkins.py b/plugins/module_utils/jenkins.py index 810128dab8..7445f9f868 100644 --- a/plugins/module_utils/jenkins.py +++ b/plugins/module_utils/jenkins.py @@ -5,7 +5,6 @@ from __future__ import annotations - import os import time diff --git a/plugins/module_utils/known_hosts.py b/plugins/module_utils/known_hosts.py index 1a30b3649c..2e27f8585c 100644 --- a/plugins/module_utils/known_hosts.py +++ b/plugins/module_utils/known_hosts.py @@ -13,10 +13,9 @@ from __future__ import annotations -import os import hmac +import os import re - from urllib.parse import urlparse try: diff --git a/plugins/module_utils/lxd.py b/plugins/module_utils/lxd.py index a217da1fea..ccb0f6fc94 100644 --- a/plugins/module_utils/lxd.py +++ b/plugins/module_utils/lxd.py @@ -4,7 +4,6 @@ from __future__ import annotations - import http.client as http_client import json import os diff --git a/plugins/module_utils/manageiq.py b/plugins/module_utils/manageiq.py index 122e6c0807..5bed65b47c 100644 --- a/plugins/module_utils/manageiq.py +++ b/plugins/module_utils/manageiq.py @@ -12,7 +12,6 @@ from __future__ import annotations - import os import traceback import typing as t diff --git a/plugins/module_utils/memset.py b/plugins/module_utils/memset.py index 6d1038b296..adbcfcc5ab 100644 --- a/plugins/module_utils/memset.py +++ b/plugins/module_utils/memset.py @@ -11,10 +11,11 @@ from __future__ import annotations -from urllib.parse import urlencode -from ansible.module_utils.urls import open_url -from ansible.module_utils.basic import json import urllib.error as urllib_error +from urllib.parse import urlencode + +from ansible.module_utils.basic import json +from ansible.module_utils.urls import open_url class Response: diff --git a/plugins/module_utils/mh/base.py b/plugins/module_utils/mh/base.py index e8275d631f..8d8017855a 100644 --- a/plugins/module_utils/mh/base.py +++ b/plugins/module_utils/mh/base.py @@ -8,8 +8,9 @@ from __future__ import annotations import typing as t from ansible.module_utils.basic import AnsibleModule -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/module_helper.py b/plugins/module_utils/mh/module_helper.py index 0582dba7f1..b41cf48639 100644 --- a/plugins/module_utils/mh/module_helper.py +++ b/plugins/module_utils/mh/module_helper.py @@ -9,13 +9,14 @@ import typing as t from ansible.module_utils.common.dict_transformations import dict_merge -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.state import StateMixin 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 + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/module_helper.py b/plugins/module_utils/module_helper.py index 57eaffff2c..d96f44dad5 100644 --- a/plugins/module_utils/module_helper.py +++ b/plugins/module_utils/module_helper.py @@ -6,15 +6,14 @@ from __future__ import annotations # pylint: disable=unused-import - +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 ModuleHelper, StateModuleHelper, ) -from ansible_collections.community.general.plugins.module_utils.mh.exceptions import ModuleHelperException # noqa: F401 -from ansible_collections.community.general.plugins.module_utils.mh.deco import ( # noqa: F401 - cause_changes, - module_fails_on_exception, - check_mode_skip, - check_mode_skip_returns, -) diff --git a/plugins/module_utils/net_tools/pritunl/api.py b/plugins/module_utils/net_tools/pritunl/api.py index d6e3b15b25..9332a96b41 100644 --- a/plugins/module_utils/net_tools/pritunl/api.py +++ b/plugins/module_utils/net_tools/pritunl/api.py @@ -13,8 +13,8 @@ import hashlib import hmac import json import time -import uuid import typing as t +import uuid from ansible.module_utils.urls import open_url diff --git a/plugins/module_utils/ocapi_utils.py b/plugins/module_utils/ocapi_utils.py index 11b5787cfb..b60bd84c4c 100644 --- a/plugins/module_utils/ocapi_utils.py +++ b/plugins/module_utils/ocapi_utils.py @@ -7,13 +7,13 @@ from __future__ import annotations import json import os -import uuid import typing as t -from urllib.error import URLError, HTTPError +import uuid +from urllib.error import HTTPError, URLError from urllib.parse import urlparse -from ansible.module_utils.urls import open_url from ansible.module_utils.common.text.converters import to_native +from ansible.module_utils.urls import open_url if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/opennebula.py b/plugins/module_utils/opennebula.py index 6cfd53518f..11e814e853 100644 --- a/plugins/module_utils/opennebula.py +++ b/plugins/module_utils/opennebula.py @@ -6,12 +6,11 @@ from __future__ import annotations - -import time import ssl +import time from os import environ -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule IMAGE_STATES = [ "INIT", diff --git a/plugins/module_utils/oracle/oci_utils.py b/plugins/module_utils/oracle/oci_utils.py index 63e9a2df32..b0ae12ec38 100644 --- a/plugins/module_utils/oracle/oci_utils.py +++ b/plugins/module_utils/oracle/oci_utils.py @@ -9,7 +9,6 @@ from __future__ import annotations # # This module utils is deprecated and will be removed in community.general 13.0.0 # - import logging import logging.config import os @@ -22,24 +21,21 @@ from datetime import datetime # noqa: F401, pylint: disable=unused-import from operator import eq try: - import yaml # noqa: F401, pylint: disable=unused-import - import oci + import yaml # noqa: F401, pylint: disable=unused-import from oci.constants import HEADER_NEXT_PAGE - from oci.exceptions import ( + ConfigFileNotFound, InvalidConfig, InvalidPrivateKey, - MissingPrivateKeyPassphrase, - ConfigFileNotFound, - ServiceError, MaximumWaitTimeExceeded, + MissingPrivateKeyPassphrase, + ServiceError, ) from oci.identity.identity_client import IdentityClient - from oci.object_storage.models import CreateBucketDetails - from oci.object_storage.models import UpdateBucketDetails + from oci.object_storage.models import CreateBucketDetails, UpdateBucketDetails from oci.retry import RetryStrategyBuilder - from oci.util import to_dict, Sentinel + from oci.util import Sentinel, to_dict HAS_OCI_PY_SDK = True except ImportError: diff --git a/plugins/module_utils/pkg_req.py b/plugins/module_utils/pkg_req.py index 06a44cd5cf..2f0d45f36c 100644 --- a/plugins/module_utils/pkg_req.py +++ b/plugins/module_utils/pkg_req.py @@ -14,7 +14,8 @@ if t.TYPE_CHECKING: with deps.declare("packaging"): from packaging.requirements import Requirement - from packaging.version import parse as parse_version, InvalidVersion + from packaging.version import InvalidVersion + from packaging.version import parse as parse_version class PackageRequirement: diff --git a/plugins/module_utils/redfish_utils.py b/plugins/module_utils/redfish_utils.py index 5904aa9eb4..b10f67b867 100644 --- a/plugins/module_utils/redfish_utils.py +++ b/plugins/module_utils/redfish_utils.py @@ -11,14 +11,12 @@ import random import string import time import typing as t - -from ansible.module_utils.urls import open_url -from ansible.module_utils.common.text.converters import to_native -from ansible.module_utils.common.text.converters import to_text -from ansible.module_utils.common.text.converters import to_bytes -from urllib.error import URLError, HTTPError +from urllib.error import HTTPError, URLError from urllib.parse import urlparse +from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text +from ansible.module_utils.urls import open_url + if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/redis.py b/plugins/module_utils/redis.py index 615dcd48cd..60995e0e1a 100644 --- a/plugins/module_utils/redis.py +++ b/plugins/module_utils/redis.py @@ -8,7 +8,7 @@ from __future__ import annotations import traceback import typing as t -from ansible.module_utils.basic import missing_required_lib, AnsibleModule +from ansible.module_utils.basic import AnsibleModule, missing_required_lib if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/scaleway.py b/plugins/module_utils/scaleway.py index 43dff7ece5..d3ac3451ed 100644 --- a/plugins/module_utils/scaleway.py +++ b/plugins/module_utils/scaleway.py @@ -4,11 +4,11 @@ from __future__ import annotations -import os +import datetime import json +import os import re import sys -import datetime import time import traceback import typing as t @@ -23,6 +23,7 @@ from ansible_collections.community.general.plugins.module_utils.datetime import if t.TYPE_CHECKING: from collections.abc import Iterable + from ansible.module_utils.basic import AnsibleModule SCALEWAY_SECRET_IMP_ERR: str | None = None diff --git a/plugins/module_utils/source_control/bitbucket.py b/plugins/module_utils/source_control/bitbucket.py index 3551d9cb91..8002d4d1de 100644 --- a/plugins/module_utils/source_control/bitbucket.py +++ b/plugins/module_utils/source_control/bitbucket.py @@ -8,7 +8,7 @@ import json import typing as t from ansible.module_utils.basic import env_fallback -from ansible.module_utils.urls import fetch_url, basic_auth_header +from ansible.module_utils.urls import basic_auth_header, fetch_url if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/ssh.py b/plugins/module_utils/ssh.py index b2af22212d..554f549997 100644 --- a/plugins/module_utils/ssh.py +++ b/plugins/module_utils/ssh.py @@ -7,7 +7,6 @@ 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 index 1e6aebaa29..604a8f8679 100644 --- a/plugins/module_utils/storage/emc/emc_vnx.py +++ b/plugins/module_utils/storage/emc/emc_vnx.py @@ -4,7 +4,6 @@ from __future__ import annotations - emc_vnx_argument_spec = { "sp_address": dict(type="str", required=True), "sp_user": dict(type="str", required=False, default="sysadmin"), diff --git a/plugins/module_utils/univention_umc.py b/plugins/module_utils/univention_umc.py index 7e4c922d47..1d9ce5189d 100644 --- a/plugins/module_utils/univention_umc.py +++ b/plugins/module_utils/univention_umc.py @@ -12,7 +12,6 @@ from __future__ import annotations - """Univention Corporate Server (UCS) access module. Provides the following functions for working with an UCS server. @@ -41,11 +40,10 @@ Any other module is not part of the "official" API and may change at any time. import re - __all__ = [ - "ldap_search", - "config_registry", "base_dn", + "config_registry", + "ldap_search", "uldap", "umc_module_for_add", "umc_module_for_edit", diff --git a/plugins/module_utils/version.py b/plugins/module_utils/version.py index 496800057c..e13fb72a33 100644 --- a/plugins/module_utils/version.py +++ b/plugins/module_utils/version.py @@ -6,5 +6,4 @@ from __future__ import annotations - from ansible.module_utils.compat.version import LooseVersion # noqa: F401, pylint: disable=unused-import diff --git a/plugins/module_utils/wdc_redfish_utils.py b/plugins/module_utils/wdc_redfish_utils.py index 56ec7537d6..afbf412acf 100644 --- a/plugins/module_utils/wdc_redfish_utils.py +++ b/plugins/module_utils/wdc_redfish_utils.py @@ -7,12 +7,13 @@ from __future__ import annotations import datetime import os import re -import time import tarfile +import time import typing as t 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 if t.TYPE_CHECKING: diff --git a/plugins/module_utils/xenserver.py b/plugins/module_utils/xenserver.py index bf9b4f0a9b..a9ccc94c22 100644 --- a/plugins/module_utils/xenserver.py +++ b/plugins/module_utils/xenserver.py @@ -6,8 +6,8 @@ from __future__ import annotations import atexit -import time import re +import time import traceback import typing as t @@ -20,8 +20,8 @@ except ImportError: HAS_XENAPI = False XENAPI_IMP_ERR = traceback.format_exc() -from ansible.module_utils.basic import env_fallback, missing_required_lib from ansible.module_utils.ansible_release import __version__ as ANSIBLE_VERSION +from ansible.module_utils.basic import env_fallback, missing_required_lib if t.TYPE_CHECKING: from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/module_utils/xfconf.py b/plugins/module_utils/xfconf.py index fb5a00df25..8a85566786 100644 --- a/plugins/module_utils/xfconf.py +++ b/plugins/module_utils/xfconf.py @@ -7,6 +7,7 @@ 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 if t.TYPE_CHECKING: diff --git a/plugins/modules/aerospike_migrations.py b/plugins/modules/aerospike_migrations.py index fe5cdb4895..e893b16f28 100644 --- a/plugins/modules/aerospike_migrations.py +++ b/plugins/modules/aerospike_migrations.py @@ -6,7 +6,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" module: aerospike_migrations short_description: Check or wait for migrations between nodes @@ -154,9 +153,10 @@ from ansible.module_utils.basic import AnsibleModule, missing_required_lib LIB_FOUND_ERR = None try: - import aerospike - from time import sleep import re + from time import sleep + + import aerospike except ImportError: LIB_FOUND = False LIB_FOUND_ERR = traceback.format_exc() diff --git a/plugins/modules/airbrake_deployment.py b/plugins/modules/airbrake_deployment.py index 322d518c26..ad66794877 100644 --- a/plugins/modules/airbrake_deployment.py +++ b/plugins/modules/airbrake_deployment.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: airbrake_deployment author: @@ -94,7 +93,6 @@ EXAMPLES = r""" from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url - # =========================================== # Module execution. # diff --git a/plugins/modules/aix_filesystem.py b/plugins/modules/aix_filesystem.py index 777732c9bd..dbe207ee07 100644 --- a/plugins/modules/aix_filesystem.py +++ b/plugins/modules/aix_filesystem.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" author: - Kairo Araujo (@kairoaraujo) @@ -164,9 +163,10 @@ EXAMPLES = r""" """ -from ansible.module_utils.basic import AnsibleModule -from os.path import ismount import re +from os.path import ismount + +from ansible.module_utils.basic import AnsibleModule def _fs_exists(module, filesystem): diff --git a/plugins/modules/aix_lvol.py b/plugins/modules/aix_lvol.py index 718ec66e00..dee5b5c9e0 100644 --- a/plugins/modules/aix_lvol.py +++ b/plugins/modules/aix_lvol.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" author: - Alain Dejoux (@adejoux) diff --git a/plugins/modules/alerta_customer.py b/plugins/modules/alerta_customer.py index a85be17323..95912b0fc4 100644 --- a/plugins/modules/alerta_customer.py +++ b/plugins/modules/alerta_customer.py @@ -94,8 +94,8 @@ response: type: dict """ -from ansible.module_utils.urls import fetch_url, basic_auth_header from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.urls import basic_auth_header, fetch_url class AlertaInterface: diff --git a/plugins/modules/ali_instance.py b/plugins/modules/ali_instance.py index faedaf34b3..4b4f96520a 100644 --- a/plugins/modules/ali_instance.py +++ b/plugins/modules/ali_instance.py @@ -21,7 +21,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ali_instance short_description: Create, Start, Stop, Restart or Terminate an Instance in ECS; Add or Remove Instance to/from a Security @@ -614,12 +613,14 @@ ids: import re import time + from ansible.module_utils.basic import AnsibleModule, missing_required_lib + from ansible_collections.community.general.plugins.module_utils.alicloud_ecs import ( - ecs_argument_spec, - ecs_connect, FOOTMARK_IMP_ERR, HAS_FOOTMARK, + ecs_argument_spec, + ecs_connect, ) diff --git a/plugins/modules/ali_instance_info.py b/plugins/modules/ali_instance_info.py index 425a15024f..a0ba26009a 100644 --- a/plugins/modules/ali_instance_info.py +++ b/plugins/modules/ali_instance_info.py @@ -21,7 +21,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ali_instance_info short_description: Gather information on instances of Alibaba Cloud ECS @@ -343,11 +342,12 @@ ids: """ from ansible.module_utils.basic import AnsibleModule, missing_required_lib + from ansible_collections.community.general.plugins.module_utils.alicloud_ecs import ( - ecs_argument_spec, - ecs_connect, FOOTMARK_IMP_ERR, HAS_FOOTMARK, + ecs_argument_spec, + ecs_connect, ) diff --git a/plugins/modules/alternatives.py b/plugins/modules/alternatives.py index 58036b9271..c422e88f11 100644 --- a/plugins/modules/alternatives.py +++ b/plugins/modules/alternatives.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: alternatives short_description: Manages alternative programs for common commands diff --git a/plugins/modules/android_sdk.py b/plugins/modules/android_sdk.py index 9295f33652..f8963d555e 100644 --- a/plugins/modules/android_sdk.py +++ b/plugins/modules/android_sdk.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: android_sdk short_description: Manages Android SDK packages @@ -133,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 Package, AndroidSdkManager class AndroidSdk(StateModuleHelper): diff --git a/plugins/modules/apache2_mod_proxy.py b/plugins/modules/apache2_mod_proxy.py index a8dcc7c4a7..3187b3fa55 100644 --- a/plugins/modules/apache2_mod_proxy.py +++ b/plugins/modules/apache2_mod_proxy.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: apache2_mod_proxy author: Olivier Boukili (@oboukili) @@ -208,12 +207,12 @@ members: import re -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.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 + with deps.declare("beautifulsoup4"): from bs4 import BeautifulSoup diff --git a/plugins/modules/apache2_module.py b/plugins/modules/apache2_module.py index bd3926ee81..da00f94abe 100644 --- a/plugins/modules/apache2_module.py +++ b/plugins/modules/apache2_module.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: apache2_module author: diff --git a/plugins/modules/apk.py b/plugins/modules/apk.py index 4bee7e3f03..b738a77c35 100644 --- a/plugins/modules/apk.py +++ b/plugins/modules/apk.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: apk short_description: Manages apk packages diff --git a/plugins/modules/archive.py b/plugins/modules/archive.py index 9b1b2041b7..06e6277e26 100644 --- a/plugins/modules/archive.py +++ b/plugins/modules/archive.py @@ -193,7 +193,6 @@ from zlib import crc32 from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_bytes, to_native - STATE_ABSENT = "absent" STATE_ARCHIVED = "archive" STATE_COMPRESSED = "compress" diff --git a/plugins/modules/atomic_container.py b/plugins/modules/atomic_container.py index ebcc56564b..6b92873208 100644 --- a/plugins/modules/atomic_container.py +++ b/plugins/modules/atomic_container.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: atomic_container short_description: Manage the containers on the atomic host platform diff --git a/plugins/modules/awall.py b/plugins/modules/awall.py index 7c6b26e7e6..a7418c24fc 100644 --- a/plugins/modules/awall.py +++ b/plugins/modules/awall.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: awall short_description: Manage awall policies @@ -67,6 +66,7 @@ EXAMPLES = r""" RETURN = """ # """ import re + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/beadm.py b/plugins/modules/beadm.py index 424d4b4ebd..ff65313208 100644 --- a/plugins/modules/beadm.py +++ b/plugins/modules/beadm.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: beadm short_description: Manage ZFS boot environments on FreeBSD/Solaris/illumos systems @@ -139,6 +138,7 @@ force: """ import os + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/bigpanda.py b/plugins/modules/bigpanda.py index 9fdf7cca24..7816201bf3 100644 --- a/plugins/modules/bigpanda.py +++ b/plugins/modules/bigpanda.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: bigpanda author: "Hagai Kariti (@hkariti)" diff --git a/plugins/modules/bitbucket_access_key.py b/plugins/modules/bitbucket_access_key.py index 86b4f697db..b141fb76dd 100644 --- a/plugins/modules/bitbucket_access_key.py +++ b/plugins/modules/bitbucket_access_key.py @@ -73,6 +73,7 @@ EXAMPLES = r""" RETURN = r""" # """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper error_messages = { diff --git a/plugins/modules/bitbucket_pipeline_key_pair.py b/plugins/modules/bitbucket_pipeline_key_pair.py index 6376fe8354..a664e20afe 100644 --- a/plugins/modules/bitbucket_pipeline_key_pair.py +++ b/plugins/modules/bitbucket_pipeline_key_pair.py @@ -70,6 +70,7 @@ EXAMPLES = r""" RETURN = r""" # """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper error_messages = { diff --git a/plugins/modules/bitbucket_pipeline_known_host.py b/plugins/modules/bitbucket_pipeline_known_host.py index c5b531cc54..c83aa69a04 100644 --- a/plugins/modules/bitbucket_pipeline_known_host.py +++ b/plugins/modules/bitbucket_pipeline_known_host.py @@ -94,6 +94,7 @@ except ImportError: HAS_PARAMIKO = False from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper error_messages = { diff --git a/plugins/modules/bitbucket_pipeline_variable.py b/plugins/modules/bitbucket_pipeline_variable.py index eccabd65ad..366e413c14 100644 --- a/plugins/modules/bitbucket_pipeline_variable.py +++ b/plugins/modules/bitbucket_pipeline_variable.py @@ -82,6 +82,7 @@ EXAMPLES = r""" RETURN = r""" # """ from ansible.module_utils.basic import AnsibleModule, _load_params + from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper error_messages = { diff --git a/plugins/modules/bower.py b/plugins/modules/bower.py index bb6adcb918..2d76548dbb 100644 --- a/plugins/modules/bower.py +++ b/plugins/modules/bower.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: bower short_description: Manage bower packages with C(bower) diff --git a/plugins/modules/btrfs_info.py b/plugins/modules/btrfs_info.py index efe529b786..ef345ee7cd 100644 --- a/plugins/modules/btrfs_info.py +++ b/plugins/modules/btrfs_info.py @@ -75,9 +75,10 @@ filesystems: """ -from ansible_collections.community.general.plugins.module_utils.btrfs import BtrfsFilesystemsProvider from ansible.module_utils.basic import AnsibleModule +from ansible_collections.community.general.plugins.module_utils.btrfs import BtrfsFilesystemsProvider + def run_module(): module_args = dict() diff --git a/plugins/modules/btrfs_subvolume.py b/plugins/modules/btrfs_subvolume.py index cbb6327f2a..6b365db41e 100644 --- a/plugins/modules/btrfs_subvolume.py +++ b/plugins/modules/btrfs_subvolume.py @@ -204,16 +204,18 @@ target_subvolume_id: returned: Success and subvolume exists after module execution """ -from ansible_collections.community.general.plugins.module_utils.btrfs import ( - BtrfsFilesystemsProvider, - BtrfsCommands, - BtrfsModuleException, -) -from ansible_collections.community.general.plugins.module_utils.btrfs import normalize_subvolume_path -from ansible.module_utils.basic import AnsibleModule import os import tempfile +from ansible.module_utils.basic import AnsibleModule + +from ansible_collections.community.general.plugins.module_utils.btrfs import ( + BtrfsCommands, + BtrfsFilesystemsProvider, + BtrfsModuleException, + normalize_subvolume_path, +) + class BtrfsSubvolumeModule: __BTRFS_ROOT_SUBVOLUME = "/" diff --git a/plugins/modules/bundler.py b/plugins/modules/bundler.py index 1a0ac552bc..bd7d7cab21 100644 --- a/plugins/modules/bundler.py +++ b/plugins/modules/bundler.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: bundler short_description: Manage Ruby Gem dependencies with Bundler diff --git a/plugins/modules/campfire.py b/plugins/modules/campfire.py index d35044d4a1..8bfd58c275 100644 --- a/plugins/modules/campfire.py +++ b/plugins/modules/campfire.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: campfire short_description: Send a message to Campfire diff --git a/plugins/modules/catapult.py b/plugins/modules/catapult.py index c7ec58b1f2..1f6430dcef 100644 --- a/plugins/modules/catapult.py +++ b/plugins/modules/catapult.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: catapult short_description: Send a sms / mms using the catapult bandwidth API diff --git a/plugins/modules/circonus_annotation.py b/plugins/modules/circonus_annotation.py index 035029c4ab..26ceb193fe 100644 --- a/plugins/modules/circonus_annotation.py +++ b/plugins/modules/circonus_annotation.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: circonus_annotation short_description: Create an annotation in Circonus diff --git a/plugins/modules/cisco_webex.py b/plugins/modules/cisco_webex.py index 3409ee71de..e56a65c229 100644 --- a/plugins/modules/cisco_webex.py +++ b/plugins/modules/cisco_webex.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: cisco_webex short_description: Send a message to a Cisco Webex Teams Room or Individual diff --git a/plugins/modules/cloud_init_data_facts.py b/plugins/modules/cloud_init_data_facts.py index c3786fbb77..fa786cf481 100644 --- a/plugins/modules/cloud_init_data_facts.py +++ b/plugins/modules/cloud_init_data_facts.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: cloud_init_data_facts short_description: Retrieve facts of cloud-init @@ -90,7 +89,6 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_text - CLOUD_INIT_PATH = "/var/lib/cloud/data" diff --git a/plugins/modules/composer.py b/plugins/modules/composer.py index a9a7422e0c..c649aae37f 100644 --- a/plugins/modules/composer.py +++ b/plugins/modules/composer.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: composer author: @@ -142,6 +141,7 @@ EXAMPLES = r""" import re import shlex + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/consul.py b/plugins/modules/consul.py index 1a8716348e..bf6a55e909 100644 --- a/plugins/modules/consul.py +++ b/plugins/modules/consul.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: consul short_description: Add, modify & delete services within a Consul cluster @@ -240,6 +239,7 @@ except ImportError: python_consul_installed = False import re + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/consul_acl_bootstrap.py b/plugins/modules/consul_acl_bootstrap.py index d7d474e9c6..c63adecb35 100644 --- a/plugins/modules/consul_acl_bootstrap.py +++ b/plugins/modules/consul_acl_bootstrap.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: consul_acl_bootstrap short_description: Bootstrap ACLs in Consul @@ -68,6 +67,7 @@ result: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.consul import ( AUTH_ARGUMENTS_SPEC, RequestError, diff --git a/plugins/modules/consul_agent_check.py b/plugins/modules/consul_agent_check.py index f2cd907640..4082c0aff0 100644 --- a/plugins/modules/consul_agent_check.py +++ b/plugins/modules/consul_agent_check.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: consul_agent_check short_description: Add, modify, and delete checks within a Consul cluster @@ -149,12 +148,13 @@ operation: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.consul import ( AUTH_ARGUMENTS_SPEC, OPERATION_CREATE, - OPERATION_UPDATE, OPERATION_DELETE, OPERATION_READ, + OPERATION_UPDATE, _ConsulModule, validate_check, ) diff --git a/plugins/modules/consul_agent_service.py b/plugins/modules/consul_agent_service.py index 48778b9428..6a3ea2f90a 100644 --- a/plugins/modules/consul_agent_service.py +++ b/plugins/modules/consul_agent_service.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: consul_agent_service short_description: Add, modify and delete services within a Consul cluster @@ -184,11 +183,12 @@ operation: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.consul import ( AUTH_ARGUMENTS_SPEC, OPERATION_CREATE, - OPERATION_UPDATE, OPERATION_DELETE, + OPERATION_UPDATE, _ConsulModule, ) diff --git a/plugins/modules/consul_auth_method.py b/plugins/modules/consul_auth_method.py index b5920d8673..25b8a237b1 100644 --- a/plugins/modules/consul_auth_method.py +++ b/plugins/modules/consul_auth_method.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: consul_auth_method short_description: Manipulate Consul auth methods @@ -132,6 +131,7 @@ operation: import re from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.consul import ( AUTH_ARGUMENTS_SPEC, _ConsulModule, diff --git a/plugins/modules/consul_binding_rule.py b/plugins/modules/consul_binding_rule.py index 3c6936a960..fcff0336b3 100644 --- a/plugins/modules/consul_binding_rule.py +++ b/plugins/modules/consul_binding_rule.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: consul_binding_rule short_description: Manipulate Consul binding rules @@ -112,6 +111,7 @@ operation: from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.consul import ( AUTH_ARGUMENTS_SPEC, RequestError, diff --git a/plugins/modules/consul_kv.py b/plugins/modules/consul_kv.py index e6804d3425..948b237696 100644 --- a/plugins/modules/consul_kv.py +++ b/plugins/modules/consul_kv.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: consul_kv short_description: Manipulate entries in the key/value store of a Consul cluster diff --git a/plugins/modules/consul_policy.py b/plugins/modules/consul_policy.py index 8f1ed1ba55..ce1cdaae29 100644 --- a/plugins/modules/consul_policy.py +++ b/plugins/modules/consul_policy.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: consul_policy short_description: Manipulate Consul policies @@ -122,6 +121,7 @@ operation: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.consul import ( AUTH_ARGUMENTS_SPEC, OPERATION_READ, diff --git a/plugins/modules/consul_role.py b/plugins/modules/consul_role.py index 2054f048d8..6f6bd47fe1 100644 --- a/plugins/modules/consul_role.py +++ b/plugins/modules/consul_role.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: consul_role short_description: Manipulate Consul roles @@ -202,6 +201,7 @@ operation: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.consul import ( AUTH_ARGUMENTS_SPEC, OPERATION_READ, diff --git a/plugins/modules/consul_session.py b/plugins/modules/consul_session.py index 7615b04055..f676421ed7 100644 --- a/plugins/modules/consul_session.py +++ b/plugins/modules/consul_session.py @@ -115,6 +115,7 @@ EXAMPLES = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.consul import AUTH_ARGUMENTS_SPEC, _ConsulModule diff --git a/plugins/modules/consul_token.py b/plugins/modules/consul_token.py index 596bc26257..ec6cdf4e3e 100644 --- a/plugins/modules/consul_token.py +++ b/plugins/modules/consul_token.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: consul_token short_description: Manipulate Consul tokens @@ -202,6 +201,7 @@ operation: """ from ansible.module_utils.basic import AnsibleModule + 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 7ead13a415..f28f0206ad 100644 --- a/plugins/modules/copr.py +++ b/plugins/modules/copr.py @@ -96,8 +96,8 @@ repo: sample: copr.fedorainfracloud.org/group_copr/integration_tests """ -import stat import os +import stat import traceback from urllib.error import HTTPError @@ -113,10 +113,9 @@ except ImportError: DNF_IMP_ERR = traceback.format_exc() HAS_DNF_PACKAGES = False -from ansible.module_utils.common import respawn -from ansible.module_utils.basic import missing_required_lib from ansible.module_utils import distro -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, missing_required_lib +from ansible.module_utils.common import respawn from ansible.module_utils.urls import open_url diff --git a/plugins/modules/cpanm.py b/plugins/modules/cpanm.py index 13a4e9989a..3f85fda3ab 100644 --- a/plugins/modules/cpanm.py +++ b/plugins/modules/cpanm.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: cpanm short_description: Manages Perl library dependencies diff --git a/plugins/modules/datadog_downtime.py b/plugins/modules/datadog_downtime.py index fab60e4ea8..66453b3d92 100644 --- a/plugins/modules/datadog_downtime.py +++ b/plugins/modules/datadog_downtime.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: datadog_downtime short_description: Manages Datadog downtimes @@ -153,12 +152,13 @@ downtime: import traceback from ansible.module_utils.basic import AnsibleModule, missing_required_lib + # Import Datadog DATADOG_IMP_ERR = None HAS_DATADOG = True try: - from datadog_api_client.v1 import Configuration, ApiClient, ApiException + from datadog_api_client.v1 import ApiClient, ApiException, Configuration from datadog_api_client.v1.api.downtimes_api import DowntimesApi from datadog_api_client.v1.model.downtime import Downtime from datadog_api_client.v1.model.downtime_recurrence import DowntimeRecurrence diff --git a/plugins/modules/datadog_event.py b/plugins/modules/datadog_event.py index 6c4346bf5b..4cdcd3b440 100644 --- a/plugins/modules/datadog_event.py +++ b/plugins/modules/datadog_event.py @@ -11,7 +11,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: datadog_event short_description: Posts events to Datadog service @@ -129,7 +128,7 @@ import traceback # Import Datadog DATADOG_IMP_ERR = None try: - from datadog import initialize, api + from datadog import api, initialize HAS_DATADOG = True except Exception: diff --git a/plugins/modules/datadog_monitor.py b/plugins/modules/datadog_monitor.py index efc5d9adf6..8962f0a1cb 100644 --- a/plugins/modules/datadog_monitor.py +++ b/plugins/modules/datadog_monitor.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: datadog_monitor short_description: Manages Datadog monitors @@ -242,7 +241,7 @@ import traceback # Import Datadog DATADOG_IMP_ERR = None try: - from datadog import initialize, api + from datadog import api, initialize HAS_DATADOG = True except Exception: diff --git a/plugins/modules/dconf.py b/plugins/modules/dconf.py index 7cb2e95761..e79004ad0d 100644 --- a/plugins/modules/dconf.py +++ b/plugins/modules/dconf.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: dconf author: @@ -134,12 +133,13 @@ from ansible.module_utils.common.respawn import ( probe_interpreters_for_module, respawn_module, ) + from ansible_collections.community.general.plugins.module_utils import deps glib_module_name = "gi.repository.GLib" try: - from gi.repository.GLib import Variant, GError + from gi.repository.GLib import GError, Variant except ImportError: Variant = None GError = AttributeError diff --git a/plugins/modules/decompress.py b/plugins/modules/decompress.py index 53ba87a11f..a981dd9771 100644 --- a/plugins/modules/decompress.py +++ b/plugins/modules/decompress.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: decompress short_description: Decompresses compressed files @@ -93,9 +92,10 @@ import os import shutil import tempfile -from ansible_collections.community.general.plugins.module_utils.mh.module_helper import ModuleHelper 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 with deps.declare("lzma"): import lzma diff --git a/plugins/modules/deploy_helper.py b/plugins/modules/deploy_helper.py index f4d84aad9d..a6e866cffc 100644 --- a/plugins/modules/deploy_helper.py +++ b/plugins/modules/deploy_helper.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: deploy_helper author: "Ramon de la Fuente (@ramondelafuente)" diff --git a/plugins/modules/dimensiondata_network.py b/plugins/modules/dimensiondata_network.py index 27747cb728..801dc170c2 100644 --- a/plugins/modules/dimensiondata_network.py +++ b/plugins/modules/dimensiondata_network.py @@ -11,7 +11,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: dimensiondata_network short_description: Create, update, and delete MCP 1.0 & 2.0 networks @@ -119,11 +118,12 @@ network: import traceback from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.dimensiondata import HAS_LIBCLOUD, DimensionDataModule if HAS_LIBCLOUD: - from libcloud.compute.base import NodeLocation from libcloud.common.dimensiondata import DimensionDataAPIException + from libcloud.compute.base import NodeLocation class DimensionDataNetworkModule(DimensionDataModule): diff --git a/plugins/modules/dimensiondata_vlan.py b/plugins/modules/dimensiondata_vlan.py index 216dc00ef2..9f86a0e1e2 100644 --- a/plugins/modules/dimensiondata_vlan.py +++ b/plugins/modules/dimensiondata_vlan.py @@ -157,13 +157,14 @@ vlan: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.dimensiondata import ( DimensionDataModule, UnknownNetworkError, ) try: - from libcloud.common.dimensiondata import DimensionDataVlan, DimensionDataAPIException + from libcloud.common.dimensiondata import DimensionDataAPIException, DimensionDataVlan HAS_LIBCLOUD = True diff --git a/plugins/modules/discord.py b/plugins/modules/discord.py index 4d4addab27..1ea54c27a9 100644 --- a/plugins/modules/discord.py +++ b/plugins/modules/discord.py @@ -125,8 +125,8 @@ http_code: sample: 204 """ -from ansible.module_utils.urls import fetch_url from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.urls import fetch_url def discord_check_mode(module): diff --git a/plugins/modules/django_command.py b/plugins/modules/django_command.py index 0afd545ab7..057d25c6b4 100644 --- a/plugins/modules/django_command.py +++ b/plugins/modules/django_command.py @@ -63,8 +63,8 @@ version: import shlex -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_manage.py b/plugins/modules/django_manage.py index 44152c01b3..1c31e6d8f2 100644 --- a/plugins/modules/django_manage.py +++ b/plugins/modules/django_manage.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: django_manage short_description: Manages a Django application @@ -170,8 +169,8 @@ EXAMPLES = r""" """ import os -import sys import shlex +import sys from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/dnf_config_manager.py b/plugins/modules/dnf_config_manager.py index a78961c293..5c789497aa 100644 --- a/plugins/modules/dnf_config_manager.py +++ b/plugins/modules/dnf_config_manager.py @@ -119,10 +119,11 @@ changed_repos: sample: ["crb"] """ -from ansible.module_utils.basic import AnsibleModule import os import re +from ansible.module_utils.basic import AnsibleModule + DNF_BIN = "/usr/bin/dnf" REPO_ID_RE = re.compile(r"^Repo-id\s*:\s*(\S+)$") REPO_STATUS_RE = re.compile(r"^Repo-status\s*:\s*(disabled|enabled)$") diff --git a/plugins/modules/dnf_versionlock.py b/plugins/modules/dnf_versionlock.py index a2fdf33a3b..7095fb102a 100644 --- a/plugins/modules/dnf_versionlock.py +++ b/plugins/modules/dnf_versionlock.py @@ -126,11 +126,12 @@ specs_todelete: sample: ["bind"] """ -from ansible.module_utils.basic import AnsibleModule import fnmatch import os import re +from ansible.module_utils.basic import AnsibleModule + DNF_BIN = "/usr/bin/dnf" VERSIONLOCK_CONF = "/etc/dnf/plugins/versionlock.conf" # NEVRA regex. diff --git a/plugins/modules/dnsimple.py b/plugins/modules/dnsimple.py index b557c39bf3..6d46210ee5 100644 --- a/plugins/modules/dnsimple.py +++ b/plugins/modules/dnsimple.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: dnsimple short_description: Interface with dnsimple.com (a DNS hosting service) @@ -166,8 +165,8 @@ EXAMPLES = r""" RETURN = r"""#""" -import traceback import re +import traceback from ansible_collections.community.general.plugins.module_utils.version import LooseVersion @@ -284,14 +283,14 @@ try: # try to import dnsimple >= 2.0.0 from dnsimple import Client, DNSimpleException from dnsimple.service import Accounts + from dnsimple.struct.zone_record import ZoneRecordInput, ZoneRecordUpdateInput from dnsimple.version import version as dnsimple_version - from dnsimple.struct.zone_record import ZoneRecordUpdateInput, ZoneRecordInput HAS_DNSIMPLE = True except ImportError: DNSIMPLE_IMP_ERR.append(traceback.format_exc()) -from ansible.module_utils.basic import AnsibleModule, missing_required_lib, env_fallback +from ansible.module_utils.basic import AnsibleModule, env_fallback, missing_required_lib def main(): diff --git a/plugins/modules/dnsimple_info.py b/plugins/modules/dnsimple_info.py index 06fca596ec..eb0a36f9e6 100644 --- a/plugins/modules/dnsimple_info.py +++ b/plugins/modules/dnsimple_info.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: dnsimple_info @@ -226,6 +225,7 @@ dnsimple_record_info: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils import deps with deps.declare("requests"): diff --git a/plugins/modules/dnsmadeeasy.py b/plugins/modules/dnsmadeeasy.py index 201fd7b22c..f172875d0b 100644 --- a/plugins/modules/dnsmadeeasy.py +++ b/plugins/modules/dnsmadeeasy.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: dnsmadeeasy short_description: Interface with dnsmadeeasy.com (a DNS hosting service) @@ -356,11 +355,11 @@ EXAMPLES = r""" # DNSMadeEasy module specific support methods. # -import json import hashlib import hmac +import json import locale -from time import strftime, gmtime +from time import gmtime, strftime from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/dpkg_divert.py b/plugins/modules/dpkg_divert.py index c843612c94..1fcf144b86 100644 --- a/plugins/modules/dpkg_divert.py +++ b/plugins/modules/dpkg_divert.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: dpkg_divert short_description: Override a debian package's version of a file @@ -140,8 +139,8 @@ diversion: """ -import re import os +import re from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_bytes diff --git a/plugins/modules/easy_install.py b/plugins/modules/easy_install.py index 9b1e291b94..4d8d6bbd12 100644 --- a/plugins/modules/easy_install.py +++ b/plugins/modules/easy_install.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: easy_install short_description: Installs Python libraries @@ -83,6 +82,7 @@ EXAMPLES = r""" import os import os.path import tempfile + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/ejabberd_user.py b/plugins/modules/ejabberd_user.py index 751740270f..093c587503 100644 --- a/plugins/modules/ejabberd_user.py +++ b/plugins/modules/ejabberd_user.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ejabberd_user author: "Peter Sprygada (@privateip)" @@ -65,6 +64,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 diff --git a/plugins/modules/elasticsearch_plugin.py b/plugins/modules/elasticsearch_plugin.py index 87a9476dd4..a97295c6b2 100644 --- a/plugins/modules/elasticsearch_plugin.py +++ b/plugins/modules/elasticsearch_plugin.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: elasticsearch_plugin short_description: Manage Elasticsearch plugins @@ -115,7 +114,6 @@ import os from ansible.module_utils.basic import AnsibleModule - PACKAGE_STATE_MAP = dict(present="install", absent="remove") PLUGIN_BIN_PATHS = tuple(["/usr/share/elasticsearch/bin/elasticsearch-plugin", "/usr/share/elasticsearch/bin/plugin"]) diff --git a/plugins/modules/emc_vnx_sg_member.py b/plugins/modules/emc_vnx_sg_member.py index a9637b69ed..a816b81d60 100644 --- a/plugins/modules/emc_vnx_sg_member.py +++ b/plugins/modules/emc_vnx_sg_member.py @@ -81,17 +81,18 @@ hluid: 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 LIB_IMP_ERR = None try: from storops import VNXSystem from storops.exception import ( - VNXCredentialError, - VNXStorageGroupError, VNXAluAlreadyAttachedError, VNXAttachAluError, + VNXCredentialError, VNXDetachAluNotFoundError, + VNXStorageGroupError, ) HAS_LIB = True diff --git a/plugins/modules/etcd3.py b/plugins/modules/etcd3.py index 121d7402d0..670698ca83 100644 --- a/plugins/modules/etcd3.py +++ b/plugins/modules/etcd3.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: etcd3 short_description: Set or delete key value pairs from an etcd3 cluster @@ -127,7 +126,6 @@ import traceback from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.common.text.converters import to_native - try: import etcd3 diff --git a/plugins/modules/file_remove.py b/plugins/modules/file_remove.py index d0fb6892ea..e2c12f2a0c 100644 --- a/plugins/modules/file_remove.py +++ b/plugins/modules/file_remove.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: file_remove @@ -131,9 +130,9 @@ path: """ +import glob import os import re -import glob import typing as t from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/filesize.py b/plugins/modules/filesize.py index 2102e34a44..980a1a2a16 100644 --- a/plugins/modules/filesize.py +++ b/plugins/modules/filesize.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: filesize @@ -214,13 +213,12 @@ path: """ -import re -import os import math +import os +import re from ansible.module_utils.basic import AnsibleModule - # These are the multiplicative suffixes understood (or returned) by dd and # others (ls, df, lvresize, lsblk...). SIZE_UNITS = dict( diff --git a/plugins/modules/filesystem.py b/plugins/modules/filesystem.py index a52873c0e4..93b78613f1 100644 --- a/plugins/modules/filesystem.py +++ b/plugins/modules/filesystem.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" author: - Alexander Bulimov (@abulimov) diff --git a/plugins/modules/gandi_livedns.py b/plugins/modules/gandi_livedns.py index 9194b8c385..3827d1020c 100644 --- a/plugins/modules/gandi_livedns.py +++ b/plugins/modules/gandi_livedns.py @@ -159,6 +159,7 @@ record: from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.gandi_livedns_api import GandiLiveDNSAPI diff --git a/plugins/modules/gconftool2.py b/plugins/modules/gconftool2.py index 90600ea6ca..55a3b1c08d 100644 --- a/plugins/modules/gconftool2.py +++ b/plugins/modules/gconftool2.py @@ -102,8 +102,8 @@ version: version_added: 10.0.0 """ -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 1fab46b792..e37a065b46 100644 --- a/plugins/modules/gconftool2_info.py +++ b/plugins/modules/gconftool2_info.py @@ -53,8 +53,8 @@ version: version_added: 10.0.0 """ -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 a3c015e74c..de0984e3ea 100644 --- a/plugins/modules/gem.py +++ b/plugins/modules/gem.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: gem short_description: Manage Ruby gems diff --git a/plugins/modules/gio_mime.py b/plugins/modules/gio_mime.py index e395cb883c..f2d3bf43ed 100644 --- a/plugins/modules/gio_mime.py +++ b/plugins/modules/gio_mime.py @@ -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_runner, gio_mime_get class GioMime(ModuleHelper): diff --git a/plugins/modules/git_config.py b/plugins/modules/git_config.py index 2faedd6113..19c00633ef 100644 --- a/plugins/modules/git_config.py +++ b/plugins/modules/git_config.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: git_config author: diff --git a/plugins/modules/git_config_info.py b/plugins/modules/git_config_info.py index 6e6ee25dbb..9f3289b203 100644 --- a/plugins/modules/git_config_info.py +++ b/plugins/modules/git_config_info.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: git_config_info author: diff --git a/plugins/modules/github_deploy_key.py b/plugins/modules/github_deploy_key.py index 9710c68d25..453d6c3d96 100644 --- a/plugins/modules/github_deploy_key.py +++ b/plugins/modules/github_deploy_key.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: github_deploy_key author: "Ali (@bincyber)" @@ -178,9 +177,10 @@ id: sample: 24381901 """ +from re import findall + from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url -from re import findall class GithubDeployKey: diff --git a/plugins/modules/github_issue.py b/plugins/modules/github_issue.py index 8ad859d057..8ae08b213e 100644 --- a/plugins/modules/github_issue.py +++ b/plugins/modules/github_issue.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: github_issue short_description: View GitHub issue diff --git a/plugins/modules/github_key.py b/plugins/modules/github_key.py index 2284e67702..9f4b3bb81b 100644 --- a/plugins/modules/github_key.py +++ b/plugins/modules/github_key.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: github_key short_description: Manage GitHub access keys diff --git a/plugins/modules/github_release.py b/plugins/modules/github_release.py index e7c1fd132e..8c6ccfa351 100644 --- a/plugins/modules/github_release.py +++ b/plugins/modules/github_release.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: github_release short_description: Interact with GitHub Releases diff --git a/plugins/modules/github_repo.py b/plugins/modules/github_repo.py index 4cd4682a0d..196dbc0c0d 100644 --- a/plugins/modules/github_repo.py +++ b/plugins/modules/github_repo.py @@ -116,6 +116,7 @@ repo: """ import traceback + from ansible.module_utils.basic import AnsibleModule, missing_required_lib GITHUB_IMP_ERR = None diff --git a/plugins/modules/gitlab_branch.py b/plugins/modules/gitlab_branch.py index 5a25efe8ce..2d57f30d7e 100644 --- a/plugins/modules/gitlab_branch.py +++ b/plugins/modules/gitlab_branch.py @@ -75,15 +75,15 @@ RETURN = r""" import traceback -from ansible.module_utils.basic import AnsibleModule 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.version import LooseVersion from ansible_collections.community.general.plugins.module_utils.gitlab import ( auth_argument_spec, - gitlab_authentication, gitlab, + gitlab_authentication, ) +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 74dadf518c..e66f3d27cf 100644 --- a/plugins/modules/gitlab_deploy_key.py +++ b/plugins/modules/gitlab_deploy_key.py @@ -118,8 +118,8 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.gitlab import ( auth_argument_spec, find_project, - gitlab_authentication, gitlab, + gitlab_authentication, list_all_kwargs, ) diff --git a/plugins/modules/gitlab_group.py b/plugins/modules/gitlab_group.py index ba11e0fe84..1e03e4a00e 100644 --- a/plugins/modules/gitlab_group.py +++ b/plugins/modules/gitlab_group.py @@ -250,8 +250,8 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.gitlab import ( auth_argument_spec, find_group, - gitlab_authentication, gitlab, + gitlab_authentication, ) diff --git a/plugins/modules/gitlab_group_access_token.py b/plugins/modules/gitlab_group_access_token.py index 21689eb787..d3095c663c 100644 --- a/plugins/modules/gitlab_group_access_token.py +++ b/plugins/modules/gitlab_group_access_token.py @@ -162,8 +162,8 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.gitlab import ( auth_argument_spec, find_group, - gitlab_authentication, gitlab, + gitlab_authentication, ) ACCESS_LEVELS = dict(guest=10, planner=15, reporter=20, developer=30, maintainer=40, owner=50) diff --git a/plugins/modules/gitlab_group_members.py b/plugins/modules/gitlab_group_members.py index b8cab67bbc..83b3dadb87 100644 --- a/plugins/modules/gitlab_group_members.py +++ b/plugins/modules/gitlab_group_members.py @@ -158,8 +158,8 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.gitlab import ( auth_argument_spec, - gitlab_authentication, gitlab, + gitlab_authentication, list_all_kwargs, ) diff --git a/plugins/modules/gitlab_group_variable.py b/plugins/modules/gitlab_group_variable.py index 0e3203faa6..24308d96f3 100644 --- a/plugins/modules/gitlab_group_variable.py +++ b/plugins/modules/gitlab_group_variable.py @@ -217,14 +217,15 @@ group_variable: sample: ["ACCESS_KEY_ID", "SECRET_ACCESS_KEY"] """ -from ansible.module_utils.basic import AnsibleModule 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 ( auth_argument_spec, - gitlab_authentication, filter_returned_variables, - vars_to_variables, + gitlab_authentication, list_all_kwargs, + vars_to_variables, ) diff --git a/plugins/modules/gitlab_instance_variable.py b/plugins/modules/gitlab_instance_variable.py index 79ff2077dc..bc14db005f 100644 --- a/plugins/modules/gitlab_instance_variable.py +++ b/plugins/modules/gitlab_instance_variable.py @@ -146,12 +146,13 @@ instance_variable: sample: ["ACCESS_KEY_ID", "SECRET_ACCESS_KEY"] """ -from ansible.module_utils.basic import AnsibleModule 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 ( auth_argument_spec, - gitlab_authentication, filter_returned_variables, + gitlab_authentication, list_all_kwargs, ) diff --git a/plugins/modules/gitlab_issue.py b/plugins/modules/gitlab_issue.py index e95af02064..775c6776ac 100644 --- a/plugins/modules/gitlab_issue.py +++ b/plugins/modules/gitlab_issue.py @@ -137,16 +137,16 @@ issue: type: dict """ -from ansible.module_utils.basic import AnsibleModule 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 ( auth_argument_spec, - gitlab_authentication, - gitlab, - find_project, find_group, + find_project, + gitlab, + gitlab_authentication, ) diff --git a/plugins/modules/gitlab_label.py b/plugins/modules/gitlab_label.py index 3c2ff9a092..141a5c7286 100644 --- a/plugins/modules/gitlab_label.py +++ b/plugins/modules/gitlab_label.py @@ -212,15 +212,15 @@ labels_obj: type: dict """ -from ansible.module_utils.basic import AnsibleModule 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 ( auth_argument_spec, - gitlab_authentication, ensure_gitlab_package, find_group, find_project, + gitlab_authentication, ) diff --git a/plugins/modules/gitlab_merge_request.py b/plugins/modules/gitlab_merge_request.py index 92f6d845b9..cca0be6f47 100644 --- a/plugins/modules/gitlab_merge_request.py +++ b/plugins/modules/gitlab_merge_request.py @@ -142,17 +142,17 @@ mr: type: dict """ -from ansible.module_utils.basic import AnsibleModule 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.version import LooseVersion from ansible_collections.community.general.plugins.module_utils.gitlab import ( auth_argument_spec, - gitlab_authentication, - gitlab, find_project, + gitlab, + gitlab_authentication, ) +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 b96e549ff0..6a758f60a0 100644 --- a/plugins/modules/gitlab_milestone.py +++ b/plugins/modules/gitlab_milestone.py @@ -195,17 +195,18 @@ milestones_obj: type: dict """ -from ansible.module_utils.basic import AnsibleModule +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 ( auth_argument_spec, - gitlab_authentication, ensure_gitlab_package, find_group, find_project, + gitlab_authentication, ) -from datetime import datetime class GitlabMilestones: diff --git a/plugins/modules/gitlab_project.py b/plugins/modules/gitlab_project.py index c7e076ff34..dbce76bf77 100644 --- a/plugins/modules/gitlab_project.py +++ b/plugins/modules/gitlab_project.py @@ -412,10 +412,9 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( auth_argument_spec, find_group, find_project, - gitlab_authentication, gitlab, + gitlab_authentication, ) - from ansible_collections.community.general.plugins.module_utils.version import LooseVersion diff --git a/plugins/modules/gitlab_project_access_token.py b/plugins/modules/gitlab_project_access_token.py index 3c037cdb53..330881bc8b 100644 --- a/plugins/modules/gitlab_project_access_token.py +++ b/plugins/modules/gitlab_project_access_token.py @@ -160,8 +160,8 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.gitlab import ( auth_argument_spec, find_project, - gitlab_authentication, gitlab, + gitlab_authentication, ) ACCESS_LEVELS = dict(guest=10, planner=15, reporter=20, developer=30, maintainer=40, owner=50) diff --git a/plugins/modules/gitlab_project_badge.py b/plugins/modules/gitlab_project_badge.py index b10198142a..64a8978b8e 100644 --- a/plugins/modules/gitlab_project_badge.py +++ b/plugins/modules/gitlab_project_badge.py @@ -95,8 +95,8 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.gitlab import ( auth_argument_spec, - gitlab_authentication, find_project, + gitlab_authentication, list_all_kwargs, ) diff --git a/plugins/modules/gitlab_project_members.py b/plugins/modules/gitlab_project_members.py index b1d77e27af..1bd759abce 100644 --- a/plugins/modules/gitlab_project_members.py +++ b/plugins/modules/gitlab_project_members.py @@ -163,8 +163,8 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.gitlab import ( auth_argument_spec, - gitlab_authentication, gitlab, + gitlab_authentication, ) diff --git a/plugins/modules/gitlab_project_variable.py b/plugins/modules/gitlab_project_variable.py index 2fded1eb59..642b22f92a 100644 --- a/plugins/modules/gitlab_project_variable.py +++ b/plugins/modules/gitlab_project_variable.py @@ -234,16 +234,15 @@ project_variable: sample: ["ACCESS_KEY_ID", "SECRET_ACCESS_KEY"] """ -from ansible.module_utils.basic import AnsibleModule 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 ( auth_argument_spec, - gitlab_authentication, filter_returned_variables, - vars_to_variables, + gitlab_authentication, list_all_kwargs, + vars_to_variables, ) diff --git a/plugins/modules/gitlab_protected_branch.py b/plugins/modules/gitlab_protected_branch.py index 900280c19a..d796854b4c 100644 --- a/plugins/modules/gitlab_protected_branch.py +++ b/plugins/modules/gitlab_protected_branch.py @@ -83,16 +83,15 @@ EXAMPLES = r""" RETURN = r""" """ -from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.api import basic_auth_argument_spec - -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion +from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.gitlab import ( auth_argument_spec, - gitlab_authentication, gitlab, + gitlab_authentication, ) +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 3ef335e44e..f8d6c5c42e 100644 --- a/plugins/modules/gitlab_runner.py +++ b/plugins/modules/gitlab_runner.py @@ -254,12 +254,10 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.gitlab import ( auth_argument_spec, - gitlab_authentication, gitlab, + gitlab_authentication, list_all_kwargs, ) - - from ansible_collections.community.general.plugins.module_utils.version import LooseVersion diff --git a/plugins/modules/gitlab_user.py b/plugins/modules/gitlab_user.py index 582e02455d..b0701ca684 100644 --- a/plugins/modules/gitlab_user.py +++ b/plugins/modules/gitlab_user.py @@ -223,8 +223,8 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.gitlab import ( auth_argument_spec, find_group, - gitlab_authentication, gitlab, + gitlab_authentication, list_all_kwargs, ) diff --git a/plugins/modules/grove.py b/plugins/modules/grove.py index 0e626b8658..ca010cf420 100644 --- a/plugins/modules/grove.py +++ b/plugins/modules/grove.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: grove short_description: Sends a notification to a grove.io channel @@ -66,7 +65,6 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url - BASE_URL = "https://grove.io/api/notice/%s/" # ============================================================== diff --git a/plugins/modules/gunicorn.py b/plugins/modules/gunicorn.py index a09d48c5f1..f63befd30b 100644 --- a/plugins/modules/gunicorn.py +++ b/plugins/modules/gunicorn.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: gunicorn short_description: Run gunicorn with various settings diff --git a/plugins/modules/haproxy.py b/plugins/modules/haproxy.py index 885b0505d4..cf02c4edcc 100644 --- a/plugins/modules/haproxy.py +++ b/plugins/modules/haproxy.py @@ -214,7 +214,6 @@ from string import Template from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_bytes, to_text - DEFAULT_SOCKET_LOCATION = "/var/run/haproxy.sock" RECV_SIZE = 1024 ACTION_CHOICES = ["enabled", "disabled", "drain"] diff --git a/plugins/modules/heroku_collaborator.py b/plugins/modules/heroku_collaborator.py index a91c9c7ed9..d30ba23a13 100644 --- a/plugins/modules/heroku_collaborator.py +++ b/plugins/modules/heroku_collaborator.py @@ -81,6 +81,7 @@ EXAMPLES = r""" RETURN = """ # """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.heroku import HerokuHelper diff --git a/plugins/modules/homebrew.py b/plugins/modules/homebrew.py index c0025ebd07..740b00857b 100644 --- a/plugins/modules/homebrew.py +++ b/plugins/modules/homebrew.py @@ -11,7 +11,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: homebrew author: @@ -178,10 +177,10 @@ changed_pkgs: import json import re -from ansible_collections.community.general.plugins.module_utils.homebrew import HomebrewValidate - from ansible.module_utils.basic import AnsibleModule +from ansible_collections.community.general.plugins.module_utils.homebrew import HomebrewValidate + # exceptions -------------------------------------------------------------- {{{ class HomebrewException(Exception): diff --git a/plugins/modules/homebrew_cask.py b/plugins/modules/homebrew_cask.py index 1ec85dd651..2da668b737 100644 --- a/plugins/modules/homebrew_cask.py +++ b/plugins/modules/homebrew_cask.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: homebrew_cask author: @@ -152,11 +151,11 @@ import os import re import tempfile -from ansible_collections.community.general.plugins.module_utils.version import LooseVersion -from ansible_collections.community.general.plugins.module_utils.homebrew import HomebrewValidate - -from ansible.module_utils.common.text.converters import to_bytes 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 # exceptions -------------------------------------------------------------- {{{ diff --git a/plugins/modules/homebrew_services.py b/plugins/modules/homebrew_services.py index 562cc477a0..5b1906ea5d 100644 --- a/plugins/modules/homebrew_services.py +++ b/plugins/modules/homebrew_services.py @@ -90,6 +90,7 @@ import json import typing as t from ansible.module_utils.basic import AnsibleModule + 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 d59c5ec112..3b29bb8cfd 100644 --- a/plugins/modules/homebrew_tap.py +++ b/plugins/modules/homebrew_tap.py @@ -10,7 +10,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: homebrew_tap author: diff --git a/plugins/modules/homectl.py b/plugins/modules/homectl.py index 5cc6724bba..c3afc244e0 100644 --- a/plugins/modules/homectl.py +++ b/plugins/modules/homectl.py @@ -269,8 +269,8 @@ data: import json import traceback -from ansible.module_utils.basic import AnsibleModule, missing_required_lib -from ansible.module_utils.basic import jsonify + +from ansible.module_utils.basic import AnsibleModule, jsonify, missing_required_lib from ansible.module_utils.common.text.formatters import human_to_bytes CRYPT_IMPORT_ERROR: str | None diff --git a/plugins/modules/honeybadger_deployment.py b/plugins/modules/honeybadger_deployment.py index 4b6de2b650..f95afefc1f 100644 --- a/plugins/modules/honeybadger_deployment.py +++ b/plugins/modules/honeybadger_deployment.py @@ -73,7 +73,6 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url - # =========================================== # Module execution. # diff --git a/plugins/modules/hpilo_boot.py b/plugins/modules/hpilo_boot.py index f18495f882..1f6008d0d0 100644 --- a/plugins/modules/hpilo_boot.py +++ b/plugins/modules/hpilo_boot.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: hpilo_boot author: Dag Wieers (@dagwieers) @@ -127,7 +126,6 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule, missing_required_lib - # Suppress warnings from hpilo warnings.simplefilter("ignore") diff --git a/plugins/modules/hpilo_info.py b/plugins/modules/hpilo_info.py index 7f43ac1e2a..0b32e4c524 100644 --- a/plugins/modules/hpilo_info.py +++ b/plugins/modules/hpilo_info.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: hpilo_info author: Dag Wieers (@dagwieers) @@ -141,7 +140,6 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule, missing_required_lib - # Suppress warnings from hpilo warnings.simplefilter("ignore") diff --git a/plugins/modules/hponcfg.py b/plugins/modules/hponcfg.py index 7664658025..5269a8dcb1 100644 --- a/plugins/modules/hponcfg.py +++ b/plugins/modules/hponcfg.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: hponcfg author: Dag Wieers (@dagwieers) diff --git a/plugins/modules/htpasswd.py b/plugins/modules/htpasswd.py index 0a37e5c8c0..bd7daaa832 100644 --- a/plugins/modules/htpasswd.py +++ b/plugins/modules/htpasswd.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: htpasswd short_description: Manage user files for basic authentication @@ -103,8 +102,8 @@ import os 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 with deps.declare("passlib"): # Apparently the type infos don't know htpasswd_context, which *does* exist diff --git a/plugins/modules/hwc_network_vpc.py b/plugins/modules/hwc_network_vpc.py index 9ff2367b47..01c8094a96 100644 --- a/plugins/modules/hwc_network_vpc.py +++ b/plugins/modules/hwc_network_vpc.py @@ -129,19 +129,20 @@ enable_shared_snat: # Imports ############################################################################### +import re + from ansible_collections.community.general.plugins.module_utils.hwc_utils import ( Config, HwcClientException, HwcClientException404, HwcModule, are_different_dicts, - is_empty_value, - wait_to_finish, - get_region, build_path, + get_region, + is_empty_value, navigate_value, + wait_to_finish, ) -import re ############################################################################### # Main diff --git a/plugins/modules/hwc_smn_topic.py b/plugins/modules/hwc_smn_topic.py index b2597f8142..84f94ac341 100644 --- a/plugins/modules/hwc_smn_topic.py +++ b/plugins/modules/hwc_smn_topic.py @@ -100,17 +100,18 @@ update_time: # Imports ############################################################################### +import re + from ansible_collections.community.general.plugins.module_utils.hwc_utils import ( Config, HwcClientException, HwcModule, - navigate_value, are_different_dicts, - is_empty_value, build_path, get_region, + is_empty_value, + navigate_value, ) -import re ############################################################################### # Main diff --git a/plugins/modules/ibm_sa_domain.py b/plugins/modules/ibm_sa_domain.py index c901e7c52f..56823b92a1 100644 --- a/plugins/modules/ibm_sa_domain.py +++ b/plugins/modules/ibm_sa_domain.py @@ -108,11 +108,12 @@ msg: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ibm_sa_utils import ( - execute_pyxcli_command, connect_ssl, - spectrum_accelerate_spec, + execute_pyxcli_command, is_pyxcli_installed, + spectrum_accelerate_spec, ) diff --git a/plugins/modules/ibm_sa_host.py b/plugins/modules/ibm_sa_host.py index bf122e96b3..672dcba5af 100644 --- a/plugins/modules/ibm_sa_host.py +++ b/plugins/modules/ibm_sa_host.py @@ -79,11 +79,12 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ibm_sa_utils import ( - execute_pyxcli_command, connect_ssl, - spectrum_accelerate_spec, + execute_pyxcli_command, is_pyxcli_installed, + spectrum_accelerate_spec, ) diff --git a/plugins/modules/ibm_sa_host_ports.py b/plugins/modules/ibm_sa_host_ports.py index 1c973ddb4f..d8bf5818b2 100644 --- a/plugins/modules/ibm_sa_host_ports.py +++ b/plugins/modules/ibm_sa_host_ports.py @@ -76,11 +76,12 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ibm_sa_utils import ( - execute_pyxcli_command, connect_ssl, - spectrum_accelerate_spec, + execute_pyxcli_command, is_pyxcli_installed, + spectrum_accelerate_spec, ) diff --git a/plugins/modules/ibm_sa_pool.py b/plugins/modules/ibm_sa_pool.py index 1bb14342bf..0d6137d8fc 100644 --- a/plugins/modules/ibm_sa_pool.py +++ b/plugins/modules/ibm_sa_pool.py @@ -79,11 +79,12 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ibm_sa_utils import ( - execute_pyxcli_command, connect_ssl, - spectrum_accelerate_spec, + execute_pyxcli_command, is_pyxcli_installed, + spectrum_accelerate_spec, ) diff --git a/plugins/modules/ibm_sa_vol.py b/plugins/modules/ibm_sa_vol.py index 52bc2d124c..abcd7cbfe7 100644 --- a/plugins/modules/ibm_sa_vol.py +++ b/plugins/modules/ibm_sa_vol.py @@ -72,11 +72,12 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ibm_sa_utils import ( - execute_pyxcli_command, connect_ssl, - spectrum_accelerate_spec, + execute_pyxcli_command, is_pyxcli_installed, + spectrum_accelerate_spec, ) diff --git a/plugins/modules/ibm_sa_vol_map.py b/plugins/modules/ibm_sa_vol_map.py index 74174b9344..4fe55941b6 100644 --- a/plugins/modules/ibm_sa_vol_map.py +++ b/plugins/modules/ibm_sa_vol_map.py @@ -91,11 +91,12 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ibm_sa_utils import ( - execute_pyxcli_command, connect_ssl, - spectrum_accelerate_spec, + execute_pyxcli_command, is_pyxcli_installed, + spectrum_accelerate_spec, ) diff --git a/plugins/modules/icinga2_feature.py b/plugins/modules/icinga2_feature.py index 882e88f450..87a57935bd 100644 --- a/plugins/modules/icinga2_feature.py +++ b/plugins/modules/icinga2_feature.py @@ -10,7 +10,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: icinga2_feature @@ -59,6 +58,7 @@ RETURN = r""" """ import re + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/icinga2_host.py b/plugins/modules/icinga2_host.py index dfb1d32897..4d65c43926 100644 --- a/plugins/modules/icinga2_host.py +++ b/plugins/modules/icinga2_host.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: icinga2_host short_description: Manage a host in Icinga2 diff --git a/plugins/modules/idrac_redfish_command.py b/plugins/modules/idrac_redfish_command.py index db0d835e39..92a97fffc8 100644 --- a/plugins/modules/idrac_redfish_command.py +++ b/plugins/modules/idrac_redfish_command.py @@ -96,10 +96,12 @@ return_values: """ import re + from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.redfish_utils import ( - RedfishUtils, REDFISH_COMMON_ARGUMENT_SPEC, + RedfishUtils, ) diff --git a/plugins/modules/idrac_redfish_config.py b/plugins/modules/idrac_redfish_config.py index 816a919293..56a2439c4d 100644 --- a/plugins/modules/idrac_redfish_config.py +++ b/plugins/modules/idrac_redfish_config.py @@ -154,9 +154,10 @@ 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 ( - RedfishUtils, REDFISH_COMMON_ARGUMENT_SPEC, + RedfishUtils, ) diff --git a/plugins/modules/idrac_redfish_info.py b/plugins/modules/idrac_redfish_info.py index fbb16cdec3..5fb017b1b3 100644 --- a/plugins/modules/idrac_redfish_info.py +++ b/plugins/modules/idrac_redfish_info.py @@ -129,9 +129,10 @@ msg: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.redfish_utils import ( - RedfishUtils, REDFISH_COMMON_ARGUMENT_SPEC, + RedfishUtils, ) diff --git a/plugins/modules/ilo_redfish_command.py b/plugins/modules/ilo_redfish_command.py index ea86f7796f..6f98782a65 100644 --- a/plugins/modules/ilo_redfish_command.py +++ b/plugins/modules/ilo_redfish_command.py @@ -94,9 +94,10 @@ ilo_redfish_command: # More will be added as module features are expanded 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.module_utils.basic import AnsibleModule def main(): diff --git a/plugins/modules/ilo_redfish_config.py b/plugins/modules/ilo_redfish_config.py index 90a10514bd..04c4b04637 100644 --- a/plugins/modules/ilo_redfish_config.py +++ b/plugins/modules/ilo_redfish_config.py @@ -114,9 +114,10 @@ msg: CATEGORY_COMMANDS_ALL = {"Manager": ["SetTimeZone", "SetDNSserver", "SetDomainName", "SetNTPServers", "SetWINSReg"]} +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.module_utils.basic import AnsibleModule def main(): diff --git a/plugins/modules/ilo_redfish_info.py b/plugins/modules/ilo_redfish_info.py index 55cabc3e21..a3ada3d04a 100644 --- a/plugins/modules/ilo_redfish_info.py +++ b/plugins/modules/ilo_redfish_info.py @@ -108,6 +108,7 @@ CATEGORY_COMMANDS_ALL = {"Sessions": ["GetiLOSessions"]} 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 diff --git a/plugins/modules/imc_rest.py b/plugins/modules/imc_rest.py index 01c4c37f44..3114c3bb63 100644 --- a/plugins/modules/imc_rest.py +++ b/plugins/modules/imc_rest.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: imc_rest short_description: Manage Cisco IMC hardware through its REST API diff --git a/plugins/modules/imgadm.py b/plugins/modules/imgadm.py index 1ce1b5212d..1a60b9ef47 100644 --- a/plugins/modules/imgadm.py +++ b/plugins/modules/imgadm.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: imgadm short_description: Manage SmartOS images diff --git a/plugins/modules/influxdb_database.py b/plugins/modules/influxdb_database.py index cd0908984c..ed67f8f67f 100644 --- a/plugins/modules/influxdb_database.py +++ b/plugins/modules/influxdb_database.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: influxdb_database short_description: Manage InfluxDB databases @@ -72,6 +71,7 @@ except ImportError: pass from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.influxdb import InfluxDb diff --git a/plugins/modules/influxdb_query.py b/plugins/modules/influxdb_query.py index 85c8ea8f06..0e84d9621f 100644 --- a/plugins/modules/influxdb_query.py +++ b/plugins/modules/influxdb_query.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: influxdb_query short_description: Query data points from InfluxDB @@ -66,6 +65,7 @@ query_results: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.influxdb import InfluxDb diff --git a/plugins/modules/influxdb_retention_policy.py b/plugins/modules/influxdb_retention_policy.py index 78062c99bc..6adf7353de 100644 --- a/plugins/modules/influxdb_retention_policy.py +++ b/plugins/modules/influxdb_retention_policy.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: influxdb_retention_policy short_description: Manage InfluxDB retention policies @@ -143,8 +142,8 @@ except ImportError: pass 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 fb1a9dc08b..29a2701ba3 100644 --- a/plugins/modules/influxdb_user.py +++ b/plugins/modules/influxdb_user.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: influxdb_user short_description: Manage InfluxDB users @@ -102,8 +101,9 @@ RETURN = r"""#""" import json -from ansible.module_utils.urls import ConnectionError 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 diff --git a/plugins/modules/influxdb_write.py b/plugins/modules/influxdb_write.py index e54716c209..9340b4347c 100644 --- a/plugins/modules/influxdb_write.py +++ b/plugins/modules/influxdb_write.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: influxdb_write short_description: Write data points into InfluxDB @@ -63,6 +62,7 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.influxdb import InfluxDb diff --git a/plugins/modules/ini_file.py b/plugins/modules/ini_file.py index 14fc709e63..426891c085 100644 --- a/plugins/modules/ini_file.py +++ b/plugins/modules/ini_file.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ini_file short_description: Tweak settings in INI files diff --git a/plugins/modules/interfaces_file.py b/plugins/modules/interfaces_file.py index 9c26ef3e9a..1cdd38eb58 100644 --- a/plugins/modules/interfaces_file.py +++ b/plugins/modules/interfaces_file.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: interfaces_file short_description: Tweak settings in C(/etc/network/interfaces) files diff --git a/plugins/modules/ipa_config.py b/plugins/modules/ipa_config.py index 0926ec8c36..d62aa060ab 100644 --- a/plugins/modules/ipa_config.py +++ b/plugins/modules/ipa_config.py @@ -230,6 +230,7 @@ config: import traceback from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec diff --git a/plugins/modules/ipa_dnsrecord.py b/plugins/modules/ipa_dnsrecord.py index 3b17d4027b..3073978a80 100644 --- a/plugins/modules/ipa_dnsrecord.py +++ b/plugins/modules/ipa_dnsrecord.py @@ -195,9 +195,10 @@ dnsrecord: 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.module_utils.common.text.converters import to_native +from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec + class DNSRecordIPAClient(IPAClient): def __init__(self, module, host, port, protocol): diff --git a/plugins/modules/ipa_dnszone.py b/plugins/modules/ipa_dnszone.py index 85eab4e4f4..58c045cd98 100644 --- a/plugins/modules/ipa_dnszone.py +++ b/plugins/modules/ipa_dnszone.py @@ -84,6 +84,7 @@ zone: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec diff --git a/plugins/modules/ipa_getkeytab.py b/plugins/modules/ipa_getkeytab.py index afc6b3960d..d98e812798 100644 --- a/plugins/modules/ipa_getkeytab.py +++ b/plugins/modules/ipa_getkeytab.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ipa_getkeytab short_description: Manage keytab file in FreeIPA @@ -124,6 +123,7 @@ EXAMPLES = r""" import os from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt diff --git a/plugins/modules/ipa_group.py b/plugins/modules/ipa_group.py index adcb3b569f..5d9c5d2aba 100644 --- a/plugins/modules/ipa_group.py +++ b/plugins/modules/ipa_group.py @@ -171,6 +171,7 @@ group: import traceback from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec diff --git a/plugins/modules/ipa_hbacrule.py b/plugins/modules/ipa_hbacrule.py index 8111996519..39f246a671 100644 --- a/plugins/modules/ipa_hbacrule.py +++ b/plugins/modules/ipa_hbacrule.py @@ -155,6 +155,7 @@ hbacrule: 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 diff --git a/plugins/modules/ipa_host.py b/plugins/modules/ipa_host.py index 6cda72a196..6a120167dd 100644 --- a/plugins/modules/ipa_host.py +++ b/plugins/modules/ipa_host.py @@ -184,6 +184,7 @@ host_diff: import traceback from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec diff --git a/plugins/modules/ipa_hostgroup.py b/plugins/modules/ipa_hostgroup.py index 47b8aa3947..4b965f0e08 100644 --- a/plugins/modules/ipa_hostgroup.py +++ b/plugins/modules/ipa_hostgroup.py @@ -98,6 +98,7 @@ hostgroup: import traceback from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec diff --git a/plugins/modules/ipa_otpconfig.py b/plugins/modules/ipa_otpconfig.py index 0601adc778..3280dbab09 100644 --- a/plugins/modules/ipa_otpconfig.py +++ b/plugins/modules/ipa_otpconfig.py @@ -81,6 +81,7 @@ otpconfig: import traceback from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec diff --git a/plugins/modules/ipa_otptoken.py b/plugins/modules/ipa_otptoken.py index 443ad2750a..1579a91112 100644 --- a/plugins/modules/ipa_otptoken.py +++ b/plugins/modules/ipa_otptoken.py @@ -172,6 +172,7 @@ import base64 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 diff --git a/plugins/modules/ipa_pwpolicy.py b/plugins/modules/ipa_pwpolicy.py index cf96e48b7f..9a2534d636 100644 --- a/plugins/modules/ipa_pwpolicy.py +++ b/plugins/modules/ipa_pwpolicy.py @@ -157,6 +157,7 @@ pwpolicy: import traceback from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec diff --git a/plugins/modules/ipa_role.py b/plugins/modules/ipa_role.py index 516a7fc93a..8ebb011177 100644 --- a/plugins/modules/ipa_role.py +++ b/plugins/modules/ipa_role.py @@ -134,6 +134,7 @@ role: import traceback from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec diff --git a/plugins/modules/ipa_service.py b/plugins/modules/ipa_service.py index d53169b2fe..daa5875556 100644 --- a/plugins/modules/ipa_service.py +++ b/plugins/modules/ipa_service.py @@ -89,6 +89,7 @@ service: import traceback from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec diff --git a/plugins/modules/ipa_subca.py b/plugins/modules/ipa_subca.py index af77462695..240cbef8b4 100644 --- a/plugins/modules/ipa_subca.py +++ b/plugins/modules/ipa_subca.py @@ -78,8 +78,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.ipa import IPAClient, ipa_argument_spec from ansible_collections.community.general.plugins.module_utils.version import LooseVersion diff --git a/plugins/modules/ipa_sudocmd.py b/plugins/modules/ipa_sudocmd.py index 2561a408c7..c6d351ac57 100644 --- a/plugins/modules/ipa_sudocmd.py +++ b/plugins/modules/ipa_sudocmd.py @@ -66,6 +66,7 @@ sudocmd: import traceback from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec diff --git a/plugins/modules/ipa_sudocmdgroup.py b/plugins/modules/ipa_sudocmdgroup.py index 151500a66b..f5f35b57e8 100644 --- a/plugins/modules/ipa_sudocmdgroup.py +++ b/plugins/modules/ipa_sudocmdgroup.py @@ -75,6 +75,7 @@ sudocmdgroup: import traceback from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec diff --git a/plugins/modules/ipa_sudorule.py b/plugins/modules/ipa_sudorule.py index dd0ec953f5..1756e504bd 100644 --- a/plugins/modules/ipa_sudorule.py +++ b/plugins/modules/ipa_sudorule.py @@ -198,6 +198,7 @@ sudorule: 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 diff --git a/plugins/modules/ipa_user.py b/plugins/modules/ipa_user.py index d6cc21079b..7c1d4261ef 100644 --- a/plugins/modules/ipa_user.py +++ b/plugins/modules/ipa_user.py @@ -182,6 +182,7 @@ import hashlib import traceback from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec diff --git a/plugins/modules/ipa_vault.py b/plugins/modules/ipa_vault.py index 0cf9365bc8..1ddc15dd5a 100644 --- a/plugins/modules/ipa_vault.py +++ b/plugins/modules/ipa_vault.py @@ -137,6 +137,7 @@ vault: import traceback from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec diff --git a/plugins/modules/ipbase_info.py b/plugins/modules/ipbase_info.py index ae0e649ca0..bfd11c846e 100644 --- a/plugins/modules/ipbase_info.py +++ b/plugins/modules/ipbase_info.py @@ -209,10 +209,10 @@ data: } """ -from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.urls import fetch_url from urllib.parse import urlencode +from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.urls import fetch_url USER_AGENT = "ansible-community.general.ipbase_info/0.1.0" BASE_URL = "https://api.ipbase.com/v2/info" diff --git a/plugins/modules/ipify_facts.py b/plugins/modules/ipify_facts.py index f82b633801..070d5ca231 100644 --- a/plugins/modules/ipify_facts.py +++ b/plugins/modules/ipify_facts.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ipify_facts short_description: Retrieve the public IP of your internet gateway @@ -62,8 +61,8 @@ ipify_public_ip: import json from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.urls import fetch_url from ansible.module_utils.common.text.converters import to_text +from ansible.module_utils.urls import fetch_url class IpifyFacts: diff --git a/plugins/modules/ipinfoio_facts.py b/plugins/modules/ipinfoio_facts.py index 705eba61ba..db2f89900d 100644 --- a/plugins/modules/ipinfoio_facts.py +++ b/plugins/modules/ipinfoio_facts.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ipinfoio_facts short_description: Retrieve IP geolocation facts of a host's IP address @@ -78,10 +77,8 @@ ansible_facts: sample: "94035" """ from ansible.module_utils.basic import AnsibleModule - from ansible.module_utils.urls import fetch_url - USER_AGENT = "ansible-ipinfoio-module/0.0.1" diff --git a/plugins/modules/ipmi_boot.py b/plugins/modules/ipmi_boot.py index 630aacb4ce..08cb9d750d 100644 --- a/plugins/modules/ipmi_boot.py +++ b/plugins/modules/ipmi_boot.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ipmi_boot short_description: Management of order of boot devices @@ -126,8 +125,8 @@ EXAMPLES = r""" state: absent """ -import traceback import binascii +import traceback PYGHMI_IMP_ERR = None try: diff --git a/plugins/modules/ipmi_power.py b/plugins/modules/ipmi_power.py index 680e19dc6a..fe61ebeb77 100644 --- a/plugins/modules/ipmi_power.py +++ b/plugins/modules/ipmi_power.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ipmi_power short_description: Power management for machine @@ -150,8 +149,8 @@ EXAMPLES = r""" state: 'off' """ -import traceback import binascii +import traceback PYGHMI_IMP_ERR = None INVALID_TARGET_ADDRESS = 0x100 diff --git a/plugins/modules/iptables_state.py b/plugins/modules/iptables_state.py index d1ae60dbb5..9bb66a0597 100644 --- a/plugins/modules/iptables_state.py +++ b/plugins/modules/iptables_state.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: iptables_state short_description: Save iptables state into a file or restore it from a file @@ -222,14 +221,13 @@ tables: """ -import re import os +import re import time from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_bytes, to_native - IPTABLES = dict( ipv4="iptables", ipv6="ip6tables", diff --git a/plugins/modules/irc.py b/plugins/modules/irc.py index 722e703335..dee53018a9 100644 --- a/plugins/modules/irc.py +++ b/plugins/modules/irc.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: irc short_description: Send a message to an IRC channel or a nick @@ -179,8 +178,8 @@ import ssl import time import traceback -from ansible.module_utils.common.text.converters import to_native, to_bytes from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.common.text.converters import to_bytes, to_native def send_msg( diff --git a/plugins/modules/iso_customize.py b/plugins/modules/iso_customize.py index 640834c9e6..80ee71391b 100644 --- a/plugins/modules/iso_customize.py +++ b/plugins/modules/iso_customize.py @@ -100,9 +100,10 @@ dest_iso: import os -from ansible_collections.community.general.plugins.module_utils import deps from ansible.module_utils.basic import AnsibleModule +from ansible_collections.community.general.plugins.module_utils import deps + with deps.declare("pycdlib"): import pycdlib diff --git a/plugins/modules/jabber.py b/plugins/modules/jabber.py index e9ed772433..05b098c6d3 100644 --- a/plugins/modules/jabber.py +++ b/plugins/modules/jabber.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: jabber short_description: Send a message to jabber user or chat room diff --git a/plugins/modules/java_cert.py b/plugins/modules/java_cert.py index f4b26128a5..b4c3e74aca 100644 --- a/plugins/modules/java_cert.py +++ b/plugins/modules/java_cert.py @@ -203,8 +203,8 @@ cmd: """ import os -import tempfile import re +import tempfile from urllib.parse import urlparse from urllib.request import getproxies diff --git a/plugins/modules/java_keystore.py b/plugins/modules/java_keystore.py index ad6090ce87..99e452365f 100644 --- a/plugins/modules/java_keystore.py +++ b/plugins/modules/java_keystore.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: java_keystore short_description: Create a Java keystore in JKS format @@ -183,20 +182,20 @@ from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.common.text.converters import to_bytes try: - from cryptography.hazmat.primitives.serialization.pkcs12 import serialize_key_and_certificates + from cryptography.exceptions import UnsupportedAlgorithm + from cryptography.hazmat.backends.openssl import backend + from cryptography.hazmat.primitives import hashes from cryptography.hazmat.primitives.serialization import ( BestAvailableEncryption, NoEncryption, - load_pem_private_key, load_der_private_key, + load_pem_private_key, ) + from cryptography.hazmat.primitives.serialization.pkcs12 import serialize_key_and_certificates from cryptography.x509 import ( - load_pem_x509_certificate, load_der_x509_certificate, + load_pem_x509_certificate, ) - from cryptography.hazmat.primitives import hashes - from cryptography.exceptions import UnsupportedAlgorithm - from cryptography.hazmat.backends.openssl import backend HAS_CRYPTOGRAPHY_PKCS12 = True except ImportError: diff --git a/plugins/modules/jboss.py b/plugins/modules/jboss.py index 6b42858c01..42355236e5 100644 --- a/plugins/modules/jboss.py +++ b/plugins/modules/jboss.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: jboss short_description: Deploy applications to JBoss @@ -79,8 +78,8 @@ RETURN = r""" # """ import os import time -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule DEFAULT_DEPLOY_PATH = "/var/lib/jbossas/standalone/deployments" diff --git a/plugins/modules/jenkins_credential.py b/plugins/modules/jenkins_credential.py index ef671cdbea..c5bbda7239 100644 --- a/plugins/modules/jenkins_credential.py +++ b/plugins/modules/jenkins_credential.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: jenkins_credential short_description: Manage Jenkins credentials and domains through API @@ -317,14 +316,15 @@ token_uuid: returned: success """ -from urllib.parse import urlencode -from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.urls import fetch_url, basic_auth_header -from ansible_collections.community.general.plugins.module_utils import deps - +import base64 import json import os -import base64 +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 with deps.declare("urllib3", reason="urllib3 is required to embed files into requests"): import urllib3 diff --git a/plugins/modules/jenkins_job_info.py b/plugins/modules/jenkins_job_info.py index 4c42b62949..61360dd8fe 100644 --- a/plugins/modules/jenkins_job_info.py +++ b/plugins/modules/jenkins_job_info.py @@ -137,8 +137,8 @@ jobs: ] """ -import ssl import fnmatch +import ssl import traceback JENKINS_IMP_ERR = None diff --git a/plugins/modules/jenkins_node.py b/plugins/modules/jenkins_node.py index d3a927bdad..bf24c09d10 100644 --- a/plugins/modules/jenkins_node.py +++ b/plugins/modules/jenkins_node.py @@ -149,6 +149,7 @@ import traceback from xml.etree import ElementTree as et from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils import deps with deps.declare( diff --git a/plugins/modules/jenkins_plugin.py b/plugins/modules/jenkins_plugin.py index d0e07f84d0..b8024914fd 100644 --- a/plugins/modules/jenkins_plugin.py +++ b/plugins/modules/jenkins_plugin.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: jenkins_plugin author: Jiri Tyr (@jtyr) @@ -341,7 +340,7 @@ from http import cookiejar from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule, to_bytes -from ansible.module_utils.urls import fetch_url, url_argument_spec, basic_auth_header +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 diff --git a/plugins/modules/jenkins_script.py b/plugins/modules/jenkins_script.py index 0f615d47b5..4098c9a9a5 100644 --- a/plugins/modules/jenkins_script.py +++ b/plugins/modules/jenkins_script.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" author: James Hogarth (@hogarthj) module: jenkins_script @@ -107,8 +106,8 @@ from string import Template from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.urls import fetch_url from ansible.module_utils.common.text.converters import to_native +from ansible.module_utils.urls import fetch_url def is_csrf_protection_enabled(module): diff --git a/plugins/modules/jira.py b/plugins/modules/jira.py index 76d4b820b4..2fce4ac33f 100644 --- a/plugins/modules/jira.py +++ b/plugins/modules/jira.py @@ -12,7 +12,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: jira short_description: Create and modify issues in a JIRA instance @@ -467,10 +466,11 @@ import string import traceback from urllib.request import pathname2url -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper, cause_changes -from ansible.module_utils.common.text.converters import to_text, to_bytes, to_native +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 + class JIRA(StateModuleHelper): module = dict( diff --git a/plugins/modules/kdeconfig.py b/plugins/modules/kdeconfig.py index 69e99d168a..4c49236d1f 100644 --- a/plugins/modules/kdeconfig.py +++ b/plugins/modules/kdeconfig.py @@ -5,7 +5,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" module: kdeconfig short_description: Manage KDE configuration files diff --git a/plugins/modules/kea_command.py b/plugins/modules/kea_command.py index 2a6609bc01..5f44d13fda 100644 --- a/plugins/modules/kea_command.py +++ b/plugins/modules/kea_command.py @@ -117,7 +117,6 @@ import traceback from ansible.module_utils.basic import AnsibleModule - # default buffer size for socket I/O BUFSIZ = 8192 diff --git a/plugins/modules/keycloak_authentication.py b/plugins/modules/keycloak_authentication.py index 455df642e2..1678f46f85 100644 --- a/plugins/modules/keycloak_authentication.py +++ b/plugins/modules/keycloak_authentication.py @@ -226,14 +226,15 @@ end_state: } """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - keycloak_argument_spec, - get_token, KeycloakError, + get_token, is_struct_included, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def find_exec_in_executions(searched_exec, executions): diff --git a/plugins/modules/keycloak_authentication_required_actions.py b/plugins/modules/keycloak_authentication_required_actions.py index 39d4255163..c08c1c4787 100644 --- a/plugins/modules/keycloak_authentication_required_actions.py +++ b/plugins/modules/keycloak_authentication_required_actions.py @@ -172,13 +172,14 @@ end_state: type: str """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - keycloak_argument_spec, - get_token, KeycloakError, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def sanitize_required_actions(objects): diff --git a/plugins/modules/keycloak_authz_authorization_scope.py b/plugins/modules/keycloak_authz_authorization_scope.py index 06b638e3d9..b00becbd52 100644 --- a/plugins/modules/keycloak_authz_authorization_scope.py +++ b/plugins/modules/keycloak_authz_authorization_scope.py @@ -121,13 +121,14 @@ end_state: sample: http://localhost/icon.png """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - keycloak_argument_spec, - get_token, KeycloakError, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def main(): diff --git a/plugins/modules/keycloak_authz_custom_policy.py b/plugins/modules/keycloak_authz_custom_policy.py index 022f0a1cc0..d44bfbd44c 100644 --- a/plugins/modules/keycloak_authz_custom_policy.py +++ b/plugins/modules/keycloak_authz_custom_policy.py @@ -110,13 +110,14 @@ end_state: sample: File delete """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - keycloak_argument_spec, - get_token, KeycloakError, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def main(): diff --git a/plugins/modules/keycloak_authz_permission.py b/plugins/modules/keycloak_authz_permission.py index e1a155507a..bc45b986e1 100644 --- a/plugins/modules/keycloak_authz_permission.py +++ b/plugins/modules/keycloak_authz_permission.py @@ -213,13 +213,14 @@ end_state: - 9da05cd2-b273-4354-bbd8-0c133918a454 """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - keycloak_argument_spec, - get_token, KeycloakError, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def main(): diff --git a/plugins/modules/keycloak_authz_permission_info.py b/plugins/modules/keycloak_authz_permission_info.py index ee2ef442ba..0e22ec4056 100644 --- a/plugins/modules/keycloak_authz_permission_info.py +++ b/plugins/modules/keycloak_authz_permission_info.py @@ -108,13 +108,14 @@ queried_state: sample: {} """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - keycloak_argument_spec, - get_token, KeycloakError, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def main(): diff --git a/plugins/modules/keycloak_client.py b/plugins/modules/keycloak_client.py index bfc03fd394..0bdf3d853b 100644 --- a/plugins/modules/keycloak_client.py +++ b/plugins/modules/keycloak_client.py @@ -744,16 +744,17 @@ end_state: } """ -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( - KeycloakAPI, - camel, - keycloak_argument_spec, - get_token, - KeycloakError, -) -from ansible.module_utils.basic import AnsibleModule import copy +from ansible.module_utils.basic import AnsibleModule + +from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( + KeycloakAPI, + KeycloakError, + camel, + get_token, + keycloak_argument_spec, +) PROTOCOL_OPENID_CONNECT = "openid-connect" PROTOCOL_SAML = "saml" diff --git a/plugins/modules/keycloak_client_rolemapping.py b/plugins/modules/keycloak_client_rolemapping.py index e190102488..a199a3dbc4 100644 --- a/plugins/modules/keycloak_client_rolemapping.py +++ b/plugins/modules/keycloak_client_rolemapping.py @@ -238,13 +238,14 @@ end_state: } """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - keycloak_argument_spec, - get_token, KeycloakError, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def main(): diff --git a/plugins/modules/keycloak_client_rolescope.py b/plugins/modules/keycloak_client_rolescope.py index 5a684516a7..37fc528f12 100644 --- a/plugins/modules/keycloak_client_rolescope.py +++ b/plugins/modules/keycloak_client_rolescope.py @@ -147,13 +147,14 @@ end_state: ] """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - keycloak_argument_spec, - get_token, KeycloakError, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def main(): diff --git a/plugins/modules/keycloak_clientscope.py b/plugins/modules/keycloak_clientscope.py index 61763886a9..585c9fc81c 100644 --- a/plugins/modules/keycloak_clientscope.py +++ b/plugins/modules/keycloak_clientscope.py @@ -288,15 +288,16 @@ end_state: } """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - camel, - keycloak_argument_spec, - get_token, KeycloakError, + camel, + get_token, is_struct_included, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def normalise_cr(clientscoperep, remove_ids=False): diff --git a/plugins/modules/keycloak_clientscope_type.py b/plugins/modules/keycloak_clientscope_type.py index 650210d365..a8994da49c 100644 --- a/plugins/modules/keycloak_clientscope_type.py +++ b/plugins/modules/keycloak_clientscope_type.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: keycloak_clientscope_type @@ -142,10 +141,9 @@ from ansible_collections.community.general.plugins.module_utils.identity.keycloa KeycloakAPI, KeycloakError, get_token, + keycloak_argument_spec, ) -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import keycloak_argument_spec - def keycloak_clientscope_type_module(): """ diff --git a/plugins/modules/keycloak_clientsecret_info.py b/plugins/modules/keycloak_clientsecret_info.py index 427ce66427..8c84a9b3c1 100644 --- a/plugins/modules/keycloak_clientsecret_info.py +++ b/plugins/modules/keycloak_clientsecret_info.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: keycloak_clientsecret_info diff --git a/plugins/modules/keycloak_clientsecret_regenerate.py b/plugins/modules/keycloak_clientsecret_regenerate.py index c9d180efb5..3d7272eb33 100644 --- a/plugins/modules/keycloak_clientsecret_regenerate.py +++ b/plugins/modules/keycloak_clientsecret_regenerate.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: keycloak_clientsecret_regenerate diff --git a/plugins/modules/keycloak_clienttemplate.py b/plugins/modules/keycloak_clienttemplate.py index 64074e16ff..f49b1a13de 100644 --- a/plugins/modules/keycloak_clienttemplate.py +++ b/plugins/modules/keycloak_clienttemplate.py @@ -265,14 +265,15 @@ end_state: } """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - camel, - keycloak_argument_spec, - get_token, KeycloakError, + camel, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def main(): diff --git a/plugins/modules/keycloak_component.py b/plugins/modules/keycloak_component.py index 52312e0c95..d3ea90aea8 100644 --- a/plugins/modules/keycloak_component.py +++ b/plugins/modules/keycloak_component.py @@ -128,16 +128,18 @@ end_state: type: dict """ +from copy import deepcopy +from urllib.parse import urlencode + +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - camel, - keycloak_argument_spec, - get_token, KeycloakError, + camel, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule -from urllib.parse import urlencode -from copy import deepcopy def main(): diff --git a/plugins/modules/keycloak_component_info.py b/plugins/modules/keycloak_component_info.py index 999130117f..4b77fd9683 100644 --- a/plugins/modules/keycloak_component_info.py +++ b/plugins/modules/keycloak_component_info.py @@ -99,14 +99,16 @@ components: elements: dict """ +from urllib.parse import quote + +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - keycloak_argument_spec, - get_token, KeycloakError, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule -from urllib.parse import quote def main(): diff --git a/plugins/modules/keycloak_group.py b/plugins/modules/keycloak_group.py index 583c660687..3fb16a33bb 100644 --- a/plugins/modules/keycloak_group.py +++ b/plugins/modules/keycloak_group.py @@ -297,14 +297,15 @@ end_state: view: true """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - camel, - keycloak_argument_spec, - get_token, KeycloakError, + camel, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def main(): diff --git a/plugins/modules/keycloak_identity_provider.py b/plugins/modules/keycloak_identity_provider.py index aa6ca0a1b1..a5bdc41078 100644 --- a/plugins/modules/keycloak_identity_provider.py +++ b/plugins/modules/keycloak_identity_provider.py @@ -454,15 +454,17 @@ end_state: } """ +from copy import deepcopy + +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - camel, - keycloak_argument_spec, - get_token, KeycloakError, + camel, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule -from copy import deepcopy def sanitize(idp): diff --git a/plugins/modules/keycloak_realm.py b/plugins/modules/keycloak_realm.py index e31b3e7248..57e8683e27 100644 --- a/plugins/modules/keycloak_realm.py +++ b/plugins/modules/keycloak_realm.py @@ -809,14 +809,15 @@ end_state: } """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - camel, - keycloak_argument_spec, - get_token, KeycloakError, + camel, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def normalise_cr(realmrep): diff --git a/plugins/modules/keycloak_realm_info.py b/plugins/modules/keycloak_realm_info.py index cb67c09609..91560d34df 100644 --- a/plugins/modules/keycloak_realm_info.py +++ b/plugins/modules/keycloak_realm_info.py @@ -95,9 +95,10 @@ realm_info: sample: 0 """ -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import KeycloakAPI from ansible.module_utils.basic import AnsibleModule +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 3824c9a4ef..996e6bf356 100644 --- a/plugins/modules/keycloak_realm_key.py +++ b/plugins/modules/keycloak_realm_key.py @@ -221,16 +221,18 @@ end_state: } """ +from copy import deepcopy +from urllib.parse import urlencode + +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - camel, - keycloak_argument_spec, - get_token, KeycloakError, + camel, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule -from urllib.parse import urlencode -from copy import deepcopy def main(): diff --git a/plugins/modules/keycloak_realm_keys_metadata_info.py b/plugins/modules/keycloak_realm_keys_metadata_info.py index e5e9e670fe..03d54b4ce6 100644 --- a/plugins/modules/keycloak_realm_keys_metadata_info.py +++ b/plugins/modules/keycloak_realm_keys_metadata_info.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: keycloak_realm_keys_metadata_info @@ -87,6 +86,7 @@ keys_metadata: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, KeycloakError, diff --git a/plugins/modules/keycloak_realm_rolemapping.py b/plugins/modules/keycloak_realm_rolemapping.py index c9f00e9d8d..872a6a862c 100644 --- a/plugins/modules/keycloak_realm_rolemapping.py +++ b/plugins/modules/keycloak_realm_rolemapping.py @@ -223,13 +223,14 @@ end_state: } """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - keycloak_argument_spec, - get_token, KeycloakError, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def main(): diff --git a/plugins/modules/keycloak_role.py b/plugins/modules/keycloak_role.py index 5251858efb..f814e9688d 100644 --- a/plugins/modules/keycloak_role.py +++ b/plugins/modules/keycloak_role.py @@ -225,16 +225,18 @@ end_state: } """ +import copy + +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - camel, - keycloak_argument_spec, - get_token, KeycloakError, + camel, + get_token, is_struct_included, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule -import copy def main(): diff --git a/plugins/modules/keycloak_user.py b/plugins/modules/keycloak_user.py index 086a7f944c..405adc24c1 100644 --- a/plugins/modules/keycloak_user.py +++ b/plugins/modules/keycloak_user.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: keycloak_user short_description: Create and configure a user in Keycloak @@ -340,16 +339,18 @@ user_created: version_added: 12.0.0 """ +import copy + +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - camel, - keycloak_argument_spec, - get_token, KeycloakError, + camel, + get_token, is_struct_included, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule -import copy def main(): diff --git a/plugins/modules/keycloak_user_execute_actions_email.py b/plugins/modules/keycloak_user_execute_actions_email.py index 1ec2a2ebde..d63919e751 100644 --- a/plugins/modules/keycloak_user_execute_actions_email.py +++ b/plugins/modules/keycloak_user_execute_actions_email.py @@ -125,11 +125,12 @@ actions: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( - keycloak_argument_spec, - get_token, - KeycloakError, KeycloakAPI, + KeycloakError, + get_token, + keycloak_argument_spec, ) diff --git a/plugins/modules/keycloak_user_federation.py b/plugins/modules/keycloak_user_federation.py index 9796c13222..c448d0247f 100644 --- a/plugins/modules/keycloak_user_federation.py +++ b/plugins/modules/keycloak_user_federation.py @@ -718,16 +718,18 @@ end_state: } """ +from copy import deepcopy +from urllib.parse import urlencode + +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - camel, - keycloak_argument_spec, - get_token, KeycloakError, + camel, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule -from urllib.parse import urlencode -from copy import deepcopy def normalize_kc_comp(comp): diff --git a/plugins/modules/keycloak_user_rolemapping.py b/plugins/modules/keycloak_user_rolemapping.py index b2bac72106..cc3004fca0 100644 --- a/plugins/modules/keycloak_user_rolemapping.py +++ b/plugins/modules/keycloak_user_rolemapping.py @@ -238,13 +238,14 @@ end_state: } """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( KeycloakAPI, - keycloak_argument_spec, - get_token, KeycloakError, + get_token, + keycloak_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def main(): diff --git a/plugins/modules/keycloak_userprofile.py b/plugins/modules/keycloak_userprofile.py index 60a8718f34..669338b090 100644 --- a/plugins/modules/keycloak_userprofile.py +++ b/plugins/modules/keycloak_userprofile.py @@ -474,17 +474,19 @@ data: type: dict """ -from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( - KeycloakAPI, - camel, - keycloak_argument_spec, - get_token, - KeycloakError, -) -from ansible.module_utils.basic import AnsibleModule +import json from copy import deepcopy from urllib.parse import urlencode -import json + +from ansible.module_utils.basic import AnsibleModule + +from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( + KeycloakAPI, + KeycloakError, + camel, + get_token, + keycloak_argument_spec, +) def remove_null_values(data): diff --git a/plugins/modules/keyring.py b/plugins/modules/keyring.py index 434ce3de39..b5cf095c43 100644 --- a/plugins/modules/keyring.py +++ b/plugins/modules/keyring.py @@ -9,7 +9,6 @@ Ansible Module - community.general.keyring from __future__ import annotations - DOCUMENTATION = r""" module: keyring version_added: 5.2.0 @@ -74,8 +73,8 @@ EXAMPLES = r""" state: absent """ -from shlex import quote import traceback +from shlex import quote from ansible.module_utils.basic import AnsibleModule, missing_required_lib diff --git a/plugins/modules/keyring_info.py b/plugins/modules/keyring_info.py index 4f45af10f6..e9328476e6 100644 --- a/plugins/modules/keyring_info.py +++ b/plugins/modules/keyring_info.py @@ -9,7 +9,6 @@ Ansible Module - community.general.keyring_info from __future__ import annotations - DOCUMENTATION = r""" module: keyring_info version_added: 5.2.0 @@ -62,8 +61,8 @@ passphrase: sample: Password123 """ -from shlex import quote import traceback +from shlex import quote from ansible.module_utils.basic import AnsibleModule, missing_required_lib diff --git a/plugins/modules/kibana_plugin.py b/plugins/modules/kibana_plugin.py index 0eb5a32ff7..8bb116380a 100644 --- a/plugins/modules/kibana_plugin.py +++ b/plugins/modules/kibana_plugin.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: kibana_plugin short_description: Manage Kibana plugins @@ -114,11 +113,11 @@ state: """ import os + from ansible.module_utils.basic import AnsibleModule 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 094ccf6f30..975ceca911 100644 --- a/plugins/modules/krb_ticket.py +++ b/plugins/modules/krb_ticket.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: krb_ticket short_description: Kerberos utils for managing tickets @@ -185,6 +184,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 diff --git a/plugins/modules/layman.py b/plugins/modules/layman.py index 2be32f66ee..3590af6ee2 100644 --- a/plugins/modules/layman.py +++ b/plugins/modules/layman.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: layman author: "Jakub Jirutka (@jirutka)" @@ -83,7 +82,6 @@ EXAMPLES = r""" import shutil import traceback - from os import path LAYMAN_IMP_ERR = None @@ -99,7 +97,6 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.urls import fetch_url - USERAGENT = "ansible-httpget" diff --git a/plugins/modules/lbu.py b/plugins/modules/lbu.py index 3996db08cb..a136f1cab1 100644 --- a/plugins/modules/lbu.py +++ b/plugins/modules/lbu.py @@ -72,10 +72,10 @@ msg: returned: on failure """ -from ansible.module_utils.basic import AnsibleModule - import os.path +from ansible.module_utils.basic import AnsibleModule + def run_module(): module = AnsibleModule( diff --git a/plugins/modules/ldap_attrs.py b/plugins/modules/ldap_attrs.py index a1f1413da6..990a4652fa 100644 --- a/plugins/modules/ldap_attrs.py +++ b/plugins/modules/ldap_attrs.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ldap_attrs short_description: Add or remove multiple LDAP attribute values @@ -157,18 +156,18 @@ modlist: - [2, "olcRootDN", ["cn=root,dc=example,dc=com"]] """ +import re 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 ( LdapGeneric, gen_specs, ldap_required_together, ) -import re - LDAP_IMP_ERR = None try: import ldap diff --git a/plugins/modules/ldap_entry.py b/plugins/modules/ldap_entry.py index 9404b1cb0d..4c95eb137e 100644 --- a/plugins/modules/ldap_entry.py +++ b/plugins/modules/ldap_entry.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ldap_entry short_description: Add or remove LDAP entries @@ -133,6 +132,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 ( LdapGeneric, gen_specs, @@ -141,8 +141,8 @@ from ansible_collections.community.general.plugins.module_utils.ldap import ( LDAP_IMP_ERR = None try: - import ldap.modlist import ldap.controls + import ldap.modlist HAS_LDAP = True except ImportError: diff --git a/plugins/modules/ldap_inc.py b/plugins/modules/ldap_inc.py index c2ed38f50a..693279491e 100644 --- a/plugins/modules/ldap_inc.py +++ b/plugins/modules/ldap_inc.py @@ -12,7 +12,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ldap_inc short_description: Use the Modify-Increment LDAP V3 feature to increment an attribute value @@ -116,6 +115,7 @@ 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 ( LdapGeneric, diff --git a/plugins/modules/ldap_passwd.py b/plugins/modules/ldap_passwd.py index 23826cfe46..3ecfc8f05f 100644 --- a/plugins/modules/ldap_passwd.py +++ b/plugins/modules/ldap_passwd.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ldap_passwd short_description: Set passwords in LDAP @@ -60,6 +59,7 @@ modlist: import traceback from ansible.module_utils.basic import AnsibleModule, missing_required_lib + from ansible_collections.community.general.plugins.module_utils.ldap import ( LdapGeneric, gen_specs, diff --git a/plugins/modules/ldap_search.py b/plugins/modules/ldap_search.py index 1bdd8d5d19..b1c2d697da 100644 --- a/plugins/modules/ldap_search.py +++ b/plugins/modules/ldap_search.py @@ -108,6 +108,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 ( LdapGeneric, gen_specs, diff --git a/plugins/modules/librato_annotation.py b/plugins/modules/librato_annotation.py index 972ffe0fba..581735d75f 100644 --- a/plugins/modules/librato_annotation.py +++ b/plugins/modules/librato_annotation.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: librato_annotation short_description: Create an annotation in Librato diff --git a/plugins/modules/linode.py b/plugins/modules/linode.py index a62d57f9dc..c56d549203 100644 --- a/plugins/modules/linode.py +++ b/plugins/modules/linode.py @@ -286,7 +286,7 @@ except ImportError: LINODE_IMP_ERR = traceback.format_exc() HAS_LINODE = False -from ansible.module_utils.basic import AnsibleModule, missing_required_lib, env_fallback +from ansible.module_utils.basic import AnsibleModule, env_fallback, missing_required_lib def randompass(): diff --git a/plugins/modules/linode_v4.py b/plugins/modules/linode_v4.py index cf9cfbeadc..e0e01a6130 100644 --- a/plugins/modules/linode_v4.py +++ b/plugins/modules/linode_v4.py @@ -171,6 +171,7 @@ instance: 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 LINODE_IMP_ERR = None diff --git a/plugins/modules/listen_ports_facts.py b/plugins/modules/listen_ports_facts.py index e70d52c3df..44ae738f0d 100644 --- a/plugins/modules/listen_ports_facts.py +++ b/plugins/modules/listen_ports_facts.py @@ -187,8 +187,9 @@ ansible_facts: sample: "root" """ -import re import platform +import re + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/lldp.py b/plugins/modules/lldp.py index 95fe12dade..5aa9c11d44 100644 --- a/plugins/modules/lldp.py +++ b/plugins/modules/lldp.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: lldp requirements: [lldpctl] diff --git a/plugins/modules/locale_gen.py b/plugins/modules/locale_gen.py index aee52a3f8c..7723c11ab4 100644 --- a/plugins/modules/locale_gen.py +++ b/plugins/modules/locale_gen.py @@ -79,11 +79,9 @@ mechanism: import os import re -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.locale_gen import locale_runner, locale_gen_runner - +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 6b7fb562a3..90ae120234 100644 --- a/plugins/modules/logentries.py +++ b/plugins/modules/logentries.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: logentries author: "Ivan Vanderbyl (@ivanvanderbyl)" diff --git a/plugins/modules/logentries_msg.py b/plugins/modules/logentries_msg.py index 543d71af0a..111a9f9e08 100644 --- a/plugins/modules/logentries_msg.py +++ b/plugins/modules/logentries_msg.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: logentries_msg short_description: Send a message to logentries diff --git a/plugins/modules/logstash_plugin.py b/plugins/modules/logstash_plugin.py index 8da8c4ec6d..abaa275d28 100644 --- a/plugins/modules/logstash_plugin.py +++ b/plugins/modules/logstash_plugin.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: logstash_plugin short_description: Manage Logstash plugins @@ -77,7 +76,6 @@ EXAMPLES = r""" from ansible.module_utils.basic import AnsibleModule - PACKAGE_STATE_MAP = dict(present="install", absent="remove") diff --git a/plugins/modules/lvm_pv.py b/plugins/modules/lvm_pv.py index 0fe02d2a5f..c8d7617ad0 100644 --- a/plugins/modules/lvm_pv.py +++ b/plugins/modules/lvm_pv.py @@ -6,7 +6,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" module: lvm_pv short_description: Manage LVM Physical Volumes @@ -71,6 +70,7 @@ RETURN = r""" import os + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/lvm_pv_move_data.py b/plugins/modules/lvm_pv_move_data.py index f048525fb2..478a510924 100644 --- a/plugins/modules/lvm_pv_move_data.py +++ b/plugins/modules/lvm_pv_move_data.py @@ -5,7 +5,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" module: lvm_pv_move_data short_description: Move data between LVM Physical Volumes (PVs) @@ -72,7 +71,9 @@ actions: import os + from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt diff --git a/plugins/modules/lxc_container.py b/plugins/modules/lxc_container.py index ab28243e52..fc43ef1536 100644 --- a/plugins/modules/lxc_container.py +++ b/plugins/modules/lxc_container.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: lxc_container short_description: Manage LXC Containers @@ -408,9 +407,9 @@ lxc_container: import os import re +import shlex import tempfile import time -import shlex try: import lxc @@ -420,8 +419,8 @@ else: HAS_LXC = True from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.common.text.converters import to_bytes, to_text from ansible.module_utils.parsing.convert_bool import BOOLEANS_FALSE -from ansible.module_utils.common.text.converters import to_text, to_bytes from ansible_collections.community.general.plugins.module_utils._lxc import create_script diff --git a/plugins/modules/lxca_cmms.py b/plugins/modules/lxca_cmms.py index 55995c77f5..7adcab6bea 100644 --- a/plugins/modules/lxca_cmms.py +++ b/plugins/modules/lxca_cmms.py @@ -5,7 +5,6 @@ # from __future__ import annotations - DOCUMENTATION = r""" author: - Naval Patel (@navalkp) @@ -91,11 +90,13 @@ result: """ import traceback + from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.remote_management.lxca.common import ( LXCA_COMMON_ARGS, - has_pylxca, connection_object, + has_pylxca, ) try: diff --git a/plugins/modules/lxca_nodes.py b/plugins/modules/lxca_nodes.py index 0cc40aa4a1..6cead65534 100644 --- a/plugins/modules/lxca_nodes.py +++ b/plugins/modules/lxca_nodes.py @@ -5,7 +5,6 @@ # from __future__ import annotations - DOCUMENTATION = r""" author: - Naval Patel (@navalkp) @@ -110,11 +109,13 @@ result: """ import traceback + from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.remote_management.lxca.common import ( LXCA_COMMON_ARGS, - has_pylxca, connection_object, + has_pylxca, ) try: diff --git a/plugins/modules/lxd_container.py b/plugins/modules/lxd_container.py index 9b884cecf4..96523bfcb5 100644 --- a/plugins/modules/lxd_container.py +++ b/plugins/modules/lxd_container.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: lxd_container short_description: Manage LXD instances @@ -403,6 +402,7 @@ import time from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule + 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 diff --git a/plugins/modules/lxd_profile.py b/plugins/modules/lxd_profile.py index e878d73c8b..ef371c8d46 100644 --- a/plugins/modules/lxd_profile.py +++ b/plugins/modules/lxd_profile.py @@ -213,6 +213,7 @@ import os from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.lxd import LXDClient, LXDClientException # ANSIBLE_LXD_DEFAULT_URL is a default value of the lxd endpoint diff --git a/plugins/modules/lxd_project.py b/plugins/modules/lxd_project.py index 56ea74722a..a84474b270 100644 --- a/plugins/modules/lxd_project.py +++ b/plugins/modules/lxd_project.py @@ -168,14 +168,16 @@ actions: sample: ["create"] """ +import os + +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.lxd import ( LXDClient, LXDClientException, - default_key_file, default_cert_file, + default_key_file, ) -from ansible.module_utils.basic import AnsibleModule -import os # 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_storage_pool_info.py b/plugins/modules/lxd_storage_pool_info.py index d615d79a8a..a271be0807 100644 --- a/plugins/modules/lxd_storage_pool_info.py +++ b/plugins/modules/lxd_storage_pool_info.py @@ -187,6 +187,7 @@ import typing as t from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.lxd import ( LXDClient, LXDClientException, diff --git a/plugins/modules/lxd_storage_volume_info.py b/plugins/modules/lxd_storage_volume_info.py index d243eaa0a7..4cf08e8fbc 100644 --- a/plugins/modules/lxd_storage_volume_info.py +++ b/plugins/modules/lxd_storage_volume_info.py @@ -192,6 +192,7 @@ import typing as t from urllib.parse import quote, urlencode from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.lxd import ( LXDClient, LXDClientException, diff --git a/plugins/modules/macports.py b/plugins/modules/macports.py index f5b84ac28f..906bfcbcb3 100644 --- a/plugins/modules/macports.py +++ b/plugins/modules/macports.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: macports author: "Jimmy Tang (@jcftang)" diff --git a/plugins/modules/mail.py b/plugins/modules/mail.py index 3a0879c019..bf4aae03f8 100644 --- a/plugins/modules/mail.py +++ b/plugins/modules/mail.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" author: - Dag Wieers (@dagwieers) @@ -220,11 +219,11 @@ import smtplib import ssl import traceback from email import encoders -from email.utils import parseaddr, formataddr, formatdate, make_msgid +from email.header import Header from email.mime.base import MIMEBase from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText -from email.header import Header +from email.utils import formataddr, formatdate, make_msgid, parseaddr from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native diff --git a/plugins/modules/make.py b/plugins/modules/make.py index 482a74774b..dcc18025bd 100644 --- a/plugins/modules/make.py +++ b/plugins/modules/make.py @@ -143,6 +143,7 @@ targets: """ from shlex import quote as shlex_quote + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/manageiq_alert_profiles.py b/plugins/modules/manageiq_alert_profiles.py index bb4f1ddf10..2939ec6943 100644 --- a/plugins/modules/manageiq_alert_profiles.py +++ b/plugins/modules/manageiq_alert_profiles.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: manageiq_alert_profiles @@ -83,6 +82,7 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec diff --git a/plugins/modules/manageiq_alerts.py b/plugins/modules/manageiq_alerts.py index 32ac129488..db936745cc 100644 --- a/plugins/modules/manageiq_alerts.py +++ b/plugins/modules/manageiq_alerts.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: manageiq_alerts @@ -127,6 +126,7 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec diff --git a/plugins/modules/manageiq_group.py b/plugins/modules/manageiq_group.py index 040275c181..4c22478a6b 100644 --- a/plugins/modules/manageiq_group.py +++ b/plugins/modules/manageiq_group.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: manageiq_group @@ -200,6 +199,7 @@ group: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec diff --git a/plugins/modules/manageiq_policies.py b/plugins/modules/manageiq_policies.py index 02ca093401..a426291239 100644 --- a/plugins/modules/manageiq_policies.py +++ b/plugins/modules/manageiq_policies.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: manageiq_policies @@ -134,6 +133,7 @@ manageiq_policies: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.manageiq import ( ManageIQ, manageiq_argument_spec, diff --git a/plugins/modules/manageiq_policies_info.py b/plugins/modules/manageiq_policies_info.py index f925148b7d..d56dfb9f5f 100644 --- a/plugins/modules/manageiq_policies_info.py +++ b/plugins/modules/manageiq_policies_info.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: manageiq_policies_info version_added: 5.8.0 @@ -89,6 +88,7 @@ profiles: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.manageiq import ( ManageIQ, manageiq_argument_spec, diff --git a/plugins/modules/manageiq_provider.py b/plugins/modules/manageiq_provider.py index 0515b900cd..ef7d697aee 100644 --- a/plugins/modules/manageiq_provider.py +++ b/plugins/modules/manageiq_provider.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: manageiq_provider short_description: Management of provider in ManageIQ @@ -509,6 +508,7 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec diff --git a/plugins/modules/manageiq_tags.py b/plugins/modules/manageiq_tags.py index adf1dd7aea..9aa8fa1fb5 100644 --- a/plugins/modules/manageiq_tags.py +++ b/plugins/modules/manageiq_tags.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: manageiq_tags @@ -123,6 +122,7 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.manageiq import ( ManageIQ, ManageIQTags, diff --git a/plugins/modules/manageiq_tags_info.py b/plugins/modules/manageiq_tags_info.py index 8083d74456..48d89526af 100644 --- a/plugins/modules/manageiq_tags_info.py +++ b/plugins/modules/manageiq_tags_info.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: manageiq_tags_info version_added: 5.8.0 @@ -73,6 +72,7 @@ tags: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.manageiq import ( ManageIQ, ManageIQTags, diff --git a/plugins/modules/manageiq_tenant.py b/plugins/modules/manageiq_tenant.py index fe85c00d7f..7456b2770e 100644 --- a/plugins/modules/manageiq_tenant.py +++ b/plugins/modules/manageiq_tenant.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: manageiq_tenant @@ -160,6 +159,7 @@ tenant: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec diff --git a/plugins/modules/manageiq_user.py b/plugins/modules/manageiq_user.py index 1353a52725..d0e1291e79 100644 --- a/plugins/modules/manageiq_user.py +++ b/plugins/modules/manageiq_user.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: manageiq_user @@ -130,6 +129,7 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec diff --git a/plugins/modules/mas.py b/plugins/modules/mas.py index c4dd224cd8..f6f28b6d4b 100644 --- a/plugins/modules/mas.py +++ b/plugins/modules/mas.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: mas short_description: Manage Mac App Store applications with mas-cli @@ -101,13 +100,13 @@ EXAMPLES = r""" RETURN = r""" # """ -from ansible.module_utils.basic import AnsibleModule import os +import platform + +from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.version import LooseVersion -import platform - NOT_WORKING_MAC_VERSION_MAS_ACCOUNT = "12.0" diff --git a/plugins/modules/mattermost.py b/plugins/modules/mattermost.py index 5c8635ff2e..9be7e60322 100644 --- a/plugins/modules/mattermost.py +++ b/plugins/modules/mattermost.py @@ -12,7 +12,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: mattermost short_description: Send Mattermost notifications diff --git a/plugins/modules/maven_artifact.py b/plugins/modules/maven_artifact.py index 41f7c53bba..c10151ecfd 100644 --- a/plugins/modules/maven_artifact.py +++ b/plugins/modules/maven_artifact.py @@ -235,15 +235,15 @@ EXAMPLES = r""" import hashlib import os import posixpath +import re import shutil import tempfile import traceback -import re - -from ansible.module_utils.ansible_release import __version__ as ansible_version from re import match from urllib.parse import urlparse +from ansible.module_utils.ansible_release import __version__ as ansible_version + LXML_ETREE_IMP_ERR = None try: from lxml import etree @@ -264,7 +264,7 @@ except ImportError: SEMANTIC_VERSION_IMP_ERR = None try: - from semantic_version import Version, Spec + from semantic_version import Spec, Version HAS_SEMANTIC_VERSION = True except ImportError: @@ -273,8 +273,8 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule, missing_required_lib -from ansible.module_utils.urls import fetch_url from ansible.module_utils.common.text.converters import to_bytes, to_text +from ansible.module_utils.urls import fetch_url def split_pre_existing_dir(dirname): diff --git a/plugins/modules/memset_dns_reload.py b/plugins/modules/memset_dns_reload.py index 9c90fb521e..50995c266c 100644 --- a/plugins/modules/memset_dns_reload.py +++ b/plugins/modules/memset_dns_reload.py @@ -83,6 +83,7 @@ memset_api: from time import sleep from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.memset import memset_api_call diff --git a/plugins/modules/memset_memstore_info.py b/plugins/modules/memset_memstore_info.py index 98914dc366..d664cf6aa9 100644 --- a/plugins/modules/memset_memstore_info.py +++ b/plugins/modules/memset_memstore_info.py @@ -106,6 +106,7 @@ memset_api: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.memset import memset_api_call diff --git a/plugins/modules/memset_server_info.py b/plugins/modules/memset_server_info.py index 5a96b7f910..150346091a 100644 --- a/plugins/modules/memset_server_info.py +++ b/plugins/modules/memset_server_info.py @@ -237,6 +237,7 @@ memset_api: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.memset import memset_api_call diff --git a/plugins/modules/memset_zone.py b/plugins/modules/memset_zone.py index 3ff43679e8..29d49d1150 100644 --- a/plugins/modules/memset_zone.py +++ b/plugins/modules/memset_zone.py @@ -108,9 +108,8 @@ memset_api: """ from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.memset import check_zone -from ansible_collections.community.general.plugins.module_utils.memset import get_zone_id -from ansible_collections.community.general.plugins.module_utils.memset import 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 c39a79a5ed..3c0885c4eb 100644 --- a/plugins/modules/memset_zone_domain.py +++ b/plugins/modules/memset_zone_domain.py @@ -79,9 +79,12 @@ memset_api: """ from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.memset import get_zone_id -from ansible_collections.community.general.plugins.module_utils.memset import check_zone_domain -from ansible_collections.community.general.plugins.module_utils.memset import memset_api_call + +from ansible_collections.community.general.plugins.module_utils.memset import ( + check_zone_domain, + get_zone_id, + memset_api_call, +) def api_validation(args=None): diff --git a/plugins/modules/memset_zone_record.py b/plugins/modules/memset_zone_record.py index 2b5c28e53c..04eb904bca 100644 --- a/plugins/modules/memset_zone_record.py +++ b/plugins/modules/memset_zone_record.py @@ -164,8 +164,8 @@ memset_api: """ from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.memset import get_zone_id -from ansible_collections.community.general.plugins.module_utils.memset import 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 e240e6a445..cdfa2fc228 100644 --- a/plugins/modules/mksysb.py +++ b/plugins/modules/mksysb.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" author: Kairo Araujo (@kairoaraujo) module: mksysb diff --git a/plugins/modules/modprobe.py b/plugins/modules/modprobe.py index fc12e0351c..27501353b3 100644 --- a/plugins/modules/modprobe.py +++ b/plugins/modules/modprobe.py @@ -81,9 +81,9 @@ EXAMPLES = r""" import os.path import platform +import re import shlex import traceback -import re from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/monit.py b/plugins/modules/monit.py index 54710114e3..7244c1fec2 100644 --- a/plugins/modules/monit.py +++ b/plugins/modules/monit.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: monit short_description: Manage the state of a program monitored using Monit @@ -49,14 +48,12 @@ EXAMPLES = r""" state: started """ -import time import re - +import time from enum import Enum from ansible.module_utils.basic import AnsibleModule - STATE_COMMAND_MAP = { "stopped": "stop", "started": "start", diff --git a/plugins/modules/mqtt.py b/plugins/modules/mqtt.py index ffc8e38a2f..019072cde8 100644 --- a/plugins/modules/mqtt.py +++ b/plugins/modules/mqtt.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: mqtt short_description: Publish a message on an MQTT topic for the IoT @@ -125,6 +124,7 @@ HAS_PAHOMQTT = True PAHOMQTT_IMP_ERR = None try: import socket + import paho.mqtt.publish as mqtt except ImportError: PAHOMQTT_IMP_ERR = traceback.format_exc() @@ -132,7 +132,6 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule, missing_required_lib - # =========================================== # Main # diff --git a/plugins/modules/mssql_db.py b/plugins/modules/mssql_db.py index 1ee5557963..6a73f466ee 100644 --- a/plugins/modules/mssql_db.py +++ b/plugins/modules/mssql_db.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: mssql_db short_description: Add or remove MSSQL databases from a remote host diff --git a/plugins/modules/mssql_script.py b/plugins/modules/mssql_script.py index 9adf835267..ff4bca4082 100644 --- a/plugins/modules/mssql_script.py +++ b/plugins/modules/mssql_script.py @@ -262,9 +262,10 @@ query_results_dict: returned: success, if output is dict """ -from ansible.module_utils.basic import AnsibleModule, missing_required_lib -import traceback import json +import traceback + +from ansible.module_utils.basic import AnsibleModule, missing_required_lib PYMSSQL_IMP_ERR = None try: diff --git a/plugins/modules/nagios.py b/plugins/modules/nagios.py index 60eb5da07f..ba50f53fb6 100644 --- a/plugins/modules/nagios.py +++ b/plugins/modules/nagios.py @@ -11,7 +11,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: nagios short_description: Perform common tasks in Nagios related to downtime and notifications @@ -266,9 +265,9 @@ EXAMPLES = r""" command: DISABLE_FAILURE_PREDICTION """ -import time import os.path import stat +import time from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/netcup_dns.py b/plugins/modules/netcup_dns.py index 55a74d201d..5a887dd81a 100644 --- a/plugins/modules/netcup_dns.py +++ b/plugins/modules/netcup_dns.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: netcup_dns notes: [] diff --git a/plugins/modules/newrelic_deployment.py b/plugins/modules/newrelic_deployment.py index 2c7db2544a..cdcf83665e 100644 --- a/plugins/modules/newrelic_deployment.py +++ b/plugins/modules/newrelic_deployment.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: newrelic_deployment author: "Matt Coddington (@mcodd)" @@ -78,10 +77,11 @@ EXAMPLES = r""" revision: '1.0' """ +import json +from urllib.parse import quote + from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url -from urllib.parse import quote -import json # =========================================== # Module execution. diff --git a/plugins/modules/nexmo.py b/plugins/modules/nexmo.py index dc0009ecf2..f08a7cd48e 100644 --- a/plugins/modules/nexmo.py +++ b/plugins/modules/nexmo.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: nexmo short_description: Send a SMS using nexmo @@ -74,7 +73,6 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url, url_argument_spec - NEXMO_API = "https://rest.nexmo.com/sms/json" diff --git a/plugins/modules/nginx_status_info.py b/plugins/modules/nginx_status_info.py index ceb5c48780..3e4bd82410 100644 --- a/plugins/modules/nginx_status_info.py +++ b/plugins/modules/nginx_status_info.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: nginx_status_info short_description: Retrieve information on nginx status @@ -92,9 +91,10 @@ data: """ import re + from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.urls import fetch_url from ansible.module_utils.common.text.converters import to_text +from ansible.module_utils.urls import fetch_url class NginxStatusInfo: diff --git a/plugins/modules/nmcli.py b/plugins/modules/nmcli.py index 3abd6e0618..bb10a53d1f 100644 --- a/plugins/modules/nmcli.py +++ b/plugins/modules/nmcli.py @@ -1696,9 +1696,10 @@ EXAMPLES = r""" RETURN = r"""# """ +import re + from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_text -import re class NmcliModuleError(Exception): diff --git a/plugins/modules/nomad_token.py b/plugins/modules/nomad_token.py index 0c8da6ef4d..5a9ba35530 100644 --- a/plugins/modules/nomad_token.py +++ b/plugins/modules/nomad_token.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: nomad_token author: Pedro Nascimento (@apecnascimento) diff --git a/plugins/modules/nosh.py b/plugins/modules/nosh.py index ab9a4b4d79..319f8d95a9 100644 --- a/plugins/modules/nosh.py +++ b/plugins/modules/nosh.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: nosh author: diff --git a/plugins/modules/npm.py b/plugins/modules/npm.py index 9d180d1e9c..48418794ca 100644 --- a/plugins/modules/npm.py +++ b/plugins/modules/npm.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: npm short_description: Manage node.js packages with npm @@ -150,6 +149,7 @@ import os import re from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt diff --git a/plugins/modules/nsupdate.py b/plugins/modules/nsupdate.py index 8e388befdb..f65537787b 100644 --- a/plugins/modules/nsupdate.py +++ b/plugins/modules/nsupdate.py @@ -11,7 +11,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: nsupdate @@ -180,16 +179,15 @@ dns_rc_str: """ import traceback - from binascii import Error as binascii_error DNSPYTHON_IMP_ERR = None try: - import dns.update - import dns.query - import dns.tsigkeyring import dns.message + import dns.query import dns.resolver + import dns.tsigkeyring + import dns.update HAVE_DNSPYTHON = True except ImportError: diff --git a/plugins/modules/ocapi_command.py b/plugins/modules/ocapi_command.py index 3308b30a4f..3d2ecbf9c9 100644 --- a/plugins/modules/ocapi_command.py +++ b/plugins/modules/ocapi_command.py @@ -164,10 +164,12 @@ operationStatusId: """ from urllib.parse import urljoin + from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ocapi_utils import OcapiUtils from ansible.module_utils.common.text.converters import to_native +from ansible_collections.community.general.plugins.module_utils.ocapi_utils import OcapiUtils + # More will be added as module features are expanded CATEGORY_COMMANDS_ALL = { "Chassis": ["IndicatorLedOn", "IndicatorLedOff", "PowerModeLow", "PowerModeNormal"], diff --git a/plugins/modules/ocapi_info.py b/plugins/modules/ocapi_info.py index d32083c116..76a06d6621 100644 --- a/plugins/modules/ocapi_info.py +++ b/plugins/modules/ocapi_info.py @@ -140,9 +140,10 @@ status: from urllib.parse import urljoin from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.ocapi_utils import OcapiUtils from ansible.module_utils.common.text.converters import to_native +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/oci_vcn.py b/plugins/modules/oci_vcn.py index 4eb7c30a5f..84b0fbaf08 100644 --- a/plugins/modules/oci_vcn.py +++ b/plugins/modules/oci_vcn.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: oci_vcn short_description: Manage Virtual Cloud Networks(VCN) in OCI @@ -99,12 +98,12 @@ vcn: """ from ansible.module_utils.basic import AnsibleModule, missing_required_lib + from ansible_collections.community.general.plugins.module_utils.oracle import oci_utils try: + from oci.core.models import CreateVcnDetails, UpdateVcnDetails from oci.core.virtual_network_client import VirtualNetworkClient - from oci.core.models import CreateVcnDetails - from oci.core.models import UpdateVcnDetails HAS_OCI_PY_SDK = True except ImportError: diff --git a/plugins/modules/office_365_connector_card.py b/plugins/modules/office_365_connector_card.py index a08e91c552..95b556f558 100644 --- a/plugins/modules/office_365_connector_card.py +++ b/plugins/modules/office_365_connector_card.py @@ -141,8 +141,8 @@ RETURN = r""" # import module snippets from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.urls import fetch_url from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict +from ansible.module_utils.urls import fetch_url OFFICE_365_CARD_CONTEXT = "http://schema.org/extensions" OFFICE_365_CARD_TYPE = "MessageCard" diff --git a/plugins/modules/ohai.py b/plugins/modules/ohai.py index 9e174aa45e..60865cb394 100644 --- a/plugins/modules/ohai.py +++ b/plugins/modules/ohai.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ohai short_description: Returns inventory data from I(Ohai) diff --git a/plugins/modules/omapi_host.py b/plugins/modules/omapi_host.py index 1a0f0a5383..a10693fc12 100644 --- a/plugins/modules/omapi_host.py +++ b/plugins/modules/omapi_host.py @@ -134,9 +134,18 @@ import traceback PUREOMAPI_IMP_ERR = None try: - from pypureomapi import Omapi, OmapiMessage, OmapiError, OmapiErrorNotFound - from pypureomapi import pack_ip, unpack_ip, pack_mac, unpack_mac - from pypureomapi import OMAPI_OP_STATUS, OMAPI_OP_UPDATE + from pypureomapi import ( + OMAPI_OP_STATUS, + OMAPI_OP_UPDATE, + Omapi, + OmapiError, + OmapiErrorNotFound, + OmapiMessage, + pack_ip, + pack_mac, + unpack_ip, + unpack_mac, + ) pureomapi_found = True except ImportError: diff --git a/plugins/modules/one_host.py b/plugins/modules/one_host.py index 37ee04bfe8..0528714a95 100644 --- a/plugins/modules/one_host.py +++ b/plugins/modules/one_host.py @@ -7,7 +7,6 @@ # Make coding more python3-ish from __future__ import annotations - DOCUMENTATION = r""" module: one_host diff --git a/plugins/modules/one_image.py b/plugins/modules/one_image.py index 8a831f6701..2f549e6c58 100644 --- a/plugins/modules/one_image.py +++ b/plugins/modules/one_image.py @@ -372,7 +372,6 @@ import time from ansible_collections.community.general.plugins.module_utils.opennebula import OpenNebulaModule - IMAGE_STATES = [ "INIT", "READY", diff --git a/plugins/modules/one_image_info.py b/plugins/modules/one_image_info.py index ee76e9eb10..f94bab4330 100644 --- a/plugins/modules/one_image_info.py +++ b/plugins/modules/one_image_info.py @@ -273,7 +273,6 @@ import re from ansible_collections.community.general.plugins.module_utils.opennebula import OpenNebulaModule - IMAGE_STATES = [ "INIT", "READY", diff --git a/plugins/modules/one_vm.py b/plugins/modules/one_vm.py index 7ca4a639c5..daeadf1c18 100644 --- a/plugins/modules/one_vm.py +++ b/plugins/modules/one_vm.py @@ -688,13 +688,11 @@ import re import time 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 - # Updateconf attributes documentation: https://docs.opennebula.io/6.10/integration_and_development/system_interfaces/api.html#one-vm-updateconf UPDATECONF_ATTRIBUTES = { "OS": ["ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT", "SD_DISK_BUS", "UUID", "FIRMWARE"], diff --git a/plugins/modules/oneandone_firewall_policy.py b/plugins/modules/oneandone_firewall_policy.py index dca0f7fb4c..55a24818d4 100644 --- a/plugins/modules/oneandone_firewall_policy.py +++ b/plugins/modules/oneandone_firewall_policy.py @@ -193,11 +193,13 @@ firewall_policy: """ import os + from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.oneandone import ( + OneAndOneResources, get_firewall_policy, get_server, - OneAndOneResources, wait_for_resource_creation_completion, ) diff --git a/plugins/modules/oneandone_load_balancer.py b/plugins/modules/oneandone_load_balancer.py index 9f24e92a90..a4737d1e5a 100644 --- a/plugins/modules/oneandone_load_balancer.py +++ b/plugins/modules/oneandone_load_balancer.py @@ -241,12 +241,14 @@ load_balancer: """ import os + from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.oneandone import ( + OneAndOneResources, + get_datacenter, get_load_balancer, get_server, - get_datacenter, - OneAndOneResources, wait_for_resource_creation_completion, ) diff --git a/plugins/modules/oneandone_monitoring_policy.py b/plugins/modules/oneandone_monitoring_policy.py index 7e6345c433..53ec39ae7f 100644 --- a/plugins/modules/oneandone_monitoring_policy.py +++ b/plugins/modules/oneandone_monitoring_policy.py @@ -408,11 +408,13 @@ monitoring_policy: """ import os + from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.oneandone import ( + OneAndOneResources, get_monitoring_policy, get_server, - OneAndOneResources, wait_for_resource_creation_completion, ) diff --git a/plugins/modules/oneandone_private_network.py b/plugins/modules/oneandone_private_network.py index df0bf1e667..1e873845b2 100644 --- a/plugins/modules/oneandone_private_network.py +++ b/plugins/modules/oneandone_private_network.py @@ -147,12 +147,14 @@ private_network: """ import os + from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.oneandone import ( + OneAndOneResources, + get_datacenter, get_private_network, get_server, - get_datacenter, - OneAndOneResources, wait_for_resource_creation_completion, wait_for_resource_deletion_completion, ) diff --git a/plugins/modules/oneandone_public_ip.py b/plugins/modules/oneandone_public_ip.py index 1f26b37b10..67d6505f44 100644 --- a/plugins/modules/oneandone_public_ip.py +++ b/plugins/modules/oneandone_public_ip.py @@ -111,11 +111,13 @@ public_ip: """ import os + from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.oneandone import ( + OneAndOneResources, get_datacenter, get_public_ip, - OneAndOneResources, wait_for_resource_creation_completion, ) diff --git a/plugins/modules/oneandone_server.py b/plugins/modules/oneandone_server.py index e3c37570ff..57ca25ea4a 100644 --- a/plugins/modules/oneandone_server.py +++ b/plugins/modules/oneandone_server.py @@ -204,17 +204,19 @@ servers: import os import time + from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.oneandone import ( - get_datacenter, - get_fixed_instance_size, - get_appliance, - get_private_network, - get_monitoring_policy, - get_firewall_policy, - get_load_balancer, - get_server, OneAndOneResources, + get_appliance, + get_datacenter, + get_firewall_policy, + get_fixed_instance_size, + get_load_balancer, + get_monitoring_policy, + get_private_network, + get_server, wait_for_resource_creation_completion, wait_for_resource_deletion_completion, ) diff --git a/plugins/modules/onepassword_info.py b/plugins/modules/onepassword_info.py index fd9e461139..9a86b7a775 100644 --- a/plugins/modules/onepassword_info.py +++ b/plugins/modules/onepassword_info.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: onepassword_info author: @@ -159,8 +158,8 @@ import json import os import re -from ansible.module_utils.common.text.converters import to_bytes, to_native 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 diff --git a/plugins/modules/online_server_info.py b/plugins/modules/online_server_info.py index 8e04373c20..3a803f3def 100644 --- a/plugins/modules/online_server_info.py +++ b/plugins/modules/online_server_info.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: online_server_info short_description: Gather information about Online servers @@ -129,6 +128,7 @@ online_server_info: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.online import ( Online, OnlineException, diff --git a/plugins/modules/online_user_info.py b/plugins/modules/online_user_info.py index 5f7a384963..aaedfbee50 100644 --- a/plugins/modules/online_user_info.py +++ b/plugins/modules/online_user_info.py @@ -46,6 +46,7 @@ online_user_info: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.online import ( Online, OnlineException, diff --git a/plugins/modules/openbsd_pkg.py b/plugins/modules/openbsd_pkg.py index d6b41e8c48..699a67f084 100644 --- a/plugins/modules/openbsd_pkg.py +++ b/plugins/modules/openbsd_pkg.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: openbsd_pkg author: diff --git a/plugins/modules/openwrt_init.py b/plugins/modules/openwrt_init.py index 472f65fdec..049ea46e22 100644 --- a/plugins/modules/openwrt_init.py +++ b/plugins/modules/openwrt_init.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: openwrt_init author: @@ -75,6 +74,7 @@ RETURN = r""" """ import os + from ansible.module_utils.basic import AnsibleModule module = None diff --git a/plugins/modules/opkg.py b/plugins/modules/opkg.py index 69afc8e9d9..1276b32431 100644 --- a/plugins/modules/opkg.py +++ b/plugins/modules/opkg.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: opkg author: "Patrick Pelletier (@skinp)" @@ -114,6 +113,7 @@ 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 diff --git a/plugins/modules/osx_defaults.py b/plugins/modules/osx_defaults.py index c799be2b13..61b54def54 100644 --- a/plugins/modules/osx_defaults.py +++ b/plugins/modules/osx_defaults.py @@ -134,8 +134,8 @@ EXAMPLES = r""" state: absent """ -from datetime import datetime import re +from datetime import datetime from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/ovh_ip_failover.py b/plugins/modules/ovh_ip_failover.py index 944a83e7c3..f41e64b4af 100644 --- a/plugins/modules/ovh_ip_failover.py +++ b/plugins/modules/ovh_ip_failover.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ovh_ip_failover short_description: Manage OVH IP failover address diff --git a/plugins/modules/ovh_ip_loadbalancing_backend.py b/plugins/modules/ovh_ip_loadbalancing_backend.py index 47ff24ddb3..a2132cc3ee 100644 --- a/plugins/modules/ovh_ip_loadbalancing_backend.py +++ b/plugins/modules/ovh_ip_loadbalancing_backend.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ovh_ip_loadbalancing_backend short_description: Manage OVH IP LoadBalancing backends diff --git a/plugins/modules/ovh_monthly_billing.py b/plugins/modules/ovh_monthly_billing.py index 2242bc54f3..8498fc8831 100644 --- a/plugins/modules/ovh_monthly_billing.py +++ b/plugins/modules/ovh_monthly_billing.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ovh_monthly_billing author: Francois Lallart (@fraff) diff --git a/plugins/modules/pacemaker_cluster.py b/plugins/modules/pacemaker_cluster.py index b702e971e9..1a1481f258 100644 --- a/plugins/modules/pacemaker_cluster.py +++ b/plugins/modules/pacemaker_cluster.py @@ -67,8 +67,8 @@ out: from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper from ansible_collections.community.general.plugins.module_utils.pacemaker import ( - pacemaker_runner, get_pacemaker_maintenance_mode, + pacemaker_runner, ) diff --git a/plugins/modules/pacemaker_resource.py b/plugins/modules/pacemaker_resource.py index b8e8cf3c1f..42edcbf2d6 100644 --- a/plugins/modules/pacemaker_resource.py +++ b/plugins/modules/pacemaker_resource.py @@ -147,8 +147,8 @@ cluster_resources: from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper from ansible_collections.community.general.plugins.module_utils.pacemaker import ( - pacemaker_runner, get_pacemaker_maintenance_mode, + pacemaker_runner, ) diff --git a/plugins/modules/packet_device.py b/plugins/modules/packet_device.py index 0a73833163..8f4d22f769 100644 --- a/plugins/modules/packet_device.py +++ b/plugins/modules/packet_device.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: packet_device @@ -275,8 +274,8 @@ devices: import os import re import time -import uuid import traceback +import uuid from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/packet_ip_subnet.py b/plugins/modules/packet_ip_subnet.py index 58d0f84304..195c411a62 100644 --- a/plugins/modules/packet_ip_subnet.py +++ b/plugins/modules/packet_ip_subnet.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: packet_ip_subnet @@ -146,8 +145,8 @@ subnet: """ -import uuid import re +import uuid from ansible.module_utils.basic import AnsibleModule, env_fallback diff --git a/plugins/modules/packet_project.py b/plugins/modules/packet_project.py index b7b974a5bc..03149522f3 100644 --- a/plugins/modules/packet_project.py +++ b/plugins/modules/packet_project.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: packet_project diff --git a/plugins/modules/packet_sshkey.py b/plugins/modules/packet_sshkey.py index 3067c133fa..11ab97db85 100644 --- a/plugins/modules/packet_sshkey.py +++ b/plugins/modules/packet_sshkey.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: packet_sshkey short_description: Create/delete an SSH key in Packet host diff --git a/plugins/modules/packet_volume_attachment.py b/plugins/modules/packet_volume_attachment.py index 29f96a7eb9..42652e8af0 100644 --- a/plugins/modules/packet_volume_attachment.py +++ b/plugins/modules/packet_volume_attachment.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: packet_volume_attachment diff --git a/plugins/modules/pacman.py b/plugins/modules/pacman.py index cb2160b989..e1c772d4f6 100644 --- a/plugins/modules/pacman.py +++ b/plugins/modules/pacman.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pacman short_description: Manage packages with I(pacman) @@ -244,9 +243,10 @@ EXAMPLES = r""" import re import shlex -from ansible.module_utils.basic import AnsibleModule from collections import defaultdict, namedtuple +from ansible.module_utils.basic import AnsibleModule + class Package: def __init__(self, name, source, source_is_URL=False): diff --git a/plugins/modules/pacman_key.py b/plugins/modules/pacman_key.py index 7f5f823756..344714c7ce 100644 --- a/plugins/modules/pacman_key.py +++ b/plugins/modules/pacman_key.py @@ -128,9 +128,10 @@ RETURN = r""" # """ import os.path import tempfile + from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.urls import fetch_url from ansible.module_utils.common.text.converters import to_native +from ansible.module_utils.urls import fetch_url class GpgListResult: diff --git a/plugins/modules/pagerduty.py b/plugins/modules/pagerduty.py index 75ba60f0e3..21298577de 100644 --- a/plugins/modules/pagerduty.py +++ b/plugins/modules/pagerduty.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pagerduty short_description: Create PagerDuty maintenance windows diff --git a/plugins/modules/pagerduty_alert.py b/plugins/modules/pagerduty_alert.py index 53bd06284b..fd93e1365d 100644 --- a/plugins/modules/pagerduty_alert.py +++ b/plugins/modules/pagerduty_alert.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pagerduty_alert short_description: Trigger, acknowledge or resolve PagerDuty incidents @@ -215,11 +214,11 @@ EXAMPLES = r""" state: resolved """ import json +from datetime import datetime +from urllib.parse import urlencode, urlparse, urlunparse from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url -from datetime import datetime -from urllib.parse import urlparse, urlencode, urlunparse def check(module, name, state, service_id, integration_key, api_key, incident_key=None, http_call=fetch_url): diff --git a/plugins/modules/pagerduty_change.py b/plugins/modules/pagerduty_change.py index 64f0ef6c8d..dc0aeb697b 100644 --- a/plugins/modules/pagerduty_change.py +++ b/plugins/modules/pagerduty_change.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pagerduty_change short_description: Track a code or infrastructure change as a PagerDuty change event @@ -99,8 +98,8 @@ EXAMPLES = r""" link_text: View changes on GitHub """ -from ansible.module_utils.urls import fetch_url 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 ( now, diff --git a/plugins/modules/pagerduty_user.py b/plugins/modules/pagerduty_user.py index 0f0016b1b7..317d2a1de8 100644 --- a/plugins/modules/pagerduty_user.py +++ b/plugins/modules/pagerduty_user.py @@ -83,7 +83,9 @@ EXAMPLES = r""" RETURN = r""" # """ from os import path + from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils import deps with deps.declare("pdpyras", url="https://github.com/PagerDuty/pdpyras"): diff --git a/plugins/modules/pamd.py b/plugins/modules/pamd.py index c09dfdbda7..b7fae88648 100644 --- a/plugins/modules/pamd.py +++ b/plugins/modules/pamd.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pamd author: @@ -228,12 +227,12 @@ backupdest: """ -from ansible.module_utils.basic import AnsibleModule import os import re -from tempfile import NamedTemporaryFile from datetime import datetime +from tempfile import NamedTemporaryFile +from ansible.module_utils.basic import AnsibleModule RULE_REGEX = re.compile( r"""(?P-?(?:auth|account|session|password))\s+ diff --git a/plugins/modules/parted.py b/plugins/modules/parted.py index 3397a8d6fb..bd5e076488 100644 --- a/plugins/modules/parted.py +++ b/plugins/modules/parted.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" author: - Fabrizio Colonna (@ColOfAbRiX) @@ -223,11 +222,11 @@ EXAMPLES = r""" """ -from ansible.module_utils.basic import AnsibleModule import math -import re import os +import re +from ansible.module_utils.basic import AnsibleModule # Reference prefixes (International System of Units and IEC) units_si = ["B", "KB", "MB", "GB", "TB"] diff --git a/plugins/modules/pear.py b/plugins/modules/pear.py index df614b5ed6..866aff82b1 100644 --- a/plugins/modules/pear.py +++ b/plugins/modules/pear.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pear short_description: Manage pear/pecl packages @@ -116,8 +115,8 @@ EXAMPLES = r""" import os -from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.common.text.converters import to_text def get_local_version(pear_output): diff --git a/plugins/modules/pids.py b/plugins/modules/pids.py index 5e3bfeebea..de11862716 100644 --- a/plugins/modules/pids.py +++ b/plugins/modules/pids.py @@ -66,9 +66,9 @@ import re from os.path import basename from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils import deps 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 with deps.declare("psutil"): diff --git a/plugins/modules/pingdom.py b/plugins/modules/pingdom.py index 92185062bf..243239a4e5 100644 --- a/plugins/modules/pingdom.py +++ b/plugins/modules/pingdom.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pingdom short_description: Pause/unpause Pingdom alerts diff --git a/plugins/modules/pipx.py b/plugins/modules/pipx.py index 979e38212d..94919d00dd 100644 --- a/plugins/modules/pipx.py +++ b/plugins/modules/pipx.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pipx short_description: Manages applications installed with pipx @@ -212,17 +211,17 @@ version: """ +from ansible.module_utils.facts.compat import ansible_facts + from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper from ansible_collections.community.general.plugins.module_utils.pipx import ( - pipx_runner, - pipx_common_argspec, 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.module_utils.facts.compat import ansible_facts - def _make_name(name, suffix): return name if suffix is None else f"{name}{suffix}" diff --git a/plugins/modules/pipx_info.py b/plugins/modules/pipx_info.py index e4082af67f..b2ac1139ce 100644 --- a/plugins/modules/pipx_info.py +++ b/plugins/modules/pipx_info.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pipx_info short_description: Rretrieves information about applications installed with pipx @@ -131,16 +130,16 @@ version: version_added: 10.1.0 """ +from ansible.module_utils.facts.compat import ansible_facts + from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper from ansible_collections.community.general.plugins.module_utils.pipx import ( - pipx_runner, - pipx_common_argspec, make_process_dict, + pipx_common_argspec, + pipx_runner, ) from ansible_collections.community.general.plugins.module_utils.version import LooseVersion -from ansible.module_utils.facts.compat import ansible_facts - class PipXInfo(ModuleHelper): output_params = ["name"] diff --git a/plugins/modules/pkg5_publisher.py b/plugins/modules/pkg5_publisher.py index 765ee49979..1c73f25ffa 100644 --- a/plugins/modules/pkg5_publisher.py +++ b/plugins/modules/pkg5_publisher.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pkg5_publisher author: "Peter Oliver (@mavit)" diff --git a/plugins/modules/pkgin.py b/plugins/modules/pkgin.py index 09ce0ffc40..06b7d0ebbd 100644 --- a/plugins/modules/pkgin.py +++ b/plugins/modules/pkgin.py @@ -13,7 +13,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pkgin short_description: Package manager for SmartOS, NetBSD, et al diff --git a/plugins/modules/pkgng.py b/plugins/modules/pkgng.py index e4091e5106..d9db694c16 100644 --- a/plugins/modules/pkgng.py +++ b/plugins/modules/pkgng.py @@ -11,7 +11,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pkgng short_description: Package manager for FreeBSD >= 9.0 @@ -135,8 +134,9 @@ EXAMPLES = r""" """ -from collections import defaultdict import re +from collections import defaultdict + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/pkgutil.py b/plugins/modules/pkgutil.py index 131f824d04..db74f3208f 100644 --- a/plugins/modules/pkgutil.py +++ b/plugins/modules/pkgutil.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pkgutil short_description: OpenCSW package management on Solaris diff --git a/plugins/modules/pmem.py b/plugins/modules/pmem.py index 52e883b9ca..b48b02f9f6 100644 --- a/plugins/modules/pmem.py +++ b/plugins/modules/pmem.py @@ -200,7 +200,8 @@ EXAMPLES = r""" import json import traceback -from ansible.module_utils.basic import AnsibleModule, missing_required_lib, human_to_bytes + +from ansible.module_utils.basic import AnsibleModule, human_to_bytes, missing_required_lib XMLTODICT_LIBRARY_IMPORT_ERROR: str | None try: diff --git a/plugins/modules/portage.py b/plugins/modules/portage.py index 1e7a408969..5a6727f9f6 100644 --- a/plugins/modules/portage.py +++ b/plugins/modules/portage.py @@ -11,7 +11,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: portage short_description: Package manager for Gentoo @@ -261,7 +260,6 @@ import traceback from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.common.respawn import has_respawned, respawn_module - try: from portage.dbapi import vartree from portage.exception import InvalidAtom diff --git a/plugins/modules/portinstall.py b/plugins/modules/portinstall.py index eee83292be..cf0a3174e4 100644 --- a/plugins/modules/portinstall.py +++ b/plugins/modules/portinstall.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: portinstall short_description: Installing packages from FreeBSD's ports system @@ -61,8 +60,8 @@ EXAMPLES = r""" """ import re - from shlex import quote as shlex_quote + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/pritunl_org.py b/plugins/modules/pritunl_org.py index e59539f902..4caa1d95a3 100644 --- a/plugins/modules/pritunl_org.py +++ b/plugins/modules/pritunl_org.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pritunl_org author: Florian Dambrine (@Lowess) @@ -78,12 +77,13 @@ 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 ( PritunlException, delete_pritunl_organization, - post_pritunl_organization, - list_pritunl_organizations, get_pritunl_settings, + list_pritunl_organizations, + post_pritunl_organization, pritunl_argument_spec, ) diff --git a/plugins/modules/pritunl_org_info.py b/plugins/modules/pritunl_org_info.py index dd867b88c2..ac44b18c38 100644 --- a/plugins/modules/pritunl_org_info.py +++ b/plugins/modules/pritunl_org_info.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pritunl_org_info author: Florian Dambrine (@Lowess) @@ -73,6 +72,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 ( PritunlException, get_pritunl_settings, diff --git a/plugins/modules/pritunl_user.py b/plugins/modules/pritunl_user.py index 5e007f72fd..37eb3bb5e3 100644 --- a/plugins/modules/pritunl_user.py +++ b/plugins/modules/pritunl_user.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pritunl_user author: "Florian Dambrine (@Lowess)" @@ -143,6 +142,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 ( PritunlException, delete_pritunl_user, diff --git a/plugins/modules/pritunl_user_info.py b/plugins/modules/pritunl_user_info.py index ccdb7e4dd0..7e61380c10 100644 --- a/plugins/modules/pritunl_user_info.py +++ b/plugins/modules/pritunl_user_info.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pritunl_user_info author: "Florian Dambrine (@Lowess)" @@ -91,6 +90,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 ( PritunlException, get_pritunl_settings, diff --git a/plugins/modules/pubnub_blocks.py b/plugins/modules/pubnub_blocks.py index a849f3356c..5927a2c8fc 100644 --- a/plugins/modules/pubnub_blocks.py +++ b/plugins/modules/pubnub_blocks.py @@ -11,7 +11,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pubnub_blocks short_description: PubNub blocks management module @@ -208,9 +207,7 @@ import os try: # Import PubNub BLOCKS client. - from pubnub_blocks_client import User - from pubnub_blocks_client import Block, EventHandler - from pubnub_blocks_client import exceptions + from pubnub_blocks_client import Block, EventHandler, User, exceptions HAS_PUBNUB_BLOCKS_CLIENT = True except ImportError: diff --git a/plugins/modules/pulp_repo.py b/plugins/modules/pulp_repo.py index 1de265ee24..23d5ff137d 100644 --- a/plugins/modules/pulp_repo.py +++ b/plugins/modules/pulp_repo.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pulp_repo author: "Joe Adams (@sysadmind)" @@ -193,8 +192,7 @@ from time import sleep # import module snippets from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.urls import fetch_url -from ansible.module_utils.urls import url_argument_spec +from ansible.module_utils.urls import fetch_url, url_argument_spec class pulp_server: diff --git a/plugins/modules/puppet.py b/plugins/modules/puppet.py index c997ba138c..917b2d9efd 100644 --- a/plugins/modules/puppet.py +++ b/plugins/modules/puppet.py @@ -188,10 +188,10 @@ import json import os import stat -import ansible_collections.community.general.plugins.module_utils.puppet as puppet_utils - from ansible.module_utils.basic import AnsibleModule +import ansible_collections.community.general.plugins.module_utils.puppet as puppet_utils + def _write_structured_data(basedir, basename, data): if not os.path.exists(basedir): diff --git a/plugins/modules/pushbullet.py b/plugins/modules/pushbullet.py index 9cea27744b..e8ca14958d 100644 --- a/plugins/modules/pushbullet.py +++ b/plugins/modules/pushbullet.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" author: "Willy Barro (@willybarro)" requirements: [pushbullet.py] @@ -107,7 +106,6 @@ else: from ansible.module_utils.basic import AnsibleModule, missing_required_lib - # =========================================== # Main # diff --git a/plugins/modules/pushover.py b/plugins/modules/pushover.py index 56891b77d5..5597c9f9f4 100644 --- a/plugins/modules/pushover.py +++ b/plugins/modules/pushover.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: pushover short_description: Send notifications through U(https://pushover.net) @@ -85,6 +84,7 @@ EXAMPLES = r""" """ from urllib.parse import urlencode + from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url diff --git a/plugins/modules/python_requirements_info.py b/plugins/modules/python_requirements_info.py index d0497cc48b..98f07cebfd 100644 --- a/plugins/modules/python_requirements_info.py +++ b/plugins/modules/python_requirements_info.py @@ -117,13 +117,14 @@ not_found: - requests """ +import operator import re import sys -import operator HAS_DISTUTILS = False try: import pkg_resources + from ansible_collections.community.general.plugins.module_utils.version import LooseVersion HAS_DISTUTILS = True diff --git a/plugins/modules/read_csv.py b/plugins/modules/read_csv.py index 3be3b90c9c..697b996e70 100644 --- a/plugins/modules/read_csv.py +++ b/plugins/modules/read_csv.py @@ -146,11 +146,11 @@ list: from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.csv import ( + CSVError, + CustomDialectFailureError, + DialectNotAvailableError, initialize_dialect, read_csv, - CSVError, - DialectNotAvailableError, - CustomDialectFailureError, ) diff --git a/plugins/modules/redfish_command.py b/plugins/modules/redfish_command.py index 5b9a532635..0994b27eb8 100644 --- a/plugins/modules/redfish_command.py +++ b/plugins/modules/redfish_command.py @@ -804,12 +804,12 @@ return_values: """ from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.redfish_utils import ( - RedfishUtils, - REDFISH_COMMON_ARGUMENT_SPEC, -) 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, + RedfishUtils, +) # More will be added as module features are expanded CATEGORY_COMMANDS_ALL = { diff --git a/plugins/modules/redfish_config.py b/plugins/modules/redfish_config.py index 8386e39fd8..3ed36efd84 100644 --- a/plugins/modules/redfish_config.py +++ b/plugins/modules/redfish_config.py @@ -374,12 +374,12 @@ msg: """ from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.redfish_utils import ( - RedfishUtils, - REDFISH_COMMON_ARGUMENT_SPEC, -) 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, + RedfishUtils, +) # More will be added as module features are expanded CATEGORY_COMMANDS_ALL = { diff --git a/plugins/modules/redfish_info.py b/plugins/modules/redfish_info.py index a89a266920..086984281d 100644 --- a/plugins/modules/redfish_info.py +++ b/plugins/modules/redfish_info.py @@ -395,9 +395,10 @@ result: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.redfish_utils import ( - RedfishUtils, REDFISH_COMMON_ARGUMENT_SPEC, + RedfishUtils, ) CATEGORY_COMMANDS_ALL = { diff --git a/plugins/modules/redhat_subscription.py b/plugins/modules/redhat_subscription.py index c73850a305..20c7cbe4d4 100644 --- a/plugins/modules/redhat_subscription.py +++ b/plugins/modules/redhat_subscription.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: redhat_subscription short_description: Manage registration and subscriptions to RHSM using C(subscription-manager) @@ -268,18 +267,17 @@ subscribed_pool_ids: sample: {"8a85f9815ab905d3015ab928c7005de4": "1"} """ -from os.path import isfile -from os import getuid, unlink import configparser +import json import re import shutil import tempfile -import json +from os import getuid, unlink +from os.path import isfile +from ansible.module_utils import distro from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible.module_utils import distro - SUBMAN_CMD = None diff --git a/plugins/modules/redis.py b/plugins/modules/redis.py index eb3d3c2297..26f2d3e78e 100644 --- a/plugins/modules/redis.py +++ b/plugins/modules/redis.py @@ -148,14 +148,16 @@ except ImportError: else: redis_found = True +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 ( fail_imports, redis_auth_argument_spec, redis_auth_params, ) -import re # Redis module specific support methods. diff --git a/plugins/modules/redis_data.py b/plugins/modules/redis_data.py index abb39531d8..285b291221 100644 --- a/plugins/modules/redis_data.py +++ b/plugins/modules/redis_data.py @@ -128,10 +128,11 @@ msg: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.redis import ( + RedisAnsible, fail_imports, redis_auth_argument_spec, - RedisAnsible, ) diff --git a/plugins/modules/redis_data_incr.py b/plugins/modules/redis_data_incr.py index 1136a1e5c6..5a901bac10 100644 --- a/plugins/modules/redis_data_incr.py +++ b/plugins/modules/redis_data_incr.py @@ -86,10 +86,11 @@ msg: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.redis import ( + RedisAnsible, fail_imports, redis_auth_argument_spec, - RedisAnsible, ) diff --git a/plugins/modules/redis_data_info.py b/plugins/modules/redis_data_info.py index 34b6858652..04a48f9fba 100644 --- a/plugins/modules/redis_data_info.py +++ b/plugins/modules/redis_data_info.py @@ -67,10 +67,11 @@ msg: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.redis import ( + RedisAnsible, fail_imports, redis_auth_argument_spec, - RedisAnsible, ) diff --git a/plugins/modules/redis_info.py b/plugins/modules/redis_info.py index 42638f5d86..fce6f03141 100644 --- a/plugins/modules/redis_info.py +++ b/plugins/modules/redis_info.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: redis_info short_description: Gather information about Redis servers @@ -224,6 +223,7 @@ except ImportError: HAS_REDIS_PACKAGE = False from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.redis import ( fail_imports, redis_auth_argument_spec, diff --git a/plugins/modules/rhevm.py b/plugins/modules/rhevm.py index b4ff5a0a7a..e45fa4356f 100644 --- a/plugins/modules/rhevm.py +++ b/plugins/modules/rhevm.py @@ -340,7 +340,6 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule - RHEV_FAILED = 1 RHEV_SUCCESS = 0 RHEV_UNAVAILABLE = 2 diff --git a/plugins/modules/rhsm_release.py b/plugins/modules/rhsm_release.py index 4620bce756..f0218c9c07 100644 --- a/plugins/modules/rhsm_release.py +++ b/plugins/modules/rhsm_release.py @@ -59,11 +59,11 @@ current_release: type: str """ -from ansible.module_utils.basic import AnsibleModule - import os import re +from ansible.module_utils.basic import AnsibleModule + # Matches release-like values such as 7.2, 5.10, 6Server, 8 # but rejects unlikely values, like 100Server, 1.100, 7server etc. release_matcher = re.compile(r"\b\d{1,2}(?:\.\d{1,2}|Server|Client|Workstation|)\b") diff --git a/plugins/modules/rhsm_repository.py b/plugins/modules/rhsm_repository.py index e2a77693e4..8b7e5eeccf 100644 --- a/plugins/modules/rhsm_repository.py +++ b/plugins/modules/rhsm_repository.py @@ -82,8 +82,9 @@ repositories: """ import os -from fnmatch import fnmatch from copy import deepcopy +from fnmatch import fnmatch + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/riak.py b/plugins/modules/riak.py index fec69bd2da..529202a2c0 100644 --- a/plugins/modules/riak.py +++ b/plugins/modules/riak.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: riak short_description: This module handles some common Riak operations diff --git a/plugins/modules/rocketchat.py b/plugins/modules/rocketchat.py index b884f440e2..eda70c202b 100644 --- a/plugins/modules/rocketchat.py +++ b/plugins/modules/rocketchat.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: rocketchat short_description: Send notifications to Rocket Chat @@ -160,7 +159,6 @@ EXAMPLES = r""" from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url - ROCKETCHAT_INCOMING_WEBHOOK = "%s://%s/hooks/%s" diff --git a/plugins/modules/rollbar_deployment.py b/plugins/modules/rollbar_deployment.py index 873aff4f9b..f7b99de0aa 100644 --- a/plugins/modules/rollbar_deployment.py +++ b/plugins/modules/rollbar_deployment.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: rollbar_deployment author: "Max Riveiro (@kavu)" diff --git a/plugins/modules/rpm_ostree_pkg.py b/plugins/modules/rpm_ostree_pkg.py index cf5b927235..b9a1aab765 100644 --- a/plugins/modules/rpm_ostree_pkg.py +++ b/plugins/modules/rpm_ostree_pkg.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: rpm_ostree_pkg short_description: Install or uninstall overlay additional packages diff --git a/plugins/modules/rundeck_acl_policy.py b/plugins/modules/rundeck_acl_policy.py index 1e676650ce..98e40d6d0b 100644 --- a/plugins/modules/rundeck_acl_policy.py +++ b/plugins/modules/rundeck_acl_policy.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: rundeck_acl_policy @@ -118,6 +117,7 @@ after: import re from ansible.module_utils.basic import AnsibleModule + 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 03d4779dc1..4ecd6f7b63 100644 --- a/plugins/modules/rundeck_job_executions_info.py +++ b/plugins/modules/rundeck_job_executions_info.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: rundeck_job_executions_info short_description: Query executions for a Rundeck job @@ -129,7 +128,9 @@ executions: """ 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 diff --git a/plugins/modules/rundeck_job_run.py b/plugins/modules/rundeck_job_run.py index 14921295a1..c36d97744a 100644 --- a/plugins/modules/rundeck_job_run.py +++ b/plugins/modules/rundeck_job_run.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: rundeck_job_run short_description: Run a Rundeck job @@ -183,6 +182,7 @@ from time import sleep 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 diff --git a/plugins/modules/rundeck_project.py b/plugins/modules/rundeck_project.py index 76ceb91ba8..05f43c876f 100644 --- a/plugins/modules/rundeck_project.py +++ b/plugins/modules/rundeck_project.py @@ -10,7 +10,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: rundeck_project @@ -99,6 +98,7 @@ after: # import module snippets from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.rundeck import ( api_argument_spec, api_request, diff --git a/plugins/modules/say.py b/plugins/modules/say.py index 0a6f9a3287..4a50d57919 100644 --- a/plugins/modules/say.py +++ b/plugins/modules/say.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: say short_description: Makes a computer to speak diff --git a/plugins/modules/scaleway_compute.py b/plugins/modules/scaleway_compute.py index 2276fb9af7..77d4fd47c5 100644 --- a/plugins/modules/scaleway_compute.py +++ b/plugins/modules/scaleway_compute.py @@ -10,7 +10,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_compute short_description: Scaleway compute management module @@ -182,11 +181,12 @@ import datetime 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 ( SCALEWAY_LOCATION, - scaleway_argument_spec, Scaleway, + scaleway_argument_spec, ) SCALEWAY_SERVER_STATES = ("stopped", "stopping", "starting", "running", "locked") diff --git a/plugins/modules/scaleway_compute_private_network.py b/plugins/modules/scaleway_compute_private_network.py index 7a0332a8e6..d1302d5137 100644 --- a/plugins/modules/scaleway_compute_private_network.py +++ b/plugins/modules/scaleway_compute_private_network.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_compute_private_network short_description: Scaleway compute - private network management @@ -121,12 +120,13 @@ scaleway_compute_private_network: } """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_LOCATION, - scaleway_argument_spec, Scaleway, + scaleway_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def get_nics_info(api, compute_id, private_network_id): diff --git a/plugins/modules/scaleway_container.py b/plugins/modules/scaleway_container.py index 7289d54849..8db6616e82 100644 --- a/plugins/modules/scaleway_container.py +++ b/plugins/modules/scaleway_container.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_container short_description: Scaleway Container management @@ -215,15 +214,16 @@ container: from copy import deepcopy +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_REGIONS, - scaleway_argument_spec, Scaleway, - scaleway_waitable_resource_argument_spec, - resource_attributes_should_be_changed, SecretVariables, + resource_attributes_should_be_changed, + scaleway_argument_spec, + scaleway_waitable_resource_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule STABLE_STATES = ("ready", "created", "absent") diff --git a/plugins/modules/scaleway_container_info.py b/plugins/modules/scaleway_container_info.py index 986b2719d6..57134f787f 100644 --- a/plugins/modules/scaleway_container_info.py +++ b/plugins/modules/scaleway_container_info.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_container_info short_description: Retrieve information on Scaleway Container @@ -91,12 +90,13 @@ container: timeout: 300s """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_REGIONS, - scaleway_argument_spec, Scaleway, + scaleway_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def info_strategy(api, wished_cn): diff --git a/plugins/modules/scaleway_container_namespace.py b/plugins/modules/scaleway_container_namespace.py index 150eaa4e76..822230867a 100644 --- a/plugins/modules/scaleway_container_namespace.py +++ b/plugins/modules/scaleway_container_namespace.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_container_namespace short_description: Scaleway Container namespace management @@ -132,15 +131,16 @@ container_namespace: from copy import deepcopy +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_REGIONS, - scaleway_argument_spec, Scaleway, - scaleway_waitable_resource_argument_spec, - resource_attributes_should_be_changed, SecretVariables, + resource_attributes_should_be_changed, + scaleway_argument_spec, + scaleway_waitable_resource_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule STABLE_STATES = ("ready", "absent") diff --git a/plugins/modules/scaleway_container_namespace_info.py b/plugins/modules/scaleway_container_namespace_info.py index 3b6a1ad085..098318812a 100644 --- a/plugins/modules/scaleway_container_namespace_info.py +++ b/plugins/modules/scaleway_container_namespace_info.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_container_namespace_info short_description: Retrieve information on Scaleway Container namespace @@ -82,12 +81,13 @@ container_namespace: status: pending """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_REGIONS, - scaleway_argument_spec, Scaleway, + scaleway_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def info_strategy(api, wished_cn): diff --git a/plugins/modules/scaleway_container_registry.py b/plugins/modules/scaleway_container_registry.py index 7cacc2c713..9a3a768547 100644 --- a/plugins/modules/scaleway_container_registry.py +++ b/plugins/modules/scaleway_container_registry.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_container_registry short_description: Scaleway Container registry management module @@ -118,14 +117,15 @@ container_registry: updated_at: "2022-10-14T09:51:07.949716Z" """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_REGIONS, - scaleway_argument_spec, Scaleway, - scaleway_waitable_resource_argument_spec, resource_attributes_should_be_changed, + scaleway_argument_spec, + scaleway_waitable_resource_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule STABLE_STATES = ("ready", "absent") diff --git a/plugins/modules/scaleway_container_registry_info.py b/plugins/modules/scaleway_container_registry_info.py index 34fb3b499f..6d4289b3c6 100644 --- a/plugins/modules/scaleway_container_registry_info.py +++ b/plugins/modules/scaleway_container_registry_info.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_container_registry_info short_description: Scaleway Container registry info module @@ -81,12 +80,13 @@ container_registry: updated_at: "2022-10-14T09:51:07.949716Z" """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_REGIONS, - scaleway_argument_spec, Scaleway, + scaleway_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def info_strategy(api, wished_cn): diff --git a/plugins/modules/scaleway_database_backup.py b/plugins/modules/scaleway_database_backup.py index 9ec386cd12..b6224fe6cc 100644 --- a/plugins/modules/scaleway_database_backup.py +++ b/plugins/modules/scaleway_database_backup.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_database_backup short_description: Scaleway database backups management module @@ -166,13 +165,14 @@ import datetime 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 ( + SCALEWAY_REGIONS, Scaleway, scaleway_argument_spec, - SCALEWAY_REGIONS, ) stable_states = ( diff --git a/plugins/modules/scaleway_function.py b/plugins/modules/scaleway_function.py index 9c6a0f64e0..b65dd8f2d9 100644 --- a/plugins/modules/scaleway_function.py +++ b/plugins/modules/scaleway_function.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_function short_description: Scaleway Function management @@ -192,15 +191,16 @@ function: from copy import deepcopy +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_REGIONS, - scaleway_argument_spec, Scaleway, - scaleway_waitable_resource_argument_spec, - resource_attributes_should_be_changed, SecretVariables, + resource_attributes_should_be_changed, + scaleway_argument_spec, + scaleway_waitable_resource_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule STABLE_STATES = ("ready", "created", "absent") diff --git a/plugins/modules/scaleway_function_info.py b/plugins/modules/scaleway_function_info.py index 583371c317..0a7305f170 100644 --- a/plugins/modules/scaleway_function_info.py +++ b/plugins/modules/scaleway_function_info.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_function_info short_description: Retrieve information on Scaleway Function @@ -90,12 +89,13 @@ function: timeout: 300s """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_REGIONS, - scaleway_argument_spec, Scaleway, + scaleway_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def info_strategy(api, wished_fn): diff --git a/plugins/modules/scaleway_function_namespace.py b/plugins/modules/scaleway_function_namespace.py index e69929a18a..ad621cc4ea 100644 --- a/plugins/modules/scaleway_function_namespace.py +++ b/plugins/modules/scaleway_function_namespace.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_function_namespace short_description: Scaleway Function namespace management @@ -132,16 +131,16 @@ function_namespace: from copy import deepcopy -from ansible_collections.community.general.plugins.module_utils.scaleway import ( - SCALEWAY_REGIONS, - scaleway_argument_spec, - Scaleway, - scaleway_waitable_resource_argument_spec, - resource_attributes_should_be_changed, - SecretVariables, -) from ansible.module_utils.basic import AnsibleModule +from ansible_collections.community.general.plugins.module_utils.scaleway import ( + SCALEWAY_REGIONS, + Scaleway, + SecretVariables, + resource_attributes_should_be_changed, + scaleway_argument_spec, + scaleway_waitable_resource_argument_spec, +) STABLE_STATES = ("ready", "absent") diff --git a/plugins/modules/scaleway_function_namespace_info.py b/plugins/modules/scaleway_function_namespace_info.py index 86cfd814b2..e3d889ed08 100644 --- a/plugins/modules/scaleway_function_namespace_info.py +++ b/plugins/modules/scaleway_function_namespace_info.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_function_namespace_info short_description: Retrieve information on Scaleway Function namespace @@ -82,12 +81,13 @@ function_namespace: status: pending """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_REGIONS, - scaleway_argument_spec, Scaleway, + scaleway_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def info_strategy(api, wished_fn): diff --git a/plugins/modules/scaleway_image_info.py b/plugins/modules/scaleway_image_info.py index fa0edd5eb6..37bf25479a 100644 --- a/plugins/modules/scaleway_image_info.py +++ b/plugins/modules/scaleway_image_info.py @@ -100,11 +100,12 @@ scaleway_image_info: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( + SCALEWAY_LOCATION, Scaleway, ScalewayException, scaleway_argument_spec, - SCALEWAY_LOCATION, ) diff --git a/plugins/modules/scaleway_ip.py b/plugins/modules/scaleway_ip.py index 2ee9cfa543..4c60ebd4df 100644 --- a/plugins/modules/scaleway_ip.py +++ b/plugins/modules/scaleway_ip.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_ip short_description: Scaleway IP management module @@ -116,12 +115,13 @@ data: } """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_LOCATION, - scaleway_argument_spec, Scaleway, + scaleway_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def ip_attributes_should_be_changed(api, target_ip, wished_ip): diff --git a/plugins/modules/scaleway_ip_info.py b/plugins/modules/scaleway_ip_info.py index 315420d7f0..cbe21e2785 100644 --- a/plugins/modules/scaleway_ip_info.py +++ b/plugins/modules/scaleway_ip_info.py @@ -80,11 +80,12 @@ scaleway_ip_info: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( + SCALEWAY_LOCATION, Scaleway, ScalewayException, scaleway_argument_spec, - SCALEWAY_LOCATION, ) diff --git a/plugins/modules/scaleway_lb.py b/plugins/modules/scaleway_lb.py index 1fd5fd0b18..72c85333c5 100644 --- a/plugins/modules/scaleway_lb.py +++ b/plugins/modules/scaleway_lb.py @@ -10,7 +10,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_lb short_description: Scaleway load-balancer management module @@ -160,13 +159,15 @@ scaleway_lb: import datetime 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 ( - SCALEWAY_REGIONS, SCALEWAY_ENDPOINT, - scaleway_argument_spec, + SCALEWAY_REGIONS, Scaleway, + scaleway_argument_spec, ) STABLE_STATES = ("ready", "absent") diff --git a/plugins/modules/scaleway_organization_info.py b/plugins/modules/scaleway_organization_info.py index 35ff636f5e..e96ec8c1e1 100644 --- a/plugins/modules/scaleway_organization_info.py +++ b/plugins/modules/scaleway_organization_info.py @@ -74,6 +74,7 @@ scaleway_organization_info: """ from ansible.module_utils.basic import AnsibleModule, env_fallback + from ansible_collections.community.general.plugins.module_utils.scaleway import ( Scaleway, ScalewayException, diff --git a/plugins/modules/scaleway_private_network.py b/plugins/modules/scaleway_private_network.py index dd016b0436..4d3bf4ce6e 100644 --- a/plugins/modules/scaleway_private_network.py +++ b/plugins/modules/scaleway_private_network.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_private_network short_description: Scaleway private network management @@ -117,12 +116,13 @@ scaleway_private_network: } """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_LOCATION, - scaleway_argument_spec, Scaleway, + scaleway_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def get_private_network(api, name, page=1): diff --git a/plugins/modules/scaleway_security_group.py b/plugins/modules/scaleway_security_group.py index d614a53a64..cff684430e 100644 --- a/plugins/modules/scaleway_security_group.py +++ b/plugins/modules/scaleway_security_group.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_security_group short_description: Scaleway Security Group management module @@ -135,13 +134,15 @@ data: } """ +from uuid import uuid4 + +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_LOCATION, - scaleway_argument_spec, Scaleway, + scaleway_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule -from uuid import uuid4 def payload_from_security_group(security_group): diff --git a/plugins/modules/scaleway_security_group_info.py b/plugins/modules/scaleway_security_group_info.py index 55a8b4afb9..45444ab2ff 100644 --- a/plugins/modules/scaleway_security_group_info.py +++ b/plugins/modules/scaleway_security_group_info.py @@ -84,11 +84,12 @@ scaleway_security_group_info: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( + SCALEWAY_LOCATION, Scaleway, ScalewayException, scaleway_argument_spec, - SCALEWAY_LOCATION, ) diff --git a/plugins/modules/scaleway_security_group_rule.py b/plugins/modules/scaleway_security_group_rule.py index ccd4e40ffb..05835b10df 100644 --- a/plugins/modules/scaleway_security_group_rule.py +++ b/plugins/modules/scaleway_security_group_rule.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_security_group_rule short_description: Scaleway Security Group Rule management module @@ -141,13 +140,14 @@ data: } """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_LOCATION, - scaleway_argument_spec, Scaleway, payload_from_object, + scaleway_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def get_sgr_from_api(security_group_rules, security_group_rule): diff --git a/plugins/modules/scaleway_server_info.py b/plugins/modules/scaleway_server_info.py index 91eb42b2d2..b2b045b308 100644 --- a/plugins/modules/scaleway_server_info.py +++ b/plugins/modules/scaleway_server_info.py @@ -166,11 +166,12 @@ scaleway_server_info: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( + SCALEWAY_LOCATION, Scaleway, ScalewayException, scaleway_argument_spec, - SCALEWAY_LOCATION, ) diff --git a/plugins/modules/scaleway_snapshot_info.py b/plugins/modules/scaleway_snapshot_info.py index a38f05b227..129607e5fe 100644 --- a/plugins/modules/scaleway_snapshot_info.py +++ b/plugins/modules/scaleway_snapshot_info.py @@ -84,11 +84,12 @@ scaleway_snapshot_info: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( + SCALEWAY_LOCATION, Scaleway, ScalewayException, scaleway_argument_spec, - SCALEWAY_LOCATION, ) diff --git a/plugins/modules/scaleway_sshkey.py b/plugins/modules/scaleway_sshkey.py index bbe4ad5bb2..f5bb1a1558 100644 --- a/plugins/modules/scaleway_sshkey.py +++ b/plugins/modules/scaleway_sshkey.py @@ -10,7 +10,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_sshkey short_description: Scaleway SSH keys management module @@ -86,7 +85,8 @@ data: """ from ansible.module_utils.basic import AnsibleModule, env_fallback -from ansible_collections.community.general.plugins.module_utils.scaleway import scaleway_argument_spec, Scaleway + +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 02bc9eca40..25c415afc4 100644 --- a/plugins/modules/scaleway_user_data.py +++ b/plugins/modules/scaleway_user_data.py @@ -10,7 +10,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_user_data short_description: Scaleway user_data management module @@ -79,10 +78,11 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_LOCATION, - scaleway_argument_spec, Scaleway, + scaleway_argument_spec, ) diff --git a/plugins/modules/scaleway_volume.py b/plugins/modules/scaleway_volume.py index 91be734281..f9fe5953d4 100644 --- a/plugins/modules/scaleway_volume.py +++ b/plugins/modules/scaleway_volume.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: scaleway_volume short_description: Scaleway volumes management module @@ -118,12 +117,13 @@ data: } """ +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( SCALEWAY_LOCATION, - scaleway_argument_spec, Scaleway, + scaleway_argument_spec, ) -from ansible.module_utils.basic import AnsibleModule def core(module): diff --git a/plugins/modules/scaleway_volume_info.py b/plugins/modules/scaleway_volume_info.py index 1293bec265..5d718018ba 100644 --- a/plugins/modules/scaleway_volume_info.py +++ b/plugins/modules/scaleway_volume_info.py @@ -82,11 +82,12 @@ scaleway_volume_info: """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.scaleway import ( + SCALEWAY_LOCATION, Scaleway, ScalewayException, scaleway_argument_spec, - SCALEWAY_LOCATION, ) diff --git a/plugins/modules/sendgrid.py b/plugins/modules/sendgrid.py index e6676a4936..b3cefc0f85 100644 --- a/plugins/modules/sendgrid.py +++ b/plugins/modules/sendgrid.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: sendgrid short_description: Sends an email with the SendGrid API diff --git a/plugins/modules/sensu_check.py b/plugins/modules/sensu_check.py index 2f1082d407..f6f03aeaad 100644 --- a/plugins/modules/sensu_check.py +++ b/plugins/modules/sensu_check.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: sensu_check short_description: Manage Sensu checks diff --git a/plugins/modules/sensu_silence.py b/plugins/modules/sensu_silence.py index ac40ffee25..c5e876f805 100644 --- a/plugins/modules/sensu_silence.py +++ b/plugins/modules/sensu_silence.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: sensu_silence author: Steven Bambling (@smbambling) diff --git a/plugins/modules/sensu_subscription.py b/plugins/modules/sensu_subscription.py index 204f1cded2..1d79001fc5 100644 --- a/plugins/modules/sensu_subscription.py +++ b/plugins/modules/sensu_subscription.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: sensu_subscription short_description: Manage Sensu subscriptions diff --git a/plugins/modules/shutdown.py b/plugins/modules/shutdown.py index 497706d25e..b2a3cee81f 100644 --- a/plugins/modules/shutdown.py +++ b/plugins/modules/shutdown.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: shutdown short_description: Shut down a machine diff --git a/plugins/modules/sl_vm.py b/plugins/modules/sl_vm.py index 0861ab1a5d..f74ab02513 100644 --- a/plugins/modules/sl_vm.py +++ b/plugins/modules/sl_vm.py @@ -287,7 +287,6 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule - # TODO: get this info from API STATES = ["present", "absent"] DATACENTERS = [ diff --git a/plugins/modules/slack.py b/plugins/modules/slack.py index cddb9b4890..0bd0e68e35 100644 --- a/plugins/modules/slack.py +++ b/plugins/modules/slack.py @@ -12,7 +12,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: slack short_description: Send Slack notifications @@ -265,9 +264,10 @@ EXAMPLES = r""" """ import re +from urllib.parse import urlencode + from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url -from urllib.parse import urlencode OLD_SLACK_INCOMING_WEBHOOK = "https://%s/services/hooks/incoming-webhook?token=%s" SLACK_INCOMING_WEBHOOK = "https://hooks.%s/services/%s" diff --git a/plugins/modules/slackpkg.py b/plugins/modules/slackpkg.py index bd66cc55ef..b1cc2ddc48 100644 --- a/plugins/modules/slackpkg.py +++ b/plugins/modules/slackpkg.py @@ -12,7 +12,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: slackpkg short_description: Package manager for Slackware >= 12.2 @@ -68,8 +67,8 @@ EXAMPLES = r""" state: latest """ -import platform import os +import platform import re from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/smartos_image_info.py b/plugins/modules/smartos_image_info.py index 113066107a..194c0b1efc 100644 --- a/plugins/modules/smartos_image_info.py +++ b/plugins/modules/smartos_image_info.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: smartos_image_info short_description: Get SmartOS image details @@ -70,6 +69,7 @@ RETURN = r""" """ import json + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/snap.py b/plugins/modules/snap.py index 9dee335109..09c6eaf56c 100644 --- a/plugins/modules/snap.py +++ b/plugins/modules/snap.py @@ -168,14 +168,14 @@ version: version_added: 10.3.0 """ -import re import json import numbers +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 snap_runner, get_version +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 e1447095d8..c9f42e15c2 100644 --- a/plugins/modules/snap_alias.py +++ b/plugins/modules/snap_alias.py @@ -89,7 +89,7 @@ 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 snap_runner, get_version +from ansible_collections.community.general.plugins.module_utils.snap import get_version, snap_runner class SnapAlias(StateModuleHelper): diff --git a/plugins/modules/snmp_facts.py b/plugins/modules/snmp_facts.py index 6a516cb9bd..cae09437af 100644 --- a/plugins/modules/snmp_facts.py +++ b/plugins/modules/snmp_facts.py @@ -191,10 +191,12 @@ ansible_facts: import binascii from collections import defaultdict -from ansible_collections.community.general.plugins.module_utils import deps + 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 + with deps.declare("pysnmp"): from pysnmp.entity.rfc3413.oneliner import cmdgen from pysnmp.proto.rfc1905 import EndOfMibView diff --git a/plugins/modules/sorcery.py b/plugins/modules/sorcery.py index 4c4ee3df6e..4fe6596615 100644 --- a/plugins/modules/sorcery.py +++ b/plugins/modules/sorcery.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: sorcery short_description: Package manager for Source Mage GNU/Linux @@ -192,7 +191,6 @@ import sys from ansible.module_utils.basic import AnsibleModule - # auto-filled at module init SORCERY = {"sorcery": None, "scribe": None, "cast": None, "dispel": None, "gaze": None} diff --git a/plugins/modules/spectrum_device.py b/plugins/modules/spectrum_device.py index b83f1a6a85..aea392e21a 100644 --- a/plugins/modules/spectrum_device.py +++ b/plugins/modules/spectrum_device.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: spectrum_device short_description: Creates/deletes devices in CA Spectrum @@ -124,8 +123,8 @@ device: } """ -from socket import gethostbyname, gaierror import xml.etree.ElementTree as ET +from socket import gaierror, gethostbyname from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url diff --git a/plugins/modules/spectrum_model_attrs.py b/plugins/modules/spectrum_model_attrs.py index 88799eecbd..5aff1e9dae 100644 --- a/plugins/modules/spectrum_model_attrs.py +++ b/plugins/modules/spectrum_model_attrs.py @@ -140,12 +140,13 @@ changed_attrs: """ -from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.urls import fetch_url -from urllib.parse import quote import json import re import xml.etree.ElementTree as ET +from urllib.parse import quote + +from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.urls import fetch_url class spectrum_model_attrs: diff --git a/plugins/modules/spotinst_aws_elastigroup.py b/plugins/modules/spotinst_aws_elastigroup.py index 4c58a86419..410a9d7430 100644 --- a/plugins/modules/spotinst_aws_elastigroup.py +++ b/plugins/modules/spotinst_aws_elastigroup.py @@ -719,6 +719,7 @@ HAS_SPOTINST_SDK = False import os import time + from ansible.module_utils.basic import AnsibleModule try: diff --git a/plugins/modules/ss_3par_cpg.py b/plugins/modules/ss_3par_cpg.py index f36cdbe87d..dd896841a3 100644 --- a/plugins/modules/ss_3par_cpg.py +++ b/plugins/modules/ss_3par_cpg.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" short_description: Manage HPE StoreServ 3PAR CPG author: @@ -123,6 +122,7 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.storage.hpe3par import hpe3par try: diff --git a/plugins/modules/ssh_config.py b/plugins/modules/ssh_config.py index 1514297d27..d92d50d797 100644 --- a/plugins/modules/ssh_config.py +++ b/plugins/modules/ssh_config.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: ssh_config short_description: Manage SSH config for user @@ -220,14 +219,14 @@ hosts_change_diff: """ import os - from copy import deepcopy from ansible.module_utils.basic import AnsibleModule, missing_required_lib + from ansible_collections.community.general.plugins.module_utils._stormssh import ( - ConfigParser, HAS_PARAMIKO, PARAMIKO_IMPORT_ERROR, + ConfigParser, ) from ansible_collections.community.general.plugins.module_utils.ssh import determine_config_file diff --git a/plugins/modules/sssd_info.py b/plugins/modules/sssd_info.py index 11c415d5b5..c7a7ff7274 100644 --- a/plugins/modules/sssd_info.py +++ b/plugins/modules/sssd_info.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: sssd_info version_added: 12.2.0 @@ -105,8 +104,10 @@ list_servers: """ -from ansible.module_utils.basic import AnsibleModule from typing import Any + +from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils import deps with deps.declare("dbus"): diff --git a/plugins/modules/stacki_host.py b/plugins/modules/stacki_host.py index 89b2300d35..823ed50263 100644 --- a/plugins/modules/stacki_host.py +++ b/plugins/modules/stacki_host.py @@ -119,9 +119,9 @@ EXAMPLES = r""" import json +from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule, env_fallback -from urllib.parse import urlencode from ansible.module_utils.urls import fetch_url diff --git a/plugins/modules/statusio_maintenance.py b/plugins/modules/statusio_maintenance.py index 46f003b6dd..4d014fa82e 100644 --- a/plugins/modules/statusio_maintenance.py +++ b/plugins/modules/statusio_maintenance.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: statusio_maintenance short_description: Create maintenance windows for your status.io dashboard diff --git a/plugins/modules/sudoers.py b/plugins/modules/sudoers.py index 32d43327e7..bf46d26c13 100644 --- a/plugins/modules/sudoers.py +++ b/plugins/modules/sudoers.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: sudoers short_description: Manage sudoers files @@ -158,6 +157,7 @@ EXAMPLES = r""" """ import os + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/supervisorctl.py b/plugins/modules/supervisorctl.py index d13c08bb22..8e181aade6 100644 --- a/plugins/modules/supervisorctl.py +++ b/plugins/modules/supervisorctl.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: supervisorctl short_description: Manage the state of a program or group of programs managed by C(supervisord) @@ -114,6 +113,7 @@ EXAMPLES = r""" import os + from ansible.module_utils.basic import AnsibleModule, is_executable diff --git a/plugins/modules/svr4pkg.py b/plugins/modules/svr4pkg.py index a291884df0..c5224d1fb4 100644 --- a/plugins/modules/svr4pkg.py +++ b/plugins/modules/svr4pkg.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: svr4pkg short_description: Manage Solaris SVR4 packages diff --git a/plugins/modules/swdepot.py b/plugins/modules/swdepot.py index ad76433630..5df924fc99 100644 --- a/plugins/modules/swdepot.py +++ b/plugins/modules/swdepot.py @@ -9,7 +9,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: swdepot short_description: Manage packages with swdepot package manager (HP-UX) diff --git a/plugins/modules/swupd.py b/plugins/modules/swupd.py index 378c9e3dcc..1886dfd6fb 100644 --- a/plugins/modules/swupd.py +++ b/plugins/modules/swupd.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: swupd short_description: Manages updates and bundles in ClearLinux systems @@ -102,6 +101,7 @@ EXAMPLES = r""" import os + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/sysrc.py b/plugins/modules/sysrc.py index a8cbf0bfbf..50c0c48517 100644 --- a/plugins/modules/sysrc.py +++ b/plugins/modules/sysrc.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" author: - David Lundgren (@dlundgren) @@ -94,11 +93,11 @@ EXAMPLES = r""" """ -from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper - import os import re +from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper + class Sysrc(StateModuleHelper): module = dict( diff --git a/plugins/modules/systemd_creds_decrypt.py b/plugins/modules/systemd_creds_decrypt.py index 3b0e49c297..9bd5d9b3d0 100644 --- a/plugins/modules/systemd_creds_decrypt.py +++ b/plugins/modules/systemd_creds_decrypt.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: systemd_creds_decrypt short_description: C(systemd)'s C(systemd-creds decrypt) plugin diff --git a/plugins/modules/systemd_info.py b/plugins/modules/systemd_info.py index eafe303133..35ed24bd25 100644 --- a/plugins/modules/systemd_info.py +++ b/plugins/modules/systemd_info.py @@ -217,7 +217,9 @@ units: """ import fnmatch + from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.systemd import systemd_runner diff --git a/plugins/modules/taiga_issue.py b/plugins/modules/taiga_issue.py index 129f8da88f..dd0ed32c9e 100644 --- a/plugins/modules/taiga_issue.py +++ b/plugins/modules/taiga_issue.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: taiga_issue short_description: Creates/deletes an issue in a Taiga Project Management Platform @@ -119,9 +118,9 @@ EXAMPLES = r""" RETURN = """#""" import traceback - from os import getenv from os.path import isfile + from ansible.module_utils.basic import AnsibleModule, missing_required_lib TAIGA_IMP_ERR = None diff --git a/plugins/modules/telegram.py b/plugins/modules/telegram.py index 41c4f606b6..ddcee8b397 100644 --- a/plugins/modules/telegram.py +++ b/plugins/modules/telegram.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: telegram author: diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py index e6bf7754a4..2588736b69 100644 --- a/plugins/modules/terraform.py +++ b/plugins/modules/terraform.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: terraform short_description: Manages a Terraform deployment (and plans) @@ -278,8 +277,8 @@ command: sample: terraform apply ... """ -import os import json +import os import tempfile from shlex import quote as shlex_quote diff --git a/plugins/modules/timezone.py b/plugins/modules/timezone.py index 23e0b7e9a9..9eae8a08a3 100644 --- a/plugins/modules/timezone.py +++ b/plugins/modules/timezone.py @@ -63,12 +63,12 @@ EXAMPLES = r""" """ import errno +import filecmp import os import platform import random import re import string -import filecmp from ansible.module_utils.basic import AnsibleModule, get_distribution diff --git a/plugins/modules/twilio.py b/plugins/modules/twilio.py index 41f0703fd4..f878518bb2 100644 --- a/plugins/modules/twilio.py +++ b/plugins/modules/twilio.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: twilio short_description: Sends a text message to a mobile phone through Twilio @@ -107,6 +106,7 @@ EXAMPLES = r""" # twilio module support methods # from urllib.parse import urlencode + from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url diff --git a/plugins/modules/typetalk.py b/plugins/modules/typetalk.py index 621e0e1512..baf2f94fde 100644 --- a/plugins/modules/typetalk.py +++ b/plugins/modules/typetalk.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: typetalk short_description: Send a message to typetalk @@ -61,7 +60,7 @@ import json from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.urls import fetch_url, ConnectionError +from ansible.module_utils.urls import ConnectionError, fetch_url def do_request(module, url, params, headers=None): diff --git a/plugins/modules/udm_dns_record.py b/plugins/modules/udm_dns_record.py index 9d691acb25..c199719fe9 100644 --- a/plugins/modules/udm_dns_record.py +++ b/plugins/modules/udm_dns_record.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: udm_dns_record author: @@ -94,17 +93,17 @@ 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 ( - umc_module_for_add, - umc_module_for_edit, - ldap_search, base_dn, config, + ldap_search, uldap, + umc_module_for_add, + umc_module_for_edit, ) - with deps.declare("univention", msg="This module requires univention python bindings"): from univention.admin.handlers.dns import ( forward_zone, diff --git a/plugins/modules/udm_dns_zone.py b/plugins/modules/udm_dns_zone.py index fe9fddd2fd..3b61cdb8f8 100644 --- a/plugins/modules/udm_dns_zone.py +++ b/plugins/modules/udm_dns_zone.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: udm_dns_zone author: @@ -103,11 +102,12 @@ EXAMPLES = r""" RETURN = """#""" from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.univention_umc import ( + base_dn, + ldap_search, umc_module_for_add, umc_module_for_edit, - ldap_search, - base_dn, ) diff --git a/plugins/modules/udm_group.py b/plugins/modules/udm_group.py index dc36d8a59c..8db4360d71 100644 --- a/plugins/modules/udm_group.py +++ b/plugins/modules/udm_group.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: udm_group author: @@ -81,11 +80,12 @@ EXAMPLES = r""" RETURN = """#""" from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.univention_umc import ( + base_dn, + ldap_search, umc_module_for_add, umc_module_for_edit, - ldap_search, - base_dn, ) diff --git a/plugins/modules/udm_share.py b/plugins/modules/udm_share.py index ad5a54326a..401b24d20f 100644 --- a/plugins/modules/udm_share.py +++ b/plugins/modules/udm_share.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: udm_share author: @@ -338,11 +337,12 @@ EXAMPLES = r""" RETURN = """#""" from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.univention_umc import ( + base_dn, + ldap_search, umc_module_for_add, umc_module_for_edit, - ldap_search, - base_dn, ) diff --git a/plugins/modules/udm_user.py b/plugins/modules/udm_user.py index 3a72c6703e..e807261244 100644 --- a/plugins/modules/udm_user.py +++ b/plugins/modules/udm_user.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: udm_user author: @@ -317,15 +316,16 @@ EXAMPLES = r""" RETURN = """#""" -from datetime import date, timedelta import traceback +from datetime import date, timedelta from ansible.module_utils.basic import AnsibleModule, missing_required_lib + from ansible_collections.community.general.plugins.module_utils.univention_umc import ( + base_dn, + ldap_search, umc_module_for_add, umc_module_for_edit, - ldap_search, - base_dn, ) CRYPT_IMPORT_ERROR: str | None diff --git a/plugins/modules/ufw.py b/plugins/modules/ufw.py index 96c965ad59..3b69924d36 100644 --- a/plugins/modules/ufw.py +++ b/plugins/modules/ufw.py @@ -287,7 +287,6 @@ EXAMPLES = r""" """ import re - from operator import itemgetter from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/uptimerobot.py b/plugins/modules/uptimerobot.py index 548f20bc86..9edeb3d8ec 100644 --- a/plugins/modules/uptimerobot.py +++ b/plugins/modules/uptimerobot.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: uptimerobot short_description: Pause and start Uptime Robot monitoring @@ -60,9 +59,8 @@ import json from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.urls import fetch_url from ansible.module_utils.common.text.converters import to_text - +from ansible.module_utils.urls import fetch_url API_BASE = "https://api.uptimerobot.com/" diff --git a/plugins/modules/usb_facts.py b/plugins/modules/usb_facts.py index 5d1f21c137..da6c27ce8b 100644 --- a/plugins/modules/usb_facts.py +++ b/plugins/modules/usb_facts.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: usb_facts short_description: Allows listing information about USB devices @@ -69,6 +68,7 @@ ansible_facts: """ import re + from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/utm_aaa_group.py b/plugins/modules/utm_aaa_group.py index 26930d3eec..0bf1f3f00c 100644 --- a/plugins/modules/utm_aaa_group.py +++ b/plugins/modules/utm_aaa_group.py @@ -5,7 +5,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" module: utm_aaa_group diff --git a/plugins/modules/utm_ca_host_key_cert.py b/plugins/modules/utm_ca_host_key_cert.py index d41f6100b0..2d53408aa7 100644 --- a/plugins/modules/utm_ca_host_key_cert.py +++ b/plugins/modules/utm_ca_host_key_cert.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: utm_ca_host_key_cert diff --git a/plugins/modules/utm_ca_host_key_cert_info.py b/plugins/modules/utm_ca_host_key_cert_info.py index 5059e6a174..f0f11acd31 100644 --- a/plugins/modules/utm_ca_host_key_cert_info.py +++ b/plugins/modules/utm_ca_host_key_cert_info.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: utm_ca_host_key_cert_info diff --git a/plugins/modules/utm_dns_host.py b/plugins/modules/utm_dns_host.py index f6204459c9..4ae5904d4f 100644 --- a/plugins/modules/utm_dns_host.py +++ b/plugins/modules/utm_dns_host.py @@ -5,7 +5,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" module: utm_dns_host diff --git a/plugins/modules/utm_network_interface_address.py b/plugins/modules/utm_network_interface_address.py index 6c999abf03..04d5b799aa 100644 --- a/plugins/modules/utm_network_interface_address.py +++ b/plugins/modules/utm_network_interface_address.py @@ -5,7 +5,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" module: utm_network_interface_address diff --git a/plugins/modules/utm_network_interface_address_info.py b/plugins/modules/utm_network_interface_address_info.py index 9714bcd28f..7e74497bfb 100644 --- a/plugins/modules/utm_network_interface_address_info.py +++ b/plugins/modules/utm_network_interface_address_info.py @@ -5,7 +5,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - DOCUMENTATION = r""" module: utm_network_interface_address_info diff --git a/plugins/modules/utm_proxy_auth_profile.py b/plugins/modules/utm_proxy_auth_profile.py index dda4bdd629..64f5163b73 100644 --- a/plugins/modules/utm_proxy_auth_profile.py +++ b/plugins/modules/utm_proxy_auth_profile.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: utm_proxy_auth_profile diff --git a/plugins/modules/utm_proxy_exception.py b/plugins/modules/utm_proxy_exception.py index 221b12e37b..572d71fd2d 100644 --- a/plugins/modules/utm_proxy_exception.py +++ b/plugins/modules/utm_proxy_exception.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: utm_proxy_exception diff --git a/plugins/modules/utm_proxy_frontend.py b/plugins/modules/utm_proxy_frontend.py index 2b736e1ec4..ff56cc6ab2 100644 --- a/plugins/modules/utm_proxy_frontend.py +++ b/plugins/modules/utm_proxy_frontend.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: utm_proxy_frontend diff --git a/plugins/modules/utm_proxy_frontend_info.py b/plugins/modules/utm_proxy_frontend_info.py index 5f4a8f1a31..4b6bfe17e2 100644 --- a/plugins/modules/utm_proxy_frontend_info.py +++ b/plugins/modules/utm_proxy_frontend_info.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: utm_proxy_frontend_info diff --git a/plugins/modules/utm_proxy_location.py b/plugins/modules/utm_proxy_location.py index e05d92f6da..42dcf94880 100644 --- a/plugins/modules/utm_proxy_location.py +++ b/plugins/modules/utm_proxy_location.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: utm_proxy_location diff --git a/plugins/modules/utm_proxy_location_info.py b/plugins/modules/utm_proxy_location_info.py index 31a6e4b781..29bee36257 100644 --- a/plugins/modules/utm_proxy_location_info.py +++ b/plugins/modules/utm_proxy_location_info.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: utm_proxy_location_info diff --git a/plugins/modules/vdo.py b/plugins/modules/vdo.py index 5c1e4027ce..0081c68818 100644 --- a/plugins/modules/vdo.py +++ b/plugins/modules/vdo.py @@ -220,10 +220,11 @@ EXAMPLES = r""" RETURN = r"""#""" -from ansible.module_utils.basic import AnsibleModule, missing_required_lib import re import traceback +from ansible.module_utils.basic import AnsibleModule, missing_required_lib + YAML_IMP_ERR = None try: import yaml diff --git a/plugins/modules/vertica_configuration.py b/plugins/modules/vertica_configuration.py index 86f630b47a..7c2074e947 100644 --- a/plugins/modules/vertica_configuration.py +++ b/plugins/modules/vertica_configuration.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: vertica_configuration short_description: Updates Vertica configuration parameters diff --git a/plugins/modules/vertica_info.py b/plugins/modules/vertica_info.py index 126ec39d6e..f1eed0b51c 100644 --- a/plugins/modules/vertica_info.py +++ b/plugins/modules/vertica_info.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: vertica_info short_description: Gathers Vertica database facts diff --git a/plugins/modules/vertica_role.py b/plugins/modules/vertica_role.py index 03e8df0b46..43721c3f67 100644 --- a/plugins/modules/vertica_role.py +++ b/plugins/modules/vertica_role.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: vertica_role short_description: Adds or removes Vertica database roles and assigns roles to them diff --git a/plugins/modules/vertica_schema.py b/plugins/modules/vertica_schema.py index 071b3f764f..123c1f6cb1 100644 --- a/plugins/modules/vertica_schema.py +++ b/plugins/modules/vertica_schema.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: vertica_schema short_description: Adds or removes Vertica database schema and roles diff --git a/plugins/modules/vertica_user.py b/plugins/modules/vertica_user.py index 9d4be97aeb..5172dba9f7 100644 --- a/plugins/modules/vertica_user.py +++ b/plugins/modules/vertica_user.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: vertica_user short_description: Adds or removes Vertica database users and assigns roles diff --git a/plugins/modules/vexata_eg.py b/plugins/modules/vexata_eg.py index 134b3de145..336868b3b9 100644 --- a/plugins/modules/vexata_eg.py +++ b/plugins/modules/vexata_eg.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: vexata_eg short_description: Manage export groups on Vexata VX100 storage arrays @@ -75,6 +74,7 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.vexata import ( argument_spec, get_array, diff --git a/plugins/modules/vexata_volume.py b/plugins/modules/vexata_volume.py index 443dd2af9c..f0a8d74051 100644 --- a/plugins/modules/vexata_volume.py +++ b/plugins/modules/vexata_volume.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: vexata_volume short_description: Manage volumes on Vexata VX100 storage arrays @@ -72,6 +71,7 @@ RETURN = r""" """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.vexata import ( argument_spec, get_array, diff --git a/plugins/modules/vmadm.py b/plugins/modules/vmadm.py index 740ed91934..a8a100f0cf 100644 --- a/plugins/modules/vmadm.py +++ b/plugins/modules/vmadm.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: vmadm short_description: Manage SmartOS virtual machines and zones @@ -344,7 +343,6 @@ import re import tempfile import traceback - from ansible.module_utils.basic import AnsibleModule # While vmadm(1M) supports a -E option to return any errors in JSON, the diff --git a/plugins/modules/wakeonlan.py b/plugins/modules/wakeonlan.py index 34cf685f52..4faadd5672 100644 --- a/plugins/modules/wakeonlan.py +++ b/plugins/modules/wakeonlan.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: wakeonlan short_description: Send a magic Wake-on-LAN (WoL) broadcast packet diff --git a/plugins/modules/wdc_redfish_command.py b/plugins/modules/wdc_redfish_command.py index e87f08a6a3..870db5fc30 100644 --- a/plugins/modules/wdc_redfish_command.py +++ b/plugins/modules/wdc_redfish_command.py @@ -194,11 +194,12 @@ msg: sample: "Action was successful" """ -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.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 + CATEGORY_COMMANDS_ALL = { "Update": ["FWActivate", "UpdateAndActivate"], "Chassis": [ diff --git a/plugins/modules/wdc_redfish_info.py b/plugins/modules/wdc_redfish_info.py index 7af3ad5007..d215503d59 100644 --- a/plugins/modules/wdc_redfish_info.py +++ b/plugins/modules/wdc_redfish_info.py @@ -122,8 +122,9 @@ 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.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/xbps.py b/plugins/modules/xbps.py index 619e6fccaf..76e3ff8078 100644 --- a/plugins/modules/xbps.py +++ b/plugins/modules/xbps.py @@ -7,7 +7,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: xbps short_description: Manage packages with XBPS diff --git a/plugins/modules/xcc_redfish_command.py b/plugins/modules/xcc_redfish_command.py index cb4e667624..80a9d6c2a8 100644 --- a/plugins/modules/xcc_redfish_command.py +++ b/plugins/modules/xcc_redfish_command.py @@ -299,9 +299,10 @@ 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 ( - RedfishUtils, REDFISH_COMMON_ARGUMENT_SPEC, + RedfishUtils, ) diff --git a/plugins/modules/xdg_mime.py b/plugins/modules/xdg_mime.py index 95d8367785..dc08a46796 100644 --- a/plugins/modules/xdg_mime.py +++ b/plugins/modules/xdg_mime.py @@ -87,7 +87,7 @@ version: """ 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_runner, xdg_mime_get +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 20253c77a6..6aae7eaba3 100644 --- a/plugins/modules/xenserver_facts.py +++ b/plugins/modules/xenserver_facts.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: xenserver_facts short_description: Get facts reported on xenserver diff --git a/plugins/modules/xenserver_guest.py b/plugins/modules/xenserver_guest.py index f1faee7f89..e17e042e0e 100644 --- a/plugins/modules/xenserver_guest.py +++ b/plugins/modules/xenserver_guest.py @@ -543,21 +543,22 @@ 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 ( - xenserver_common_argument_spec, XenServerObject, - get_object_ref, - gather_vm_params, gather_vm_facts, - set_vm_power_state, - wait_for_vm_ip_address, + gather_vm_params, + get_object_ref, + ip_netmask_to_prefix, + ip_prefix_to_netmask, + is_valid_ip6_addr, + is_valid_ip6_prefix, is_valid_ip_addr, is_valid_ip_netmask, is_valid_ip_prefix, - ip_prefix_to_netmask, - ip_netmask_to_prefix, - is_valid_ip6_addr, - is_valid_ip6_prefix, + set_vm_power_state, + wait_for_vm_ip_address, + xenserver_common_argument_spec, ) diff --git a/plugins/modules/xenserver_guest_info.py b/plugins/modules/xenserver_guest_info.py index 7ec8383505..5feb82be0e 100644 --- a/plugins/modules/xenserver_guest_info.py +++ b/plugins/modules/xenserver_guest_info.py @@ -149,12 +149,13 @@ instance: from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.xenserver import ( - xenserver_common_argument_spec, XenServerObject, - get_object_ref, - gather_vm_params, gather_vm_facts, + gather_vm_params, + get_object_ref, + xenserver_common_argument_spec, ) diff --git a/plugins/modules/xenserver_guest_powerstate.py b/plugins/modules/xenserver_guest_powerstate.py index 1a30ecff5f..a600fdccf3 100644 --- a/plugins/modules/xenserver_guest_powerstate.py +++ b/plugins/modules/xenserver_guest_powerstate.py @@ -176,14 +176,15 @@ instance: from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.xenserver import ( - xenserver_common_argument_spec, XenServerObject, - get_object_ref, - gather_vm_params, gather_vm_facts, + gather_vm_params, + get_object_ref, set_vm_power_state, wait_for_vm_ip_address, + xenserver_common_argument_spec, ) diff --git a/plugins/modules/xfconf.py b/plugins/modules/xfconf.py index a6fd94c4c1..6736f9d382 100644 --- a/plugins/modules/xfconf.py +++ b/plugins/modules/xfconf.py @@ -175,7 +175,7 @@ version: """ from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper -from ansible_collections.community.general.plugins.module_utils.xfconf import xfconf_runner, get_xfconf_version +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 ecc1292f4b..61cfc8c66a 100644 --- a/plugins/modules/xfconf_info.py +++ b/plugins/modules/xfconf_info.py @@ -126,7 +126,7 @@ version: """ from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper -from ansible_collections.community.general.plugins.module_utils.xfconf import xfconf_runner, get_xfconf_version +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 322754d329..1bd1da512a 100644 --- a/plugins/modules/xfs_quota.py +++ b/plugins/modules/xfs_quota.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: xfs_quota short_description: Manage quotas on XFS filesystems diff --git a/plugins/modules/xml.py b/plugins/modules/xml.py index b73d70f1fb..514ae13a46 100644 --- a/plugins/modules/xml.py +++ b/plugins/modules/xml.py @@ -360,7 +360,6 @@ import json import os import re import traceback - from collections.abc import MutableMapping from io import BytesIO diff --git a/plugins/modules/yarn.py b/plugins/modules/yarn.py index 7e9e358c3e..935ccd5710 100644 --- a/plugins/modules/yarn.py +++ b/plugins/modules/yarn.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: yarn short_description: Manage Node.js packages with Yarn @@ -124,8 +123,8 @@ out: fresh packages...success Saved lockfile.success Saved 1 new dependency..left-pad@1.1.3 Done in 0.59s." """ -import os import json +import os from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/yum_versionlock.py b/plugins/modules/yum_versionlock.py index 1cb1539136..1e27b8167c 100644 --- a/plugins/modules/yum_versionlock.py +++ b/plugins/modules/yum_versionlock.py @@ -87,9 +87,10 @@ state: """ import re -from ansible.module_utils.basic import AnsibleModule from fnmatch import fnmatch +from ansible.module_utils.basic import AnsibleModule + # on DNF-based distros, yum is a symlink to dnf, so we try to handle their different entry formats. NEVRA_RE_YUM = re.compile( r"^(?P!)?(?P\d+):(?P.+)-" diff --git a/plugins/modules/zfs_facts.py b/plugins/modules/zfs_facts.py index b7c7dbb294..a9287c8ef8 100644 --- a/plugins/modules/zfs_facts.py +++ b/plugins/modules/zfs_facts.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: zfs_facts short_description: Gather facts about ZFS datasets @@ -154,7 +153,6 @@ from collections import defaultdict from ansible.module_utils.basic import AnsibleModule - SUPPORTED_TYPES = ["all", "filesystem", "volume", "snapshot", "bookmark"] diff --git a/plugins/modules/znode.py b/plugins/modules/znode.py index 36d692fd34..b9f24858be 100644 --- a/plugins/modules/znode.py +++ b/plugins/modules/znode.py @@ -5,7 +5,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: znode short_description: Create, delete, retrieve, and update znodes using ZooKeeper diff --git a/plugins/modules/zpool.py b/plugins/modules/zpool.py index d3b6be1841..acbc76f2b9 100644 --- a/plugins/modules/zpool.py +++ b/plugins/modules/zpool.py @@ -136,7 +136,9 @@ EXAMPLES = r""" """ import re + from ansible.module_utils.basic import AnsibleModule + from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt diff --git a/plugins/modules/zpool_facts.py b/plugins/modules/zpool_facts.py index 39125cd97d..023df18258 100644 --- a/plugins/modules/zpool_facts.py +++ b/plugins/modules/zpool_facts.py @@ -6,7 +6,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: zpool_facts short_description: Gather facts about ZFS pools diff --git a/plugins/modules/zypper.py b/plugins/modules/zypper.py index f20cec172d..1a2e8de6c2 100644 --- a/plugins/modules/zypper.py +++ b/plugins/modules/zypper.py @@ -15,7 +15,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: zypper author: @@ -253,8 +252,8 @@ EXAMPLES = r""" """ import os.path -import xml import re +import xml from xml.dom.minidom import parseString as parseXML # import module snippets diff --git a/plugins/modules/zypper_repository.py b/plugins/modules/zypper_repository.py index 512dc169c7..f66f92ef85 100644 --- a/plugins/modules/zypper_repository.py +++ b/plugins/modules/zypper_repository.py @@ -8,7 +8,6 @@ from __future__ import annotations - DOCUMENTATION = r""" module: zypper_repository author: "Matthias Vogelgesang (@matze)" @@ -138,12 +137,12 @@ except ImportError: XML_IMP_ERR = traceback.format_exc() HAS_XML = False -from ansible.module_utils.basic import AnsibleModule, missing_required_lib - -from ansible.module_utils.urls import fetch_url -from ansible.module_utils.common.text.converters import to_text from io import StringIO +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 REPO_OPTS = ["alias", "name", "priority", "enabled", "autorefresh", "gpgcheck"] diff --git a/plugins/plugin_utils/keys_filter.py b/plugins/plugin_utils/keys_filter.py index 2d49b32725..9834a83c98 100644 --- a/plugins/plugin_utils/keys_filter.py +++ b/plugins/plugin_utils/keys_filter.py @@ -7,7 +7,6 @@ from __future__ import annotations import re import typing as t - from collections.abc import Mapping, Sequence from ansible.errors import AnsibleFilterError diff --git a/plugins/plugin_utils/unsafe.py b/plugins/plugin_utils/unsafe.py index c4efaf26e6..d6224ba29f 100644 --- a/plugins/plugin_utils/unsafe.py +++ b/plugins/plugin_utils/unsafe.py @@ -6,11 +6,13 @@ from __future__ import annotations import re import typing as t - from collections.abc import Mapping, Sequence, Set + from ansible.module_utils.common.collections import is_sequence from ansible.utils.unsafe_proxy import ( AnsibleUnsafe, +) +from ansible.utils.unsafe_proxy import ( wrap_var as _make_unsafe, ) diff --git a/plugins/test/a_module.py b/plugins/test/a_module.py index fbd1e1f004..4dd873ec1c 100644 --- a/plugins/test/a_module.py +++ b/plugins/test/a_module.py @@ -41,8 +41,8 @@ _value: import typing as t from collections.abc import Callable -from ansible.plugins.loader import action_loader, module_loader from ansible.errors import AnsibleFilterError +from ansible.plugins.loader import action_loader, module_loader try: from ansible.errors import AnsiblePluginRemovedError diff --git a/plugins/test/ansible_type.py b/plugins/test/ansible_type.py index 262645d427..fea1772062 100644 --- a/plugins/test/ansible_type.py +++ b/plugins/test/ansible_type.py @@ -226,6 +226,7 @@ import typing as t from collections.abc import Callable, Sequence from ansible.errors import AnsibleFilterError + from ansible_collections.community.general.plugins.plugin_utils.ansible_type import _ansible_type diff --git a/plugins/test/fqdn_valid.py b/plugins/test/fqdn_valid.py index 8a3377c35c..470a9acde4 100644 --- a/plugins/test/fqdn_valid.py +++ b/plugins/test/fqdn_valid.py @@ -4,7 +4,6 @@ from __future__ import annotations - DOCUMENTATION = """ name: fqdn_valid short_description: Validates fully-qualified domain names against RFC 1123 diff --git a/tests/integration/targets/cmd_runner/library/cmd_echo.py b/tests/integration/targets/cmd_runner/library/cmd_echo.py index 93f2c27746..339e0201ac 100644 --- a/tests/integration/targets/cmd_runner/library/cmd_echo.py +++ b/tests/integration/targets/cmd_runner/library/cmd_echo.py @@ -7,7 +7,6 @@ from __future__ import annotations import traceback - DOCUMENTATION = "" EXAMPLES = "" @@ -15,7 +14,9 @@ EXAMPLES = "" RETURN = "" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, 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/flatpak/files/serve.py b/tests/integration/targets/flatpak/files/serve.py index 44cdc718cb..297d2641c5 100644 --- a/tests/integration/targets/flatpak/files/serve.py +++ b/tests/integration/targets/flatpak/files/serve.py @@ -8,11 +8,9 @@ from __future__ import annotations import os import posixpath import sys - -from http.server import SimpleHTTPRequestHandler, HTTPServer +from http.server import HTTPServer, SimpleHTTPRequestHandler from urllib.parse import unquote - # Argument parsing if len(sys.argv) != 4: print(f"Syntax: {sys.argv[0]} ") diff --git a/tests/integration/targets/java_cert/files/setupSSLServer.py b/tests/integration/targets/java_cert/files/setupSSLServer.py index 5e40a7e496..fd015ef725 100644 --- a/tests/integration/targets/java_cert/files/setupSSLServer.py +++ b/tests/integration/targets/java_cert/files/setupSSLServer.py @@ -3,8 +3,9 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations -import ssl + import os +import ssl import sys root_dir = sys.argv[1] diff --git a/tests/integration/targets/launchd/files/ansible_test_service.py b/tests/integration/targets/launchd/files/ansible_test_service.py index 54bbdb0714..06182809ff 100644 --- a/tests/integration/targets/launchd/files/ansible_test_service.py +++ b/tests/integration/targets/launchd/files/ansible_test_service.py @@ -5,10 +5,9 @@ from __future__ import annotations -import sys import http.server import socketserver - +import sys if __name__ == "__main__": PORT = int(sys.argv[1]) diff --git a/tests/integration/targets/lookup_lmdb_kv/test_db.py b/tests/integration/targets/lookup_lmdb_kv/test_db.py index 9b11419a50..0d71727946 100644 --- a/tests/integration/targets/lookup_lmdb_kv/test_db.py +++ b/tests/integration/targets/lookup_lmdb_kv/test_db.py @@ -3,6 +3,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations + import lmdb map_size = 1024 * 100 diff --git a/tests/integration/targets/module_helper/library/msimple.py b/tests/integration/targets/module_helper/library/msimple.py index 907b466268..f54fea4e21 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.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 deac6e176e..8752f75a4a 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.module_helper import ModuleHelper 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 class MSimpleDA(ModuleHelper): diff --git a/tests/integration/targets/monit/files/httpd_echo.py b/tests/integration/targets/monit/files/httpd_echo.py index d1941e9323..1ab2c459cf 100644 --- a/tests/integration/targets/monit/files/httpd_echo.py +++ b/tests/integration/targets/monit/files/httpd_echo.py @@ -4,10 +4,10 @@ from __future__ import annotations -import daemon - from http.server import BaseHTTPRequestHandler, HTTPServer +import daemon + def write_to_output(stream, content): stream.write(bytes(content, "utf-8")) diff --git a/tests/integration/targets/supervisorctl/files/sendProcessStdin.py b/tests/integration/targets/supervisorctl/files/sendProcessStdin.py index 28f9c78279..d03a04f892 100644 --- a/tests/integration/targets/supervisorctl/files/sendProcessStdin.py +++ b/tests/integration/targets/supervisorctl/files/sendProcessStdin.py @@ -7,9 +7,8 @@ from __future__ import annotations import sys -from xmlrpc.client import ServerProxy from urllib.parse import quote - +from xmlrpc.client import ServerProxy proc = sys.argv[1] value = sys.argv[2] diff --git a/tests/sanity/extra/botmeta.py b/tests/sanity/extra/botmeta.py index c1c9d149a1..dd9228719a 100644 --- a/tests/sanity/extra/botmeta.py +++ b/tests/sanity/extra/botmeta.py @@ -11,11 +11,9 @@ import re import sys import yaml - -from voluptuous import Any, MultipleInvalid, PREVENT_EXTRA, Schema +from voluptuous import PREVENT_EXTRA, Any, MultipleInvalid, Schema from voluptuous.humanize import humanize_error - IGNORE_NO_MAINTAINERS = [ "docs/docsite/rst/filter_guide.rst", "docs/docsite/rst/filter_guide_abstract_informations.rst", diff --git a/tests/unit/plugins/become/conftest.py b/tests/unit/plugins/become/conftest.py index 2bc412fe94..5e4cc83a9b 100644 --- a/tests/unit/plugins/become/conftest.py +++ b/tests/unit/plugins/become/conftest.py @@ -8,7 +8,6 @@ from __future__ import annotations import pytest - from ansible.cli.arguments import option_helpers as opt_help from ansible.utils import context_objects as co diff --git a/tests/unit/plugins/become/test_run0.py b/tests/unit/plugins/become/test_run0.py index 3f0840b7e6..01c9b026bc 100644 --- a/tests/unit/plugins/become/test_run0.py +++ b/tests/unit/plugins/become/test_run0.py @@ -5,7 +5,6 @@ from __future__ import annotations - import re from ansible import context diff --git a/tests/unit/plugins/cache/test_memcached.py b/tests/unit/plugins/cache/test_memcached.py index c3b7253d80..ec65bb8c56 100644 --- a/tests/unit/plugins/cache/test_memcached.py +++ b/tests/unit/plugins/cache/test_memcached.py @@ -10,6 +10,7 @@ import pytest pytest.importorskip("memcache") from ansible.plugins.loader import cache_loader + from ansible_collections.community.general.plugins.cache.memcached import CacheModule as MemcachedCache diff --git a/tests/unit/plugins/cache/test_redis.py b/tests/unit/plugins/cache/test_redis.py index 426438251b..ce7dd218f5 100644 --- a/tests/unit/plugins/cache/test_redis.py +++ b/tests/unit/plugins/cache/test_redis.py @@ -10,6 +10,7 @@ import pytest pytest.importorskip("redis") from ansible.plugins.loader import cache_loader + from ansible_collections.community.general.plugins.cache.redis import CacheModule as RedisCache diff --git a/tests/unit/plugins/callback/test_elastic.py b/tests/unit/plugins/callback/test_elastic.py index 3ddff23af1..23aab39b2d 100644 --- a/tests/unit/plugins/callback/test_elastic.py +++ b/tests/unit/plugins/callback/test_elastic.py @@ -6,10 +6,11 @@ from __future__ import annotations import unittest from collections import OrderedDict -from unittest.mock import patch, MagicMock, Mock +from unittest.mock import MagicMock, Mock, patch -from ansible.playbook.task import Task from ansible.executor.task_result import TaskResult +from ansible.playbook.task import Task + from ansible_collections.community.general.plugins.callback.elastic import ElasticSource, TaskData diff --git a/tests/unit/plugins/callback/test_loganalytics.py b/tests/unit/plugins/callback/test_loganalytics.py index e2c40e38f2..7637b53312 100644 --- a/tests/unit/plugins/callback/test_loganalytics.py +++ b/tests/unit/plugins/callback/test_loganalytics.py @@ -7,9 +7,10 @@ from __future__ import annotations import json import unittest from datetime import datetime -from unittest.mock import patch, Mock +from unittest.mock import Mock, patch from ansible.executor.task_result import TaskResult + from ansible_collections.community.general.plugins.callback.loganalytics import AzureLogAnalyticsSource diff --git a/tests/unit/plugins/callback/test_opentelemetry.py b/tests/unit/plugins/callback/test_opentelemetry.py index 044851cfa4..9fb566ef88 100644 --- a/tests/unit/plugins/callback/test_opentelemetry.py +++ b/tests/unit/plugins/callback/test_opentelemetry.py @@ -6,10 +6,11 @@ from __future__ import annotations import unittest from collections import OrderedDict -from unittest.mock import patch, MagicMock, Mock +from unittest.mock import MagicMock, Mock, patch -from ansible.playbook.task import Task from ansible.executor.task_result import TaskResult +from ansible.playbook.task import Task + from ansible_collections.community.general.plugins.callback.opentelemetry import OpenTelemetrySource, TaskData diff --git a/tests/unit/plugins/callback/test_splunk.py b/tests/unit/plugins/callback/test_splunk.py index 1a89d6c631..e5d747dfee 100644 --- a/tests/unit/plugins/callback/test_splunk.py +++ b/tests/unit/plugins/callback/test_splunk.py @@ -4,13 +4,14 @@ from __future__ import annotations -import unittest -from unittest.mock import patch, Mock -from ansible.executor.task_result import TaskResult -from ansible_collections.community.general.plugins.callback.splunk import SplunkHTTPCollectorSource -from datetime import datetime - import json +import unittest +from datetime import datetime +from unittest.mock import Mock, patch + +from ansible.executor.task_result import TaskResult + +from ansible_collections.community.general.plugins.callback.splunk import SplunkHTTPCollectorSource class TestSplunkClient(unittest.TestCase): diff --git a/tests/unit/plugins/connection/test_lxc.py b/tests/unit/plugins/connection/test_lxc.py index d40f5a590c..ccf2b700a1 100644 --- a/tests/unit/plugins/connection/test_lxc.py +++ b/tests/unit/plugins/connection/test_lxc.py @@ -5,12 +5,11 @@ # Make coding more python3-ish from __future__ import annotations -import pytest import sys - from io import StringIO from unittest import mock +import pytest from ansible.errors import AnsibleError from ansible.playbook.play_context import PlayContext from ansible.plugins.loader import connection_loader diff --git a/tests/unit/plugins/connection/test_wsl.py b/tests/unit/plugins/connection/test_wsl.py index 3060ce9c46..5445bfde83 100644 --- a/tests/unit/plugins/connection/test_wsl.py +++ b/tests/unit/plugins/connection/test_wsl.py @@ -5,18 +5,18 @@ # SPDX-License-Identifier: GPL-3.0-or-later import os -import pytest +from io import StringIO +from pathlib import Path +from unittest.mock import MagicMock, mock_open, patch -from ansible_collections.community.general.plugins.connection.wsl import authenticity_msg, MyAddPolicy -from ansible_collections.community.general.plugins.module_utils._filelock import FileLock, LockTimeout -from ansible.errors import AnsibleError, AnsibleAuthenticationFailure, AnsibleConnectionFailure +import pytest +from ansible.errors import AnsibleAuthenticationFailure, AnsibleConnectionFailure, AnsibleError from ansible.module_utils.common.text.converters import to_bytes from ansible.playbook.play_context import PlayContext from ansible.plugins.loader import connection_loader -from io import StringIO -from pathlib import Path -from unittest.mock import patch, MagicMock, mock_open +from ansible_collections.community.general.plugins.connection.wsl import MyAddPolicy, authenticity_msg +from ansible_collections.community.general.plugins.module_utils._filelock import FileLock, LockTimeout paramiko = pytest.importorskip("paramiko") diff --git a/tests/unit/plugins/filter/test_json_patch.py b/tests/unit/plugins/filter/test_json_patch.py index 7a96a195b3..fb145afd8e 100644 --- a/tests/unit/plugins/filter/test_json_patch.py +++ b/tests/unit/plugins/filter/test_json_patch.py @@ -4,11 +4,12 @@ from __future__ import annotations - import unittest -from ansible_collections.community.general.plugins.filter.json_patch import FilterModule + from ansible.errors import AnsibleFilterError +from ansible_collections.community.general.plugins.filter.json_patch import FilterModule + class TestJsonPatch(unittest.TestCase): def setUp(self): diff --git a/tests/unit/plugins/inventory/test_icinga2.py b/tests/unit/plugins/inventory/test_icinga2.py index 2597490ccf..9a7713a5dd 100644 --- a/tests/unit/plugins/inventory/test_icinga2.py +++ b/tests/unit/plugins/inventory/test_icinga2.py @@ -7,8 +7,8 @@ from __future__ import annotations import pytest - from ansible.inventory.data import InventoryData + from ansible_collections.community.general.plugins.inventory.icinga2 import InventoryModule diff --git a/tests/unit/plugins/inventory/test_incus.py b/tests/unit/plugins/inventory/test_incus.py index dbbf4eda62..7d6eaa140f 100644 --- a/tests/unit/plugins/inventory/test_incus.py +++ b/tests/unit/plugins/inventory/test_incus.py @@ -5,10 +5,10 @@ from __future__ import annotations import pytest - from ansible.inventory.data import InventoryData from ansible.parsing.dataloader import DataLoader from ansible.template import Templar + from ansible_collections.community.general.plugins.inventory.incus import ( InventoryModule, ) diff --git a/tests/unit/plugins/inventory/test_iocage.py b/tests/unit/plugins/inventory/test_iocage.py index d7823516c2..468ae4c729 100644 --- a/tests/unit/plugins/inventory/test_iocage.py +++ b/tests/unit/plugins/inventory/test_iocage.py @@ -6,12 +6,12 @@ from __future__ import annotations import pytest import yaml - from ansible.inventory.data import InventoryData from ansible.template import Templar -from ansible_collections.community.general.plugins.inventory.iocage import InventoryModule from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import make_trusted +from ansible_collections.community.general.plugins.inventory.iocage import InventoryModule + @pytest.fixture def inventory(): diff --git a/tests/unit/plugins/inventory/test_linode.py b/tests/unit/plugins/inventory/test_linode.py index 7add0fd5b2..71ae000493 100644 --- a/tests/unit/plugins/inventory/test_linode.py +++ b/tests/unit/plugins/inventory/test_linode.py @@ -11,6 +11,7 @@ linode_apiv4 = pytest.importorskip("linode_api4") from ansible.errors import AnsibleError from ansible.parsing.dataloader import DataLoader from ansible.template import Templar + from ansible_collections.community.general.plugins.inventory.linode import InventoryModule diff --git a/tests/unit/plugins/inventory/test_lxd.py b/tests/unit/plugins/inventory/test_lxd.py index 5bf937622b..28da082898 100644 --- a/tests/unit/plugins/inventory/test_lxd.py +++ b/tests/unit/plugins/inventory/test_lxd.py @@ -6,10 +6,9 @@ from __future__ import annotations import pytest - from ansible.inventory.data import InventoryData -from ansible_collections.community.general.plugins.inventory.lxd import InventoryModule +from ansible_collections.community.general.plugins.inventory.lxd import InventoryModule HOST_COMPARATIVE_DATA = { "ansible_connection": "ssh", diff --git a/tests/unit/plugins/inventory/test_opennebula.py b/tests/unit/plugins/inventory/test_opennebula.py index 1613217222..ee8dfbd625 100644 --- a/tests/unit/plugins/inventory/test_opennebula.py +++ b/tests/unit/plugins/inventory/test_opennebula.py @@ -6,13 +6,11 @@ from __future__ import annotations - -from collections import OrderedDict import json import os +from collections import OrderedDict import pytest - from ansible import constants as C from ansible.inventory.data import InventoryData from ansible.inventory.manager import InventoryManager @@ -22,7 +20,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.mock.path impo from ansible_collections.community.general.plugins.inventory.opennebula import InventoryModule - original_exists = os.path.exists original_access = os.access diff --git a/tests/unit/plugins/inventory/test_xen_orchestra.py b/tests/unit/plugins/inventory/test_xen_orchestra.py index 199d454ea6..90efd15b4b 100644 --- a/tests/unit/plugins/inventory/test_xen_orchestra.py +++ b/tests/unit/plugins/inventory/test_xen_orchestra.py @@ -7,8 +7,8 @@ from __future__ import annotations import pytest - from ansible.inventory.data import InventoryData + from ansible_collections.community.general.plugins.inventory.xen_orchestra import InventoryModule objects = { diff --git a/tests/unit/plugins/lookup/onepassword_common.py b/tests/unit/plugins/lookup/onepassword_common.py index 26ad677662..be35a33788 100644 --- a/tests/unit/plugins/lookup/onepassword_common.py +++ b/tests/unit/plugins/lookup/onepassword_common.py @@ -4,8 +4,8 @@ from __future__ import annotations -import os import json +import os from ansible_collections.community.general.plugins.lookup.onepassword import ( OnePassCLIv1, diff --git a/tests/unit/plugins/lookup/test_bitwarden.py b/tests/unit/plugins/lookup/test_bitwarden.py index 5761a64674..2c137eec68 100644 --- a/tests/unit/plugins/lookup/test_bitwarden.py +++ b/tests/unit/plugins/lookup/test_bitwarden.py @@ -9,9 +9,10 @@ import unittest from unittest.mock import patch from ansible.errors import AnsibleError -from ansible.plugins.loader import lookup_loader -from ansible_collections.community.general.plugins.lookup.bitwarden import Bitwarden, BitwardenException from ansible.parsing.ajson import AnsibleJSONEncoder +from ansible.plugins.loader import lookup_loader + +from ansible_collections.community.general.plugins.lookup.bitwarden import Bitwarden, BitwardenException MOCK_COLLECTION_ID = "3b12a9da-7c49-40b8-ad33-aede017a7ead" MOCK_ORGANIZATION_ID = "292ba0c6-f289-11ee-9301-ef7b639ccd2a" diff --git a/tests/unit/plugins/lookup/test_bitwarden_secrets_manager.py b/tests/unit/plugins/lookup/test_bitwarden_secrets_manager.py index a46b63d4a8..4bd73c58c4 100644 --- a/tests/unit/plugins/lookup/test_bitwarden_secrets_manager.py +++ b/tests/unit/plugins/lookup/test_bitwarden_secrets_manager.py @@ -10,8 +10,8 @@ from unittest.mock import patch from ansible.errors import AnsibleLookupError from ansible.plugins.loader import lookup_loader -from ansible_collections.community.general.plugins.lookup.bitwarden_secrets_manager import BitwardenSecretsManager +from ansible_collections.community.general.plugins.lookup.bitwarden_secrets_manager import BitwardenSecretsManager MOCK_SECRETS = [ { diff --git a/tests/unit/plugins/lookup/test_dependent.py b/tests/unit/plugins/lookup/test_dependent.py index cbd045d2df..b8ba3bf843 100644 --- a/tests/unit/plugins/lookup/test_dependent.py +++ b/tests/unit/plugins/lookup/test_dependent.py @@ -9,7 +9,6 @@ from unittest import TestCase from ansible.plugins.loader import lookup_loader from ansible.template import Templar - from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import make_trusted diff --git a/tests/unit/plugins/lookup/test_dsv.py b/tests/unit/plugins/lookup/test_dsv.py index af69bda489..0787826a9a 100644 --- a/tests/unit/plugins/lookup/test_dsv.py +++ b/tests/unit/plugins/lookup/test_dsv.py @@ -7,13 +7,14 @@ from __future__ import annotations from unittest import TestCase from unittest.mock import ( - patch, MagicMock, + patch, ) -from ansible_collections.community.general.plugins.lookup import dsv from ansible.plugins.loader import lookup_loader +from ansible_collections.community.general.plugins.lookup import dsv + class MockSecretsVault(MagicMock): RESPONSE = '{"foo": "bar"}' diff --git a/tests/unit/plugins/lookup/test_etcd3.py b/tests/unit/plugins/lookup/test_etcd3.py index e237e56d7d..306538266d 100644 --- a/tests/unit/plugins/lookup/test_etcd3.py +++ b/tests/unit/plugins/lookup/test_etcd3.py @@ -6,10 +6,11 @@ from __future__ import annotations import unittest -from unittest.mock import patch, MagicMock +from unittest.mock import MagicMock, patch + +from ansible.plugins.loader import lookup_loader from ansible_collections.community.general.plugins.lookup import etcd3 -from ansible.plugins.loader import lookup_loader class FakeKVMetadata: diff --git a/tests/unit/plugins/lookup/test_github_app_access_token.py b/tests/unit/plugins/lookup/test_github_app_access_token.py index cfbbaac23c..9f7fb6b543 100644 --- a/tests/unit/plugins/lookup/test_github_app_access_token.py +++ b/tests/unit/plugins/lookup/test_github_app_access_token.py @@ -9,9 +9,9 @@ import sys import types import unittest from unittest.mock import ( - patch, MagicMock, mock_open, + patch, ) from ansible.plugins.loader import lookup_loader diff --git a/tests/unit/plugins/lookup/test_lastpass.py b/tests/unit/plugins/lookup/test_lastpass.py index 38a98c8fae..d3d8f30b94 100644 --- a/tests/unit/plugins/lookup/test_lastpass.py +++ b/tests/unit/plugins/lookup/test_lastpass.py @@ -11,8 +11,8 @@ from unittest.mock import patch from ansible.errors import AnsibleError from ansible.plugins.loader import lookup_loader -from ansible_collections.community.general.plugins.lookup.lastpass import LPass, LPassException +from ansible_collections.community.general.plugins.lookup.lastpass import LPass, LPassException MOCK_ENTRIES = [ { diff --git a/tests/unit/plugins/lookup/test_merge_variables.py b/tests/unit/plugins/lookup/test_merge_variables.py index c2d0b188e1..94bc8c604b 100644 --- a/tests/unit/plugins/lookup/test_merge_variables.py +++ b/tests/unit/plugins/lookup/test_merge_variables.py @@ -7,12 +7,12 @@ from __future__ import annotations import unittest from unittest.mock import patch -from ansible_collections.community.internal_test_tools.tests.unit.mock.loader import DictDataLoader - +from ansible.errors import AnsibleError from ansible.plugins import AnsiblePlugin from ansible.template import Templar -from ansible.errors import AnsibleError from ansible.utils.display import Display +from ansible_collections.community.internal_test_tools.tests.unit.mock.loader import DictDataLoader + from ansible_collections.community.general.plugins.lookup import merge_variables diff --git a/tests/unit/plugins/lookup/test_onepassword.py b/tests/unit/plugins/lookup/test_onepassword.py index ecb15ad455..4e48f2ee17 100644 --- a/tests/unit/plugins/lookup/test_onepassword.py +++ b/tests/unit/plugins/lookup/test_onepassword.py @@ -4,20 +4,20 @@ from __future__ import annotations -import operator import itertools import json +import operator + import pytest - -from .onepassword_common import MOCK_ENTRIES - from ansible.errors import AnsibleLookupError, AnsibleOptionsError from ansible.plugins.loader import lookup_loader + from ansible_collections.community.general.plugins.lookup.onepassword import ( OnePassCLIv1, OnePassCLIv2, ) +from .onepassword_common import MOCK_ENTRIES OP_VERSION_FIXTURES = ["opv1", "opv2"] diff --git a/tests/unit/plugins/lookup/test_onepassword_ssh_key.py b/tests/unit/plugins/lookup/test_onepassword_ssh_key.py index 42ac99f272..1da0ac55bd 100644 --- a/tests/unit/plugins/lookup/test_onepassword_ssh_key.py +++ b/tests/unit/plugins/lookup/test_onepassword_ssh_key.py @@ -5,12 +5,12 @@ from __future__ import annotations import json + import pytest +from ansible.plugins.loader import lookup_loader from .onepassword_common import SSH_KEY_MOCK_ENTRIES -from ansible.plugins.loader import lookup_loader - @pytest.mark.parametrize( ("vault", "queries", "kwargs", "output", "expected"), diff --git a/tests/unit/plugins/lookup/test_revbitspss.py b/tests/unit/plugins/lookup/test_revbitspss.py index 910f38dded..93b7aa29d8 100644 --- a/tests/unit/plugins/lookup/test_revbitspss.py +++ b/tests/unit/plugins/lookup/test_revbitspss.py @@ -5,13 +5,14 @@ from __future__ import annotations from unittest import TestCase from unittest.mock import ( - patch, MagicMock, + patch, ) -from ansible_collections.community.general.plugins.lookup import revbitspss from ansible.plugins.loader import lookup_loader +from ansible_collections.community.general.plugins.lookup import revbitspss + class MockPamSecrets(MagicMock): RESPONSE = "dummy value" diff --git a/tests/unit/plugins/lookup/test_tss.py b/tests/unit/plugins/lookup/test_tss.py index 70e3e40099..c32affcfb8 100644 --- a/tests/unit/plugins/lookup/test_tss.py +++ b/tests/unit/plugins/lookup/test_tss.py @@ -7,14 +7,14 @@ from __future__ import annotations from unittest import TestCase from unittest.mock import ( - patch, DEFAULT, MagicMock, + patch, ) -from ansible_collections.community.general.plugins.lookup import tss from ansible.plugins.loader import lookup_loader +from ansible_collections.community.general.plugins.lookup import tss TSS_IMPORT_PATH = "ansible_collections.community.general.plugins.lookup.tss" 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 index 8b954bee5a..7a80d85b93 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 @@ -4,14 +4,15 @@ from __future__ import annotations -import pytest from io import StringIO from itertools import count from urllib.error import HTTPError +import pytest + from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import ( - get_token, KeycloakError, + get_token, ) module_params_creds = { 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 index 027f3e5a8a..dc339d69fe 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 @@ -8,13 +8,12 @@ import json 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 ( api, ) - # Pritunl Mocks PRITUNL_ORGS = [ diff --git a/tests/unit/plugins/module_utils/test_cmd_runner.py b/tests/unit/plugins/module_utils/test_cmd_runner.py index b06eeffa3d..3b20cc7ecc 100644 --- a/tests/unit/plugins/module_utils/test_cmd_runner.py +++ b/tests/unit/plugins/module_utils/test_cmd_runner.py @@ -11,7 +11,6 @@ import pytest 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), simple_boolean__false=(partial(cmd_runner_fmt.as_bool, "--superflag"), False, [], None), diff --git a/tests/unit/plugins/module_utils/test_csv.py b/tests/unit/plugins/module_utils/test_csv.py index b652f61838..400ba9446c 100644 --- a/tests/unit/plugins/module_utils/test_csv.py +++ b/tests/unit/plugins/module_utils/test_csv.py @@ -10,7 +10,6 @@ import pytest from ansible_collections.community.general.plugins.module_utils import csv - VALID_CSV = [ ( "excel", diff --git a/tests/unit/plugins/module_utils/test_database.py b/tests/unit/plugins/module_utils/test_database.py index 0adaf28280..2099aebaba 100644 --- a/tests/unit/plugins/module_utils/test_database.py +++ b/tests/unit/plugins/module_utils/test_database.py @@ -7,9 +7,9 @@ from __future__ import annotations import pytest from ansible_collections.community.general.plugins.module_utils.database import ( + SQLParseError, is_input_dangerous, pg_quote_identifier, - SQLParseError, ) # These are all valid strings diff --git a/tests/unit/plugins/module_utils/test_known_hosts.py b/tests/unit/plugins/module_utils/test_known_hosts.py index b4c73c475a..38cda65c95 100644 --- a/tests/unit/plugins/module_utils/test_known_hosts.py +++ b/tests/unit/plugins/module_utils/test_known_hosts.py @@ -9,7 +9,6 @@ import pytest from ansible_collections.community.general.plugins.module_utils import known_hosts - URLS = { "ssh://one.example.org/example.git": { "is_ssh_url": True, diff --git a/tests/unit/plugins/module_utils/test_module_helper.py b/tests/unit/plugins/module_utils/test_module_helper.py index 29181ffa55..454c183457 100644 --- a/tests/unit/plugins/module_utils/test_module_helper.py +++ b/tests/unit/plugins/module_utils/test_module_helper.py @@ -9,7 +9,6 @@ import pytest from ansible_collections.community.general.plugins.module_utils.module_helper import cause_changes - # # DEPRECATION NOTICE # Parameters on_success and on_failure are deprecated and will be removed in community.general 12.0.0 diff --git a/tests/unit/plugins/module_utils/test_opennebula.py b/tests/unit/plugins/module_utils/test_opennebula.py index 4a30394e2e..c07d1589e7 100644 --- a/tests/unit/plugins/module_utils/test_opennebula.py +++ b/tests/unit/plugins/module_utils/test_opennebula.py @@ -10,7 +10,6 @@ import pytest from ansible_collections.community.general.plugins.module_utils.opennebula import flatten, render - FLATTEN_VALID = [ ([[[1]], [2], 3], False, [1, 2, 3]), ([[[1]], [2], 3], True, [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 index bc18c983a9..fd02f03df7 100644 --- a/tests/unit/plugins/module_utils/test_python_runner.py +++ b/tests/unit/plugins/module_utils/test_python_runner.py @@ -12,7 +12,6 @@ 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 - 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/test_saslprep.py b/tests/unit/plugins/module_utils/test_saslprep.py index e17c021605..682bff916c 100644 --- a/tests/unit/plugins/module_utils/test_saslprep.py +++ b/tests/unit/plugins/module_utils/test_saslprep.py @@ -9,7 +9,6 @@ import pytest from ansible_collections.community.general.plugins.module_utils.saslprep import saslprep - VALID = [ ("", ""), ("\u00a0", " "), diff --git a/tests/unit/plugins/module_utils/test_vardict.py b/tests/unit/plugins/module_utils/test_vardict.py index 8fa22d6646..f51943a582 100644 --- a/tests/unit/plugins/module_utils/test_vardict.py +++ b/tests/unit/plugins/module_utils/test_vardict.py @@ -5,7 +5,6 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.module_utils.vardict import VarDict diff --git a/tests/unit/plugins/module_utils/xenserver/conftest.py b/tests/unit/plugins/module_utils/xenserver/conftest.py index f2c62eb672..4a58ec6fcd 100644 --- a/tests/unit/plugins/module_utils/xenserver/conftest.py +++ b/tests/unit/plugins/module_utils/xenserver/conftest.py @@ -5,11 +5,10 @@ from __future__ import annotations - -import sys import importlib -import os import json +import os +import sys from unittest.mock import MagicMock import pytest 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 index 5029cbd5da..32edf3918f 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 @@ -5,12 +5,10 @@ from __future__ import annotations - import pytest from .common import testcase_bad_xenapi_refs - testcase_gather_vm_params_and_facts = { "params": [ ["ansible-test-vm-1-params.json", "ansible-test-vm-1-facts.json"], 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 index e8e36873a8..eb695aefaa 100644 --- a/tests/unit/plugins/module_utils/xenserver/test_get_object_ref.py +++ b/tests/unit/plugins/module_utils/xenserver/test_get_object_ref.py @@ -5,11 +5,10 @@ from __future__ import annotations - import pytest -from .FakeAnsibleModule import FailJsonException from .common import fake_xenapi_ref +from .FakeAnsibleModule import FailJsonException def test_get_object_ref_xenapi_failure(mocker, fake_ansible_module, XenAPI, xenserver): diff --git a/tests/unit/plugins/module_utils/xenserver/test_netaddr_functions.py b/tests/unit/plugins/module_utils/xenserver/test_netaddr_functions.py index 076c2e2647..81ec5c1968 100644 --- a/tests/unit/plugins/module_utils/xenserver/test_netaddr_functions.py +++ b/tests/unit/plugins/module_utils/xenserver/test_netaddr_functions.py @@ -5,9 +5,7 @@ from __future__ import annotations - import pytest - from ansible.module_utils.common.network import is_mac testcase_is_valid_mac_addr = [ 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 index ec62a74fcc..4f4ffda50f 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 @@ -5,12 +5,10 @@ from __future__ import annotations - import pytest -from .FakeAnsibleModule import FailJsonException from .common import fake_xenapi_ref, testcase_bad_xenapi_refs - +from .FakeAnsibleModule import FailJsonException testcase_set_vm_power_state_bad_transitions = { "params": [ 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 index 8028396dc7..51080328ee 100644 --- a/tests/unit/plugins/module_utils/xenserver/test_wait_for_functions.py +++ b/tests/unit/plugins/module_utils/xenserver/test_wait_for_functions.py @@ -5,12 +5,10 @@ from __future__ import annotations - import pytest -from .FakeAnsibleModule import FailJsonException from .common import fake_xenapi_ref, testcase_bad_xenapi_refs - +from .FakeAnsibleModule import FailJsonException testcase_wait_for_vm_ip_address_bad_power_states = { "params": [ diff --git a/tests/unit/plugins/module_utils/xenserver/test_xapi.py b/tests/unit/plugins/module_utils/xenserver/test_xapi.py index 71da5ae6b1..a1183b4ecf 100644 --- a/tests/unit/plugins/module_utils/xenserver/test_xapi.py +++ b/tests/unit/plugins/module_utils/xenserver/test_xapi.py @@ -5,13 +5,12 @@ from __future__ import annotations - -import pytest import atexit -from .FakeAnsibleModule import FailJsonException +import pytest from ansible.module_utils.ansible_release import __version__ as ANSIBLE_VERSION +from .FakeAnsibleModule import FailJsonException testcase_module_local_conn = { "params": [ diff --git a/tests/unit/plugins/module_utils/xenserver/test_xenserverobject.py b/tests/unit/plugins/module_utils/xenserver/test_xenserverobject.py index 1d286ece49..1ff415f2bd 100644 --- a/tests/unit/plugins/module_utils/xenserver/test_xenserverobject.py +++ b/tests/unit/plugins/module_utils/xenserver/test_xenserverobject.py @@ -5,11 +5,10 @@ from __future__ import annotations - import pytest -from .FakeAnsibleModule import FailJsonException from .common import fake_xenapi_ref +from .FakeAnsibleModule import FailJsonException def test_xenserverobject_xenapi_lib_detection(mocker, fake_ansible_module, xenserver): diff --git a/tests/unit/plugins/modules/conftest.py b/tests/unit/plugins/modules/conftest.py index 4a41ebc1cf..aa9312d446 100644 --- a/tests/unit/plugins/modules/conftest.py +++ b/tests/unit/plugins/modules/conftest.py @@ -9,12 +9,12 @@ import json from collections.abc import MutableMapping import pytest - -from ansible_collections.community.general.plugins.module_utils import deps from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( set_module_args as _set_module_args, ) +from ansible_collections.community.general.plugins.module_utils import deps + def _fix_ansible_args(args): if isinstance(args, str): diff --git a/tests/unit/plugins/modules/gitlab.py b/tests/unit/plugins/modules/gitlab.py index 3b80298926..87eb9ef94c 100644 --- a/tests/unit/plugins/modules/gitlab.py +++ b/tests/unit/plugins/modules/gitlab.py @@ -6,10 +6,11 @@ from __future__ import annotations import unittest -from httmock import response # noqa -from httmock import urlmatch # noqa - import gitlab +from httmock import ( + response, # noqa + urlmatch, # noqa +) class FakeAnsibleModule: diff --git a/tests/unit/plugins/modules/hpe_test_utils.py b/tests/unit/plugins/modules/hpe_test_utils.py index 9a0cee0cb5..2dcd8449e9 100644 --- a/tests/unit/plugins/modules/hpe_test_utils.py +++ b/tests/unit/plugins/modules/hpe_test_utils.py @@ -5,12 +5,15 @@ from __future__ import annotations -import pytest import re - from unittest.mock import Mock, patch + +import pytest + from .oneview_module_loader import ONEVIEW_MODULE_UTILS_PATH -from hpOneView.oneview_client import OneViewClient + +# This import must come *after* the oneview_module_loader import! +from hpOneView.oneview_client import OneViewClient # isort: skip class OneViewBaseTest: diff --git a/tests/unit/plugins/modules/interfaces_file/test_interfaces_file.py b/tests/unit/plugins/modules/interfaces_file/test_interfaces_file.py index 54e58bdedb..a4221dcf47 100644 --- a/tests/unit/plugins/modules/interfaces_file/test_interfaces_file.py +++ b/tests/unit/plugins/modules/interfaces_file/test_interfaces_file.py @@ -7,8 +7,6 @@ from __future__ import annotations -from ansible_collections.community.general.plugins.modules import interfaces_file -from shutil import copyfile, move import difflib import inspect import json @@ -17,6 +15,9 @@ import re import shutil import tempfile import unittest +from shutil import copyfile, move + +from ansible_collections.community.general.plugins.modules import interfaces_file class AnsibleFailJson(Exception): diff --git a/tests/unit/plugins/modules/oneview_conftest.py b/tests/unit/plugins/modules/oneview_conftest.py index a0598239b2..bd31f95749 100644 --- a/tests/unit/plugins/modules/oneview_conftest.py +++ b/tests/unit/plugins/modules/oneview_conftest.py @@ -4,11 +4,14 @@ from __future__ import annotations +from unittest.mock import Mock, patch + import pytest -from unittest.mock import Mock, patch from .oneview_module_loader import ONEVIEW_MODULE_UTILS_PATH -from hpOneView.oneview_client import OneViewClient + +# This import must come *after* the oneview_module_loader import! +from hpOneView.oneview_client import OneViewClient # isort: skip @pytest.fixture diff --git a/tests/unit/plugins/modules/oneview_module_loader.py b/tests/unit/plugins/modules/oneview_module_loader.py index f979424be0..707e3d3bab 100644 --- a/tests/unit/plugins/modules/oneview_module_loader.py +++ b/tests/unit/plugins/modules/oneview_module_loader.py @@ -15,21 +15,38 @@ if "hpOneView" not in sys.modules: 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 - OneViewModuleException, - OneViewModuleTaskError, - OneViewModuleResourceNotFound, OneViewModuleBase, + OneViewModuleException, + OneViewModuleResourceNotFound, + OneViewModuleTaskError, +) +from ansible_collections.community.general.plugins.modules.oneview_ethernet_network import ( # pylint: disable=unused-import + EthernetNetworkModule, # noqa: F401 ) - -from ansible_collections.community.general.plugins.modules.oneview_ethernet_network import EthernetNetworkModule # noqa: F401, pylint: disable=unused-import from ansible_collections.community.general.plugins.modules.oneview_ethernet_network_info import ( # noqa: F401, pylint: disable=unused-import EthernetNetworkInfoModule, ) -from ansible_collections.community.general.plugins.modules.oneview_fc_network import FcNetworkModule # noqa: F401, pylint: disable=unused-import -from ansible_collections.community.general.plugins.modules.oneview_fc_network_info import FcNetworkInfoModule # noqa: F401, pylint: disable=unused-import -from ansible_collections.community.general.plugins.modules.oneview_fcoe_network import FcoeNetworkModule # noqa: F401, pylint: disable=unused-import -from ansible_collections.community.general.plugins.modules.oneview_fcoe_network_info import FcoeNetworkInfoModule # noqa: F401, pylint: disable=unused-import -from ansible_collections.community.general.plugins.modules.oneview_network_set import NetworkSetModule # noqa: F401, pylint: disable=unused-import -from ansible_collections.community.general.plugins.modules.oneview_network_set_info import NetworkSetInfoModule # noqa: F401, pylint: disable=unused-import -from ansible_collections.community.general.plugins.modules.oneview_san_manager import SanManagerModule # noqa: F401, pylint: disable=unused-import -from ansible_collections.community.general.plugins.modules.oneview_san_manager_info import SanManagerInfoModule # noqa: F401, pylint: disable=unused-import +from ansible_collections.community.general.plugins.modules.oneview_fc_network import ( # pylint: disable=unused-import + FcNetworkModule, # noqa: F401 +) +from ansible_collections.community.general.plugins.modules.oneview_fc_network_info import ( # pylint: disable=unused-import + FcNetworkInfoModule, # noqa: F401 +) +from ansible_collections.community.general.plugins.modules.oneview_fcoe_network import ( # pylint: disable=unused-import + FcoeNetworkModule, # noqa: F401 +) +from ansible_collections.community.general.plugins.modules.oneview_fcoe_network_info import ( # pylint: disable=unused-import + FcoeNetworkInfoModule, # noqa: F401 +) +from ansible_collections.community.general.plugins.modules.oneview_network_set import ( # pylint: disable=unused-import + NetworkSetModule, # noqa: F401 +) +from ansible_collections.community.general.plugins.modules.oneview_network_set_info import ( # pylint: disable=unused-import + NetworkSetInfoModule, # noqa: F401 +) +from ansible_collections.community.general.plugins.modules.oneview_san_manager import ( # pylint: disable=unused-import + SanManagerModule, # noqa: F401 +) +from ansible_collections.community.general.plugins.modules.oneview_san_manager_info import ( # pylint: disable=unused-import + SanManagerInfoModule, # noqa: F401 +) diff --git a/tests/unit/plugins/modules/test_alerta_customer.py b/tests/unit/plugins/modules/test_alerta_customer.py index 94f141847a..5403285765 100644 --- a/tests/unit/plugins/modules/test_alerta_customer.py +++ b/tests/unit/plugins/modules/test_alerta_customer.py @@ -8,7 +8,6 @@ import json from unittest.mock import patch import pytest -from ansible_collections.community.general.plugins.modules import alerta_customer from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -16,6 +15,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import alerta_customer + class MockedReponse: def __init__(self, data): diff --git a/tests/unit/plugins/modules/test_apk.py b/tests/unit/plugins/modules/test_apk.py index 46a4aacb54..2d6e38fcd0 100644 --- a/tests/unit/plugins/modules/test_apk.py +++ b/tests/unit/plugins/modules/test_apk.py @@ -4,8 +4,8 @@ from __future__ import annotations -from unittest import mock import unittest +from unittest import mock from ansible_collections.community.general.plugins.modules import apk diff --git a/tests/unit/plugins/modules/test_archive.py b/tests/unit/plugins/modules/test_archive.py index 210a5dd6a9..8edd848748 100644 --- a/tests/unit/plugins/modules/test_archive.py +++ b/tests/unit/plugins/modules/test_archive.py @@ -4,14 +4,15 @@ from __future__ import annotations -import pytest from unittest.mock import Mock, patch +import pytest from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( ModuleTestCase, set_module_args, ) -from ansible_collections.community.general.plugins.modules.archive import get_archive, common_path, create_module + +from ansible_collections.community.general.plugins.modules.archive import common_path, create_module, get_archive class TestArchive(ModuleTestCase): diff --git a/tests/unit/plugins/modules/test_bitbucket_access_key.py b/tests/unit/plugins/modules/test_bitbucket_access_key.py index 3c43021d5b..20ce1a1c21 100644 --- a/tests/unit/plugins/modules/test_bitbucket_access_key.py +++ b/tests/unit/plugins/modules/test_bitbucket_access_key.py @@ -6,15 +6,16 @@ from __future__ import annotations from unittest.mock import patch -from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper -from ansible_collections.community.general.plugins.modules import bitbucket_access_key from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( - AnsibleFailJson, AnsibleExitJson, + AnsibleFailJson, ModuleTestCase, set_module_args, ) +from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.modules import bitbucket_access_key + class TestBucketAccessKeyModule(ModuleTestCase): def setUp(self): 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 3bdd984e52..a8c3281cde 100644 --- a/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py +++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py @@ -6,15 +6,16 @@ from __future__ import annotations from unittest.mock import patch -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( - AnsibleFailJson, AnsibleExitJson, + AnsibleFailJson, ModuleTestCase, set_module_args, ) +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 + class TestBucketPipelineKeyPairModule(ModuleTestCase): def setUp(self): 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 581a02bba3..b365617d5b 100644 --- a/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py +++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py @@ -7,16 +7,16 @@ from __future__ import annotations from unittest.mock import patch import pytest - -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, ModuleTestCase, set_module_args, ) +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 + class TestBucketPipelineKnownHostModule(ModuleTestCase): def setUp(self): diff --git a/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py b/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py index 2938ea7311..7ab977b4e0 100644 --- a/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py +++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py @@ -6,15 +6,16 @@ from __future__ import annotations from unittest.mock import patch -from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper -from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_variable from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( - AnsibleFailJson, AnsibleExitJson, + AnsibleFailJson, ModuleTestCase, set_module_args, ) +from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_variable + class TestBucketPipelineVariableModule(ModuleTestCase): def setUp(self): diff --git a/tests/unit/plugins/modules/test_bootc_manage.py b/tests/unit/plugins/modules/test_bootc_manage.py index af072eacf1..96a27e79e3 100644 --- a/tests/unit/plugins/modules/test_bootc_manage.py +++ b/tests/unit/plugins/modules/test_bootc_manage.py @@ -5,7 +5,7 @@ from __future__ import annotations from unittest.mock import patch -from ansible_collections.community.general.plugins.modules import bootc_manage + from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -13,6 +13,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import bootc_manage + class TestBootcManageModule(ModuleTestCase): def setUp(self): diff --git a/tests/unit/plugins/modules/test_campfire.py b/tests/unit/plugins/modules/test_campfire.py index 00cc8ad95c..4d268b7c5c 100644 --- a/tests/unit/plugins/modules/test_campfire.py +++ b/tests/unit/plugins/modules/test_campfire.py @@ -4,9 +4,9 @@ from __future__ import annotations -import pytest from unittest.mock import patch -from ansible_collections.community.general.plugins.modules import campfire + +import pytest from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -14,6 +14,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import campfire + class TestCampfireModule(ModuleTestCase): def setUp(self): diff --git a/tests/unit/plugins/modules/test_circonus_annotation.py b/tests/unit/plugins/modules/test_circonus_annotation.py index 8372cdeeda..a56c5f84b7 100644 --- a/tests/unit/plugins/modules/test_circonus_annotation.py +++ b/tests/unit/plugins/modules/test_circonus_annotation.py @@ -9,16 +9,17 @@ import json import re import uuid from unittest.mock import patch -from urllib3.response import HTTPResponse from ansible.module_utils.common.text.converters import to_bytes -from ansible_collections.community.general.plugins.modules import circonus_annotation from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args, ) +from urllib3.response import HTTPResponse + +from ansible_collections.community.general.plugins.modules import circonus_annotation class TestCirconusAnnotation(ModuleTestCase): diff --git a/tests/unit/plugins/modules/test_composer.py b/tests/unit/plugins/modules/test_composer.py index 68f716e14a..71648bfa86 100644 --- a/tests/unit/plugins/modules/test_composer.py +++ b/tests/unit/plugins/modules/test_composer.py @@ -7,9 +7,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import composer -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(composer, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_cpanm.py b/tests/unit/plugins/modules/test_cpanm.py index 3949b68ff3..8be24a1d60 100644 --- a/tests/unit/plugins/modules/test_cpanm.py +++ b/tests/unit/plugins/modules/test_cpanm.py @@ -10,9 +10,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import cpanm -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(cpanm, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_datadog_downtime.py b/tests/unit/plugins/modules/test_datadog_downtime.py index 193858f9a8..d3bafdaeb7 100644 --- a/tests/unit/plugins/modules/test_datadog_downtime.py +++ b/tests/unit/plugins/modules/test_datadog_downtime.py @@ -4,18 +4,18 @@ from __future__ import annotations - -from ansible_collections.community.general.plugins.modules import datadog_downtime from unittest.mock import MagicMock, patch + from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args, ) - from pytest import importorskip +from ansible_collections.community.general.plugins.modules import datadog_downtime + # Skip this test if datadog_api_client cannot be installed datadog_api_client = importorskip("datadog_api_client") Downtime = datadog_api_client.v1.model.downtime.Downtime diff --git a/tests/unit/plugins/modules/test_discord.py b/tests/unit/plugins/modules/test_discord.py index c43b1ffdd3..56bda00cb2 100644 --- a/tests/unit/plugins/modules/test_discord.py +++ b/tests/unit/plugins/modules/test_discord.py @@ -8,8 +8,6 @@ import json from unittest.mock import patch import pytest - -from ansible_collections.community.general.plugins.modules import discord from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -17,6 +15,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import discord + class TestDiscordModule(ModuleTestCase): def setUp(self): diff --git a/tests/unit/plugins/modules/test_django_check.py b/tests/unit/plugins/modules/test_django_check.py index 276ba94f97..d9a7bb7f62 100644 --- a/tests/unit/plugins/modules/test_django_check.py +++ b/tests/unit/plugins/modules/test_django_check.py @@ -4,9 +4,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import django_check -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(django_check, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_django_command.py b/tests/unit/plugins/modules/test_django_command.py index fc8ecf73d0..ef128e10f6 100644 --- a/tests/unit/plugins/modules/test_django_command.py +++ b/tests/unit/plugins/modules/test_django_command.py @@ -4,9 +4,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import django_command -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(django_command, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_django_createcachetable.py b/tests/unit/plugins/modules/test_django_createcachetable.py index f0ece53516..6cd8335018 100644 --- a/tests/unit/plugins/modules/test_django_createcachetable.py +++ b/tests/unit/plugins/modules/test_django_createcachetable.py @@ -4,9 +4,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import django_createcachetable -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(django_createcachetable, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_django_dumpdata.py b/tests/unit/plugins/modules/test_django_dumpdata.py index 004cd4effc..bde6e54bd4 100644 --- a/tests/unit/plugins/modules/test_django_dumpdata.py +++ b/tests/unit/plugins/modules/test_django_dumpdata.py @@ -4,9 +4,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import django_dumpdata -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(django_dumpdata, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_django_loaddata.py b/tests/unit/plugins/modules/test_django_loaddata.py index 6231ab3b1e..90134f06db 100644 --- a/tests/unit/plugins/modules/test_django_loaddata.py +++ b/tests/unit/plugins/modules/test_django_loaddata.py @@ -4,9 +4,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import django_loaddata -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(django_loaddata, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_dnf_config_manager.py b/tests/unit/plugins/modules/test_dnf_config_manager.py index c68041f762..ba0809a47d 100644 --- a/tests/unit/plugins/modules/test_dnf_config_manager.py +++ b/tests/unit/plugins/modules/test_dnf_config_manager.py @@ -3,8 +3,8 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations -from unittest.mock import patch, call -from ansible_collections.community.general.plugins.modules import dnf_config_manager as dnf_config_manager_module +from unittest.mock import call, patch + from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -12,6 +12,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import dnf_config_manager as dnf_config_manager_module + # Return value on all-default arguments mock_repolist_crb_enabled = """Loaded plugins: builddep, changelog, config-manager, copr, debug, debuginfo-install DNF version: 4.14.0 diff --git a/tests/unit/plugins/modules/test_dnsimple.py b/tests/unit/plugins/modules/test_dnsimple.py index 6db2d2bf62..48b82f5fd4 100644 --- a/tests/unit/plugins/modules/test_dnsimple.py +++ b/tests/unit/plugins/modules/test_dnsimple.py @@ -4,14 +4,16 @@ from __future__ import annotations -from ansible_collections.community.general.plugins.modules import dnsimple as dnsimple_module +from unittest.mock import patch + +import pytest from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleFailJson, ModuleTestCase, set_module_args, ) -from unittest.mock import patch -import pytest + +from ansible_collections.community.general.plugins.modules import dnsimple as dnsimple_module dnsimple = pytest.importorskip("dnsimple") diff --git a/tests/unit/plugins/modules/test_dnsimple_info.py b/tests/unit/plugins/modules/test_dnsimple_info.py index 271900a2a3..b93736eabf 100644 --- a/tests/unit/plugins/modules/test_dnsimple_info.py +++ b/tests/unit/plugins/modules/test_dnsimple_info.py @@ -4,17 +4,15 @@ from __future__ import annotations - -from ansible_collections.community.general.plugins.modules import dnsimple_info from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( + AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args, - AnsibleExitJson, ) -from httmock import response -from httmock import with_httmock -from httmock import urlmatch +from httmock import response, urlmatch, with_httmock + +from ansible_collections.community.general.plugins.modules import dnsimple_info @urlmatch(netloc="(.)*dnsimple.com(.)*", path="/v2/[0-9]*/zones/") diff --git a/tests/unit/plugins/modules/test_facter_facts.py b/tests/unit/plugins/modules/test_facter_facts.py index a54fae84f9..7d1058a6ca 100644 --- a/tests/unit/plugins/modules/test_facter_facts.py +++ b/tests/unit/plugins/modules/test_facter_facts.py @@ -4,9 +4,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import facter_facts -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(facter_facts, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_gconftool2.py b/tests/unit/plugins/modules/test_gconftool2.py index 8aa99db313..77e1eaa318 100644 --- a/tests/unit/plugins/modules/test_gconftool2.py +++ b/tests/unit/plugins/modules/test_gconftool2.py @@ -4,9 +4,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import gconftool2 -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(gconftool2, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_gconftool2_info.py b/tests/unit/plugins/modules/test_gconftool2_info.py index c3117317d1..ebc4829f11 100644 --- a/tests/unit/plugins/modules/test_gconftool2_info.py +++ b/tests/unit/plugins/modules/test_gconftool2_info.py @@ -4,9 +4,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import gconftool2_info -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(gconftool2_info, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_gem.py b/tests/unit/plugins/modules/test_gem.py index d29f1366c9..c979f2a553 100644 --- a/tests/unit/plugins/modules/test_gem.py +++ b/tests/unit/plugins/modules/test_gem.py @@ -6,8 +6,6 @@ from __future__ import annotations import copy import pytest - -from ansible_collections.community.general.plugins.modules import gem from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -15,6 +13,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import gem + def get_command(run_command): """Generate the command line string from the patched run_command""" diff --git a/tests/unit/plugins/modules/test_gio_mime.py b/tests/unit/plugins/modules/test_gio_mime.py index 7ce60eea97..62cd3ca6f8 100644 --- a/tests/unit/plugins/modules/test_gio_mime.py +++ b/tests/unit/plugins/modules/test_gio_mime.py @@ -4,9 +4,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import gio_mime -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(gio_mime, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_github_repo.py b/tests/unit/plugins/modules/test_github_repo.py index 4058fa9fdf..b8fd9208b1 100644 --- a/tests/unit/plugins/modules/test_github_repo.py +++ b/tests/unit/plugins/modules/test_github_repo.py @@ -4,13 +4,14 @@ from __future__ import annotations -import re import json +import re import unittest -import pytest -from httmock import with_httmock, urlmatch, response -from ansible_collections.community.general.plugins.modules import github_repo +import pytest +from httmock import response, urlmatch, with_httmock + +from ansible_collections.community.general.plugins.modules import github_repo pytest.importorskip("github") diff --git a/tests/unit/plugins/modules/test_gitlab_deploy_key.py b/tests/unit/plugins/modules/test_gitlab_deploy_key.py index 7dd3823445..b5fcd311bc 100644 --- a/tests/unit/plugins/modules/test_gitlab_deploy_key.py +++ b/tests/unit/plugins/modules/test_gitlab_deploy_key.py @@ -17,16 +17,16 @@ def _dummy(x): pytestmark = [] try: - from .gitlab import ( - GitlabModuleTestCase, - resp_get_project, - resp_find_project_deploy_key, - resp_create_project_deploy_key, - resp_delete_project_deploy_key, - ) - # GitLab module requirements from gitlab.v4.objects import ProjectKey + + from .gitlab import ( + GitlabModuleTestCase, + resp_create_project_deploy_key, + resp_delete_project_deploy_key, + resp_find_project_deploy_key, + resp_get_project, + ) except ImportError: pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing")) # Need to set these to something so that we don't fail when parsing diff --git a/tests/unit/plugins/modules/test_gitlab_group.py b/tests/unit/plugins/modules/test_gitlab_group.py index 71e81e0c77..6c996d42f6 100644 --- a/tests/unit/plugins/modules/test_gitlab_group.py +++ b/tests/unit/plugins/modules/test_gitlab_group.py @@ -17,18 +17,18 @@ def _dummy(x): pytestmark = [] try: + # GitLab module requirements + from gitlab.v4.objects import Group + from .gitlab import ( GitlabModuleTestCase, - resp_get_group, - resp_get_missing_group, resp_create_group, resp_create_subgroup, resp_delete_group, resp_find_group_project, + resp_get_group, + resp_get_missing_group, ) - - # GitLab module requirements - from gitlab.v4.objects import Group except ImportError: pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing")) # Need to set these to something so that we don't fail when parsing diff --git a/tests/unit/plugins/modules/test_gitlab_group_access_token.py b/tests/unit/plugins/modules/test_gitlab_group_access_token.py index 5473623708..7eef49d5c8 100644 --- a/tests/unit/plugins/modules/test_gitlab_group_access_token.py +++ b/tests/unit/plugins/modules/test_gitlab_group_access_token.py @@ -4,8 +4,8 @@ from __future__ import annotations -import pytest import gitlab +import pytest from ansible_collections.community.general.plugins.modules.gitlab_group_access_token import GitLabGroupAccessToken @@ -27,10 +27,10 @@ pytestmark = [] try: from .gitlab import ( GitlabModuleTestCase, - resp_get_user, - resp_get_group, - resp_list_group_access_tokens, resp_create_group_access_tokens, + resp_get_group, + resp_get_user, + resp_list_group_access_tokens, resp_revoke_group_access_tokens, ) diff --git a/tests/unit/plugins/modules/test_gitlab_hook.py b/tests/unit/plugins/modules/test_gitlab_hook.py index 7dc8055766..17b96025e6 100644 --- a/tests/unit/plugins/modules/test_gitlab_hook.py +++ b/tests/unit/plugins/modules/test_gitlab_hook.py @@ -17,16 +17,16 @@ def _dummy(x): pytestmark = [] try: - from .gitlab import ( - GitlabModuleTestCase, - resp_get_project, - resp_find_project_hook, - resp_create_project_hook, - resp_delete_project_hook, - ) - # GitLab module requirements from gitlab.v4.objects import ProjectHook + + from .gitlab import ( + GitlabModuleTestCase, + resp_create_project_hook, + resp_delete_project_hook, + resp_find_project_hook, + resp_get_project, + ) except ImportError: pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing")) # Need to set these to something so that we don't fail when parsing diff --git a/tests/unit/plugins/modules/test_gitlab_project.py b/tests/unit/plugins/modules/test_gitlab_project.py index 5298469bd1..19f4c30363 100644 --- a/tests/unit/plugins/modules/test_gitlab_project.py +++ b/tests/unit/plugins/modules/test_gitlab_project.py @@ -17,18 +17,18 @@ def _dummy(x): pytestmark = [] try: - from .gitlab import ( - GitlabModuleTestCase, - resp_get_group, - resp_get_project_by_name, - resp_create_project, - resp_get_project, - resp_delete_project, - resp_get_user, - ) - # GitLab module requirements from gitlab.v4.objects import Project + + from .gitlab import ( + GitlabModuleTestCase, + resp_create_project, + resp_delete_project, + resp_get_group, + resp_get_project, + resp_get_project_by_name, + resp_get_user, + ) except ImportError: pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing")) # Need to set these to something so that we don't fail when parsing diff --git a/tests/unit/plugins/modules/test_gitlab_project_access_token.py b/tests/unit/plugins/modules/test_gitlab_project_access_token.py index 3eccae9c5f..d9af516deb 100644 --- a/tests/unit/plugins/modules/test_gitlab_project_access_token.py +++ b/tests/unit/plugins/modules/test_gitlab_project_access_token.py @@ -4,8 +4,8 @@ from __future__ import annotations -import pytest import gitlab +import pytest from ansible_collections.community.general.plugins.modules.gitlab_project_access_token import GitLabProjectAccessToken @@ -27,10 +27,10 @@ pytestmark = [] try: from .gitlab import ( GitlabModuleTestCase, - resp_get_user, - resp_get_project, - resp_list_project_access_tokens, resp_create_project_access_tokens, + resp_get_project, + resp_get_user, + resp_list_project_access_tokens, resp_revoke_project_access_tokens, ) diff --git a/tests/unit/plugins/modules/test_gitlab_protected_branch.py b/tests/unit/plugins/modules/test_gitlab_protected_branch.py index d42193cd25..4ec80f430b 100644 --- a/tests/unit/plugins/modules/test_gitlab_protected_branch.py +++ b/tests/unit/plugins/modules/test_gitlab_protected_branch.py @@ -7,7 +7,6 @@ from __future__ import annotations import pytest from ansible_collections.community.general.plugins.module_utils.version import LooseVersion - from ansible_collections.community.general.plugins.modules.gitlab_protected_branch import GitlabProtectedBranch @@ -19,20 +18,20 @@ def _dummy(x): pytestmark = [] try: + # GitLab module requirements + from gitlab.v4.objects import Project # noqa: F401, pylint: disable=unused-import + from .gitlab import ( GitlabModuleTestCase, python_gitlab_module_version, python_gitlab_version_match_requirement, - resp_get_protected_branch, - resp_get_project_by_name, - resp_get_protected_branch_not_exist, resp_delete_protected_branch, + resp_get_project_by_name, + resp_get_protected_branch, + resp_get_protected_branch_not_exist, resp_get_user, ) - # GitLab module requirements - from gitlab.v4.objects import Project # noqa: F401, pylint: disable=unused-import - gitlab_req_version = python_gitlab_version_match_requirement() gitlab_module_version = python_gitlab_module_version() if LooseVersion(gitlab_module_version) < LooseVersion(gitlab_req_version): diff --git a/tests/unit/plugins/modules/test_gitlab_runner.py b/tests/unit/plugins/modules/test_gitlab_runner.py index b9197b24c6..12ccd28770 100644 --- a/tests/unit/plugins/modules/test_gitlab_runner.py +++ b/tests/unit/plugins/modules/test_gitlab_runner.py @@ -5,7 +5,6 @@ from __future__ import annotations import gitlab - import pytest from ansible_collections.community.general.plugins.modules.gitlab_runner import GitLabRunner @@ -19,22 +18,22 @@ def _dummy(x): pytestmark = [] try: + # GitLab module requirements + from gitlab.v4.objects import Runner + from .gitlab import ( FakeAnsibleModule, GitlabModuleTestCase, - resp_find_runners_all, - resp_find_runners_list, - resp_find_project_runners, - resp_find_group_runners, - resp_get_runner, resp_create_runner, resp_delete_runner, - resp_get_project_by_name, + resp_find_group_runners, + resp_find_project_runners, + resp_find_runners_all, + resp_find_runners_list, resp_get_group_by_name, + resp_get_project_by_name, + resp_get_runner, ) - - # GitLab module requirements - from gitlab.v4.objects import Runner except ImportError: pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing")) # Need to set these to something so that we don't fail when parsing diff --git a/tests/unit/plugins/modules/test_gitlab_user.py b/tests/unit/plugins/modules/test_gitlab_user.py index 2dbae4edff..9fb02f2b70 100644 --- a/tests/unit/plugins/modules/test_gitlab_user.py +++ b/tests/unit/plugins/modules/test_gitlab_user.py @@ -17,23 +17,22 @@ def _dummy(x): pytestmark = [] try: - from .gitlab import ( - GitlabModuleTestCase, - resp_find_user, - resp_get_user, - resp_get_user_keys, - resp_create_user_keys, - resp_create_user, - resp_delete_user, - resp_get_member, - resp_get_group, - resp_add_member, - resp_update_member, - resp_get_member, - ) - # GitLab module requirements from gitlab.v4.objects import User + + from .gitlab import ( + GitlabModuleTestCase, + resp_add_member, + resp_create_user, + resp_create_user_keys, + resp_delete_user, + resp_find_user, + resp_get_group, + resp_get_member, + resp_get_user, + resp_get_user_keys, + resp_update_member, + ) except ImportError: pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing")) # Need to set these to something so that we don't fail when parsing diff --git a/tests/unit/plugins/modules/test_homebrew.py b/tests/unit/plugins/modules/test_homebrew.py index 395f2f9201..e768d0d06f 100644 --- a/tests/unit/plugins/modules/test_homebrew.py +++ b/tests/unit/plugins/modules/test_homebrew.py @@ -5,6 +5,7 @@ from __future__ import annotations import unittest + from ansible_collections.community.general.plugins.module_utils.homebrew import HomebrewValidate diff --git a/tests/unit/plugins/modules/test_homebrew_cask.py b/tests/unit/plugins/modules/test_homebrew_cask.py index a18b9929fd..60dab6e459 100644 --- a/tests/unit/plugins/modules/test_homebrew_cask.py +++ b/tests/unit/plugins/modules/test_homebrew_cask.py @@ -4,13 +4,12 @@ from __future__ import annotations - -from ansible_collections.community.general.plugins.modules.homebrew_cask import ( - HomebrewCask, -) from ansible_collections.community.general.plugins.module_utils.homebrew import ( HomebrewValidate, ) +from ansible_collections.community.general.plugins.modules.homebrew_cask import ( + HomebrewCask, +) def test_valid_cask_names(): diff --git a/tests/unit/plugins/modules/test_icinga2_feature.py b/tests/unit/plugins/modules/test_icinga2_feature.py index c818e1462c..db32e9ae70 100644 --- a/tests/unit/plugins/modules/test_icinga2_feature.py +++ b/tests/unit/plugins/modules/test_icinga2_feature.py @@ -7,14 +7,16 @@ from __future__ import annotations from unittest.mock import patch -from ansible_collections.community.general.plugins.modules import icinga2_feature + +from ansible.module_utils import basic from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args, ) -from ansible.module_utils import basic + +from ansible_collections.community.general.plugins.modules import icinga2_feature def get_bin_path(*args, **kwargs): diff --git a/tests/unit/plugins/modules/test_ip2location_info.py b/tests/unit/plugins/modules/test_ip2location_info.py index ad4d35334a..b6e4cbced9 100644 --- a/tests/unit/plugins/modules/test_ip2location_info.py +++ b/tests/unit/plugins/modules/test_ip2location_info.py @@ -10,7 +10,6 @@ from unittest.mock import Mock, patch from ansible_collections.community.general.plugins.modules.ip2location_info import Ip2LocationInfo - IP2LOCATION_DATA = { "ip": "8.8.8.8", "country_code": "US", diff --git a/tests/unit/plugins/modules/test_ipa_getkeytab.py b/tests/unit/plugins/modules/test_ipa_getkeytab.py index 1bd35cecb6..4be8869bd4 100644 --- a/tests/unit/plugins/modules/test_ipa_getkeytab.py +++ b/tests/unit/plugins/modules/test_ipa_getkeytab.py @@ -6,13 +6,15 @@ from __future__ import annotations from unittest.mock import call, patch -from ansible_collections.community.general.plugins.modules import ipa_getkeytab + from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, ModuleTestCase, set_module_args, ) +from ansible_collections.community.general.plugins.modules import ipa_getkeytab + class IPAKeytabModuleTestCase(ModuleTestCase): module = ipa_getkeytab diff --git a/tests/unit/plugins/modules/test_ipbase.py b/tests/unit/plugins/modules/test_ipbase.py index 4a96df1bf6..f6054e4edb 100644 --- a/tests/unit/plugins/modules/test_ipbase.py +++ b/tests/unit/plugins/modules/test_ipbase.py @@ -5,11 +5,10 @@ from __future__ import annotations import json - -from ansible_collections.community.general.plugins.modules.ipbase_info import IpbaseInfo import unittest from unittest.mock import Mock +from ansible_collections.community.general.plugins.modules.ipbase_info import IpbaseInfo IPBASE_DATA = { "response": b""" diff --git a/tests/unit/plugins/modules/test_java_keystore.py b/tests/unit/plugins/modules/test_java_keystore.py index 983bd5983b..bb8aa93ab2 100644 --- a/tests/unit/plugins/modules/test_java_keystore.py +++ b/tests/unit/plugins/modules/test_java_keystore.py @@ -7,13 +7,14 @@ from __future__ import annotations import os -from unittest.mock import patch, Mock +from unittest.mock import Mock, patch +from ansible.module_utils.basic import AnsibleModule # noqa: F401 # pylint: disable=unused-import from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( ModuleTestCase, set_module_args, ) -from ansible.module_utils.basic import AnsibleModule # noqa: F401 # pylint: disable=unused-import + from ansible_collections.community.general.plugins.modules.java_keystore import JavaKeystore, create_module diff --git a/tests/unit/plugins/modules/test_jenkins_build.py b/tests/unit/plugins/modules/test_jenkins_build.py index c902dfc9fc..886f698cdc 100644 --- a/tests/unit/plugins/modules/test_jenkins_build.py +++ b/tests/unit/plugins/modules/test_jenkins_build.py @@ -8,15 +8,16 @@ import unittest from unittest.mock import patch from ansible.module_utils import basic -from ansible_collections.community.general.plugins.modules import jenkins_build from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, - set_module_args, exit_json, fail_json, + set_module_args, ) +from ansible_collections.community.general.plugins.modules import jenkins_build + class jenkins: class JenkinsException(Exception): diff --git a/tests/unit/plugins/modules/test_jenkins_build_info.py b/tests/unit/plugins/modules/test_jenkins_build_info.py index c4868d05be..13c02640bf 100644 --- a/tests/unit/plugins/modules/test_jenkins_build_info.py +++ b/tests/unit/plugins/modules/test_jenkins_build_info.py @@ -8,15 +8,16 @@ import unittest from unittest.mock import patch from ansible.module_utils import basic -from ansible_collections.community.general.plugins.modules import jenkins_build_info from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, - set_module_args, exit_json, fail_json, + set_module_args, ) +from ansible_collections.community.general.plugins.modules import jenkins_build_info + class jenkins: class JenkinsException(Exception): diff --git a/tests/unit/plugins/modules/test_jenkins_credential.py b/tests/unit/plugins/modules/test_jenkins_credential.py index d9a891628b..68e48a9bdc 100644 --- a/tests/unit/plugins/modules/test_jenkins_credential.py +++ b/tests/unit/plugins/modules/test_jenkins_credential.py @@ -4,16 +4,15 @@ from __future__ import annotations - -from ansible_collections.community.general.plugins.modules import jenkins_credential -from unittest.mock import ( - MagicMock, - patch, - mock_open, -) - import builtins import json +from unittest.mock import ( + MagicMock, + mock_open, + patch, +) + +from ansible_collections.community.general.plugins.modules import jenkins_credential def test_validate_file_exist_passes_when_file_exists(): diff --git a/tests/unit/plugins/modules/test_jenkins_node.py b/tests/unit/plugins/modules/test_jenkins_node.py index 5d8272aa98..d85fc3adee 100644 --- a/tests/unit/plugins/modules/test_jenkins_node.py +++ b/tests/unit/plugins/modules/test_jenkins_node.py @@ -4,22 +4,21 @@ from __future__ import annotations -import jenkins - -from unittest.mock import patch, call +from unittest.mock import call, patch from xml.etree import ElementTree as et +import jenkins import pytest - -from ansible_collections.community.general.plugins.modules import jenkins_node from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, - set_module_args, exit_json, fail_json, + set_module_args, ) -from pytest import fixture, raises, mark, param +from pytest import fixture, mark, param, raises + +from ansible_collections.community.general.plugins.modules import jenkins_node def xml_equal(x, y): diff --git a/tests/unit/plugins/modules/test_jenkins_plugin.py b/tests/unit/plugins/modules/test_jenkins_plugin.py index 38db65af7b..3c9237534a 100644 --- a/tests/unit/plugins/modules/test_jenkins_plugin.py +++ b/tests/unit/plugins/modules/test_jenkins_plugin.py @@ -4,18 +4,19 @@ from __future__ import annotations -from io import BytesIO import json from collections import OrderedDict from collections.abc import Mapping +from io import BytesIO from unittest.mock import ( MagicMock, patch, ) -from ansible_collections.community.general.plugins.modules.jenkins_plugin import JenkinsPlugin from ansible.module_utils.urls import basic_auth_header +from ansible_collections.community.general.plugins.modules.jenkins_plugin import JenkinsPlugin + def pass_function(*args, **kwargs): pass diff --git a/tests/unit/plugins/modules/test_keycloak_authentication.py b/tests/unit/plugins/modules/test_keycloak_authentication.py index ebb884de73..5a9f1bc524 100644 --- a/tests/unit/plugins/modules/test_keycloak_authentication.py +++ b/tests/unit/plugins/modules/test_keycloak_authentication.py @@ -5,8 +5,10 @@ from __future__ import annotations from contextlib import contextmanager - +from io import StringIO +from itertools import count from unittest.mock import patch + from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, ModuleTestCase, @@ -15,9 +17,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import keycloak_authentication -from io import StringIO -from itertools import count - @contextmanager def patch_keycloak_api( 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 2c1860194b..410460c952 100644 --- a/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py +++ b/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py @@ -5,6 +5,8 @@ from __future__ import annotations from contextlib import contextmanager +from io import StringIO +from itertools import count from unittest.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( @@ -15,9 +17,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import keycloak_authentication_required_actions -from io import StringIO -from itertools import count - @contextmanager def patch_keycloak_api( diff --git a/tests/unit/plugins/modules/test_keycloak_client.py b/tests/unit/plugins/modules/test_keycloak_client.py index b1c15eb2e0..d472ef4284 100644 --- a/tests/unit/plugins/modules/test_keycloak_client.py +++ b/tests/unit/plugins/modules/test_keycloak_client.py @@ -4,10 +4,11 @@ from __future__ import annotations - from contextlib import contextmanager - +from io import StringIO +from itertools import count from unittest.mock import patch + from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, ModuleTestCase, @@ -16,9 +17,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import keycloak_client -from io import StringIO -from itertools import count - @contextmanager def patch_keycloak_api( diff --git a/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py b/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py index 2165e00aa6..0be5589391 100644 --- a/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py +++ b/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py @@ -5,6 +5,8 @@ from __future__ import annotations from contextlib import contextmanager +from io import StringIO +from itertools import count from unittest.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( @@ -15,9 +17,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import keycloak_client_rolemapping -from io import StringIO -from itertools import count - @contextmanager def patch_keycloak_api( diff --git a/tests/unit/plugins/modules/test_keycloak_clientscope.py b/tests/unit/plugins/modules/test_keycloak_clientscope.py index b5d9fc213a..76df2bf4ca 100644 --- a/tests/unit/plugins/modules/test_keycloak_clientscope.py +++ b/tests/unit/plugins/modules/test_keycloak_clientscope.py @@ -5,6 +5,8 @@ from __future__ import annotations from contextlib import contextmanager +from io import StringIO +from itertools import count from unittest.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( @@ -15,9 +17,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import keycloak_clientscope -from io import StringIO -from itertools import count - @contextmanager def patch_keycloak_api( diff --git a/tests/unit/plugins/modules/test_keycloak_component.py b/tests/unit/plugins/modules/test_keycloak_component.py index b319d21610..0d9ee42519 100644 --- a/tests/unit/plugins/modules/test_keycloak_component.py +++ b/tests/unit/plugins/modules/test_keycloak_component.py @@ -9,14 +9,13 @@ from io import StringIO from itertools import count from unittest.mock import patch -from ansible_collections.community.general.plugins.modules import keycloak_realm_key from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, ModuleTestCase, set_module_args, ) -from ansible_collections.community.general.plugins.modules import keycloak_component +from ansible_collections.community.general.plugins.modules import keycloak_component, keycloak_realm_key @contextmanager diff --git a/tests/unit/plugins/modules/test_keycloak_identity_provider.py b/tests/unit/plugins/modules/test_keycloak_identity_provider.py index 4f49387230..4680230bb5 100644 --- a/tests/unit/plugins/modules/test_keycloak_identity_provider.py +++ b/tests/unit/plugins/modules/test_keycloak_identity_provider.py @@ -5,8 +5,10 @@ from __future__ import annotations from contextlib import contextmanager - +from io import StringIO +from itertools import count from unittest.mock import patch + from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, ModuleTestCase, @@ -15,9 +17,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import keycloak_identity_provider -from io import StringIO -from itertools import count - @contextmanager def patch_keycloak_api( diff --git a/tests/unit/plugins/modules/test_keycloak_realm.py b/tests/unit/plugins/modules/test_keycloak_realm.py index b3e3efe9ab..a5ff89306a 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm.py +++ b/tests/unit/plugins/modules/test_keycloak_realm.py @@ -5,6 +5,8 @@ from __future__ import annotations from contextlib import contextmanager +from io import StringIO +from itertools import count from unittest.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( @@ -15,9 +17,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import keycloak_realm -from io import StringIO -from itertools import count - @contextmanager def patch_keycloak_api(get_realm_by_id, create_realm=None, update_realm=None, delete_realm=None): diff --git a/tests/unit/plugins/modules/test_keycloak_realm_info.py b/tests/unit/plugins/modules/test_keycloak_realm_info.py index cd14209eae..a5751248f8 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm_info.py +++ b/tests/unit/plugins/modules/test_keycloak_realm_info.py @@ -5,6 +5,8 @@ from __future__ import annotations from contextlib import contextmanager +from io import StringIO +from itertools import count from unittest.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( @@ -15,9 +17,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import keycloak_realm_info -from io import StringIO -from itertools import count - @contextmanager def patch_keycloak_api(get_realm_info_by_id): diff --git a/tests/unit/plugins/modules/test_keycloak_realm_keys.py b/tests/unit/plugins/modules/test_keycloak_realm_keys.py index 0831b6032f..9c71116394 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm_keys.py +++ b/tests/unit/plugins/modules/test_keycloak_realm_keys.py @@ -5,6 +5,8 @@ from __future__ import annotations from contextlib import contextmanager +from io import StringIO +from itertools import count from unittest.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( @@ -15,9 +17,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import keycloak_realm_key -from io import StringIO -from itertools import count - @contextmanager def patch_keycloak_api( 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 7e2093b315..1b3045d165 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 @@ -9,13 +9,14 @@ from io import StringIO from itertools import count from unittest.mock import patch -from ansible_collections.community.general.plugins.modules import keycloak_realm_keys_metadata_info from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, ModuleTestCase, set_module_args, ) +from ansible_collections.community.general.plugins.modules import keycloak_realm_keys_metadata_info + @contextmanager def patch_keycloak_api(side_effect): diff --git a/tests/unit/plugins/modules/test_keycloak_role.py b/tests/unit/plugins/modules/test_keycloak_role.py index e01d99c184..5ff597bc7d 100644 --- a/tests/unit/plugins/modules/test_keycloak_role.py +++ b/tests/unit/plugins/modules/test_keycloak_role.py @@ -5,6 +5,8 @@ from __future__ import annotations from contextlib import contextmanager +from io import StringIO +from itertools import count from unittest.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( @@ -15,9 +17,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import keycloak_role -from io import StringIO -from itertools import count - @contextmanager def patch_keycloak_api( diff --git a/tests/unit/plugins/modules/test_keycloak_user.py b/tests/unit/plugins/modules/test_keycloak_user.py index e3a4519bfa..ae6925eff2 100644 --- a/tests/unit/plugins/modules/test_keycloak_user.py +++ b/tests/unit/plugins/modules/test_keycloak_user.py @@ -4,10 +4,11 @@ from __future__ import annotations - from contextlib import contextmanager - +from io import StringIO +from itertools import count from unittest.mock import patch + from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, ModuleTestCase, @@ -16,9 +17,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import keycloak_user -from io import StringIO -from itertools import count - @contextmanager def patch_keycloak_api( 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 80302f45e5..dc411f4fee 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 @@ -5,6 +5,8 @@ from __future__ import annotations from contextlib import contextmanager +from io import StringIO +from itertools import count from unittest.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( @@ -18,9 +20,6 @@ from ansible_collections.community.general.plugins.modules import ( keycloak_user_execute_actions_email as module_under_test, ) -from io import StringIO -from itertools import count - def _create_wrapper(text_as_string): def _wrapper(): diff --git a/tests/unit/plugins/modules/test_keycloak_user_federation.py b/tests/unit/plugins/modules/test_keycloak_user_federation.py index 1311d70e76..0283d195eb 100644 --- a/tests/unit/plugins/modules/test_keycloak_user_federation.py +++ b/tests/unit/plugins/modules/test_keycloak_user_federation.py @@ -5,6 +5,8 @@ from __future__ import annotations from contextlib import contextmanager +from io import StringIO +from itertools import count from unittest.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( @@ -15,9 +17,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import keycloak_user_federation -from io import StringIO -from itertools import count - @contextmanager def patch_keycloak_api( diff --git a/tests/unit/plugins/modules/test_keycloak_userprofile.py b/tests/unit/plugins/modules/test_keycloak_userprofile.py index f9d54f36d7..4f559ee096 100644 --- a/tests/unit/plugins/modules/test_keycloak_userprofile.py +++ b/tests/unit/plugins/modules/test_keycloak_userprofile.py @@ -5,6 +5,9 @@ from __future__ import annotations from contextlib import contextmanager +from io import StringIO +from itertools import count +from json import dumps from unittest.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( @@ -15,11 +18,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import keycloak_userprofile -from io import StringIO -from itertools import count - -from json import dumps - @contextmanager def patch_keycloak_api( diff --git a/tests/unit/plugins/modules/test_krb_ticket.py b/tests/unit/plugins/modules/test_krb_ticket.py index f722507d5a..324883a784 100644 --- a/tests/unit/plugins/modules/test_krb_ticket.py +++ b/tests/unit/plugins/modules/test_krb_ticket.py @@ -4,9 +4,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import krb_ticket -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(krb_ticket, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_linode.py b/tests/unit/plugins/modules/test_linode.py index 3c911a1992..ec0ab3bcf0 100644 --- a/tests/unit/plugins/modules/test_linode.py +++ b/tests/unit/plugins/modules/test_linode.py @@ -5,9 +5,9 @@ from __future__ import annotations import pytest +from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args from ansible_collections.community.general.plugins.modules import linode -from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args from .linode_conftest import api_key, auth # noqa: F401, pylint: disable=unused-import diff --git a/tests/unit/plugins/modules/test_linode_v4.py b/tests/unit/plugins/modules/test_linode_v4.py index a1fe56cbf2..a0272bdb7a 100644 --- a/tests/unit/plugins/modules/test_linode_v4.py +++ b/tests/unit/plugins/modules/test_linode_v4.py @@ -12,14 +12,19 @@ import pytest linode_apiv4 = pytest.importorskip("linode_api4") -from linode_api4.errors import ApiError as LinodeApiError -from linode_api4 import LinodeClient - -from ansible_collections.community.general.plugins.modules import linode_v4 -from ansible_collections.community.general.plugins.module_utils.linode import get_user_agent from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args +from linode_api4 import LinodeClient +from linode_api4.errors import ApiError as LinodeApiError -from .linode_conftest import access_token, no_access_token_in_env, default_args, mock_linode # noqa: F401, pylint: disable=unused-import +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 + access_token, + default_args, + mock_linode, + no_access_token_in_env, +) def test_mandatory_state_is_validated(capfd): diff --git a/tests/unit/plugins/modules/test_lvg_rename.py b/tests/unit/plugins/modules/test_lvg_rename.py index 53a47f78fe..a8a4834764 100644 --- a/tests/unit/plugins/modules/test_lvg_rename.py +++ b/tests/unit/plugins/modules/test_lvg_rename.py @@ -5,14 +5,15 @@ from __future__ import annotations from unittest.mock import patch -from ansible_collections.community.general.plugins.modules import lvg_rename + from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( - AnsibleFailJson, AnsibleExitJson, + AnsibleFailJson, ModuleTestCase, set_module_args, ) +from ansible_collections.community.general.plugins.modules import lvg_rename VGS_OUTPUT = """\ vg_data_testhost1;XKZ5gn-YhWY-NlrT-QCFN-qmMG-VGT9-7uOmex diff --git a/tests/unit/plugins/modules/test_lxca_cmms.py b/tests/unit/plugins/modules/test_lxca_cmms.py index 0b59df5b78..2a0882ee48 100644 --- a/tests/unit/plugins/modules/test_lxca_cmms.py +++ b/tests/unit/plugins/modules/test_lxca_cmms.py @@ -8,6 +8,7 @@ import json from unittest import mock import pytest + from ansible_collections.community.general.plugins.modules import lxca_cmms diff --git a/tests/unit/plugins/modules/test_lxca_nodes.py b/tests/unit/plugins/modules/test_lxca_nodes.py index 41a0c48569..8edd533102 100644 --- a/tests/unit/plugins/modules/test_lxca_nodes.py +++ b/tests/unit/plugins/modules/test_lxca_nodes.py @@ -8,6 +8,7 @@ import json from unittest import mock import pytest + from ansible_collections.community.general.plugins.modules import lxca_nodes diff --git a/tests/unit/plugins/modules/test_lxd_storage_pool_info.py b/tests/unit/plugins/modules/test_lxd_storage_pool_info.py index 5ea94e4992..5cd2c7ce24 100644 --- a/tests/unit/plugins/modules/test_lxd_storage_pool_info.py +++ b/tests/unit/plugins/modules/test_lxd_storage_pool_info.py @@ -6,7 +6,6 @@ from __future__ import annotations from unittest.mock import patch -from ansible_collections.community.general.plugins.modules import lxd_storage_pool_info as module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -14,6 +13,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import lxd_storage_pool_info as module + class FakeLXDClient: responses: dict[tuple[str, str], dict] = {} diff --git a/tests/unit/plugins/modules/test_lxd_storage_volume_info.py b/tests/unit/plugins/modules/test_lxd_storage_volume_info.py index e525675d37..18b9792100 100644 --- a/tests/unit/plugins/modules/test_lxd_storage_volume_info.py +++ b/tests/unit/plugins/modules/test_lxd_storage_volume_info.py @@ -6,7 +6,6 @@ from __future__ import annotations from unittest.mock import patch -from ansible_collections.community.general.plugins.modules import lxd_storage_volume_info as module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -14,6 +13,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import lxd_storage_volume_info as module + class FakeLXDClient: responses: dict[tuple[str, str], dict] = {} diff --git a/tests/unit/plugins/modules/test_macports.py b/tests/unit/plugins/modules/test_macports.py index 84fb5c86fe..60d945b14f 100644 --- a/tests/unit/plugins/modules/test_macports.py +++ b/tests/unit/plugins/modules/test_macports.py @@ -4,10 +4,10 @@ from __future__ import annotations -from ansible_collections.community.general.plugins.modules import macports - import pytest +from ansible_collections.community.general.plugins.modules import macports + TESTED_MODULE = macports.__name__ QUERY_PORT_TEST_CASES = [ diff --git a/tests/unit/plugins/modules/test_maven_artifact.py b/tests/unit/plugins/modules/test_maven_artifact.py index 1bdaccde3e..c0ce2729ef 100644 --- a/tests/unit/plugins/modules/test_maven_artifact.py +++ b/tests/unit/plugins/modules/test_maven_artifact.py @@ -4,10 +4,9 @@ from __future__ import annotations import pytest - -from ansible_collections.community.general.plugins.modules import maven_artifact from ansible.module_utils import basic +from ansible_collections.community.general.plugins.modules import maven_artifact pytestmark = pytest.mark.usefixtures("patch_ansible_module") diff --git a/tests/unit/plugins/modules/test_modprobe.py b/tests/unit/plugins/modules/test_modprobe.py index 202a233985..4f55b52128 100644 --- a/tests/unit/plugins/modules/test_modprobe.py +++ b/tests/unit/plugins/modules/test_modprobe.py @@ -4,11 +4,13 @@ from __future__ import annotations -from unittest.mock import patch, Mock, mock_open +from unittest.mock import Mock, mock_open, patch + from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( ModuleTestCase, set_module_args, ) + from ansible_collections.community.general.plugins.modules.modprobe import Modprobe, build_module diff --git a/tests/unit/plugins/modules/test_monit.py b/tests/unit/plugins/modules/test_monit.py index 8b3a52c003..c6e3af5410 100644 --- a/tests/unit/plugins/modules/test_monit.py +++ b/tests/unit/plugins/modules/test_monit.py @@ -8,13 +8,12 @@ import unittest from unittest import mock import pytest - -from ansible_collections.community.general.plugins.modules import monit from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, ) +from ansible_collections.community.general.plugins.modules import monit TEST_OUTPUT = """ %s '%s' diff --git a/tests/unit/plugins/modules/test_nmcli.py b/tests/unit/plugins/modules/test_nmcli.py index 29a3cb85b0..c10ad68760 100644 --- a/tests/unit/plugins/modules/test_nmcli.py +++ b/tests/unit/plugins/modules/test_nmcli.py @@ -7,10 +7,10 @@ from __future__ import annotations import json import pytest - -from ansible.module_utils.common.text.converters import to_text -from ansible_collections.community.general.plugins.modules import nmcli from ansible.module_utils.basic import AnsibleModule # noqa: F401 # pylint: disable=unused-import +from ansible.module_utils.common.text.converters import to_text + +from ansible_collections.community.general.plugins.modules import nmcli pytestmark = pytest.mark.usefixtures("patch_ansible_module") diff --git a/tests/unit/plugins/modules/test_nomad_token.py b/tests/unit/plugins/modules/test_nomad_token.py index 8986a02923..1563764a23 100644 --- a/tests/unit/plugins/modules/test_nomad_token.py +++ b/tests/unit/plugins/modules/test_nomad_token.py @@ -7,7 +7,6 @@ from __future__ import annotations from unittest.mock import patch import nomad -from ansible_collections.community.general.plugins.modules import nomad_token from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -15,6 +14,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import nomad_token + def mock_acl_get_tokens(empty_list=False): response_object = [] diff --git a/tests/unit/plugins/modules/test_npm.py b/tests/unit/plugins/modules/test_npm.py index 0716c5a14b..4d1a8f24d1 100644 --- a/tests/unit/plugins/modules/test_npm.py +++ b/tests/unit/plugins/modules/test_npm.py @@ -7,13 +7,14 @@ from __future__ import annotations from unittest.mock import call, patch -from ansible_collections.community.general.plugins.modules import npm from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, ModuleTestCase, set_module_args, ) +from ansible_collections.community.general.plugins.modules import npm + class NPMModuleTestCase(ModuleTestCase): module = npm diff --git a/tests/unit/plugins/modules/test_ocapi_command.py b/tests/unit/plugins/modules/test_ocapi_command.py index b51fabb1af..76888f7d7f 100644 --- a/tests/unit/plugins/modules/test_ocapi_command.py +++ b/tests/unit/plugins/modules/test_ocapi_command.py @@ -12,17 +12,15 @@ from unittest.mock import patch from urllib.parse import urljoin from ansible.module_utils import basic -import ansible_collections.community.general.plugins.modules.ocapi_command as module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, -) -from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( - set_module_args, exit_json, fail_json, + set_module_args, ) +import ansible_collections.community.general.plugins.modules.ocapi_command as module MOCK_BASE_URI = "mockBaseUri/" OPERATING_SYSTEM_URI = "OperatingSystem" diff --git a/tests/unit/plugins/modules/test_ocapi_info.py b/tests/unit/plugins/modules/test_ocapi_info.py index eb3cf283d6..e74e907d48 100644 --- a/tests/unit/plugins/modules/test_ocapi_info.py +++ b/tests/unit/plugins/modules/test_ocapi_info.py @@ -8,17 +8,16 @@ import unittest from unittest.mock import patch from ansible.module_utils import basic -import ansible_collections.community.general.plugins.modules.ocapi_info as module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, -) -from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( - set_module_args, exit_json, fail_json, + set_module_args, ) +import ansible_collections.community.general.plugins.modules.ocapi_info as module + MOCK_BASE_URI = "mockBaseUri" MOCK_JOB_NAME_IN_PROGRESS = "MockJobInProgress" MOCK_JOB_NAME_COMPLETE = "MockJobComplete" diff --git a/tests/unit/plugins/modules/test_one_vm.py b/tests/unit/plugins/modules/test_one_vm.py index 40c4fab00c..eb25b85c14 100644 --- a/tests/unit/plugins/modules/test_one_vm.py +++ b/tests/unit/plugins/modules/test_one_vm.py @@ -8,7 +8,6 @@ import pytest from ansible_collections.community.general.plugins.modules.one_vm import parse_updateconf - PARSE_UPDATECONF_VALID = [ ( { diff --git a/tests/unit/plugins/modules/test_oneview_datacenter_info.py b/tests/unit/plugins/modules/test_oneview_datacenter_info.py index 7614470dea..58cfeb7748 100644 --- a/tests/unit/plugins/modules/test_oneview_datacenter_info.py +++ b/tests/unit/plugins/modules/test_oneview_datacenter_info.py @@ -7,9 +7,10 @@ from __future__ import annotations import pytest from .hpe_test_utils import FactsParamsTest -from .oneview_conftest import mock_ov_client, mock_ansible_module # noqa: F401, pylint: disable=unused-import +from .oneview_conftest import mock_ansible_module, mock_ov_client # noqa: F401, pylint: disable=unused-import -from ansible_collections.community.general.plugins.modules.oneview_datacenter_info import DatacenterInfoModule +# This import must come *after* the oneview_module_loader / hpe_test_utils import! +from ansible_collections.community.general.plugins.modules.oneview_datacenter_info import DatacenterInfoModule # isort: skip PARAMS_GET_CONNECTED = dict(config="config.json", name="MyDatacenter", options=["visualContent"]) diff --git a/tests/unit/plugins/modules/test_oneview_enclosure_info.py b/tests/unit/plugins/modules/test_oneview_enclosure_info.py index 0f0c6e852c..2889e9382b 100644 --- a/tests/unit/plugins/modules/test_oneview_enclosure_info.py +++ b/tests/unit/plugins/modules/test_oneview_enclosure_info.py @@ -4,11 +4,12 @@ from __future__ import annotations +import unittest + from .hpe_test_utils import FactsParamsTestCase -import unittest -from ansible_collections.community.general.plugins.modules.oneview_enclosure_info import EnclosureInfoModule - +# This import must come *after* the oneview_module_loader / hpe_test_utils import! +from ansible_collections.community.general.plugins.modules.oneview_enclosure_info import EnclosureInfoModule # isort: skip ERROR_MSG = "Fake message error" diff --git a/tests/unit/plugins/modules/test_oneview_ethernet_network.py b/tests/unit/plugins/modules/test_oneview_ethernet_network.py index db6221c10d..4a47b769a1 100644 --- a/tests/unit/plugins/modules/test_oneview_ethernet_network.py +++ b/tests/unit/plugins/modules/test_oneview_ethernet_network.py @@ -10,8 +10,8 @@ from unittest import mock import yaml -from .oneview_module_loader import EthernetNetworkModule from .hpe_test_utils import OneViewBaseTestCase +from .oneview_module_loader import EthernetNetworkModule FAKE_MSG_ERROR = "Fake message error" DEFAULT_ETHERNET_NAME = "Test Ethernet Network" diff --git a/tests/unit/plugins/modules/test_oneview_ethernet_network_info.py b/tests/unit/plugins/modules/test_oneview_ethernet_network_info.py index 7f71a1aeba..b1e4ff097e 100644 --- a/tests/unit/plugins/modules/test_oneview_ethernet_network_info.py +++ b/tests/unit/plugins/modules/test_oneview_ethernet_network_info.py @@ -6,8 +6,8 @@ from __future__ import annotations import unittest -from .oneview_module_loader import EthernetNetworkInfoModule from .hpe_test_utils import FactsParamsTestCase +from .oneview_module_loader import EthernetNetworkInfoModule ERROR_MSG = "Fake message error" diff --git a/tests/unit/plugins/modules/test_oneview_fc_network.py b/tests/unit/plugins/modules/test_oneview_fc_network.py index 9cf3e14a28..68f867372f 100644 --- a/tests/unit/plugins/modules/test_oneview_fc_network.py +++ b/tests/unit/plugins/modules/test_oneview_fc_network.py @@ -6,8 +6,9 @@ from __future__ import annotations import unittest -from .oneview_module_loader import FcNetworkModule + from .hpe_test_utils import OneViewBaseTestCase +from .oneview_module_loader import FcNetworkModule FAKE_MSG_ERROR = "Fake message error" diff --git a/tests/unit/plugins/modules/test_oneview_fc_network_info.py b/tests/unit/plugins/modules/test_oneview_fc_network_info.py index 1d4f67ae69..6606919f5b 100644 --- a/tests/unit/plugins/modules/test_oneview_fc_network_info.py +++ b/tests/unit/plugins/modules/test_oneview_fc_network_info.py @@ -5,8 +5,9 @@ from __future__ import annotations import unittest -from .oneview_module_loader import FcNetworkInfoModule + from .hpe_test_utils import FactsParamsTestCase +from .oneview_module_loader import FcNetworkInfoModule ERROR_MSG = "Fake message error" diff --git a/tests/unit/plugins/modules/test_oneview_fcoe_network.py b/tests/unit/plugins/modules/test_oneview_fcoe_network.py index 9b2c96f66c..a985c518f9 100644 --- a/tests/unit/plugins/modules/test_oneview_fcoe_network.py +++ b/tests/unit/plugins/modules/test_oneview_fcoe_network.py @@ -6,8 +6,9 @@ from __future__ import annotations import unittest -from .oneview_module_loader import FcoeNetworkModule + from .hpe_test_utils import OneViewBaseTestCase +from .oneview_module_loader import FcoeNetworkModule FAKE_MSG_ERROR = "Fake message error" diff --git a/tests/unit/plugins/modules/test_oneview_fcoe_network_info.py b/tests/unit/plugins/modules/test_oneview_fcoe_network_info.py index 852ec13b4d..83563f542a 100644 --- a/tests/unit/plugins/modules/test_oneview_fcoe_network_info.py +++ b/tests/unit/plugins/modules/test_oneview_fcoe_network_info.py @@ -6,8 +6,8 @@ from __future__ import annotations import unittest -from .oneview_module_loader import FcoeNetworkInfoModule from .hpe_test_utils import FactsParamsTestCase +from .oneview_module_loader import FcoeNetworkInfoModule ERROR_MSG = "Fake message error" diff --git a/tests/unit/plugins/modules/test_oneview_logical_interconnect_group.py b/tests/unit/plugins/modules/test_oneview_logical_interconnect_group.py index 57902bcdf1..c6d27b8dee 100644 --- a/tests/unit/plugins/modules/test_oneview_logical_interconnect_group.py +++ b/tests/unit/plugins/modules/test_oneview_logical_interconnect_group.py @@ -9,11 +9,12 @@ from copy import deepcopy from unittest import mock from .hpe_test_utils import OneViewBaseTestCase -from ansible_collections.community.general.plugins.modules.oneview_logical_interconnect_group import ( + +# This import must come *after* the oneview_module_loader / hpe_test_utils import! +from ansible_collections.community.general.plugins.modules.oneview_logical_interconnect_group import ( # isort: skip LogicalInterconnectGroupModule, ) - FAKE_MSG_ERROR = "Fake message error" DEFAULT_LIG_NAME = "Test Logical Interconnect Group" diff --git a/tests/unit/plugins/modules/test_oneview_logical_interconnect_group_info.py b/tests/unit/plugins/modules/test_oneview_logical_interconnect_group_info.py index 52126a2cc4..b440ca4343 100644 --- a/tests/unit/plugins/modules/test_oneview_logical_interconnect_group_info.py +++ b/tests/unit/plugins/modules/test_oneview_logical_interconnect_group_info.py @@ -5,12 +5,14 @@ from __future__ import annotations import unittest + from .hpe_test_utils import FactsParamsTestCase -from ansible_collections.community.general.plugins.modules.oneview_logical_interconnect_group_info import ( + +# This import must come *after* the oneview_module_loader / hpe_test_utils import! +from ansible_collections.community.general.plugins.modules.oneview_logical_interconnect_group_info import ( # isort: skip LogicalInterconnectGroupInfoModule, ) - ERROR_MSG = "Fake message error" PARAMS_GET_ALL = dict(config="config.json", name=None) diff --git a/tests/unit/plugins/modules/test_oneview_network_set.py b/tests/unit/plugins/modules/test_oneview_network_set.py index eed62d99ec..840160dee2 100644 --- a/tests/unit/plugins/modules/test_oneview_network_set.py +++ b/tests/unit/plugins/modules/test_oneview_network_set.py @@ -6,6 +6,7 @@ from __future__ import annotations import unittest from unittest import mock + from .hpe_test_utils import OneViewBaseTestCase from .oneview_module_loader import NetworkSetModule diff --git a/tests/unit/plugins/modules/test_oneview_network_set_info.py b/tests/unit/plugins/modules/test_oneview_network_set_info.py index 4e178f6adc..c5e63d458c 100644 --- a/tests/unit/plugins/modules/test_oneview_network_set_info.py +++ b/tests/unit/plugins/modules/test_oneview_network_set_info.py @@ -5,8 +5,9 @@ from __future__ import annotations import unittest -from .oneview_module_loader import NetworkSetInfoModule + from .hpe_test_utils import FactsParamsTestCase +from .oneview_module_loader import NetworkSetInfoModule ERROR_MSG = "Fake message error" diff --git a/tests/unit/plugins/modules/test_oneview_san_manager.py b/tests/unit/plugins/modules/test_oneview_san_manager.py index 104aaede2d..2c60564205 100644 --- a/tests/unit/plugins/modules/test_oneview_san_manager.py +++ b/tests/unit/plugins/modules/test_oneview_san_manager.py @@ -8,8 +8,8 @@ import unittest from copy import deepcopy from unittest import mock -from .oneview_module_loader import SanManagerModule from .hpe_test_utils import OneViewBaseTestCase +from .oneview_module_loader import SanManagerModule FAKE_MSG_ERROR = "Fake message error" diff --git a/tests/unit/plugins/modules/test_oneview_san_manager_info.py b/tests/unit/plugins/modules/test_oneview_san_manager_info.py index d34f66c253..77c50c7145 100644 --- a/tests/unit/plugins/modules/test_oneview_san_manager_info.py +++ b/tests/unit/plugins/modules/test_oneview_san_manager_info.py @@ -5,8 +5,9 @@ from __future__ import annotations import unittest -from .oneview_module_loader import SanManagerInfoModule + from .hpe_test_utils import FactsParamsTestCase +from .oneview_module_loader import SanManagerInfoModule class SanManagerInfoSpec(unittest.TestCase, FactsParamsTestCase): diff --git a/tests/unit/plugins/modules/test_opkg.py b/tests/unit/plugins/modules/test_opkg.py index c6d6b72e62..6e0acd023c 100644 --- a/tests/unit/plugins/modules/test_opkg.py +++ b/tests/unit/plugins/modules/test_opkg.py @@ -4,9 +4,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import opkg -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(opkg, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_pacemaker_cluster.py b/tests/unit/plugins/modules/test_pacemaker_cluster.py index c51ad9c5c9..b4257027be 100644 --- a/tests/unit/plugins/modules/test_pacemaker_cluster.py +++ b/tests/unit/plugins/modules/test_pacemaker_cluster.py @@ -10,8 +10,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import pacemaker_cluster -from .uthelper import UTHelper, RunCommandMock + +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(pacemaker_cluster, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_pacemaker_info.py b/tests/unit/plugins/modules/test_pacemaker_info.py index d572c65e69..e4f5c0ef44 100644 --- a/tests/unit/plugins/modules/test_pacemaker_info.py +++ b/tests/unit/plugins/modules/test_pacemaker_info.py @@ -10,8 +10,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import pacemaker_info -from .uthelper import UTHelper, RunCommandMock + +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(pacemaker_info, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_pacemaker_resource.py b/tests/unit/plugins/modules/test_pacemaker_resource.py index b7909cb144..1e2c7cdf9b 100644 --- a/tests/unit/plugins/modules/test_pacemaker_resource.py +++ b/tests/unit/plugins/modules/test_pacemaker_resource.py @@ -10,8 +10,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import pacemaker_resource -from .uthelper import UTHelper, RunCommandMock + +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(pacemaker_resource, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_pacemaker_stonith.py b/tests/unit/plugins/modules/test_pacemaker_stonith.py index ac55751b03..7b32b245df 100644 --- a/tests/unit/plugins/modules/test_pacemaker_stonith.py +++ b/tests/unit/plugins/modules/test_pacemaker_stonith.py @@ -10,8 +10,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import pacemaker_stonith -from .uthelper import UTHelper, RunCommandMock + +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(pacemaker_stonith, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_pacman.py b/tests/unit/plugins/modules/test_pacman.py index 618672dc9f..a1d0439a9a 100644 --- a/tests/unit/plugins/modules/test_pacman.py +++ b/tests/unit/plugins/modules/test_pacman.py @@ -6,13 +6,15 @@ from __future__ import annotations import typing as t from unittest import mock + +import pytest from ansible.module_utils import basic from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, - set_module_args, exit_json, fail_json, + set_module_args, ) from ansible_collections.community.general.plugins.modules import pacman @@ -21,8 +23,6 @@ from ansible_collections.community.general.plugins.modules.pacman import ( VersionTuple, ) -import pytest - def get_bin_path(self, arg, required=False): """Mock AnsibleModule.get_bin_path""" diff --git a/tests/unit/plugins/modules/test_pacman_key.py b/tests/unit/plugins/modules/test_pacman_key.py index 41a79e042e..434c746452 100644 --- a/tests/unit/plugins/modules/test_pacman_key.py +++ b/tests/unit/plugins/modules/test_pacman_key.py @@ -4,11 +4,13 @@ from __future__ import annotations -from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.modules import pacman_key -import pytest import json +import pytest +from ansible.module_utils.basic import AnsibleModule + +from ansible_collections.community.general.plugins.modules import pacman_key + # path used for mocking get_bin_path() MOCK_BIN_PATH = "/mocked/path" diff --git a/tests/unit/plugins/modules/test_pagerduty.py b/tests/unit/plugins/modules/test_pagerduty.py index cc101b5774..96bf610078 100644 --- a/tests/unit/plugins/modules/test_pagerduty.py +++ b/tests/unit/plugins/modules/test_pagerduty.py @@ -4,10 +4,10 @@ from __future__ import annotations -import unittest -from ansible_collections.community.general.plugins.modules import pagerduty - import json +import unittest + +from ansible_collections.community.general.plugins.modules import pagerduty class PagerDutyTest(unittest.TestCase): diff --git a/tests/unit/plugins/modules/test_pagerduty_alert.py b/tests/unit/plugins/modules/test_pagerduty_alert.py index 2724e81b51..b3cf3dff60 100644 --- a/tests/unit/plugins/modules/test_pagerduty_alert.py +++ b/tests/unit/plugins/modules/test_pagerduty_alert.py @@ -9,8 +9,6 @@ import unittest from unittest.mock import patch import pytest - -from ansible_collections.community.general.plugins.modules import pagerduty_alert from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -18,6 +16,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import pagerduty_alert + class PagerDutyAlertsTest(unittest.TestCase): def _assert_incident_api(self, module, url, method, headers): diff --git a/tests/unit/plugins/modules/test_pagerduty_change.py b/tests/unit/plugins/modules/test_pagerduty_change.py index 264a947317..7a3e4bd91c 100644 --- a/tests/unit/plugins/modules/test_pagerduty_change.py +++ b/tests/unit/plugins/modules/test_pagerduty_change.py @@ -8,8 +8,6 @@ import json from unittest.mock import patch import pytest - -from ansible_collections.community.general.plugins.modules import pagerduty_change from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -17,6 +15,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import pagerduty_change + class TestPagerDutyChangeModule(ModuleTestCase): def setUp(self): diff --git a/tests/unit/plugins/modules/test_pamd.py b/tests/unit/plugins/modules/test_pamd.py index 3400a5baab..cafa4e2aca 100644 --- a/tests/unit/plugins/modules/test_pamd.py +++ b/tests/unit/plugins/modules/test_pamd.py @@ -6,11 +6,13 @@ from __future__ import annotations import unittest -from ansible_collections.community.general.plugins.modules.pamd import PamdRule -from ansible_collections.community.general.plugins.modules.pamd import PamdLine -from ansible_collections.community.general.plugins.modules.pamd import PamdComment -from ansible_collections.community.general.plugins.modules.pamd import PamdInclude -from ansible_collections.community.general.plugins.modules.pamd import PamdService +from ansible_collections.community.general.plugins.modules.pamd import ( + PamdComment, + PamdInclude, + PamdLine, + PamdRule, + PamdService, +) class PamdLineTestCase(unittest.TestCase): diff --git a/tests/unit/plugins/modules/test_parted.py b/tests/unit/plugins/modules/test_parted.py index 1774c88a22..13d1c05f34 100644 --- a/tests/unit/plugins/modules/test_parted.py +++ b/tests/unit/plugins/modules/test_parted.py @@ -4,11 +4,8 @@ from __future__ import annotations -from unittest.mock import patch, call +from unittest.mock import call, patch -from ansible_collections.community.general.plugins.modules import parted as parted_module -from ansible_collections.community.general.plugins.modules.parted import parse_parted_version -from ansible_collections.community.general.plugins.modules.parted import parse_partition_info from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -16,6 +13,9 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import parted as parted_module +from ansible_collections.community.general.plugins.modules.parted import parse_parted_version, parse_partition_info + # Example of output : parted -s -m /dev/sdb -- unit 'MB' print parted_output1 = """ BYT; diff --git a/tests/unit/plugins/modules/test_pmem.py b/tests/unit/plugins/modules/test_pmem.py index 90b92004aa..a3fb3f25bf 100644 --- a/tests/unit/plugins/modules/test_pmem.py +++ b/tests/unit/plugins/modules/test_pmem.py @@ -4,17 +4,18 @@ from __future__ import annotations -import pytest import json from unittest.mock import patch +import pytest + pytest.importorskip("xmltodict") from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( + AnsibleExitJson, + AnsibleFailJson, ModuleTestCase, set_module_args, - AnsibleFailJson, - AnsibleExitJson, ) from ansible_collections.community.general.plugins.modules import pmem as pmem_module diff --git a/tests/unit/plugins/modules/test_pritunl_org.py b/tests/unit/plugins/modules/test_pritunl_org.py index 5f788fd433..5b02cc1918 100644 --- a/tests/unit/plugins/modules/test_pritunl_org.py +++ b/tests/unit/plugins/modules/test_pritunl_org.py @@ -7,15 +7,6 @@ from __future__ import annotations from unittest.mock import patch from ansible.module_utils.common.dict_transformations import dict_merge -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 ( - PritunlDeleteOrganizationMock, - PritunlListOrganizationMock, - PritunlListOrganizationAfterPostMock, - PritunlPostOrganizationMock, -) from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -23,6 +14,16 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +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 ( + PritunlDeleteOrganizationMock, + PritunlListOrganizationAfterPostMock, + PritunlListOrganizationMock, + PritunlPostOrganizationMock, +) + class TestPritunlOrg(ModuleTestCase): def setUp(self): diff --git a/tests/unit/plugins/modules/test_pritunl_org_info.py b/tests/unit/plugins/modules/test_pritunl_org_info.py index c8bc6ca8c1..ae9a6dc6d7 100644 --- a/tests/unit/plugins/modules/test_pritunl_org_info.py +++ b/tests/unit/plugins/modules/test_pritunl_org_info.py @@ -6,13 +6,6 @@ from __future__ import annotations from unittest.mock import patch -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 ( - PritunlListOrganizationMock, - PritunlEmptyOrganizationMock, -) from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -20,6 +13,14 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +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 ( + PritunlEmptyOrganizationMock, + PritunlListOrganizationMock, +) + class TestPritunlOrgInfo(ModuleTestCase): def setUp(self): diff --git a/tests/unit/plugins/modules/test_pritunl_user.py b/tests/unit/plugins/modules/test_pritunl_user.py index 16ec57426e..c40dc4d395 100644 --- a/tests/unit/plugins/modules/test_pritunl_user.py +++ b/tests/unit/plugins/modules/test_pritunl_user.py @@ -7,6 +7,13 @@ from __future__ import annotations from unittest.mock import patch from ansible.module_utils.common.dict_transformations import dict_merge +from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( + AnsibleExitJson, + AnsibleFailJson, + ModuleTestCase, + set_module_args, +) + from ansible_collections.community.general.plugins.modules import ( pritunl_user, ) @@ -17,12 +24,6 @@ from ansible_collections.community.general.tests.unit.plugins.module_utils.net_t PritunlPostUserMock, PritunlPutUserMock, ) -from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( - AnsibleExitJson, - AnsibleFailJson, - ModuleTestCase, - set_module_args, -) def mock_pritunl_api(func, **kwargs): diff --git a/tests/unit/plugins/modules/test_pritunl_user_info.py b/tests/unit/plugins/modules/test_pritunl_user_info.py index c1766a99ec..5ff0b6eefd 100644 --- a/tests/unit/plugins/modules/test_pritunl_user_info.py +++ b/tests/unit/plugins/modules/test_pritunl_user_info.py @@ -6,6 +6,13 @@ from __future__ import annotations from unittest.mock import patch +from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( + AnsibleExitJson, + AnsibleFailJson, + ModuleTestCase, + set_module_args, +) + from ansible_collections.community.general.plugins.modules import ( pritunl_user_info, ) @@ -13,12 +20,6 @@ from ansible_collections.community.general.tests.unit.plugins.module_utils.net_t PritunlListOrganizationMock, PritunlListUserMock, ) -from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( - AnsibleExitJson, - AnsibleFailJson, - ModuleTestCase, - set_module_args, -) class TestPritunlUserInfo(ModuleTestCase): diff --git a/tests/unit/plugins/modules/test_puppet.py b/tests/unit/plugins/modules/test_puppet.py index 58d7372a4c..0a9804ae00 100644 --- a/tests/unit/plugins/modules/test_puppet.py +++ b/tests/unit/plugins/modules/test_puppet.py @@ -10,9 +10,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import puppet -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(puppet, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_redhat_subscription.py b/tests/unit/plugins/modules/test_redhat_subscription.py index 1df242ad33..55b24a8ae5 100644 --- a/tests/unit/plugins/modules/test_redhat_subscription.py +++ b/tests/unit/plugins/modules/test_redhat_subscription.py @@ -7,10 +7,10 @@ from __future__ import annotations import json -from ansible.module_utils import basic -from ansible_collections.community.general.plugins.modules import redhat_subscription - import pytest +from ansible.module_utils import basic + +from ansible_collections.community.general.plugins.modules import redhat_subscription TESTED_MODULE = redhat_subscription.__name__ diff --git a/tests/unit/plugins/modules/test_redis_data.py b/tests/unit/plugins/modules/test_redis_data.py index fd9b3792c5..6405dbe766 100644 --- a/tests/unit/plugins/modules/test_redis_data.py +++ b/tests/unit/plugins/modules/test_redis_data.py @@ -5,13 +5,13 @@ from __future__ import annotations +import json import pytest -import json +from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args from redis import __version__ from ansible_collections.community.general.plugins.modules import redis_data -from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args HAS_REDIS_USERNAME_OPTION = True if tuple(map(int, __version__.split("."))) < (3, 4, 0): diff --git a/tests/unit/plugins/modules/test_redis_data_incr.py b/tests/unit/plugins/modules/test_redis_data_incr.py index 48ad080606..006d155fff 100644 --- a/tests/unit/plugins/modules/test_redis_data_incr.py +++ b/tests/unit/plugins/modules/test_redis_data_incr.py @@ -5,15 +5,14 @@ from __future__ import annotations +import json import pytest -import json import redis +from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args from redis import __version__ from ansible_collections.community.general.plugins.modules import redis_data_incr -from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args - HAS_REDIS_USERNAME_OPTION = True if tuple(map(int, __version__.split("."))) < (3, 4, 0): diff --git a/tests/unit/plugins/modules/test_redis_data_info.py b/tests/unit/plugins/modules/test_redis_data_info.py index 06f2831b42..71373f4246 100644 --- a/tests/unit/plugins/modules/test_redis_data_info.py +++ b/tests/unit/plugins/modules/test_redis_data_info.py @@ -5,14 +5,13 @@ from __future__ import annotations +import json import pytest -import json +from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args from redis import __version__ from ansible_collections.community.general.plugins.modules import redis_data_info -from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args - HAS_REDIS_USERNAME_OPTION = True if tuple(map(int, __version__.split("."))) < (3, 4, 0): diff --git a/tests/unit/plugins/modules/test_redis_info.py b/tests/unit/plugins/modules/test_redis_info.py index 02841ccc74..683f797f04 100644 --- a/tests/unit/plugins/modules/test_redis_info.py +++ b/tests/unit/plugins/modules/test_redis_info.py @@ -4,8 +4,8 @@ from __future__ import annotations -from unittest.mock import patch, MagicMock -from ansible_collections.community.general.plugins.modules import redis_info +from unittest.mock import MagicMock, patch + from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -13,6 +13,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import redis_info + class FakeRedisClient(MagicMock): def ping(self): diff --git a/tests/unit/plugins/modules/test_rhsm_release.py b/tests/unit/plugins/modules/test_rhsm_release.py index 65237f6d62..e41d563dff 100644 --- a/tests/unit/plugins/modules/test_rhsm_release.py +++ b/tests/unit/plugins/modules/test_rhsm_release.py @@ -5,7 +5,7 @@ from __future__ import annotations from unittest.mock import call, patch -from ansible_collections.community.general.plugins.modules import rhsm_release + from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -13,6 +13,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import rhsm_release + class RhsmRepositoryReleaseModuleTestCase(ModuleTestCase): module = rhsm_release diff --git a/tests/unit/plugins/modules/test_rhsm_repository.py b/tests/unit/plugins/modules/test_rhsm_repository.py index 9689bbe3fb..1925f4023f 100644 --- a/tests/unit/plugins/modules/test_rhsm_repository.py +++ b/tests/unit/plugins/modules/test_rhsm_repository.py @@ -15,10 +15,10 @@ import fnmatch import itertools import json -from ansible.module_utils import basic -from ansible_collections.community.general.plugins.modules import rhsm_repository - import pytest +from ansible.module_utils import basic + +from ansible_collections.community.general.plugins.modules import rhsm_repository TESTED_MODULE = rhsm_repository.__name__ diff --git a/tests/unit/plugins/modules/test_rpm_ostree_pkg.py b/tests/unit/plugins/modules/test_rpm_ostree_pkg.py index 49c845d83e..91e6d87aeb 100644 --- a/tests/unit/plugins/modules/test_rpm_ostree_pkg.py +++ b/tests/unit/plugins/modules/test_rpm_ostree_pkg.py @@ -6,7 +6,7 @@ from __future__ import annotations from unittest.mock import call, patch -from ansible_collections.community.general.plugins.modules import rpm_ostree_pkg + from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -14,6 +14,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import rpm_ostree_pkg + class RpmOSTreeModuleTestCase(ModuleTestCase): module = rpm_ostree_pkg diff --git a/tests/unit/plugins/modules/test_rundeck_acl_policy.py b/tests/unit/plugins/modules/test_rundeck_acl_policy.py index e9af79aadc..ff91332fbb 100644 --- a/tests/unit/plugins/modules/test_rundeck_acl_policy.py +++ b/tests/unit/plugins/modules/test_rundeck_acl_policy.py @@ -4,17 +4,18 @@ from __future__ import annotations -import pytest from unittest.mock import patch -from ansible_collections.community.general.plugins.modules import rundeck_acl_policy +import pytest from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( - set_module_args, AnsibleExitJson, exit_json, fail_json, + set_module_args, ) +from ansible_collections.community.general.plugins.modules import rundeck_acl_policy + @pytest.fixture(autouse=True) def module(): 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 3dbd70d67c..7120179786 100644 --- a/tests/unit/plugins/modules/test_scaleway_compute_private_network.py +++ b/tests/unit/plugins/modules/test_scaleway_compute_private_network.py @@ -3,16 +3,16 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations -import os import json +import os from unittest.mock import patch import pytest - -from ansible_collections.community.general.plugins.modules import scaleway_compute_private_network -from ansible_collections.community.general.plugins.module_utils.scaleway import Scaleway, Response 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.modules import scaleway_compute_private_network + def response_without_nics(): info = {"status": 200, "body": '{ "private_nics": []}'} diff --git a/tests/unit/plugins/modules/test_scaleway_private_network.py b/tests/unit/plugins/modules/test_scaleway_private_network.py index f35101862a..47129ea7d2 100644 --- a/tests/unit/plugins/modules/test_scaleway_private_network.py +++ b/tests/unit/plugins/modules/test_scaleway_private_network.py @@ -3,16 +3,16 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations -import os import json +import os from unittest.mock import patch import pytest - -from ansible_collections.community.general.plugins.modules import scaleway_private_network -from ansible_collections.community.general.plugins.module_utils.scaleway import Scaleway, Response 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.modules import scaleway_private_network + def response_with_zero_network(): info = {"status": 200, "body": '{ "private_networks": [], "total_count": 0}'} diff --git a/tests/unit/plugins/modules/test_simpleinit_msb.py b/tests/unit/plugins/modules/test_simpleinit_msb.py index 5103dfab86..2a51d85510 100644 --- a/tests/unit/plugins/modules/test_simpleinit_msb.py +++ b/tests/unit/plugins/modules/test_simpleinit_msb.py @@ -14,7 +14,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules.simpleinit_msb import SimpleinitMSB, build_module - _TELINIT_LIST = """ RUNLEVEL SCRIPT 2 smgl-suspend-single diff --git a/tests/unit/plugins/modules/test_slack.py b/tests/unit/plugins/modules/test_slack.py index d43a455a69..89ff19d7fc 100644 --- a/tests/unit/plugins/modules/test_slack.py +++ b/tests/unit/plugins/modules/test_slack.py @@ -5,9 +5,9 @@ from __future__ import annotations import json -import pytest from unittest.mock import Mock, patch -from ansible_collections.community.general.plugins.modules import slack + +import pytest from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -15,6 +15,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import slack + class TestSlackModule(ModuleTestCase): def setUp(self): diff --git a/tests/unit/plugins/modules/test_snap.py b/tests/unit/plugins/modules/test_snap.py index f2b0bafc97..9bea05aa34 100644 --- a/tests/unit/plugins/modules/test_snap.py +++ b/tests/unit/plugins/modules/test_snap.py @@ -7,8 +7,8 @@ from __future__ import annotations import sys from ansible_collections.community.general.plugins.modules import snap -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper issue_6803_status_out = """Name Version Rev Tracking Publisher Notes core20 20220826 1623 latest/stable canonical** base diff --git a/tests/unit/plugins/modules/test_solaris_zone.py b/tests/unit/plugins/modules/test_solaris_zone.py index f03b8b675e..6158981bfd 100644 --- a/tests/unit/plugins/modules/test_solaris_zone.py +++ b/tests/unit/plugins/modules/test_solaris_zone.py @@ -9,11 +9,11 @@ import platform import pytest from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.modules import solaris_zone from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( set_module_args, ) +from ansible_collections.community.general.plugins.modules import solaris_zone ZONEADM = "/usr/sbin/zoneadm" diff --git a/tests/unit/plugins/modules/test_ss_3par_cpg.py b/tests/unit/plugins/modules/test_ss_3par_cpg.py index f4658d287f..2410940e23 100644 --- a/tests/unit/plugins/modules/test_ss_3par_cpg.py +++ b/tests/unit/plugins/modules/test_ss_3par_cpg.py @@ -11,8 +11,8 @@ 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.modules import ss_3par_cpg from ansible_collections.community.general.plugins.module_utils.storage.hpe3par import hpe3par +from ansible_collections.community.general.plugins.modules import ss_3par_cpg @mock.patch("ansible_collections.community.general.plugins.modules.ss_3par_cpg.client") diff --git a/tests/unit/plugins/modules/test_statsd.py b/tests/unit/plugins/modules/test_statsd.py index f29a21b25a..0beb15617d 100644 --- a/tests/unit/plugins/modules/test_statsd.py +++ b/tests/unit/plugins/modules/test_statsd.py @@ -4,9 +4,8 @@ from __future__ import annotations -from unittest.mock import patch, MagicMock +from unittest.mock import MagicMock, patch -from ansible_collections.community.general.plugins.modules import statsd from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, @@ -14,6 +13,8 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) +from ansible_collections.community.general.plugins.modules import statsd + class FakeStatsD(MagicMock): def incr(self, *args, **kwargs): diff --git a/tests/unit/plugins/modules/test_sysupgrade.py b/tests/unit/plugins/modules/test_sysupgrade.py index 544037caad..d7a8e242d1 100644 --- a/tests/unit/plugins/modules/test_sysupgrade.py +++ b/tests/unit/plugins/modules/test_sysupgrade.py @@ -5,13 +5,15 @@ from __future__ import annotations from unittest.mock import patch + from ansible.module_utils import basic from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( - set_module_args, AnsibleExitJson, AnsibleFailJson, ModuleTestCase, + set_module_args, ) + from ansible_collections.community.general.plugins.modules import sysupgrade diff --git a/tests/unit/plugins/modules/test_terraform.py b/tests/unit/plugins/modules/test_terraform.py index 914d33557e..894b0119d0 100644 --- a/tests/unit/plugins/modules/test_terraform.py +++ b/tests/unit/plugins/modules/test_terraform.py @@ -6,9 +6,9 @@ from __future__ import annotations import json import pytest +from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args from ansible_collections.community.general.plugins.modules import terraform -from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args def test_terraform_without_argument(capfd): diff --git a/tests/unit/plugins/modules/test_ufw.py b/tests/unit/plugins/modules/test_ufw.py index c3d40ec37b..b6d8352467 100644 --- a/tests/unit/plugins/modules/test_ufw.py +++ b/tests/unit/plugins/modules/test_ufw.py @@ -7,15 +7,15 @@ import unittest from unittest.mock import patch from ansible.module_utils import basic -import ansible_collections.community.general.plugins.modules.ufw as module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, - set_module_args, exit_json, fail_json, + set_module_args, ) +import ansible_collections.community.general.plugins.modules.ufw as module # mock ufw messages diff --git a/tests/unit/plugins/modules/test_usb_facts.py b/tests/unit/plugins/modules/test_usb_facts.py index d551d8244b..3420e320f7 100644 --- a/tests/unit/plugins/modules/test_usb_facts.py +++ b/tests/unit/plugins/modules/test_usb_facts.py @@ -6,15 +6,17 @@ from __future__ import annotations import unittest from unittest import mock + from ansible.module_utils import basic -from ansible_collections.community.general.plugins.modules import usb_facts from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, - set_module_args, exit_json, fail_json, + set_module_args, ) +from ansible_collections.community.general.plugins.modules import usb_facts + def get_bin_path(self, arg, required=False): """Mock AnsibleModule.get_bin_path""" diff --git a/tests/unit/plugins/modules/test_wdc_redfish_command.py b/tests/unit/plugins/modules/test_wdc_redfish_command.py index 3f30e66f82..75c0718ad5 100644 --- a/tests/unit/plugins/modules/test_wdc_redfish_command.py +++ b/tests/unit/plugins/modules/test_wdc_redfish_command.py @@ -4,26 +4,25 @@ from __future__ import annotations +import os import shutil -import uuid import tarfile import tempfile -import os import unittest +import uuid from unittest.mock import patch from ansible.module_utils import basic -import ansible_collections.community.general.plugins.modules.wdc_redfish_command as module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, -) -from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( - set_module_args, exit_json, fail_json, + set_module_args, ) +import ansible_collections.community.general.plugins.modules.wdc_redfish_command as module + MOCK_SUCCESSFUL_HTTP_EMPTY_RESPONSE = {"ret": True, "data": {}} MOCK_GET_ENCLOSURE_RESPONSE_SINGLE_TENANT = {"ret": True, "data": {"SerialNumber": "12345"}} diff --git a/tests/unit/plugins/modules/test_wdc_redfish_info.py b/tests/unit/plugins/modules/test_wdc_redfish_info.py index 0c94f9925d..b3557ec9c6 100644 --- a/tests/unit/plugins/modules/test_wdc_redfish_info.py +++ b/tests/unit/plugins/modules/test_wdc_redfish_info.py @@ -8,17 +8,16 @@ import unittest from unittest.mock import patch from ansible.module_utils import basic -import ansible_collections.community.general.plugins.modules.wdc_redfish_info as module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, -) -from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( - set_module_args, exit_json, fail_json, + set_module_args, ) +import ansible_collections.community.general.plugins.modules.wdc_redfish_info as module + MOCK_SUCCESSFUL_RESPONSE_WITH_ACTIONS = {"ret": True, "data": {"Actions": {}}} MOCK_SUCCESSFUL_HTTP_EMPTY_RESPONSE = {"ret": True, "data": {}} diff --git a/tests/unit/plugins/modules/test_xcc_redfish_command.py b/tests/unit/plugins/modules/test_xcc_redfish_command.py index d1b330de90..250ca40185 100644 --- a/tests/unit/plugins/modules/test_xcc_redfish_command.py +++ b/tests/unit/plugins/modules/test_xcc_redfish_command.py @@ -8,17 +8,16 @@ import unittest from unittest.mock import patch from ansible.module_utils import basic -import ansible_collections.community.general.plugins.modules.xcc_redfish_command as module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, -) -from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( - set_module_args, exit_json, fail_json, + set_module_args, ) +import ansible_collections.community.general.plugins.modules.xcc_redfish_command as module + def get_bin_path(self, arg, required=False): """Mock AnsibleModule.get_bin_path""" diff --git a/tests/unit/plugins/modules/test_xdg_mime.py b/tests/unit/plugins/modules/test_xdg_mime.py index 22a88ebb8f..285e71d5bc 100644 --- a/tests/unit/plugins/modules/test_xdg_mime.py +++ b/tests/unit/plugins/modules/test_xdg_mime.py @@ -5,9 +5,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import xdg_mime -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(xdg_mime, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_xenserver_guest_info.py b/tests/unit/plugins/modules/test_xenserver_guest_info.py index bb278e83c3..c2ba75eb01 100644 --- a/tests/unit/plugins/modules/test_xenserver_guest_info.py +++ b/tests/unit/plugins/modules/test_xenserver_guest_info.py @@ -5,8 +5,8 @@ from __future__ import annotations - import json + import pytest from .xenserver_common import fake_xenapi_ref diff --git a/tests/unit/plugins/modules/test_xenserver_guest_powerstate.py b/tests/unit/plugins/modules/test_xenserver_guest_powerstate.py index be0c80f673..7d32e8a840 100644 --- a/tests/unit/plugins/modules/test_xenserver_guest_powerstate.py +++ b/tests/unit/plugins/modules/test_xenserver_guest_powerstate.py @@ -6,11 +6,15 @@ from __future__ import annotations import json + import pytest from .xenserver_common import fake_xenapi_ref -from .xenserver_conftest import fake_ansible_module, XenAPI, xenserver_guest_powerstate # noqa: F401, pylint: disable=unused-import - +from .xenserver_conftest import ( # noqa: F401, pylint: disable=unused-import + XenAPI, + fake_ansible_module, + xenserver_guest_powerstate, +) testcase_set_powerstate = { "params": [ diff --git a/tests/unit/plugins/modules/test_xfconf.py b/tests/unit/plugins/modules/test_xfconf.py index 78ff971df0..d277fffed3 100644 --- a/tests/unit/plugins/modules/test_xfconf.py +++ b/tests/unit/plugins/modules/test_xfconf.py @@ -10,9 +10,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import xfconf -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(xfconf, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/test_xfconf_info.py b/tests/unit/plugins/modules/test_xfconf_info.py index 00dcb3d727..cda4f25d7d 100644 --- a/tests/unit/plugins/modules/test_xfconf_info.py +++ b/tests/unit/plugins/modules/test_xfconf_info.py @@ -4,9 +4,8 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import xfconf_info -from .uthelper import UTHelper, RunCommandMock +from .uthelper import RunCommandMock, UTHelper UTHelper.from_module(xfconf_info, __name__, mocks=[RunCommandMock]) diff --git a/tests/unit/plugins/modules/uthelper.py b/tests/unit/plugins/modules/uthelper.py index 5ab6ac5168..3cd2bcfde1 100644 --- a/tests/unit/plugins/modules/uthelper.py +++ b/tests/unit/plugins/modules/uthelper.py @@ -5,12 +5,12 @@ from __future__ import annotations +import json import os import sys -import json -import yaml import pytest +import yaml class UTHelper: diff --git a/tests/unit/plugins/modules/xenserver_conftest.py b/tests/unit/plugins/modules/xenserver_conftest.py index 6a9cc561e6..97228229d7 100644 --- a/tests/unit/plugins/modules/xenserver_conftest.py +++ b/tests/unit/plugins/modules/xenserver_conftest.py @@ -5,9 +5,9 @@ from __future__ import annotations - -import sys import importlib +import sys + import pytest from .FakeAnsibleModule import FakeAnsibleModule diff --git a/tests/unit/plugins/plugin_utils/test_unsafe.py b/tests/unit/plugins/plugin_utils/test_unsafe.py index b2ac4d7fa1..d5f029ed92 100644 --- a/tests/unit/plugins/plugin_utils/test_unsafe.py +++ b/tests/unit/plugins/plugin_utils/test_unsafe.py @@ -6,19 +6,23 @@ from __future__ import annotations import pytest - +from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import ( + SUPPORTS_DATA_TAGGING, +) +from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import ( + is_trusted as _is_trusted, +) +from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import ( + make_trusted as _make_trusted, +) from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import ( make_untrusted as _make_untrusted, - make_trusted as _make_trusted, - is_trusted as _is_trusted, - SUPPORTS_DATA_TAGGING, ) from ansible_collections.community.general.plugins.plugin_utils.unsafe import ( make_unsafe, ) - TEST_MAKE_UNSAFE = [ ( _make_trusted("text"),