From 3739dc9684403a9ef42227302678912071908b9d Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Thu, 10 Jan 2019 09:26:18 +0800 Subject: [PATCH] cleanup - required: false (#50648) --- .../cloud/azure/azure_rm_containerregistry.py | 6 +--- .../azure/azure_rm_managed_disk_facts.py | 9 ++--- .../cloud/azure/azure_rm_networkinterface.py | 2 -- .../modules/cloud/azure/azure_rm_resource.py | 3 +- .../cloud/azure/azure_rm_resource_facts.py | 16 +++------ .../modules/cloud/azure/azure_rm_sqlserver.py | 16 +++------ .../azure_rm_virtualmachine_extension.py | 34 +++++-------------- 7 files changed, 23 insertions(+), 63 deletions(-) diff --git a/lib/ansible/modules/cloud/azure/azure_rm_containerregistry.py b/lib/ansible/modules/cloud/azure/azure_rm_containerregistry.py index 2f15e5dc2f2..f34b219a48b 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_containerregistry.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_containerregistry.py @@ -218,22 +218,18 @@ class AzureRMContainerRegistry(AzureRMModuleBase): ), state=dict( type='str', - required=False, default='present', choices=['present', 'absent'] ), location=dict( - type='str', - required=False + type='str' ), admin_user_enabled=dict( type='bool', - required=False, default=False ), sku=dict( type='str', - required=False, default='Standard', choices=['Basic', 'Standard', 'Premium'] ) diff --git a/lib/ansible/modules/cloud/azure/azure_rm_managed_disk_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_managed_disk_facts.py index b5582a917c5..f666dff3c08 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_managed_disk_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_managed_disk_facts.py @@ -108,16 +108,13 @@ class AzureRMManagedDiskFacts(AzureRMModuleBase): def __init__(self): self.module_arg_spec = dict( resource_group=dict( - type='str', - required=False + type='str' ), name=dict( - type='str', - required=False + type='str' ), tags=dict( - type='str', - required=False + type='str' ), ) self.results = dict( diff --git a/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py b/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py index cdffe46e969..f22ac4a6a40 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py @@ -46,11 +46,9 @@ options: choices: - absent - present - required: false location: description: - Valid azure location. Defaults to location of the resource group. - required: false virtual_network: description: - An existing virtual network with which the network interface will be associated. Required diff --git a/lib/ansible/modules/cloud/azure/azure_rm_resource.py b/lib/ansible/modules/cloud/azure/azure_rm_resource.py index 954a35beb06..50eebc271cf 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_resource.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_resource.py @@ -144,8 +144,7 @@ class AzureRMResource(AzureRMModuleBase): # define user inputs into argument self.module_arg_spec = dict( url=dict( - type='str', - required=False + type='str' ), provider=dict( type='str', diff --git a/lib/ansible/modules/cloud/azure/azure_rm_resource_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_resource_facts.py index eebce579791..015ad50b22a 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_resource_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_resource_facts.py @@ -102,28 +102,22 @@ class AzureRMResourceFacts(AzureRMModuleBase): # define user inputs into argument self.module_arg_spec = dict( url=dict( - type='str', - required=False + type='str' ), provider=dict( - type='str', - required=False + type='str' ), resource_group=dict( - type='str', - required=False + type='str' ), resource_type=dict( - type='str', - required=False + type='str' ), resource_name=dict( - type='str', - required=False + type='str' ), subresource=dict( type='list', - required=False, default=[] ), api_version=dict( diff --git a/lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py b/lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py index b6cc06ddf7e..634241bf347 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py @@ -132,29 +132,23 @@ class AzureRMServers(AzureRMModuleBase): required=True ), location=dict( - type='str', - required=False + type='str' ), admin_username=dict( - type='str', - required=False + type='str' ), admin_password=dict( type='str', - no_log=True, - required=False + no_log=True ), version=dict( - type='str', - required=False + type='str' ), identity=dict( - type='str', - required=False + type='str' ), state=dict( type='str', - required=False, default='present', choices=['present', 'absent'] ) diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_extension.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_extension.py index 48d08bb9db2..35fa0899ad2 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_extension.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_extension.py @@ -41,39 +41,30 @@ options: choices: - absent - present - required: false location: description: - Valid azure location. Defaults to location of the resource group. - required: false virtual_machine_name: description: - The name of the virtual machine where the extension should be create or updated. - required: false publisher: description: - The name of the extension handler publisher. - required: false virtual_machine_extension_type: description: - The type of the extension handler. - required: false type_handler_version: description: - The type version of the extension handler. - required: false settings: description: - Json formatted public settings for the extension. - required: false protected_settings: description: - Json formatted protected settings for the extension. - required: false auto_upgrade_minor_version: description: - Whether the extension handler should be automatically upgraded across minor versions. - required: false type: bool extends_documentation_fragment: @@ -159,41 +150,32 @@ class AzureRMVMExtension(AzureRMModuleBase): ), state=dict( type='str', - required=False, default='present', choices=['present', 'absent'] ), location=dict( - type='str', - required=False + type='str' ), virtual_machine_name=dict( - type='str', - required=False + type='str' ), publisher=dict( - type='str', - required=False + type='str' ), virtual_machine_extension_type=dict( - type='str', - required=False + type='str' ), type_handler_version=dict( - type='str', - required=False + type='str' ), auto_upgrade_minor_version=dict( - type='bool', - required=False + type='bool' ), settings=dict( - type='dict', - required=False + type='dict' ), protected_settings=dict( - type='dict', - required=False + type='dict' ) )