Upgrade to 0.12

[github/fretlink/terraform-provider-statuscake.git] / vendor / github.com / aws / aws-sdk-go / aws / ec2metadata / api.go

diff --git a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
index c215cd3f5997eead1021cb843fa51e39d908f1b7..d57a1af5992067c75012fb7930c1564df7ee4e64 100644 (file)
--- a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
@@ -24,8 +24,9 @@ func (c *EC2Metadata) GetMetadata(p string) (string, error) {
 
        output := &metadataOutput{}
        req := c.NewRequest(op, nil, output)
+       err := req.Send()
 
-       return output.Content, req.Send()
+       return output.Content, err
 }
 
 // GetUserData returns the userdata that was configured for the service. If
@@ -45,8 +46,9 @@ func (c *EC2Metadata) GetUserData() (string, error) {
                        r.Error = awserr.New("NotFoundError", "user-data not found", r.Error)
                }
        })
+       err := req.Send()
 
-       return output.Content, req.Send()
+       return output.Content, err
 }
 
 // GetDynamicData uses the path provided to request information from the EC2
@@ -61,8 +63,9 @@ func (c *EC2Metadata) GetDynamicData(p string) (string, error) {
 
        output := &metadataOutput{}
        req := c.NewRequest(op, nil, output)
+       err := req.Send()
 
-       return output.Content, req.Send()
+       return output.Content, err
 }
 
 // GetInstanceIdentityDocument retrieves an identity document describing an
@@ -118,6 +121,10 @@ func (c *EC2Metadata) Region() (string, error) {
                return "", err
        }
 
+       if len(resp) == 0 {
+               return "", awserr.New("EC2MetadataError", "invalid Region response", nil)
+       }
+
        // returns region without the suffix. Eg: us-west-2a becomes us-west-2
        return resp[:len(resp)-1], nil
 }