Skip to content
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.

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

Only pull metadata when necessary #611

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
19 changes: 11 additions & 8 deletions driver/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,20 +122,23 @@ func NewDriver(p NewDriverParams) (*Driver, error) {
})
oauthClient := oauth2.NewClient(context.Background(), tokenSource)

mdClient := metadata.NewClient()
var region string
if p.Region == "" {
region := p.Region
hostID := "external"

if region == "" {
mdClient := metadata.NewClient()
var err error
region, err = mdClient.Region()
if err != nil {
return nil, fmt.Errorf("couldn't get region from metadata: %s (are you running outside of a DigitalOcean droplet and possibly forgot to specify the 'region' flag?)", err)
}

hostIDInt, err := mdClient.DropletID()
if err != nil {
return nil, fmt.Errorf("couldn't get droplet ID from metadata: %s (are you running outside of a DigitalOcean droplet?)", err)
}
hostID = strconv.Itoa(hostIDInt)
}
hostIDInt, err := mdClient.DropletID()
if err != nil {
return nil, fmt.Errorf("couldn't get droplet ID from metadata: %s (are you running outside of a DigitalOcean droplet?)", err)
}
hostID := strconv.Itoa(hostIDInt)

var opts []godo.ClientOpt
opts = append(opts, godo.SetBaseURL(p.URL))
Expand Down