feat/provider: read .scwrc #111
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
ghost
added
the
nicolai86
force-pushed
the
feat/read-scwrc
branch
from
50fd595 to
d26e19e
Compare
tombuildsstuff
approved these changes
Feb 22, 2019
There was a problem hiding this comment.
hey @nicolai86
Thanks for this PR - taking a look through this mostly LGTM, if we can address the comments this otherwise should be good 👍
Thanks!
scaleway/provider.go
Outdated
| defer f.Close() | ||
|
|
||
| var data scalewayConfig | ||
| err = json.NewDecoder(f).Decode(&data) |
There was a problem hiding this comment.
if there's an error parsing this should we also return:
Suggested change
| err = json.NewDecoder(f).Decode(&data) | |
| err = json.NewDecoder(f).Decode(&data) | |
| if err != nil { | |
| return "", "", err | |
| } |
There was a problem hiding this comment.
good point, I'll update this
scaleway/provider.go
Outdated
| if apiKey == "" { | ||
| if path, err := homedir.Expand(d.Get(".scwrc").(string)); err == nil { | ||
| scwAPIKey, scwOrganization, err := readScalewayConfig(path) | ||
| if err == nil { |
There was a problem hiding this comment.
should we invert this and raise this error?
Suggested change
| if err == nil { | |
| if err != nil { | |
| return fmt.Errorf("Error loading credentials from SCW: %s", err) | |
| } |
There was a problem hiding this comment.
that's a miss, yes it should be inverted
nicolai86
force-pushed
the
feat/read-scwrc
branch
from
d26e19e to
e458fc6
Compare
nicolai86
force-pushed
the
feat/read-scwrc
branch
from
e458fc6 to
83386ca
Compare
nicolai86
force-pushed
the
feat/read-scwrc
branch
from
83386ca to
8902a29
Compare
|
Ran all the tests over night, without setting environment variables - they all passed. Will pull this in :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
once merged, the provider will fallback to scaleways ~/.scwrc to get
access credentials.
closes #104