Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

validate-modules - Better fix for invalid data in 'options' field #58353

Merged
merged 1 commit into from
Jul 11, 2019
Merged

validate-modules - Better fix for invalid data in 'options' field #58353

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/sanity/validate-modules/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,13 +1178,13 @@ def _validate_argument_spec(self, docs, spec, kwargs):
deprecated_args_from_argspec.add(arg)
deprecated_args_from_argspec.update(data.get('aliases', []))
if arg == 'provider' and self.object_path.startswith('lib/ansible/modules/network/'):
if data.get('options') and not isinstance(data.get('options'), Mapping):
if data.get('options') is not None and not isinstance(data.get('options'), Mapping):
self.reporter.error(
path=self.object_path,
code=331,
msg="Argument 'options' in argument_spec['provider'] must be a dictionary/hash when used",
)
else:
elif data.get('options'):
# Record provider options from network modules, for later comparison
for provider_arg, provider_data in data.get('options', {}).items():
provider_args.add(provider_arg)
Expand Down