Skip to content

Commit 47a0f5c

Browse files
author
Quentin Perez
committed
scw integration: loads credentials from ~/.scwrc if available
1 parent 1feb12f commit 47a0f5c

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

driver/scaleway.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/docker/machine/libmachine/ssh"
1515
"github.com/docker/machine/libmachine/state"
1616
"github.com/scaleway/scaleway-cli/pkg/api"
17+
"github.com/scaleway/scaleway-cli/pkg/config"
1718
)
1819

1920
const (
@@ -57,7 +58,17 @@ func (d *Driver) getClient() (cl *api.ScalewayAPI, err error) {
5758
func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) (err error) {
5859
d.Token, d.Organization = flags.String("scaleway-token"), flags.String("scaleway-organization")
5960
if d.Token == "" || d.Organization == "" {
60-
return fmt.Errorf("You must provide organization and token")
61+
config, cfgErr := config.GetConfig()
62+
if cfgErr == nil {
63+
if d.Token == "" {
64+
d.Token = config.Token
65+
}
66+
if d.Organization == "" {
67+
d.Organization = config.Organization
68+
}
69+
} else {
70+
return fmt.Errorf("You must provide organization and token")
71+
}
6172
}
6273
d.commercialType = flags.String("scaleway-commercial-type")
6374
d.name = flags.String("scaleway-name")

0 commit comments

Comments
 (0)