From a75222d21a055e05ef0be82789484534ab73e869 Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Mon, 25 Sep 2023 14:09:00 +0800 Subject: [PATCH 1/3] Change ansible default version from 2.14 to 2.15 --- pr-pipelines.yml | 2 +- tests/sanity/ignore-2.15.txt | 265 +++++++++++++++++++++++++++++++++++ 2 files changed, 266 insertions(+), 1 deletion(-) create mode 100644 tests/sanity/ignore-2.15.txt diff --git a/pr-pipelines.yml b/pr-pipelines.yml index d427e320d..1667eb7b1 100644 --- a/pr-pipelines.yml +++ b/pr-pipelines.yml @@ -13,7 +13,7 @@ parameters: - name: ANSIBLE_VER displayName: 'Ansible Version' type: string - default: "2.14" + default: "2.15" values: - "2.9" - "2.10" diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt new file mode 100644 index 000000000..3cf234e4c --- /dev/null +++ b/tests/sanity/ignore-2.15.txt @@ -0,0 +1,265 @@ +plugins/modules/azure_rm_aks.py validate-modules:doc-choices-do-not-match-spec +plugins/modules/azure_rm_aks.py validate-modules:doc-default-does-not-match-spec +plugins/modules/azure_rm_aks.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_aks.py validate-modules:undocumented-parameter +plugins/modules/azure_rm_aks.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_aks.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_aks_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_aksversion_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_apimanagement.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_appgateway.py validate-modules:doc-choices-do-not-match-spec +plugins/modules/azure_rm_appgateway.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_appgateway.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_appgateway.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_applicationsecuritygroup.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_applicationsecuritygroup_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_appserviceplan.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_appserviceplan_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_availabilityset.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_containerregistryreplication.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_containerregistryreplication.py validate-modules:doc-choices-do-not-match-spec +plugins/modules/azure_rm_containerregistryreplication.py validate-modules:doc-default-does-not-match-spec +plugins/modules/azure_rm_containerregistryreplication.py validate-modules:undocumented-parameter +plugins/modules/azure_rm_containerregistryreplication_info.py validate-modules:doc-default-does-not-match-spec +plugins/modules/azure_rm_containerregistryreplication_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_containerregistryreplication_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_containerregistryreplication_info.py validate-modules:undocumented-parameter +plugins/modules/azure_rm_containerregistrywebhook.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_containerregistrywebhook.py validate-modules:doc-choices-do-not-match-spec +plugins/modules/azure_rm_containerregistrywebhook.py validate-modules:doc-default-does-not-match-spec +plugins/modules/azure_rm_containerregistrywebhook.py validate-modules:undocumented-parameter +plugins/modules/azure_rm_containerregistrywebhook.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_containerregistrywebhook_info.py validate-modules:doc-default-does-not-match-spec +plugins/modules/azure_rm_containerregistrywebhook_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_containerregistrywebhook_info.py validate-modules:undocumented-parameter +plugins/modules/azure_rm_datalakestore.py validate-modules:nonexistent-parameter-documented +plugins/modules/azure_rm_deployment.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_deployment.py validate-modules:return-syntax-error +plugins/modules/azure_rm_deployment_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_deployment_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_dnsrecordset.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_dnszone.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_dnszone_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_dnszone_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_functionapp.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_functionapp.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_functionapp_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_gallery.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_galleryimage.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_galleryimage.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_galleryimage.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_galleryimage_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_galleryimageversion.py validate-modules:doc-choices-do-not-match-spec +plugins/modules/azure_rm_galleryimageversion.py validate-modules:doc-type-does-not-match-spec +plugins/modules/azure_rm_galleryimageversion.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_galleryimageversion.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_galleryimageversion.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_galleryimageversion.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_iothubconsumergroup.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_keyvault.py validate-modules:doc-choices-do-not-match-spec +plugins/modules/azure_rm_keyvault.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_keyvault.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_keyvault.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_keyvaultkey.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_keyvaultkey_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_keyvaultsecret.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_manageddisk.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_managementgroup.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_networkinterface.py validate-modules:doc-missing-type +plugins/modules/azure_rm_networkinterface.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_networkinterface.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_networkinterface.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_networkinterface.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_networkinterface_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_networkinterface_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_publicipaddress.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_publicipaddress.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_publicipaddress.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_publicipaddress_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_resource.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_resource.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_resource_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_resource_info.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_resourcegroup.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_resourcegroup_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_registrationdefinition.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_registrationassignment.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_securitygroup.py validate-modules:doc-choices-do-not-match-spec +plugins/modules/azure_rm_securitygroup.py validate-modules:doc-default-does-not-match-spec +plugins/modules/azure_rm_securitygroup.py validate-modules:missing-suboption-docs +plugins/modules/azure_rm_securitygroup.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_securitygroup.py validate-modules:undocumented-parameter +plugins/modules/azure_rm_securitygroup.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_securitygroup.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_securitygroup.py validate-modules:mutually_exclusive-unknown +plugins/modules/azure_rm_securitygroup_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_storageaccount.py validate-modules:doc-missing-type +plugins/modules/azure_rm_storageaccount.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_storageaccount.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_storageaccount_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_storageaccount_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_storageblob.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_subnet.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_subnet.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_subnet_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualmachine.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualmachine.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_virtualmachine.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_virtualmachine.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_virtualmachine_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualmachineimage_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualmachinescaleset.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualmachinescaleset.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_virtualmachinescaleset.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_virtualmachinescaleset_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualmachinescalesetextension.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualmachinescalesetextension.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_virtualmachinescalesetextension_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualmachinescalesetinstance.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualmachinescalesetinstance.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_virtualmachinescalesetinstance_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualwan.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualwan.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_virtualwan.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_webapp.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_webapp.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_webapp.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_webapp_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_webappslot.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_webappslot.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_webappslot.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_autoscale.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_autoscale.py validate-modules:undocumented-parameter +plugins/modules/azure_rm_autoscale.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_autoscale_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_cdnendpoint.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_cdnendpoint.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_cdnendpoint.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_cosmosdbaccount.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_cosmosdbaccount.py validate-modules:undocumented-parameter +plugins/modules/azure_rm_cosmosdbaccount.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_cosmosdbaccount.py validate-modules:nonexistent-parameter-documented +plugins/modules/azure_rm_cosmosdbaccount.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_devtestlab.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_devtestlab_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_devtestlabarmtemplate_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_devtestlabartifact_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_devtestlabartifactsource.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_devtestlabartifactsource_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_devtestlabcustomimage.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_devtestlabcustomimage_info.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_devtestlabcustomimage_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_devtestlabenvironment.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_devtestlabenvironment_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_devtestlabpolicy.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_devtestlabpolicy_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_devtestlabvirtualmachine.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_devtestlabvirtualmachine.py validate-modules:undocumented-parameter +plugins/modules/azure_rm_devtestlabvirtualmachine.py validate-modules:nonexistent-parameter-documented +plugins/modules/azure_rm_devtestlabvirtualmachine.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_devtestlabvirtualmachine_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_devtestlabvirtualnetwork.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_hdinsightcluster.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_hdinsightcluster.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_loadbalancer.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_loadbalancer.py validate-modules:doc-choices-do-not-match-spec +plugins/modules/azure_rm_loadbalancer.py validate-modules:doc-default-does-not-match-spec +plugins/modules/azure_rm_loadbalancer.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_loadbalancer.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_loganalyticsworkspace.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_loganalyticsworkspace_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_mariadbdatabase.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_mariadbfirewallrule.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_mariadbserver.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_mysqlconfiguration.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_mysqldatabase.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_mysqlfirewallrule.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_mysqlfirewallrule.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_postgresqlconfiguration.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_postgresqldatabase.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_postgresqlfirewallrule.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_rediscache.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_rediscache.py validate-modules:doc-default-does-not-match-spec +plugins/modules/azure_rm_rediscache.py validate-modules:doc-type-does-not-match-spec +plugins/modules/azure_rm_rediscache.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_rediscache_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_rediscachefirewallrule.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_roleassignment.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_roleassignment_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_route.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_routetable.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_routetable_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_servicebus.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_servicebus_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_servicebus_info.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_servicebusqueue.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_servicebustopic.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_servicebustopic.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_servicebustopicsubscription.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_servicebussaspolicy.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_servicebussaspolicy.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_snapshot.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_snapshot.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_sqldatabase.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_sqldatabase_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_sqlfirewallrule.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_sqlfirewallrule_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_sqlserver.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_sqlserver_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_trafficmanager.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_trafficmanager.py validate-modules:doc-choices-do-not-match-spec +plugins/modules/azure_rm_trafficmanager.py validate-modules:doc-default-does-not-match-spec +plugins/modules/azure_rm_trafficmanager.py validate-modules:invalid-documentation +plugins/modules/azure_rm_trafficmanager.py validate-modules:undocumented-parameter +plugins/modules/azure_rm_trafficmanager.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_trafficmanager.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_trafficmanagerendpoint.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_trafficmanagerendpoint_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_trafficmanagerprofile.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_trafficmanagerprofile.py validate-modules:doc-choices-do-not-match-spec +plugins/modules/azure_rm_trafficmanagerprofile.py validate-modules:undocumented-parameter +plugins/modules/azure_rm_trafficmanagerprofile.py validate-modules:doc-default-does-not-match-spec +plugins/modules/azure_rm_trafficmanagerprofile_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualnetwork.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualnetwork_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualnetworkpeering.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualnetworkpeering.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_virtualnetworkpeering_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualnetworkgateway.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_virtualnetworkgateway.py validate-modules:doc-choices-do-not-match-spec +plugins/modules/azure_rm_virtualnetworkgateway.py validate-modules:doc-default-does-not-match-spec +plugins/modules/azure_rm_virtualnetworkgateway.py validate-modules:doc-missing-type +plugins/modules/azure_rm_virtualnetworkgateway.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_virtualnetworkgateway.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_vpnsite.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_batchaccount.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_batchaccount.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_cdnendpoint_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_cdnendpoint_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_cdnprofile.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_cosmosdbaccount_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_devtestlabschedule.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_devtestlabschedule_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_hdinsightcluster_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_hdinsightcluster_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_lock_info.py validate-modules:doc-required-mismatch +plugins/modules/azure_rm_cdnprofile_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_azurefirewall.py validate-modules:missing-suboption-docs +plugins/modules/azure_rm_azurefirewall.py validate-modules:parameter-type-not-in-doc +plugins/modules/azure_rm_azurefirewall.py validate-modules:undocumented-parameter +plugins/modules/azure_rm_azurefirewall.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_azurefirewall.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_adpassword.py validate-modules:return-syntax-error +plugins/modules/azure_rm_adpassword.py validate-modules:import-before-documentation +plugins/modules/azure_rm_adpassword.py validate-modules:nonexistent-parameter-documented +plugins/modules/azure_rm_adpassword_info.py validate-modules:return-syntax-error +plugins/modules/azure_rm_adpassword_info.py validate-modules:import-before-documentation +plugins/modules/azure_rm_adserviceprincipal.py validate-modules:nonexistent-parameter-documented +plugins/modules/azure_rm_apimanagementservice.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_openshiftmanagedcluster.py validate-modules:invalid-ansiblemodule-schema +plugins/modules/azure_rm_openshiftmanagedcluster.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_subnet.py validate-modules:doc-elements-mismatch +plugins/modules/azure_rm_vmbackuppolicy.py validate-modules:parameter-list-no-elements +plugins/modules/azure_rm_privatednsrecordset.py validate-modules:invalid-ansiblemodule-schema +tests/utils/shippable/check_matrix.py replace-urlopen +tests/utils/shippable/timing.py shebang From aec9f424ba28fe72f51d429db6dba12bfd269214 Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Mon, 25 Sep 2023 15:44:05 +0800 Subject: [PATCH 2/3] fix sanity fail --- plugins/lookup/azure_keyvault_secret.py | 1 - plugins/module_utils/azure_rm_common.py | 2 -- plugins/module_utils/azure_rm_common_ext.py | 3 +-- plugins/module_utils/azure_rm_common_rest.py | 1 - plugins/modules/azure_rm_adapplication.py | 1 - plugins/modules/azure_rm_adapplication_info.py | 1 - plugins/modules/azure_rm_adgroup.py | 1 - plugins/modules/azure_rm_adgroup_info.py | 1 - plugins/modules/azure_rm_adpassword.py | 1 - plugins/modules/azure_rm_adpassword_info.py | 4 ---- plugins/modules/azure_rm_adserviceprincipal.py | 2 -- plugins/modules/azure_rm_adserviceprincipal_info.py | 1 - plugins/modules/azure_rm_aduser.py | 1 - plugins/modules/azure_rm_aduser_info.py | 1 - plugins/modules/azure_rm_aksversion_info.py | 7 ------- plugins/modules/azure_rm_apimanagement.py | 3 --- plugins/modules/azure_rm_apimanagement_info.py | 3 --- plugins/modules/azure_rm_apimanagementservice.py | 2 -- plugins/modules/azure_rm_apimanagementservice_info.py | 2 -- plugins/modules/azure_rm_appgateway.py | 9 +++++++++ .../modules/azure_rm_applicationsecuritygroup_info.py | 1 - plugins/modules/azure_rm_appserviceplan.py | 1 - plugins/modules/azure_rm_autoscale_info.py | 6 ------ plugins/modules/azure_rm_azurefirewall.py | 2 -- plugins/modules/azure_rm_azurefirewall_info.py | 2 -- plugins/modules/azure_rm_backupazurevm.py | 2 -- plugins/modules/azure_rm_backupazurevm_info.py | 2 -- plugins/modules/azure_rm_backuppolicy.py | 1 - plugins/modules/azure_rm_backuppolicy_info.py | 2 -- plugins/modules/azure_rm_cdnendpoint_info.py | 2 -- plugins/modules/azure_rm_containerinstance.py | 1 + .../azure_rm_containerregistryreplication_info.py | 1 - plugins/modules/azure_rm_datalakestore.py | 1 - plugins/modules/azure_rm_ddosprotectionplan.py | 1 - plugins/modules/azure_rm_ddosprotectionplan_info.py | 1 - plugins/modules/azure_rm_deployment.py | 5 ----- plugins/modules/azure_rm_deployment_info.py | 2 -- plugins/modules/azure_rm_devtestlab.py | 1 - plugins/modules/azure_rm_devtestlabarmtemplate_info.py | 1 - plugins/modules/azure_rm_devtestlabartifactsource.py | 1 - plugins/modules/azure_rm_devtestlabcustomimage.py | 1 - plugins/modules/azure_rm_devtestlabenvironment.py | 2 -- plugins/modules/azure_rm_devtestlabpolicy.py | 1 - plugins/modules/azure_rm_devtestlabschedule.py | 2 -- plugins/modules/azure_rm_devtestlabvirtualmachine.py | 1 - plugins/modules/azure_rm_devtestlabvirtualnetwork.py | 2 -- plugins/modules/azure_rm_diskencryptionset.py | 2 +- plugins/modules/azure_rm_dnsrecordset.py | 3 --- plugins/modules/azure_rm_eventhub.py | 1 - plugins/modules/azure_rm_expressroute.py | 1 - plugins/modules/azure_rm_expressroute_info.py | 1 - plugins/modules/azure_rm_firewallpolicy.py | 2 +- plugins/modules/azure_rm_firewallpolicy_info.py | 1 - plugins/modules/azure_rm_gallery.py | 2 -- plugins/modules/azure_rm_gallery_info.py | 2 -- plugins/modules/azure_rm_galleryimage.py | 2 -- plugins/modules/azure_rm_galleryimage_info.py | 2 -- plugins/modules/azure_rm_galleryimageversion_info.py | 2 -- plugins/modules/azure_rm_hdinsightcluster.py | 1 - plugins/modules/azure_rm_hdinsightcluster_info.py | 1 - plugins/modules/azure_rm_hostgroup.py | 2 +- plugins/modules/azure_rm_image.py | 1 + plugins/modules/azure_rm_iotdevice.py | 2 ++ plugins/modules/azure_rm_iotdevicemodule.py | 2 ++ plugins/modules/azure_rm_iothub.py | 8 +------- plugins/modules/azure_rm_iothubconsumergroup.py | 10 +--------- plugins/modules/azure_rm_ipgroup.py | 3 +-- plugins/modules/azure_rm_keyvault.py | 1 - plugins/modules/azure_rm_keyvaultkey_info.py | 6 +++--- plugins/modules/azure_rm_keyvaultsecret_info.py | 8 ++++---- plugins/modules/azure_rm_loadbalancer.py | 3 --- plugins/modules/azure_rm_loadbalancer_info.py | 1 - plugins/modules/azure_rm_loganalyticsworkspace.py | 3 +-- plugins/modules/azure_rm_loganalyticsworkspace_info.py | 5 ++--- plugins/modules/azure_rm_manageddisk.py | 2 -- plugins/modules/azure_rm_mariadbconfiguration.py | 1 - plugins/modules/azure_rm_mariadbfirewallrule.py | 1 - plugins/modules/azure_rm_mariadbfirewallrule_info.py | 1 - plugins/modules/azure_rm_monitorlogprofile.py | 1 - plugins/modules/azure_rm_mysqlconfiguration.py | 2 -- plugins/modules/azure_rm_mysqlconfiguration_info.py | 1 - plugins/modules/azure_rm_networkinterface.py | 2 +- plugins/modules/azure_rm_networkinterface_info.py | 1 - plugins/modules/azure_rm_openshiftmanagedcluster.py | 1 - .../modules/azure_rm_openshiftmanagedcluster_info.py | 2 -- plugins/modules/azure_rm_postgresqlconfiguration.py | 2 -- .../modules/azure_rm_postgresqlconfiguration_info.py | 1 - plugins/modules/azure_rm_postgresqldatabase.py | 1 - plugins/modules/azure_rm_privatednszone.py | 3 +-- plugins/modules/azure_rm_privatednszone_info.py | 1 - plugins/modules/azure_rm_privatednszonelink.py | 2 +- plugins/modules/azure_rm_proximityplacementgroup.py | 3 +-- plugins/modules/azure_rm_recoveryservicesvault.py | 2 -- plugins/modules/azure_rm_recoveryservicesvault_info.py | 2 -- .../modules/azure_rm_registrationassignment_info.py | 3 --- .../modules/azure_rm_registrationdefinition_info.py | 3 --- plugins/modules/azure_rm_resource.py | 4 ++-- plugins/modules/azure_rm_resource_info.py | 3 +-- plugins/modules/azure_rm_roledefinition.py | 2 -- plugins/modules/azure_rm_roledefinition_info.py | 2 -- plugins/modules/azure_rm_route_info.py | 3 --- plugins/modules/azure_rm_securitygroup.py | 2 -- plugins/modules/azure_rm_servicebus.py | 1 - plugins/modules/azure_rm_servicebus_info.py | 1 - plugins/modules/azure_rm_servicebussaspolicy.py | 4 ---- plugins/modules/azure_rm_sqlfirewallrule.py | 1 - plugins/modules/azure_rm_sqlmanagedinstance.py | 1 - plugins/modules/azure_rm_storageaccount_info.py | 5 ----- plugins/modules/azure_rm_subnet.py | 3 ++- plugins/modules/azure_rm_trafficmanagerendpoint.py | 6 ++---- .../modules/azure_rm_trafficmanagerendpoint_info.py | 2 -- plugins/modules/azure_rm_trafficmanagerprofile.py | 2 +- plugins/modules/azure_rm_virtualmachine.py | 1 + plugins/modules/azure_rm_virtualnetworkgateway.py | 2 +- plugins/modules/azure_rm_webapp.py | 1 - plugins/modules/azure_rm_webappaccessrestriction.py | 2 ++ plugins/modules/azure_rm_webappslot.py | 1 - .../azure_service_principal_attribute.py | 1 - .../azure_service_principal_attribute.py | 1 - .../azure_service_principal_attribute.py | 1 - .../azure_service_principal_attribute.py | 1 - 121 files changed, 48 insertions(+), 213 deletions(-) diff --git a/plugins/lookup/azure_keyvault_secret.py b/plugins/lookup/azure_keyvault_secret.py index 9f72cb1f2..ff08a1d4f 100644 --- a/plugins/lookup/azure_keyvault_secret.py +++ b/plugins/lookup/azure_keyvault_secret.py @@ -120,7 +120,6 @@ import requests from azure.keyvault.secrets import SecretClient from azure.common.exceptions import ClientRequestError - from msrest.exceptions import ClientRequestError from azure.identity import DefaultAzureCredential, ClientSecretCredential from azure.keyvault.secrets import SecretClient diff --git a/plugins/module_utils/azure_rm_common.py b/plugins/module_utils/azure_rm_common.py index 46dd466d4..dca095520 100644 --- a/plugins/module_utils/azure_rm_common.py +++ b/plugins/module_utils/azure_rm_common.py @@ -249,7 +249,6 @@ def default_api_version(self): from azure.mgmt.authorization import AuthorizationManagementClient from azure.mgmt.sql import SqlManagementClient from azure.mgmt.servicebus import ServiceBusManagementClient - import azure.mgmt.servicebus.models as ServicebusModel from azure.mgmt.rdbms.postgresql import PostgreSQLManagementClient from azure.mgmt.rdbms.mysql import MySQLManagementClient from azure.mgmt.rdbms.mariadb import MariaDBManagementClient @@ -261,7 +260,6 @@ def default_api_version(self): import azure.mgmt.automation.models as AutomationModel from azure.mgmt.iothub import IotHubClient from azure.mgmt.iothub import models as IoTHubModels - from msrestazure import AzureConfiguration from azure.mgmt.resource.locks import ManagementLockClient from azure.mgmt.recoveryservicesbackup import RecoveryServicesBackupClient import azure.mgmt.recoveryservicesbackup.models as RecoveryServicesBackupModels diff --git a/plugins/module_utils/azure_rm_common_ext.py b/plugins/module_utils/azure_rm_common_ext.py index df477c89b..0229e1027 100644 --- a/plugins/module_utils/azure_rm_common_ext.py +++ b/plugins/module_utils/azure_rm_common_ext.py @@ -7,8 +7,7 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase -import re -from ansible.module_utils.common.dict_transformations import _camel_to_snake, _snake_to_camel +from ansible.module_utils.common.dict_transformations import _snake_to_camel from ansible.module_utils.six import string_types diff --git a/plugins/module_utils/azure_rm_common_rest.py b/plugins/module_utils/azure_rm_common_rest.py index 09e73c20e..4baefc4b9 100644 --- a/plugins/module_utils/azure_rm_common_rest.py +++ b/plugins/module_utils/azure_rm_common_rest.py @@ -19,7 +19,6 @@ from azure.core.pipeline.policies import BearerTokenCredentialPolicy from azure.mgmt.core.polling.arm_polling import ARMPolling import uuid - import json from azure.core.configuration import Configuration except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_adapplication.py b/plugins/modules/azure_rm_adapplication.py index f65f8b191..e5784ee8f 100644 --- a/plugins/modules/azure_rm_adapplication.py +++ b/plugins/modules/azure_rm_adapplication.py @@ -322,7 +322,6 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt try: - from msrestazure.azure_exceptions import CloudError from azure.graphrbac.models import GraphErrorException import datetime from dateutil.relativedelta import relativedelta diff --git a/plugins/modules/azure_rm_adapplication_info.py b/plugins/modules/azure_rm_adapplication_info.py index becfdd0b3..84f4018b4 100644 --- a/plugins/modules/azure_rm_adapplication_info.py +++ b/plugins/modules/azure_rm_adapplication_info.py @@ -101,7 +101,6 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase try: - from msrestazure.azure_exceptions import CloudError from azure.graphrbac.models import GraphErrorException except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_adgroup.py b/plugins/modules/azure_rm_adgroup.py index 092ed8c78..b4b8911a0 100644 --- a/plugins/modules/azure_rm_adgroup.py +++ b/plugins/modules/azure_rm_adgroup.py @@ -222,7 +222,6 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase try: - from msrestazure.azure_exceptions import CloudError from azure.graphrbac.models import GraphErrorException from azure.graphrbac.models import GroupCreateParameters except ImportError: diff --git a/plugins/modules/azure_rm_adgroup_info.py b/plugins/modules/azure_rm_adgroup_info.py index 9e8c5e456..0627f7730 100644 --- a/plugins/modules/azure_rm_adgroup_info.py +++ b/plugins/modules/azure_rm_adgroup_info.py @@ -173,7 +173,6 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase try: - from msrestazure.azure_exceptions import CloudError from azure.graphrbac.models import GraphErrorException from azure.graphrbac.models import CheckGroupMembershipParameters except ImportError: diff --git a/plugins/modules/azure_rm_adpassword.py b/plugins/modules/azure_rm_adpassword.py index d56791864..9743ed4d7 100644 --- a/plugins/modules/azure_rm_adpassword.py +++ b/plugins/modules/azure_rm_adpassword.py @@ -111,7 +111,6 @@ import uuid try: - from msrestazure.azure_exceptions import CloudError from azure.graphrbac.models import GraphErrorException from azure.graphrbac.models import PasswordCredential from azure.graphrbac.models import ApplicationUpdateParameters diff --git a/plugins/modules/azure_rm_adpassword_info.py b/plugins/modules/azure_rm_adpassword_info.py index 8fc99cb7e..bbd32fecd 100644 --- a/plugins/modules/azure_rm_adpassword_info.py +++ b/plugins/modules/azure_rm_adpassword_info.py @@ -5,7 +5,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import absolute_import, division, print_function -import datetime __metaclass__ = type @@ -108,10 +107,7 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase try: - from msrestazure.azure_exceptions import CloudError from azure.graphrbac.models import GraphErrorException - from azure.graphrbac.models import PasswordCredential - from azure.graphrbac.models import ApplicationUpdateParameters except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_adserviceprincipal.py b/plugins/modules/azure_rm_adserviceprincipal.py index ca5586e48..0d35caa83 100644 --- a/plugins/modules/azure_rm_adserviceprincipal.py +++ b/plugins/modules/azure_rm_adserviceprincipal.py @@ -92,12 +92,10 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt try: from azure.graphrbac.models import ServicePrincipalCreateParameters - from azure.graphrbac.models import ServicePrincipalUpdateParameters except Exception: pass try: - from msrestazure.azure_exceptions import CloudError from azure.graphrbac.models import GraphErrorException except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_adserviceprincipal_info.py b/plugins/modules/azure_rm_adserviceprincipal_info.py index 80e30b47f..b5bfd6d02 100644 --- a/plugins/modules/azure_rm_adserviceprincipal_info.py +++ b/plugins/modules/azure_rm_adserviceprincipal_info.py @@ -81,7 +81,6 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase try: - from msrestazure.azure_exceptions import CloudError from azure.graphrbac.models import GraphErrorException except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_aduser.py b/plugins/modules/azure_rm_aduser.py index 2bfa04aac..f9b20cdfe 100644 --- a/plugins/modules/azure_rm_aduser.py +++ b/plugins/modules/azure_rm_aduser.py @@ -202,7 +202,6 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase try: - from msrestazure.azure_exceptions import CloudError from azure.graphrbac.models import UserUpdateParameters from azure.graphrbac.models import UserCreateParameters from azure.graphrbac.models import PasswordProfile diff --git a/plugins/modules/azure_rm_aduser_info.py b/plugins/modules/azure_rm_aduser_info.py index 36d27d547..10d777667 100644 --- a/plugins/modules/azure_rm_aduser_info.py +++ b/plugins/modules/azure_rm_aduser_info.py @@ -152,7 +152,6 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase try: - from msrestazure.azure_exceptions import CloudError from azure.graphrbac.models import GraphErrorException except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_aksversion_info.py b/plugins/modules/azure_rm_aksversion_info.py index 4306fcce8..c0f719c0a 100644 --- a/plugins/modules/azure_rm_aksversion_info.py +++ b/plugins/modules/azure_rm_aksversion_info.py @@ -54,13 +54,6 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase -try: - from msrestazure.azure_exceptions import CloudError - from azure.common import AzureHttpError -except Exception: - # handled in azure_rm_common - pass - class AzureRMAKSVersion(AzureRMModuleBase): diff --git a/plugins/modules/azure_rm_apimanagement.py b/plugins/modules/azure_rm_apimanagement.py index 5ee1a8069..848a756c2 100644 --- a/plugins/modules/azure_rm_apimanagement.py +++ b/plugins/modules/azure_rm_apimanagement.py @@ -284,10 +284,7 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt -from copy import deepcopy -import time import json -import re try: from msrestazure.azure_exceptions import CloudError except ImportError: diff --git a/plugins/modules/azure_rm_apimanagement_info.py b/plugins/modules/azure_rm_apimanagement_info.py index 0ae7e9d10..4209dd6b3 100644 --- a/plugins/modules/azure_rm_apimanagement_info.py +++ b/plugins/modules/azure_rm_apimanagement_info.py @@ -100,10 +100,7 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt -from copy import deepcopy -import time import json -import re try: from msrestazure.azure_exceptions import CloudError except ImportError: diff --git a/plugins/modules/azure_rm_apimanagementservice.py b/plugins/modules/azure_rm_apimanagementservice.py index 0945eaa9d..8ae01cef0 100644 --- a/plugins/modules/azure_rm_apimanagementservice.py +++ b/plugins/modules/azure_rm_apimanagementservice.py @@ -100,10 +100,8 @@ import time import json -import re from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt -from copy import deepcopy try: from msrestazure.azure_exceptions import CloudError except ImportError: diff --git a/plugins/modules/azure_rm_apimanagementservice_info.py b/plugins/modules/azure_rm_apimanagementservice_info.py index c7347c17d..779e4fb2a 100644 --- a/plugins/modules/azure_rm_apimanagementservice_info.py +++ b/plugins/modules/azure_rm_apimanagementservice_info.py @@ -117,11 +117,9 @@ sample: null ''' -import time import json from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt -from copy import deepcopy try: from msrestazure.azure_exceptions import CloudError except ImportError: diff --git a/plugins/modules/azure_rm_appgateway.py b/plugins/modules/azure_rm_appgateway.py index 01f3b2eb5..aa8dd89ba 100644 --- a/plugins/modules/azure_rm_appgateway.py +++ b/plugins/modules/azure_rm_appgateway.py @@ -236,6 +236,7 @@ - Conditions based on which the action set execution will be evaluated. type: list elements: dict + default: [] suboptions: variable: description: @@ -266,6 +267,7 @@ - List of actions to be taken on request headers. type: list elements: dict + default: [] suboptions: header_name: description: @@ -275,11 +277,13 @@ description: - Value of the header. - Leave the parameter unset to remove the header. + default: '' response_header_configurations: description: - List of actions to be taken on response headers. type: list elements: dict + default: [] suboptions: header_name: description: @@ -289,6 +293,7 @@ description: - Value of the header. - Leave the parameter unset to remove the header. + default: '' url_configuration: description: - Action to be taken on the URL. @@ -342,6 +347,7 @@ key_vault_secret_id: description: - Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in KeyVault. + default: '' type: str frontend_ip_configurations: description: @@ -683,6 +689,7 @@ - The disabled rule groups. type: list elements: dict + default: [] suboptions: rule_group_name: description: @@ -693,6 +700,7 @@ - The list of rules that will be disabled. If null, all rules of the rule group will be disabled. type: list elements: int + default: [] enabled: description: - Whether the web application firewall is enabled or not. @@ -702,6 +710,7 @@ - The exclusion list. type: list elements: dict + default: [] suboptions: match_variable: description: diff --git a/plugins/modules/azure_rm_applicationsecuritygroup_info.py b/plugins/modules/azure_rm_applicationsecuritygroup_info.py index 738404b4e..bae599e70 100644 --- a/plugins/modules/azure_rm_applicationsecuritygroup_info.py +++ b/plugins/modules/azure_rm_applicationsecuritygroup_info.py @@ -90,7 +90,6 @@ try: from azure.core.exceptions import ResourceNotFoundError - from msrestazure.azure_operation import AzureOperationPoller except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_appserviceplan.py b/plugins/modules/azure_rm_appserviceplan.py index 2c0e883bf..ed129d279 100644 --- a/plugins/modules/azure_rm_appserviceplan.py +++ b/plugins/modules/azure_rm_appserviceplan.py @@ -99,7 +99,6 @@ } ''' -import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase try: diff --git a/plugins/modules/azure_rm_autoscale_info.py b/plugins/modules/azure_rm_autoscale_info.py index 49411ad48..dcac4e124 100644 --- a/plugins/modules/azure_rm_autoscale_info.py +++ b/plugins/modules/azure_rm_autoscale_info.py @@ -117,12 +117,6 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from ansible.module_utils._text import to_native -try: - from msrest.serialization import Model -except ImportError: - # This is handled in azure_rm_common - pass - # duplicated in azure_rm_autoscale def timedelta_to_minutes(time): diff --git a/plugins/modules/azure_rm_azurefirewall.py b/plugins/modules/azure_rm_azurefirewall.py index 743ab7e35..819e5dbc5 100644 --- a/plugins/modules/azure_rm_azurefirewall.py +++ b/plugins/modules/azure_rm_azurefirewall.py @@ -314,10 +314,8 @@ import time import json -import re from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient -from copy import deepcopy try: from msrestazure.azure_exceptions import CloudError except ImportError: diff --git a/plugins/modules/azure_rm_azurefirewall_info.py b/plugins/modules/azure_rm_azurefirewall_info.py index 4cbde2a4b..a1fa062d9 100644 --- a/plugins/modules/azure_rm_azurefirewall_info.py +++ b/plugins/modules/azure_rm_azurefirewall_info.py @@ -102,11 +102,9 @@ ''' -import time import json from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient -from copy import deepcopy try: from msrestazure.azure_exceptions import CloudError except Exception: diff --git a/plugins/modules/azure_rm_backupazurevm.py b/plugins/modules/azure_rm_backupazurevm.py index 63bd9aa2f..a0432a1c9 100644 --- a/plugins/modules/azure_rm_backupazurevm.py +++ b/plugins/modules/azure_rm_backupazurevm.py @@ -121,9 +121,7 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt -import re import json -import time class Actions: diff --git a/plugins/modules/azure_rm_backupazurevm_info.py b/plugins/modules/azure_rm_backupazurevm_info.py index 5bd6bd015..a6c5fbcdd 100644 --- a/plugins/modules/azure_rm_backupazurevm_info.py +++ b/plugins/modules/azure_rm_backupazurevm_info.py @@ -62,9 +62,7 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt -import re import json -import time class Actions: diff --git a/plugins/modules/azure_rm_backuppolicy.py b/plugins/modules/azure_rm_backuppolicy.py index 7ec699566..e26cf37e2 100644 --- a/plugins/modules/azure_rm_backuppolicy.py +++ b/plugins/modules/azure_rm_backuppolicy.py @@ -169,7 +169,6 @@ sample: Microsoft.RecoveryServices/vaults/backupPolicies ''' -import uuid from datetime import datetime from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase diff --git a/plugins/modules/azure_rm_backuppolicy_info.py b/plugins/modules/azure_rm_backuppolicy_info.py index d4a086766..e499f651f 100644 --- a/plugins/modules/azure_rm_backuppolicy_info.py +++ b/plugins/modules/azure_rm_backuppolicy_info.py @@ -80,8 +80,6 @@ sample: Microsoft.RecoveryServices/vaults/backupPolicies ''' -import uuid -from datetime import datetime from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase try: diff --git a/plugins/modules/azure_rm_cdnendpoint_info.py b/plugins/modules/azure_rm_cdnendpoint_info.py index 897071eb9..d345425fc 100644 --- a/plugins/modules/azure_rm_cdnendpoint_info.py +++ b/plugins/modules/azure_rm_cdnendpoint_info.py @@ -170,8 +170,6 @@ try: from azure.mgmt.cdn import CdnManagementClient - from azure.mgmt.cdn.models import ErrorResponseException - from azure.common import AzureHttpError except ImportError: # handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_containerinstance.py b/plugins/modules/azure_rm_containerinstance.py index 2b0bffbc5..f6de5f9a6 100644 --- a/plugins/modules/azure_rm_containerinstance.py +++ b/plugins/modules/azure_rm_containerinstance.py @@ -63,6 +63,7 @@ - This option is deprecated, using I(ports) under I(containers)". type: list elements: int + default: [] location: description: - Valid azure location. Defaults to location of the resource group. diff --git a/plugins/modules/azure_rm_containerregistryreplication_info.py b/plugins/modules/azure_rm_containerregistryreplication_info.py index 123a83288..c183061ed 100644 --- a/plugins/modules/azure_rm_containerregistryreplication_info.py +++ b/plugins/modules/azure_rm_containerregistryreplication_info.py @@ -106,7 +106,6 @@ try: from azure.core.exceptions import ResourceNotFoundError - from azure.core.polling import LROPoller except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_datalakestore.py b/plugins/modules/azure_rm_datalakestore.py index edce24665..1f2b23309 100644 --- a/plugins/modules/azure_rm_datalakestore.py +++ b/plugins/modules/azure_rm_datalakestore.py @@ -417,7 +417,6 @@ ''' from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase -import datetime try: from azure.core.exceptions import ResourceNotFoundError diff --git a/plugins/modules/azure_rm_ddosprotectionplan.py b/plugins/modules/azure_rm_ddosprotectionplan.py index 0ae5e82f8..65505a36c 100644 --- a/plugins/modules/azure_rm_ddosprotectionplan.py +++ b/plugins/modules/azure_rm_ddosprotectionplan.py @@ -87,7 +87,6 @@ try: from azure.core.exceptions import ResourceNotFoundError - from azure.mgmt.network import NetworkManagementClient except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_ddosprotectionplan_info.py b/plugins/modules/azure_rm_ddosprotectionplan_info.py index 70b37ac73..3f8bf4461 100644 --- a/plugins/modules/azure_rm_ddosprotectionplan_info.py +++ b/plugins/modules/azure_rm_ddosprotectionplan_info.py @@ -47,7 +47,6 @@ try: from azure.core.exceptions import ResourceNotFoundError - from msrest.serialization import Model except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_deployment.py b/plugins/modules/azure_rm_deployment.py index 2b6a23a52..fa30b8516 100644 --- a/plugins/modules/azure_rm_deployment.py +++ b/plugins/modules/azure_rm_deployment.py @@ -402,17 +402,12 @@ import time try: - from azure.common.credentials import ServicePrincipalCredentials import time - import yaml except ImportError as exc: IMPORT_ERROR = "Error importing module prerequisites: %s" % exc try: - from itertools import chain from azure.core.exceptions import ResourceNotFoundError - from azure.mgmt.resource.resources import ResourceManagementClient - from azure.mgmt.network import NetworkManagementClient except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_deployment_info.py b/plugins/modules/azure_rm_deployment_info.py index 95dd56195..ad5ad943e 100644 --- a/plugins/modules/azure_rm_deployment_info.py +++ b/plugins/modules/azure_rm_deployment_info.py @@ -122,8 +122,6 @@ try: from azure.core.exceptions import ResourceNotFoundError - from azure.mgmt.devtestlabs import DevTestLabsClient - from msrest.serialization import Model except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_devtestlab.py b/plugins/modules/azure_rm_devtestlab.py index dd1bc3a0d..d33f430a5 100644 --- a/plugins/modules/azure_rm_devtestlab.py +++ b/plugins/modules/azure_rm_devtestlab.py @@ -73,7 +73,6 @@ sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourcegroups/myResourceGroup/providers/microsoft.devtestlab/labs/mylab ''' -import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from ansible.module_utils.common.dict_transformations import _snake_to_camel diff --git a/plugins/modules/azure_rm_devtestlabarmtemplate_info.py b/plugins/modules/azure_rm_devtestlabarmtemplate_info.py index 42556856c..c27ef22be 100644 --- a/plugins/modules/azure_rm_devtestlabarmtemplate_info.py +++ b/plugins/modules/azure_rm_devtestlabarmtemplate_info.py @@ -110,7 +110,6 @@ try: from azure.core.exceptions import ResourceNotFoundError from azure.mgmt.devtestlabs import DevTestLabsClient - from msrest.serialization import Model except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_devtestlabartifactsource.py b/plugins/modules/azure_rm_devtestlabartifactsource.py index f558f49b9..d820812da 100644 --- a/plugins/modules/azure_rm_devtestlabartifactsource.py +++ b/plugins/modules/azure_rm_devtestlabartifactsource.py @@ -104,7 +104,6 @@ import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase -from ansible.module_utils.common.dict_transformations import _snake_to_camel try: from azure.core.polling import LROPoller diff --git a/plugins/modules/azure_rm_devtestlabcustomimage.py b/plugins/modules/azure_rm_devtestlabcustomimage.py index 05eb0e59a..c273c54b6 100644 --- a/plugins/modules/azure_rm_devtestlabcustomimage.py +++ b/plugins/modules/azure_rm_devtestlabcustomimage.py @@ -89,7 +89,6 @@ sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourcegroups/myResourceGroup/providers/microsoft.devtestlab/labs/myLab/images/myImage" ''' -import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from ansible.module_utils.common.dict_transformations import _snake_to_camel diff --git a/plugins/modules/azure_rm_devtestlabenvironment.py b/plugins/modules/azure_rm_devtestlabenvironment.py index cc789a7b8..1aeb2bef2 100644 --- a/plugins/modules/azure_rm_devtestlabenvironment.py +++ b/plugins/modules/azure_rm_devtestlabenvironment.py @@ -101,9 +101,7 @@ ''' -import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase -from ansible.module_utils.common.dict_transformations import _snake_to_camel try: from azure.core.polling import LROPoller diff --git a/plugins/modules/azure_rm_devtestlabpolicy.py b/plugins/modules/azure_rm_devtestlabpolicy.py index 3766ba5bd..52f561321 100644 --- a/plugins/modules/azure_rm_devtestlabpolicy.py +++ b/plugins/modules/azure_rm_devtestlabpolicy.py @@ -92,7 +92,6 @@ ''' -import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from ansible.module_utils.common.dict_transformations import _snake_to_camel diff --git a/plugins/modules/azure_rm_devtestlabschedule.py b/plugins/modules/azure_rm_devtestlabschedule.py index fdbee1cad..0bd4bec7b 100644 --- a/plugins/modules/azure_rm_devtestlabschedule.py +++ b/plugins/modules/azure_rm_devtestlabschedule.py @@ -76,9 +76,7 @@ abVmsShutdown" ''' -import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase -from ansible.module_utils.common.dict_transformations import _snake_to_camel try: from azure.core.polling import LROPoller diff --git a/plugins/modules/azure_rm_devtestlabvirtualmachine.py b/plugins/modules/azure_rm_devtestlabvirtualmachine.py index 3c66a506f..83b5c242e 100644 --- a/plugins/modules/azure_rm_devtestlabvirtualmachine.py +++ b/plugins/modules/azure_rm_devtestlabvirtualmachine.py @@ -181,7 +181,6 @@ sample: myvm.eastus.cloudapp.azure.com ''' -import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from ansible.module_utils.common.dict_transformations import _snake_to_camel diff --git a/plugins/modules/azure_rm_devtestlabvirtualnetwork.py b/plugins/modules/azure_rm_devtestlabvirtualnetwork.py index 0c1293bff..9a7c32ddb 100644 --- a/plugins/modules/azure_rm_devtestlabvirtualnetwork.py +++ b/plugins/modules/azure_rm_devtestlabvirtualnetwork.py @@ -79,9 +79,7 @@ rtualNetworks/myvn" ''' -import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase -from ansible.module_utils.common.dict_transformations import _snake_to_camel try: from azure.core.polling import LROPoller diff --git a/plugins/modules/azure_rm_diskencryptionset.py b/plugins/modules/azure_rm_diskencryptionset.py index 93bd8ab47..f76f784eb 100644 --- a/plugins/modules/azure_rm_diskencryptionset.py +++ b/plugins/modules/azure_rm_diskencryptionset.py @@ -153,7 +153,7 @@ ''' from ansible.module_utils.basic import _load_params -from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, HAS_AZURE, \ +from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, \ format_resource_id, normalize_location_name try: diff --git a/plugins/modules/azure_rm_dnsrecordset.py b/plugins/modules/azure_rm_dnsrecordset.py index 55b682be6..bd77eb850 100644 --- a/plugins/modules/azure_rm_dnsrecordset.py +++ b/plugins/modules/azure_rm_dnsrecordset.py @@ -277,12 +277,9 @@ ] ''' -import inspect -import sys import copy from ansible.module_utils.basic import _load_params -from ansible.module_utils.six import iteritems from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, HAS_AZURE try: diff --git a/plugins/modules/azure_rm_eventhub.py b/plugins/modules/azure_rm_eventhub.py index ecc8bc424..ff0bd0ec3 100644 --- a/plugins/modules/azure_rm_eventhub.py +++ b/plugins/modules/azure_rm_eventhub.py @@ -157,7 +157,6 @@ ''' try: - from azure.core.exceptions import ResourceNotFoundError from azure.mgmt.eventhub.models import Eventhub, EHNamespace from azure.mgmt.eventhub.models import Sku except ImportError: diff --git a/plugins/modules/azure_rm_expressroute.py b/plugins/modules/azure_rm_expressroute.py index 93b53dc70..b32f65500 100644 --- a/plugins/modules/azure_rm_expressroute.py +++ b/plugins/modules/azure_rm_expressroute.py @@ -179,7 +179,6 @@ try: from azure.core.exceptions import ResourceNotFoundError - from azure.mgmt.network import NetworkManagementClient except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_expressroute_info.py b/plugins/modules/azure_rm_expressroute_info.py index e1b61be63..e86e75503 100644 --- a/plugins/modules/azure_rm_expressroute_info.py +++ b/plugins/modules/azure_rm_expressroute_info.py @@ -98,7 +98,6 @@ try: from azure.core.exceptions import ResourceNotFoundError - from azure.mgmt.network import NetworkManagementClient except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_firewallpolicy.py b/plugins/modules/azure_rm_firewallpolicy.py index e7dfdafe2..dab7f5403 100644 --- a/plugins/modules/azure_rm_firewallpolicy.py +++ b/plugins/modules/azure_rm_firewallpolicy.py @@ -246,7 +246,7 @@ ''' from ansible.module_utils.basic import _load_params -from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, HAS_AZURE, \ +from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, \ format_resource_id, normalize_location_name import copy diff --git a/plugins/modules/azure_rm_firewallpolicy_info.py b/plugins/modules/azure_rm_firewallpolicy_info.py index 2c5c6c5dc..4dc7c7053 100644 --- a/plugins/modules/azure_rm_firewallpolicy_info.py +++ b/plugins/modules/azure_rm_firewallpolicy_info.py @@ -104,7 +104,6 @@ try: from azure.core.exceptions import ResourceNotFoundError - from azure.common import AzureMissingResourceHttpError, AzureHttpError except Exception: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_gallery.py b/plugins/modules/azure_rm_gallery.py index 1e4da25ce..f66dcae23 100644 --- a/plugins/modules/azure_rm_gallery.py +++ b/plugins/modules/azure_rm_gallery.py @@ -72,10 +72,8 @@ import time import json -import re from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient -from copy import deepcopy try: from msrestazure.azure_exceptions import CloudError except ImportError: diff --git a/plugins/modules/azure_rm_gallery_info.py b/plugins/modules/azure_rm_gallery_info.py index 79e1ef115..5e33cec68 100644 --- a/plugins/modules/azure_rm_gallery_info.py +++ b/plugins/modules/azure_rm_gallery_info.py @@ -90,11 +90,9 @@ ''' -import time import json from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient -from copy import deepcopy try: from msrestazure.azure_exceptions import CloudError except Exception: diff --git a/plugins/modules/azure_rm_galleryimage.py b/plugins/modules/azure_rm_galleryimage.py index cc1b3d51c..a38371c5b 100644 --- a/plugins/modules/azure_rm_galleryimage.py +++ b/plugins/modules/azure_rm_galleryimage.py @@ -205,10 +205,8 @@ import time import json -import re from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient -from copy import deepcopy try: from msrestazure.azure_exceptions import CloudError except ImportError: diff --git a/plugins/modules/azure_rm_galleryimage_info.py b/plugins/modules/azure_rm_galleryimage_info.py index d451b86c1..bae1f6bc9 100644 --- a/plugins/modules/azure_rm_galleryimage_info.py +++ b/plugins/modules/azure_rm_galleryimage_info.py @@ -115,11 +115,9 @@ ''' -import time import json from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient -from copy import deepcopy try: from msrestazure.azure_exceptions import CloudError except Exception: diff --git a/plugins/modules/azure_rm_galleryimageversion_info.py b/plugins/modules/azure_rm_galleryimageversion_info.py index 627593157..791193d77 100644 --- a/plugins/modules/azure_rm_galleryimageversion_info.py +++ b/plugins/modules/azure_rm_galleryimageversion_info.py @@ -101,11 +101,9 @@ ''' -import time import json from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient -from copy import deepcopy try: from msrestazure.azure_exceptions import CloudError except Exception: diff --git a/plugins/modules/azure_rm_hdinsightcluster.py b/plugins/modules/azure_rm_hdinsightcluster.py index 85a67c8ac..e885b5e8a 100644 --- a/plugins/modules/azure_rm_hdinsightcluster.py +++ b/plugins/modules/azure_rm_hdinsightcluster.py @@ -169,7 +169,6 @@ sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.HDInsight/clusters/myCluster ''' -import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase try: diff --git a/plugins/modules/azure_rm_hdinsightcluster_info.py b/plugins/modules/azure_rm_hdinsightcluster_info.py index f5c22fc97..36a459115 100644 --- a/plugins/modules/azure_rm_hdinsightcluster_info.py +++ b/plugins/modules/azure_rm_hdinsightcluster_info.py @@ -180,7 +180,6 @@ ''' from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase -from ansible.module_utils.common.dict_transformations import _camel_to_snake try: from azure.core.exceptions import ResourceNotFoundError diff --git a/plugins/modules/azure_rm_hostgroup.py b/plugins/modules/azure_rm_hostgroup.py index d7e80bf14..235728b64 100644 --- a/plugins/modules/azure_rm_hostgroup.py +++ b/plugins/modules/azure_rm_hostgroup.py @@ -143,7 +143,7 @@ ''' from ansible.module_utils.basic import _load_params -from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, HAS_AZURE, \ +from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, \ normalize_location_name try: diff --git a/plugins/modules/azure_rm_image.py b/plugins/modules/azure_rm_image.py index 8c4fb4475..15eb50b3d 100644 --- a/plugins/modules/azure_rm_image.py +++ b/plugins/modules/azure_rm_image.py @@ -39,6 +39,7 @@ - List of data disk sources, including unmanaged blob URI, managed disk id or name, or snapshot id or name. type: list elements: str + default: [] location: description: - Location of the image. Derived from I(resource_group) if not specified. diff --git a/plugins/modules/azure_rm_iotdevice.py b/plugins/modules/azure_rm_iotdevice.py index 084f1131d..77a8a3ae0 100644 --- a/plugins/modules/azure_rm_iotdevice.py +++ b/plugins/modules/azure_rm_iotdevice.py @@ -370,6 +370,7 @@ def is_equal(self, updated, original): return not changed def update_device(self, device): + response = None try: if self.auth_method == 'sas': response = self.mgmt_client.update_device_with_sas(self.name, device['etag'], @@ -385,6 +386,7 @@ def update_device(self, device): self.fail('Error when creating or updating IoT Hub device {0}: {1}'.format(self.name, exc.message or str(exc))) def create_device(self): + response = None try: if self.auth_method == 'sas': response = self.mgmt_client.create_device_with_sas(self.name, self.primary_key, self.secondary_key, self.status, iot_edge=self.edge_enabled) diff --git a/plugins/modules/azure_rm_iotdevicemodule.py b/plugins/modules/azure_rm_iotdevicemodule.py index d73af3863..58df84fd8 100644 --- a/plugins/modules/azure_rm_iotdevicemodule.py +++ b/plugins/modules/azure_rm_iotdevicemodule.py @@ -287,6 +287,7 @@ def is_equal(self, updated, original): return not changed def update_module(self): + response = None try: if self.auth_method == 'sas': response = self.mgmt_client.update_module_with_sas(self.device, self.name, self.managed_by, self.etag, self.primary_key, self.secondary_key) @@ -304,6 +305,7 @@ def update_module(self): self.fail('Error when creating or updating IoT Hub device {0}: {1}'.format(self.name, exc.message or str(exc))) def create_module(self): + response = None try: if self.auth_method == 'sas': response = self.mgmt_client.create_module_with_sas(self.device, self.name, self.managed_by, self.primary_key, self.secondary_key) diff --git a/plugins/modules/azure_rm_iothub.py b/plugins/modules/azure_rm_iothub.py index daf59783a..8f32abfb8 100644 --- a/plugins/modules/azure_rm_iothub.py +++ b/plugins/modules/azure_rm_iothub.py @@ -507,16 +507,10 @@ sample: "true" ''' # NOQA -from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, format_resource_id +from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from ansible.module_utils.common.dict_transformations import _snake_to_camel, _camel_to_snake import re -try: - from msrestazure.tools import parse_resource_id -except ImportError: - # This is handled in azure_rm_common - pass - ip_filter_spec = dict( name=dict(type='str', required=True), diff --git a/plugins/modules/azure_rm_iothubconsumergroup.py b/plugins/modules/azure_rm_iothubconsumergroup.py index 21dde7fbb..586aa6dd7 100644 --- a/plugins/modules/azure_rm_iothubconsumergroup.py +++ b/plugins/modules/azure_rm_iothubconsumergroup.py @@ -76,15 +76,7 @@ type: str ''' # NOQA -from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, format_resource_id -from ansible.module_utils.common.dict_transformations import _snake_to_camel, _camel_to_snake -import re - -try: - from msrestazure.tools import parse_resource_id -except ImportError: - # This is handled in azure_rm_common - pass +from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase class AzureRMIoTHubConsumerGroup(AzureRMModuleBase): diff --git a/plugins/modules/azure_rm_ipgroup.py b/plugins/modules/azure_rm_ipgroup.py index 717923770..1e464ced2 100644 --- a/plugins/modules/azure_rm_ipgroup.py +++ b/plugins/modules/azure_rm_ipgroup.py @@ -162,8 +162,7 @@ ''' from ansible.module_utils.basic import _load_params -from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, HAS_AZURE, \ - format_resource_id, normalize_location_name +from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, normalize_location_name try: from azure.core.exceptions import ResourceNotFoundError diff --git a/plugins/modules/azure_rm_keyvault.py b/plugins/modules/azure_rm_keyvault.py index 08940eeda..afc24e450 100644 --- a/plugins/modules/azure_rm_keyvault.py +++ b/plugins/modules/azure_rm_keyvault.py @@ -191,7 +191,6 @@ sample: id ''' -import collections import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase diff --git a/plugins/modules/azure_rm_keyvaultkey_info.py b/plugins/modules/azure_rm_keyvaultkey_info.py index d149f7b22..8a430e598 100644 --- a/plugins/modules/azure_rm_keyvaultkey_info.py +++ b/plugins/modules/azure_rm_keyvaultkey_info.py @@ -271,7 +271,7 @@ def deletedkeybundle_to_dict(bundle): crv=bundle.key.crv if hasattr(bundle.key, 'crv') else None, x=bundle.key.x if hasattr(bundle.key, 'x') else None, y=bundle.key.y if hasattr(bundle.key, 'y') else None) - keybundle['id'] = bundle.id, + keybundle['id'] = bundle.id return keybundle @@ -313,8 +313,8 @@ def delete_item_to_dict(bundle): def deletedkeyitem_to_dict(keyitem): item = delete_item_to_dict(keyitem) - item['recovery_id'] = keyitem.recovery_id, - item['scheduled_purge_date'] = keyitem.scheduled_purge_date, + item['recovery_id'] = keyitem.recovery_id + item['scheduled_purge_date'] = keyitem.scheduled_purge_date item['deleted_date'] = keyitem.deleted_date return item diff --git a/plugins/modules/azure_rm_keyvaultsecret_info.py b/plugins/modules/azure_rm_keyvaultsecret_info.py index 4a813a895..4dac6c7a5 100644 --- a/plugins/modules/azure_rm_keyvaultsecret_info.py +++ b/plugins/modules/azure_rm_keyvaultsecret_info.py @@ -200,8 +200,8 @@ def deleted_bundle_to_dict(bundle): def deletedsecretbundle_to_dict(bundle): secretbundle = deleted_bundle_to_dict(bundle.properties) - secretbundle['recovery_id'] = bundle._recovery_id, - secretbundle['scheduled_purge_date'] = bundle._scheduled_purge_date, + secretbundle['recovery_id'] = bundle._recovery_id + secretbundle['scheduled_purge_date'] = bundle._scheduled_purge_date secretbundle['deleted_date'] = bundle._deleted_date return secretbundle @@ -221,8 +221,8 @@ def secretitem_to_dict(secretitem): def deletedsecretitem_to_dict(secretitem): item = secretitem_to_dict(secretitem.properties) - item['recovery_id'] = secretitem._recovery_id, - item['scheduled_purge_date'] = secretitem._scheduled_purge_date, + item['recovery_id'] = secretitem._recovery_id + item['scheduled_purge_date'] = secretitem._scheduled_purge_date item['deleted_date'] = secretitem._deleted_date return item diff --git a/plugins/modules/azure_rm_loadbalancer.py b/plugins/modules/azure_rm_loadbalancer.py index 86c4335f8..2fc20eaef 100644 --- a/plugins/modules/azure_rm_loadbalancer.py +++ b/plugins/modules/azure_rm_loadbalancer.py @@ -403,12 +403,9 @@ type: bool ''' -import random from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, format_resource_id from ansible.module_utils._text import to_native try: - from msrestazure.tools import parse_resource_id - from msrestazure.azure_exceptions import CloudError from azure.core.exceptions import ResourceNotFoundError except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_loadbalancer_info.py b/plugins/modules/azure_rm_loadbalancer_info.py index 130e12d5c..2f3d705f2 100644 --- a/plugins/modules/azure_rm_loadbalancer_info.py +++ b/plugins/modules/azure_rm_loadbalancer_info.py @@ -116,7 +116,6 @@ try: from azure.core.exceptions import ResourceNotFoundError - from azure.common import AzureHttpError except Exception: # handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_loganalyticsworkspace.py b/plugins/modules/azure_rm_loganalyticsworkspace.py index 7e8acf260..2bdd87d6e 100644 --- a/plugins/modules/azure_rm_loganalyticsworkspace.py +++ b/plugins/modules/azure_rm_loganalyticsworkspace.py @@ -154,8 +154,7 @@ from ansible.module_utils.common.dict_transformations import _snake_to_camel, _camel_to_snake try: - from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, format_resource_id - from msrestazure.tools import parse_resource_id + from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from azure.core.exceptions import ResourceNotFoundError except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_loganalyticsworkspace_info.py b/plugins/modules/azure_rm_loganalyticsworkspace_info.py index 4861954da..8f3ffbe1f 100644 --- a/plugins/modules/azure_rm_loganalyticsworkspace_info.py +++ b/plugins/modules/azure_rm_loganalyticsworkspace_info.py @@ -134,11 +134,10 @@ } ''' # NOQA -from ansible.module_utils.common.dict_transformations import _snake_to_camel, _camel_to_snake +from ansible.module_utils.common.dict_transformations import _camel_to_snake try: - from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, format_resource_id - from msrestazure.tools import parse_resource_id + from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from azure.core.exceptions import ResourceNotFoundError except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_manageddisk.py b/plugins/modules/azure_rm_manageddisk.py index 07e9896ee..1d1e1cb78 100644 --- a/plugins/modules/azure_rm_manageddisk.py +++ b/plugins/modules/azure_rm_manageddisk.py @@ -278,8 +278,6 @@ type: bool ''' -import re - from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase try: diff --git a/plugins/modules/azure_rm_mariadbconfiguration.py b/plugins/modules/azure_rm_mariadbconfiguration.py index 7ba037ada..0f3383fd9 100644 --- a/plugins/modules/azure_rm_mariadbconfiguration.py +++ b/plugins/modules/azure_rm_mariadbconfiguration.py @@ -73,7 +73,6 @@ gurations/event_scheduler" ''' -import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase try: diff --git a/plugins/modules/azure_rm_mariadbfirewallrule.py b/plugins/modules/azure_rm_mariadbfirewallrule.py index 0424db9f7..6226b29c3 100644 --- a/plugins/modules/azure_rm_mariadbfirewallrule.py +++ b/plugins/modules/azure_rm_mariadbfirewallrule.py @@ -79,7 +79,6 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from azure.core.exceptions import ResourceNotFoundError from azure.core.polling import LROPoller - from msrest.serialization import Model except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_mariadbfirewallrule_info.py b/plugins/modules/azure_rm_mariadbfirewallrule_info.py index 5076e33d2..92659dadb 100644 --- a/plugins/modules/azure_rm_mariadbfirewallrule_info.py +++ b/plugins/modules/azure_rm_mariadbfirewallrule_info.py @@ -97,7 +97,6 @@ try: from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase - from msrestazure.azure_operation import AzureOperationPoller from azure.core.exceptions import ResourceNotFoundError except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_monitorlogprofile.py b/plugins/modules/azure_rm_monitorlogprofile.py index a224c1fba..7b5e7b3c1 100644 --- a/plugins/modules/azure_rm_monitorlogprofile.py +++ b/plugins/modules/azure_rm_monitorlogprofile.py @@ -114,7 +114,6 @@ ''' -import time try: from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, format_resource_id diff --git a/plugins/modules/azure_rm_mysqlconfiguration.py b/plugins/modules/azure_rm_mysqlconfiguration.py index 414fb5028..377388086 100644 --- a/plugins/modules/azure_rm_mysqlconfiguration.py +++ b/plugins/modules/azure_rm_mysqlconfiguration.py @@ -67,8 +67,6 @@ gurations/event_scheduler" ''' -import time - try: from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from azure.core.exceptions import ResourceNotFoundError diff --git a/plugins/modules/azure_rm_mysqlconfiguration_info.py b/plugins/modules/azure_rm_mysqlconfiguration_info.py index 8404286a8..4800353b8 100644 --- a/plugins/modules/azure_rm_mysqlconfiguration_info.py +++ b/plugins/modules/azure_rm_mysqlconfiguration_info.py @@ -95,7 +95,6 @@ try: from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase - from msrestazure.azure_operation import AzureOperationPoller from azure.core.exceptions import ResourceNotFoundError except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_networkinterface.py b/plugins/modules/azure_rm_networkinterface.py index bd988f06a..92da196da 100644 --- a/plugins/modules/azure_rm_networkinterface.py +++ b/plugins/modules/azure_rm_networkinterface.py @@ -485,7 +485,7 @@ ''' try: - from msrestazure.tools import parse_resource_id, resource_id, is_valid_resource_id + from msrestazure.tools import resource_id, is_valid_resource_id from azure.core.exceptions import ResourceNotFoundError except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_networkinterface_info.py b/plugins/modules/azure_rm_networkinterface_info.py index 10b55c6fc..4289554e0 100644 --- a/plugins/modules/azure_rm_networkinterface_info.py +++ b/plugins/modules/azure_rm_networkinterface_info.py @@ -206,7 +206,6 @@ ''' # NOQA try: from azure.core.exceptions import ResourceNotFoundError - from azure.common import AzureMissingResourceHttpError, AzureHttpError except Exception: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_openshiftmanagedcluster.py b/plugins/modules/azure_rm_openshiftmanagedcluster.py index 8902f23fe..e82d66b70 100644 --- a/plugins/modules/azure_rm_openshiftmanagedcluster.py +++ b/plugins/modules/azure_rm_openshiftmanagedcluster.py @@ -41,7 +41,6 @@ description: - Pull secret for the cluster (immutable). type: str - default: "" domain: description: - The domain for the cluster (immutable). diff --git a/plugins/modules/azure_rm_openshiftmanagedcluster_info.py b/plugins/modules/azure_rm_openshiftmanagedcluster_info.py index c6b8a1e1d..e284fb4c1 100644 --- a/plugins/modules/azure_rm_openshiftmanagedcluster_info.py +++ b/plugins/modules/azure_rm_openshiftmanagedcluster_info.py @@ -211,9 +211,7 @@ sample: Public ''' -import time import json -import random from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient try: diff --git a/plugins/modules/azure_rm_postgresqlconfiguration.py b/plugins/modules/azure_rm_postgresqlconfiguration.py index 1482fedb1..988ba4858 100644 --- a/plugins/modules/azure_rm_postgresqlconfiguration.py +++ b/plugins/modules/azure_rm_postgresqlconfiguration.py @@ -67,8 +67,6 @@ gurations/event_scheduler" ''' -import time - try: from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from azure.core.exceptions import ResourceNotFoundError diff --git a/plugins/modules/azure_rm_postgresqlconfiguration_info.py b/plugins/modules/azure_rm_postgresqlconfiguration_info.py index 9cf61642d..8de4baf09 100644 --- a/plugins/modules/azure_rm_postgresqlconfiguration_info.py +++ b/plugins/modules/azure_rm_postgresqlconfiguration_info.py @@ -96,7 +96,6 @@ try: from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from azure.core.exceptions import ResourceNotFoundError - from msrestazure.azure_operation import AzureOperationPoller except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_postgresqldatabase.py b/plugins/modules/azure_rm_postgresqldatabase.py index ba594401b..ba65764a6 100644 --- a/plugins/modules/azure_rm_postgresqldatabase.py +++ b/plugins/modules/azure_rm_postgresqldatabase.py @@ -87,7 +87,6 @@ try: from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase - from azure.mgmt.rdbms.postgresql import PostgreSQLManagementClient from azure.core.exceptions import ResourceNotFoundError from azure.core.polling import LROPoller except ImportError: diff --git a/plugins/modules/azure_rm_privatednszone.py b/plugins/modules/azure_rm_privatednszone.py index 4a84cdbce..fae2069dc 100644 --- a/plugins/modules/azure_rm_privatednszone.py +++ b/plugins/modules/azure_rm_privatednszone.py @@ -81,8 +81,7 @@ ''' -from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, format_resource_id -from ansible.module_utils._text import to_native +from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase try: from azure.core.exceptions import ResourceNotFoundError diff --git a/plugins/modules/azure_rm_privatednszone_info.py b/plugins/modules/azure_rm_privatednszone_info.py index 5a5730e4c..3b5cbbca0 100644 --- a/plugins/modules/azure_rm_privatednszone_info.py +++ b/plugins/modules/azure_rm_privatednszone_info.py @@ -111,7 +111,6 @@ ''' from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase -from ansible.module_utils._text import to_native try: from azure.core.exceptions import ResourceNotFoundError diff --git a/plugins/modules/azure_rm_privatednszonelink.py b/plugins/modules/azure_rm_privatednszonelink.py index b87b54a6b..65168ea6b 100644 --- a/plugins/modules/azure_rm_privatednszonelink.py +++ b/plugins/modules/azure_rm_privatednszonelink.py @@ -156,7 +156,7 @@ ''' from ansible.module_utils.basic import _load_params -from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, HAS_AZURE, \ +from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, \ format_resource_id try: diff --git a/plugins/modules/azure_rm_proximityplacementgroup.py b/plugins/modules/azure_rm_proximityplacementgroup.py index da68e776e..7852c1dcf 100644 --- a/plugins/modules/azure_rm_proximityplacementgroup.py +++ b/plugins/modules/azure_rm_proximityplacementgroup.py @@ -121,8 +121,7 @@ ''' from ansible.module_utils.basic import _load_params -from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, HAS_AZURE, \ - format_resource_id, normalize_location_name +from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, normalize_location_name try: from azure.core.exceptions import ResourceNotFoundError diff --git a/plugins/modules/azure_rm_recoveryservicesvault.py b/plugins/modules/azure_rm_recoveryservicesvault.py index 37532f146..e0dfac0cd 100644 --- a/plugins/modules/azure_rm_recoveryservicesvault.py +++ b/plugins/modules/azure_rm_recoveryservicesvault.py @@ -121,9 +121,7 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt -import re import json -import time class AzureRMRecoveryServicesVault(AzureRMModuleBaseExt): diff --git a/plugins/modules/azure_rm_recoveryservicesvault_info.py b/plugins/modules/azure_rm_recoveryservicesvault_info.py index bc8958ef8..d1338bc45 100644 --- a/plugins/modules/azure_rm_recoveryservicesvault_info.py +++ b/plugins/modules/azure_rm_recoveryservicesvault_info.py @@ -98,9 +98,7 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBaseExt -import re import json -import time class AzureRMRecoveryServicesVaultInfo(AzureRMModuleBaseExt): diff --git a/plugins/modules/azure_rm_registrationassignment_info.py b/plugins/modules/azure_rm_registrationassignment_info.py index 60003a192..711296068 100644 --- a/plugins/modules/azure_rm_registrationassignment_info.py +++ b/plugins/modules/azure_rm_registrationassignment_info.py @@ -89,10 +89,7 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase try: - from msrestazure.azure_exceptions import CloudError from azure.mgmt.managedservices import ManagedServicesClient - from msrestazure.azure_operation import AzureOperationPoller - from msrest.polling import LROPoller except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_registrationdefinition_info.py b/plugins/modules/azure_rm_registrationdefinition_info.py index be6937fc7..6d6cfe0c9 100644 --- a/plugins/modules/azure_rm_registrationdefinition_info.py +++ b/plugins/modules/azure_rm_registrationdefinition_info.py @@ -149,10 +149,7 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase try: - from msrestazure.azure_exceptions import CloudError from azure.mgmt.managedservices import ManagedServicesClient - from msrestazure.azure_operation import AzureOperationPoller - from azure.core.polling import LROPoller except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_resource.py b/plugins/modules/azure_rm_resource.py index ff77c53e7..2e2a55bb9 100644 --- a/plugins/modules/azure_rm_resource.py +++ b/plugins/modules/azure_rm_resource.py @@ -44,6 +44,7 @@ subresource: description: - List of subresources. + default: [] suboptions: namespace: description: @@ -215,8 +216,7 @@ from ansible.module_utils.common.dict_transformations import dict_merge try: - from msrestazure.azure_exceptions import CloudError - from msrestazure.tools import resource_id, is_valid_resource_id + from msrestazure.tools import resource_id import json except ImportError: diff --git a/plugins/modules/azure_rm_resource_info.py b/plugins/modules/azure_rm_resource_info.py index 00df5b388..f4356ba52 100644 --- a/plugins/modules/azure_rm_resource_info.py +++ b/plugins/modules/azure_rm_resource_info.py @@ -289,8 +289,7 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_rest import GenericRestClient try: - from msrestazure.azure_exceptions import CloudError - from msrestazure.tools import resource_id, is_valid_resource_id + from msrestazure.tools import resource_id import json except ImportError: diff --git a/plugins/modules/azure_rm_roledefinition.py b/plugins/modules/azure_rm_roledefinition.py index d1cc4c2a5..13bf29fe6 100644 --- a/plugins/modules/azure_rm_roledefinition.py +++ b/plugins/modules/azure_rm_roledefinition.py @@ -110,9 +110,7 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from msrestazure.azure_operation import AzureOperationPoller from azure.core.polling import LROPoller - from msrest.serialization import Model from azure.mgmt.authorization import AuthorizationManagementClient - from azure.mgmt.authorization.model import (RoleDefinition, Permission) except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_roledefinition_info.py b/plugins/modules/azure_rm_roledefinition_info.py index 42c98b087..dc91b6619 100644 --- a/plugins/modules/azure_rm_roledefinition_info.py +++ b/plugins/modules/azure_rm_roledefinition_info.py @@ -120,8 +120,6 @@ sample: [ 'Microsoft.Storage/storageAccounts/blobServices/containers/blobs/write' ] ''' -from ansible.module_utils._text import to_native - try: from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from azure.mgmt.authorization import AuthorizationManagementClient diff --git a/plugins/modules/azure_rm_route_info.py b/plugins/modules/azure_rm_route_info.py index d285972ce..8c7ee6f58 100644 --- a/plugins/modules/azure_rm_route_info.py +++ b/plugins/modules/azure_rm_route_info.py @@ -116,9 +116,6 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common_ext import AzureRMModuleBase try: from azure.core.exceptions import ResourceNotFoundError - from azure.mgmt.network import NetworkManagementClient - from msrestazure.azure_operation import AzureOperationPoller - from azure.core.polling import LROPoller except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_securitygroup.py b/plugins/modules/azure_rm_securitygroup.py index 28a9b8391..372281749 100644 --- a/plugins/modules/azure_rm_securitygroup.py +++ b/plugins/modules/azure_rm_securitygroup.py @@ -418,13 +418,11 @@ try: from azure.core.exceptions import ResourceNotFoundError from msrestazure.tools import is_valid_resource_id - from azure.mgmt.network import NetworkManagementClient except ImportError: # This is handled in azure_rm_common pass from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase -from ansible.module_utils.six import integer_types from ansible.module_utils._text import to_native diff --git a/plugins/modules/azure_rm_servicebus.py b/plugins/modules/azure_rm_servicebus.py index 07db88849..10b995119 100644 --- a/plugins/modules/azure_rm_servicebus.py +++ b/plugins/modules/azure_rm_servicebus.py @@ -75,7 +75,6 @@ # This is handled in azure_rm_common pass -from ansible.module_utils.common.dict_transformations import _snake_to_camel, _camel_to_snake from ansible.module_utils._text import to_native from datetime import datetime, timedelta diff --git a/plugins/modules/azure_rm_servicebus_info.py b/plugins/modules/azure_rm_servicebus_info.py index 246bb514b..dd7faf59f 100644 --- a/plugins/modules/azure_rm_servicebus_info.py +++ b/plugins/modules/azure_rm_servicebus_info.py @@ -376,7 +376,6 @@ try: from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, azure_id_to_dict - from msrestazure.azure_exceptions import CloudError except Exception: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_servicebussaspolicy.py b/plugins/modules/azure_rm_servicebussaspolicy.py index 3acb2f479..b043a0a11 100644 --- a/plugins/modules/azure_rm_servicebussaspolicy.py +++ b/plugins/modules/azure_rm_servicebussaspolicy.py @@ -153,10 +153,6 @@ # This is handled in azure_rm_common pass -from ansible.module_utils.common.dict_transformations import _snake_to_camel, _camel_to_snake -from ansible.module_utils._text import to_native -from datetime import datetime, timedelta - class AzureRMServiceBusSASPolicy(AzureRMModuleBase): diff --git a/plugins/modules/azure_rm_sqlfirewallrule.py b/plugins/modules/azure_rm_sqlfirewallrule.py index 059256a07..b4a14f14f 100644 --- a/plugins/modules/azure_rm_sqlfirewallrule.py +++ b/plugins/modules/azure_rm_sqlfirewallrule.py @@ -78,7 +78,6 @@ try: from azure.core.exceptions import ResourceNotFoundError - from azure.core.polling import LROPoller from azure.mgmt.sql.models import FirewallRule except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_sqlmanagedinstance.py b/plugins/modules/azure_rm_sqlmanagedinstance.py index c9d905343..b59421062 100644 --- a/plugins/modules/azure_rm_sqlmanagedinstance.py +++ b/plugins/modules/azure_rm_sqlmanagedinstance.py @@ -513,7 +513,6 @@ try: from azure.core.exceptions import ResourceNotFoundError - from azure.core.polling import LROPoller except ImportError: pass diff --git a/plugins/modules/azure_rm_storageaccount_info.py b/plugins/modules/azure_rm_storageaccount_info.py index 6f7d9873d..9a975542f 100644 --- a/plugins/modules/azure_rm_storageaccount_info.py +++ b/plugins/modules/azure_rm_storageaccount_info.py @@ -533,11 +533,6 @@ sample: error.html ''' -try: - from azure.core.exceptions import ResourceNotFoundError -except Exception: - # This is handled in azure_rm_common - pass from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from ansible.module_utils._text import to_native diff --git a/plugins/modules/azure_rm_subnet.py b/plugins/modules/azure_rm_subnet.py index 063ba1504..385c4ec1f 100644 --- a/plugins/modules/azure_rm_subnet.py +++ b/plugins/modules/azure_rm_subnet.py @@ -143,6 +143,7 @@ description: - A list of actions. type: list + default: [] nat_gateway: description: - Existing NAT Gateway with which to associate the subnet. @@ -485,7 +486,7 @@ def exec_module(self, **kwargs): else: subnet['private_endpoint_network_policies'] = results['private_endpoint_network_policies'] if self.private_link_service_network_policies is not None: - if results['private_link_service_network_policies'] != self.private_link_service_network_policies is not None: + if results['private_link_service_network_policies'] != self.private_link_service_network_policies: self.log("CHANGED: subnet {0} private_link_service_network_policies".format(self.private_link_service_network_policies)) changed = True results['private_link_service_network_policies'] = self.private_link_service_network_policies diff --git a/plugins/modules/azure_rm_trafficmanagerendpoint.py b/plugins/modules/azure_rm_trafficmanagerendpoint.py index df87ed93f..b114cd4dd 100644 --- a/plugins/modules/azure_rm_trafficmanagerendpoint.py +++ b/plugins/modules/azure_rm_trafficmanagerendpoint.py @@ -119,14 +119,12 @@ "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Network/trafficManagerProfiles/testProfil e/externalEndpoints/testendpoint" ''' -from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, normalize_location_name +from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from ansible.module_utils.common.dict_transformations import _snake_to_camel try: from azure.core.exceptions import ResourceNotFoundError - from azure.mgmt.trafficmanager.models import ( - Endpoint, DnsConfig, MonitorConfig - ) + from azure.mgmt.trafficmanager.models import Endpoint except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_trafficmanagerendpoint_info.py b/plugins/modules/azure_rm_trafficmanagerendpoint_info.py index 94bd2ac87..6d63b15a4 100644 --- a/plugins/modules/azure_rm_trafficmanagerendpoint_info.py +++ b/plugins/modules/azure_rm_trafficmanagerendpoint_info.py @@ -150,8 +150,6 @@ # handled in azure_rm_common pass -import re - AZURE_OBJECT_CLASS = 'TrafficManagerEndpoints' diff --git a/plugins/modules/azure_rm_trafficmanagerprofile.py b/plugins/modules/azure_rm_trafficmanagerprofile.py index b529666d3..d9c2c3bed 100644 --- a/plugins/modules/azure_rm_trafficmanagerprofile.py +++ b/plugins/modules/azure_rm_trafficmanagerprofile.py @@ -156,7 +156,7 @@ try: from azure.core.exceptions import ResourceNotFoundError from azure.mgmt.trafficmanager.models import ( - Profile, Endpoint, DnsConfig, MonitorConfig + Profile, DnsConfig, MonitorConfig ) except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_virtualmachine.py b/plugins/modules/azure_rm_virtualmachine.py index 87cf51dd9..a316d08e9 100644 --- a/plugins/modules/azure_rm_virtualmachine.py +++ b/plugins/modules/azure_rm_virtualmachine.py @@ -396,6 +396,7 @@ - User Assigned Managed Identities and its options required: false type: dict + default: {} suboptions: id: description: diff --git a/plugins/modules/azure_rm_virtualnetworkgateway.py b/plugins/modules/azure_rm_virtualnetworkgateway.py index 4371fb162..76861a268 100644 --- a/plugins/modules/azure_rm_virtualnetworkgateway.py +++ b/plugins/modules/azure_rm_virtualnetworkgateway.py @@ -192,7 +192,7 @@ # This is handled in azure_rm_common pass -from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, CIDR_PATTERN +from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from ansible.module_utils.common.dict_transformations import _snake_to_camel diff --git a/plugins/modules/azure_rm_webapp.py b/plugins/modules/azure_rm_webapp.py index 50256ea0c..a57dc621d 100644 --- a/plugins/modules/azure_rm_webapp.py +++ b/plugins/modules/azure_rm_webapp.py @@ -327,7 +327,6 @@ sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Web/sites/myWebApp" ''' -import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase try: diff --git a/plugins/modules/azure_rm_webappaccessrestriction.py b/plugins/modules/azure_rm_webappaccessrestriction.py index d8b49a335..c6cc6b4a3 100644 --- a/plugins/modules/azure_rm_webappaccessrestriction.py +++ b/plugins/modules/azure_rm_webappaccessrestriction.py @@ -39,6 +39,7 @@ - The web app's HTTP access restrictions. type: list elements: dict + default: [] suboptions: name: description: @@ -73,6 +74,7 @@ the SCM restrictions will be configured but not used. type: list elements: dict + default: [] suboptions: name: description: diff --git a/plugins/modules/azure_rm_webappslot.py b/plugins/modules/azure_rm_webappslot.py index 08ca490b0..e353b8c72 100644 --- a/plugins/modules/azure_rm_webappslot.py +++ b/plugins/modules/azure_rm_webappslot.py @@ -223,7 +223,6 @@ sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Web/sites/testapp/slots/stage1 ''' -import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase try: diff --git a/tests/integration/targets/azure_rm_diskencryptionset/lookup_plugins/azure_service_principal_attribute.py b/tests/integration/targets/azure_rm_diskencryptionset/lookup_plugins/azure_service_principal_attribute.py index 1b7d0318f..38da1656c 100644 --- a/tests/integration/targets/azure_rm_diskencryptionset/lookup_plugins/azure_service_principal_attribute.py +++ b/tests/integration/targets/azure_rm_diskencryptionset/lookup_plugins/azure_service_principal_attribute.py @@ -45,7 +45,6 @@ """ from ansible.errors import AnsibleError -from ansible.plugins import AnsiblePlugin from ansible.plugins.lookup import LookupBase from ansible.module_utils._text import to_native diff --git a/tests/integration/targets/azure_rm_keyvault/lookup_plugins/azure_service_principal_attribute.py b/tests/integration/targets/azure_rm_keyvault/lookup_plugins/azure_service_principal_attribute.py index 1b7d0318f..38da1656c 100644 --- a/tests/integration/targets/azure_rm_keyvault/lookup_plugins/azure_service_principal_attribute.py +++ b/tests/integration/targets/azure_rm_keyvault/lookup_plugins/azure_service_principal_attribute.py @@ -45,7 +45,6 @@ """ from ansible.errors import AnsibleError -from ansible.plugins import AnsiblePlugin from ansible.plugins.lookup import LookupBase from ansible.module_utils._text import to_native diff --git a/tests/integration/targets/azure_rm_keyvaultkey/lookup_plugins/azure_service_principal_attribute.py b/tests/integration/targets/azure_rm_keyvaultkey/lookup_plugins/azure_service_principal_attribute.py index 1b7d0318f..38da1656c 100644 --- a/tests/integration/targets/azure_rm_keyvaultkey/lookup_plugins/azure_service_principal_attribute.py +++ b/tests/integration/targets/azure_rm_keyvaultkey/lookup_plugins/azure_service_principal_attribute.py @@ -45,7 +45,6 @@ """ from ansible.errors import AnsibleError -from ansible.plugins import AnsiblePlugin from ansible.plugins.lookup import LookupBase from ansible.module_utils._text import to_native diff --git a/tests/integration/targets/azure_rm_keyvaultsecret/lookup_plugins/azure_service_principal_attribute.py b/tests/integration/targets/azure_rm_keyvaultsecret/lookup_plugins/azure_service_principal_attribute.py index 1b7d0318f..38da1656c 100644 --- a/tests/integration/targets/azure_rm_keyvaultsecret/lookup_plugins/azure_service_principal_attribute.py +++ b/tests/integration/targets/azure_rm_keyvaultsecret/lookup_plugins/azure_service_principal_attribute.py @@ -45,7 +45,6 @@ """ from ansible.errors import AnsibleError -from ansible.plugins import AnsiblePlugin from ansible.plugins.lookup import LookupBase from ansible.module_utils._text import to_native From 5627117fa7c67d131c2c983d33828d76924e7367 Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Mon, 25 Sep 2023 15:59:08 +0800 Subject: [PATCH 3/3] fix santiy error --- 02 --- plugins/lookup/azure_keyvault_secret.py | 1 - plugins/modules/azure_rm_devtestlabartifactsource.py | 1 - plugins/modules/azure_rm_ipgroup_info.py | 1 - plugins/modules/azure_rm_mariadbconfiguration_info.py | 1 - plugins/modules/azure_rm_mysqldatabase_info.py | 1 - plugins/modules/azure_rm_mysqlfirewallrule_info.py | 1 - plugins/modules/azure_rm_privatednszone.py | 2 +- plugins/modules/azure_rm_rediscachefirewallrule.py | 2 -- plugins/modules/azure_rm_resource_info.py | 1 + plugins/modules/azure_rm_servicebus_info.py | 2 +- tests/sanity/ignore-2.15.txt | 1 - 11 files changed, 3 insertions(+), 11 deletions(-) diff --git a/plugins/lookup/azure_keyvault_secret.py b/plugins/lookup/azure_keyvault_secret.py index ff08a1d4f..5ae0e8030 100644 --- a/plugins/lookup/azure_keyvault_secret.py +++ b/plugins/lookup/azure_keyvault_secret.py @@ -119,7 +119,6 @@ import logging import requests from azure.keyvault.secrets import SecretClient - from azure.common.exceptions import ClientRequestError from azure.identity import DefaultAzureCredential, ClientSecretCredential from azure.keyvault.secrets import SecretClient diff --git a/plugins/modules/azure_rm_devtestlabartifactsource.py b/plugins/modules/azure_rm_devtestlabartifactsource.py index d820812da..c91b90005 100644 --- a/plugins/modules/azure_rm_devtestlabartifactsource.py +++ b/plugins/modules/azure_rm_devtestlabartifactsource.py @@ -102,7 +102,6 @@ sample: true ''' -import time from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase try: diff --git a/plugins/modules/azure_rm_ipgroup_info.py b/plugins/modules/azure_rm_ipgroup_info.py index 3ed6423a6..21a922c3b 100644 --- a/plugins/modules/azure_rm_ipgroup_info.py +++ b/plugins/modules/azure_rm_ipgroup_info.py @@ -84,7 +84,6 @@ try: from azure.core.exceptions import ResourceNotFoundError - from azure.common import AzureMissingResourceHttpError, AzureHttpError except Exception: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_mariadbconfiguration_info.py b/plugins/modules/azure_rm_mariadbconfiguration_info.py index f1965f474..0e5d4c806 100644 --- a/plugins/modules/azure_rm_mariadbconfiguration_info.py +++ b/plugins/modules/azure_rm_mariadbconfiguration_info.py @@ -97,7 +97,6 @@ from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase try: - from msrestazure.azure_operation import AzureOperationPoller from azure.core.exceptions import ResourceNotFoundError except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_mysqldatabase_info.py b/plugins/modules/azure_rm_mysqldatabase_info.py index b31a10dc2..80f5cf0f6 100644 --- a/plugins/modules/azure_rm_mysqldatabase_info.py +++ b/plugins/modules/azure_rm_mysqldatabase_info.py @@ -102,7 +102,6 @@ try: from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from azure.core.exceptions import ResourceNotFoundError - from azure.core.polling import LROPoller except ImportError: # This is handled in azure_rm_common pass diff --git a/plugins/modules/azure_rm_mysqlfirewallrule_info.py b/plugins/modules/azure_rm_mysqlfirewallrule_info.py index c29032989..e706c4e2d 100644 --- a/plugins/modules/azure_rm_mysqlfirewallrule_info.py +++ b/plugins/modules/azure_rm_mysqlfirewallrule_info.py @@ -95,7 +95,6 @@ try: from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase - from msrestazure.azure_operation import AzureOperationPoller from azure.core.exceptions import ResourceNotFoundError except ImportError: # This is handled in azure_rm_common diff --git a/plugins/modules/azure_rm_privatednszone.py b/plugins/modules/azure_rm_privatednszone.py index fae2069dc..b49c99401 100644 --- a/plugins/modules/azure_rm_privatednszone.py +++ b/plugins/modules/azure_rm_privatednszone.py @@ -81,7 +81,7 @@ ''' -from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase +from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase try: from azure.core.exceptions import ResourceNotFoundError diff --git a/plugins/modules/azure_rm_rediscachefirewallrule.py b/plugins/modules/azure_rm_rediscachefirewallrule.py index 921f982a6..0a5f58419 100644 --- a/plugins/modules/azure_rm_rediscachefirewallrule.py +++ b/plugins/modules/azure_rm_rediscachefirewallrule.py @@ -80,8 +80,6 @@ sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Cache/redis/myRedis/firewallRules/myRule" ''' -import time - try: from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase from azure.core.polling import LROPoller diff --git a/plugins/modules/azure_rm_resource_info.py b/plugins/modules/azure_rm_resource_info.py index f4356ba52..ab3d3df38 100644 --- a/plugins/modules/azure_rm_resource_info.py +++ b/plugins/modules/azure_rm_resource_info.py @@ -53,6 +53,7 @@ subresource: description: - List of subresources. + default: [] suboptions: namespace: description: diff --git a/plugins/modules/azure_rm_servicebus_info.py b/plugins/modules/azure_rm_servicebus_info.py index dd7faf59f..58de80ac2 100644 --- a/plugins/modules/azure_rm_servicebus_info.py +++ b/plugins/modules/azure_rm_servicebus_info.py @@ -375,7 +375,7 @@ ''' try: - from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase, azure_id_to_dict + from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase except Exception: # This is handled in azure_rm_common pass diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt index 3cf234e4c..67a802955 100644 --- a/tests/sanity/ignore-2.15.txt +++ b/tests/sanity/ignore-2.15.txt @@ -253,7 +253,6 @@ plugins/modules/azure_rm_adpassword.py validate-modules:return-syntax-error plugins/modules/azure_rm_adpassword.py validate-modules:import-before-documentation plugins/modules/azure_rm_adpassword.py validate-modules:nonexistent-parameter-documented plugins/modules/azure_rm_adpassword_info.py validate-modules:return-syntax-error -plugins/modules/azure_rm_adpassword_info.py validate-modules:import-before-documentation plugins/modules/azure_rm_adserviceprincipal.py validate-modules:nonexistent-parameter-documented plugins/modules/azure_rm_apimanagementservice.py validate-modules:invalid-ansiblemodule-schema plugins/modules/azure_rm_openshiftmanagedcluster.py validate-modules:invalid-ansiblemodule-schema