1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00

Simpler error message

Signed-off-by: David Gageot <david@gageot.net>
This commit is contained in:
David Gageot
2015-11-30 09:45:14 +01:00
parent 77b7734404
commit fea0dcb3da

View File

@@ -12,8 +12,11 @@ import (
"github.com/docker/machine/libmachine/ssh"
raw "google.golang.org/api/compute/v1"
"errors"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
"google.golang.org/api/googleapi"
)
// ComputeUtil is used to wrap the raw GCE API code and store common parameters.
@@ -380,7 +383,7 @@ func (c *ComputeUtil) waitForGlobalOp(name string) error {
func (c *ComputeUtil) ip() (string, error) {
instance, err := c.service.Instances.Get(c.project, c.zone, c.instanceName).Do()
if err != nil {
return "", err
return "", unwrapGoogleError(err)
}
nic := instance.NetworkInterfaces[0]
@@ -389,3 +392,11 @@ func (c *ComputeUtil) ip() (string, error) {
}
return nic.AccessConfigs[0].NatIP, nil
}
func unwrapGoogleError(err error) error {
if googleErr, ok := err.(*googleapi.Error); ok {
return errors.New(googleErr.Message)
}
return err
}