Skip to content

fix(config): LoadConfigFromPath better handle cross platform error #395

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

Merged
jerome-quere merged 2 commits into from
Apr 28, 2020
Merged

fix(config): LoadConfigFromPath better handle cross platform error #395

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55b7d2a
fix(config): LoadConfigFromPath better handle cross platform error
jerome-quere Apr 27, 2020
c5ca3ba
address comments
jerome-quere Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions scw/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"io/ioutil"
"os"
"path/filepath"
"syscall"
"text/template"

"github.com/scaleway/scaleway-sdk-go/internal/auth"
Expand Down Expand Up @@ -182,11 +181,16 @@ func LoadConfig() (*Config, error) {

// LoadConfigFromPath read the config from the given path.
func LoadConfigFromPath(path string) (*Config, error) {
_, err := os.Stat(path)
if os.IsNotExist(err) {
return nil, configFileNotFound(path)
}
if err != nil {
return nil, err
}

file, err := ioutil.ReadFile(path)
if err != nil {
if pathError, isPathError := err.(*os.PathError); isPathError && pathError.Err == syscall.ENOENT {
return nil, configFileNotFound(pathError.Path)
}
return nil, errors.Wrap(err, "cannot read config file")
}

Expand Down