vultr.py: Do not try to parse ini if $VULTR_API_KEY #42659
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ansibot
added
affects_2.7
resmo
reviewed
Jul 12, 2018
lib/ansible/module_utils/vultr.py
Outdated
| continue | ||
| env_conf[key] = os.environ['VULTR_API_%s' % key.upper()] | ||
|
|
||
| if env_conf.get('key'): | ||
| return env_conf |
There was a problem hiding this comment.
we should not return here anymore
samdoran
removed
the
needs_triage
Spredzy
force-pushed
the
improve_file_parsing
branch
from
ecc95fb
to
bbee7a7
Compare
|
@resmo does the last approach looks better? |
resmo
reviewed
Jul 16, 2018
lib/ansible/module_utils/vultr.py
Outdated
| except KeyError: | ||
| config = {} | ||
|
|
||
| if not config.get('key'): |
There was a problem hiding this comment.
this check is too early, it should be after the self.api_config setting and therefore check should be updated to
if not self.api_config.get('api_key'):
self.module.fail_json(msg="The API key is not specified. Please refer to the documentation.")In its current behavior, `read_ini_config()` tries to read ini file, even thought $VULTR_API_KEY environment file has been specified. This is due to the fact that if not *all* the keys (key, timeout, retries and endpoint) are specified in the environment, then the method goes and look for the vultr.ini file. Since timeout, retries and endpoint have default value, it is a perfectly valid use case to only specify key. Before patch: VULTR_API_KEY=XXXX ansible -m vr_ssh_key .... fails with Config file is missing After patch: VULTR_API_KEY=XXXX ansible -m vr_ssh_key goes all the way
Spredzy
force-pushed
the
improve_file_parsing
branch
from
bbee7a7
to
4fc7c86
Compare
ansibot
added
needs_ci
|
shipit |
Spredzy
added a commit
to Spredzy/ansible
that referenced
this pull request
Jul 17, 2018
mattclay
pushed a commit
that referenced
this pull request
Jul 17, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SUMMARY
In its current behavior,
read_ini_config()tries to read ini file,even thought
$VULTR_API_KEYenvironment file has been specified.This is due to the fact that if not all the keys (key, timeout,
retries and endpoint) are specified in the environment, then the method
goes and look for the vultr.ini file.
Since timeout, retries and endpoint have default value, it is a
perfectly valid use case to only specify key.
Before patch:
VULTR_API_KEY=XXXX ansible -m vr_ssh_key ...fails with Config file ismissing
After patch:
VULTR_API_KEY=XXXX ansible -m vr_ssh_key ...goes all the wayISSUE TYPE
COMPONENT NAME
ANSIBLE VERSION
ADDITIONAL INFORMATION