Add AnsibleModule signature schema, and fix associated issues (#43512)

This commit is contained in:
Matt Martz 2018-07-31 15:04:22 -05:00 committed by GitHub
commit 01c0446cb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 72 additions and 36 deletions

View file

@ -257,7 +257,7 @@ def main():
attributes=dict(required=True, type='list'),
))
required_together = (['cluster', 'ec2_instance_id', 'attributes'])
required_together = [['cluster', 'ec2_instance_id', 'attributes']]
module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True,
required_together=required_together)

View file

@ -162,7 +162,7 @@ def main():
delay=dict(required=False, type='int', default=10),
repeat=dict(required=False, type='int', default=10)
))
required_together = (['state', 'name'])
required_together = [['state', 'name']]
module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True, required_together=required_together)

View file

@ -540,9 +540,9 @@ def main():
required_if=[
('state', 'present', ['subnets', 'security_groups'])
],
required_together=(
required_together=[
['access_logs_enabled', 'access_logs_s3_bucket', 'access_logs_s3_prefix']
)
]
)
# Quick check of listeners parameters

View file

@ -258,7 +258,7 @@ def main():
)
module = AnsibleModule(argument_spec=argument_spec,
mutually_exclusive=['load_balancer_arns', 'names'],
mutually_exclusive=[['load_balancer_arns', 'names']],
supports_check_mode=True
)

View file

@ -296,7 +296,7 @@ def main():
)
module = AnsibleModule(argument_spec=argument_spec,
mutually_exclusive=['target_group_arn', 'target_group_name']
mutually_exclusive=[['target_group_arn', 'target_group_name']]
)
if not HAS_BOTO3:

View file

@ -247,7 +247,7 @@ def main():
)
module = AnsibleModule(argument_spec=argument_spec,
mutually_exclusive=['load_balancer_arn', 'target_group_arns', 'names'],
mutually_exclusive=[['load_balancer_arn', 'target_group_arns', 'names']],
supports_check_mode=True
)

View file

@ -302,12 +302,12 @@ def main():
validate_certs=dict(type='bool', default=True),
timeout=dict(type='int', default=30),
),
required_if=([
required_if=[
('state', 'delete', ['ip'])
]),
mutually_exclusive=(
],
mutually_exclusive=[
['region', 'droplet_id']
),
],
)
core(module)

View file

@ -693,7 +693,7 @@ def main():
['template_id', 'template_name', 'cardinality'],
['service_id', 'custom_attrs']
],
required_together=['role', 'cardinality'],
required_together=[['role', 'cardinality']],
supports_check_mode=True)
auth = get_connection_info(module)

View file

@ -398,7 +398,7 @@ def main():
argument_spec=argument_spec,
add_file_common_args=True,
supports_check_mode=True,
mutually_exclusive=(['checksum', 'sha256sum']),
mutually_exclusive=[['checksum', 'sha256sum']],
)
url = module.params['url']

View file

@ -169,9 +169,9 @@ def main():
state=dict(required=False, choices=['present', 'absent']),
solo=dict(required=False, type='bool'),
),
required_together=(
required_together=[
['record', 'value']
),
],
supports_check_mode=True,
)

View file

@ -562,9 +562,9 @@ def main():
ip5=dict(required=False),
validate_certs=dict(default='yes', type='bool'),
),
required_together=(
required_together=[
['record_value', 'record_ttl', 'record_type']
),
],
required_if=[
['failover', True, ['autoFailover', 'port', 'protocol', 'ip1', 'ip2']],
['monitor', True, ['port', 'protocol', 'maxEmails', 'systemDescription', 'ip1']]

View file

@ -393,7 +393,7 @@ def main():
required_one_of = [['name', 'aggregate']]
mutually_exclusive = [['name', 'aggregate']]
required_together = (['speed', 'duplex'])
required_together = [['speed', 'duplex']]
module = AnsibleModule(argument_spec=argument_spec,
required_one_of=required_one_of,
mutually_exclusive=mutually_exclusive,

View file

@ -201,10 +201,9 @@ def check_packages(module, packages, state):
def main():
module = AnsibleModule(
argument_spec=dict(
name=dict(aliases=['pkg']),
name=dict(aliases=['pkg'], required=True),
state=dict(default='present', choices=['present', 'installed', "latest", 'absent', 'removed']),
executable=dict(default=None, required=False, type='path')),
required_one_of=[['name']],
supports_check_mode=True)
p = module.params