Better fix for invalid data in 'options' field (ansible#58353)

alustau · Jul 11, 2019 · 36da7e4 · 36da7e4
1 parent e8f4ebb
commit 36da7e4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/test/sanity/validate-modules/main.py b/test/sanity/validate-modules/main.py
@@ -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)