From 2ca0e8f9a0f9863555a26e984cde15efff9ef8f8 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 23 Sep 2016 10:17:51 -0400 Subject: Updating golang dependancies (#4075) --- vendor/github.com/goamz/goamz/aws/aws.go | 2 ++ vendor/github.com/goamz/goamz/aws/regions.go | 23 ++++++++++++++++++++++ vendor/github.com/goamz/goamz/exp/ses/ses.go | 10 +++++++--- vendor/github.com/goamz/goamz/exp/ses/ses_types.go | 4 ++++ vendor/github.com/goamz/goamz/s3/s3test/server.go | 4 +++- vendor/github.com/goamz/goamz/sqs/sqs.go | 23 +++++++++++++++++----- 6 files changed, 57 insertions(+), 9 deletions(-) (limited to 'vendor/github.com/goamz') diff --git a/vendor/github.com/goamz/goamz/aws/aws.go b/vendor/github.com/goamz/goamz/aws/aws.go index 77bf563d6..49eed632e 100644 --- a/vendor/github.com/goamz/goamz/aws/aws.go +++ b/vendor/github.com/goamz/goamz/aws/aws.go @@ -65,6 +65,7 @@ type Region struct { var Regions = map[string]Region{ APNortheast.Name: APNortheast, + APNortheast2.Name: APNortheast2, APSoutheast.Name: APSoutheast, APSoutheast2.Name: APSoutheast2, EUCentral.Name: EUCentral, @@ -390,6 +391,7 @@ func SharedAuth() (auth Auth, err error) { auth.AccessKey = profile["aws_access_key_id"] auth.SecretKey = profile["aws_secret_access_key"] + auth.token = profile["aws_session_token"] if auth.AccessKey == "" { err = errors.New("AWS_ACCESS_KEY_ID not found in environment in credentials file") diff --git a/vendor/github.com/goamz/goamz/aws/regions.go b/vendor/github.com/goamz/goamz/aws/regions.go index 5e18f023d..94d79d46d 100644 --- a/vendor/github.com/goamz/goamz/aws/regions.go +++ b/vendor/github.com/goamz/goamz/aws/regions.go @@ -207,6 +207,29 @@ var APNortheast = Region{ "https://streams.dynamodb.ap-northeast-1.amazonaws.com", } +var APNortheast2 = Region{ + "ap-northeast-2", + "https://ec2.ap-northeast-2.amazonaws.com", + "https://s3-ap-northeast-2.amazonaws.com", + "", + true, + true, + "https://sdb.ap-northeast-2.amazonaws.com", + "", + "https://sns.ap-northeast-2.amazonaws.com", + "https://sqs.ap-northeast-2.amazonaws.com", + "https://iam.amazonaws.com", + "https://elasticloadbalancing.ap-northeast-2.amazonaws.com", + "https://dynamodb.ap-northeast-2.amazonaws.com", + ServiceInfo{"https://monitoring.ap-northeast-2.amazonaws.com", V2Signature}, + "https://autoscaling.ap-northeast-2.amazonaws.com", + ServiceInfo{"https://rds.ap-northeast-2.amazonaws.com", V2Signature}, + "https://sts.amazonaws.com", + "https://cloudformation.ap-northeast-2.amazonaws.com", + "https://ecs.ap-northeast-2.amazonaws.com", + "https://streams.dynamodb.ap-northeast-2.amazonaws.com", +} + var SAEast = Region{ "sa-east-1", "https://ec2.sa-east-1.amazonaws.com", diff --git a/vendor/github.com/goamz/goamz/exp/ses/ses.go b/vendor/github.com/goamz/goamz/exp/ses/ses.go index 7c9c7c352..3896c5253 100644 --- a/vendor/github.com/goamz/goamz/exp/ses/ses.go +++ b/vendor/github.com/goamz/goamz/exp/ses/ses.go @@ -113,6 +113,10 @@ func (ses *SES) doPost(action string, data url.Values) error { req.URL = URL req.Header.Add("Content-Type", "application/x-www-form-urlencoded") + token := ses.auth.Token() + if token != "" { + req.Header.Set("X-Amz-Security-Token", token) + } sign(ses.auth, "POST", req.Header) data.Add("AWSAccessKeyId", ses.auth.AccessKey) @@ -139,7 +143,7 @@ func (ses *SES) doPost(action string, data url.Values) error { } func buildError(r *http.Response) *SESError { - err := SESError{} - xml.NewDecoder(r.Body).Decode(&err) - return &err + rootElem := errorResponse{} + xml.NewDecoder(r.Body).Decode(&rootElem) + return &rootElem.Error } diff --git a/vendor/github.com/goamz/goamz/exp/ses/ses_types.go b/vendor/github.com/goamz/goamz/exp/ses/ses_types.go index 698fa7623..d26e83740 100644 --- a/vendor/github.com/goamz/goamz/exp/ses/ses_types.go +++ b/vendor/github.com/goamz/goamz/exp/ses/ses_types.go @@ -45,6 +45,10 @@ type SESError struct { RequestId string } +type errorResponse struct { + Error SESError +} + func (err *SESError) Error() string { return err.Message } diff --git a/vendor/github.com/goamz/goamz/s3/s3test/server.go b/vendor/github.com/goamz/goamz/s3/s3test/server.go index bf4dd8a3c..04808d3ad 100644 --- a/vendor/github.com/goamz/goamz/s3/s3test/server.go +++ b/vendor/github.com/goamz/goamz/s3/s3test/server.go @@ -497,6 +497,8 @@ type objectResource struct { object *object // may be nil. } +const awsTimeFormat = "Mon, 2 Jan 2006 15:04:05 GMT" + // GET on an object gets the contents of the object. // http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectGET.html func (objr objectResource) get(a *action) interface{} { @@ -531,7 +533,7 @@ func (objr objectResource) get(a *action) interface{} { // TODO x-amz-request-id h.Set("Content-Length", fmt.Sprint(len(obj.data))) h.Set("ETag", hex.EncodeToString(obj.checksum)) - h.Set("Last-Modified", obj.mtime.Format(time.RFC1123)) + h.Set("Last-Modified", obj.mtime.Format(awsTimeFormat)) if a.req.Method == "HEAD" { return nil } diff --git a/vendor/github.com/goamz/goamz/sqs/sqs.go b/vendor/github.com/goamz/goamz/sqs/sqs.go index 4005b1b37..23f1951ab 100644 --- a/vendor/github.com/goamz/goamz/sqs/sqs.go +++ b/vendor/github.com/goamz/goamz/sqs/sqs.go @@ -34,7 +34,8 @@ const debug = false type SQS struct { aws.Auth aws.Region - private byte // Reserve the right of using private data. + private byte // Reserve the right of using private data. + transport *http.Transport } // NewFrom Create A new SQS Client given an access and secret Key @@ -59,6 +60,8 @@ func NewFrom(accessKey, secretKey, region string) (*SQS, error) { aws_region = aws.APSoutheast2 case "ap.northeast", "ap.northeast.1": aws_region = aws.APNortheast + case "ap.northeast.2": + aws_region = aws.APNortheast2 case "sa.east", "sa.east.1": aws_region = aws.SAEast case "cn.north", "cn.north.1": @@ -73,7 +76,12 @@ func NewFrom(accessKey, secretKey, region string) (*SQS, error) { // NewFrom Create A new SQS Client from an exisisting aws.Auth func New(auth aws.Auth, region aws.Region) *SQS { - return &SQS{auth, region, 0} + return &SQS{auth, region, 0, nil} +} + +// NewFromTransport Create A new SQS Client that uses a given &http.Transport +func NewFromTransport(auth aws.Auth, region aws.Region, transport *http.Transport) *SQS { + return &SQS{auth, region, 0, transport} } // Queue Reference to a Queue @@ -511,11 +519,16 @@ func (s *SQS) query(queueUrl string, params map[string]string, resp interface{}) } signer := aws.NewV4Signer(s.Auth, "sqs", s.Region) signer.Sign(req) - client := http.Client{} + var client http.Client + if s.transport == nil { + client = http.Client{} + } else { + client = http.Client{Transport: s.transport} + } r, err = client.Do(req) if debug { - log.Printf("GET ", url_.String()) + log.Printf("GET %s\n", url_.String()) } if err != nil { @@ -526,7 +539,7 @@ func (s *SQS) query(queueUrl string, params map[string]string, resp interface{}) if debug { dump, _ := httputil.DumpResponse(r, true) - log.Printf("DUMP:\n", string(dump)) + log.Printf("DUMP:%s\n", string(dump)) } if r.StatusCode != 200 { -- cgit v1.2.3-1-g7c22