Merge pull request #27 from terraform-providers/go-modules-2019-02-22

[MODULES] Switch to Go Modules

2 files changed, 28 insertions, 25 deletions

diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
index 7161835..b34f525 100644
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
@@ -4,7 +4,6 @@ package rest
 import (
         "bytes"
         "encoding/base64"
-        "encoding/json"
         "fmt"
         "io"
         "net/http"
@@ -18,11 +17,9 @@ import (
         "github.com/aws/aws-sdk-go/aws"
         "github.com/aws/aws-sdk-go/aws/awserr"
         "github.com/aws/aws-sdk-go/aws/request"
+        "github.com/aws/aws-sdk-go/private/protocol"
 )
 
-// RFC822 returns an RFC822 formatted timestamp for AWS protocols
-const RFC822 = "Mon, 2 Jan 2006 15:04:05 GMT"
-
 // Whether the byte value can be sent without escaping in AWS URLs
 var noEscape [256]bool
 
@@ -252,13 +249,12 @@ func EscapePath(path string, encodeSep bool) string {
         return buf.String()
 }
 
-func convertType(v reflect.Value, tag reflect.StructTag) (string, error) {
+func convertType(v reflect.Value, tag reflect.StructTag) (str string, err error) {
         v = reflect.Indirect(v)
         if !v.IsValid() {
                 return "", errValueNotSet
         }
 
-        var str string
         switch value := v.Interface().(type) {
         case string:
                 str = value
@@ -271,19 +267,28 @@ func convertType(v reflect.Value, tag reflect.StructTag) (string, error) {
         case float64:
                 str = strconv.FormatFloat(value, 'f', -1, 64)
         case time.Time:
-                str = value.UTC().Format(RFC822)
+                format := tag.Get("timestampFormat")
+                if len(format) == 0 {
+                        format = protocol.RFC822TimeFormatName
+                        if tag.Get("location") == "querystring" {
+                                format = protocol.ISO8601TimeFormatName
+                        }
+                }
+                str = protocol.FormatTime(format, value)
         case aws.JSONValue:
-                b, err := json.Marshal(value)
-                if err != nil {
-                        return "", err
+                if len(value) == 0 {
+                        return "", errValueNotSet
                 }
+                escaping := protocol.NoEscape
                 if tag.Get("location") == "header" {
-                        str = base64.StdEncoding.EncodeToString(b)
-                } else {
-                        str = string(b)
+                        escaping = protocol.Base64Escape
+                }
+                str, err = protocol.EncodeJSONValue(value, escaping)
+                if err != nil {
+                        return "", fmt.Errorf("unable to encode JSONValue, %v", err)
                 }
         default:
-                err := fmt.Errorf("Unsupported value for param %v (%s)", v.Interface(), v.Type())
+                err := fmt.Errorf("unsupported value for param %v (%s)", v.Interface(), v.Type())
                 return "", err
         }
         return str, nil
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
index 7a779ee..33fd53b 100644
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
@@ -3,7 +3,6 @@ package rest
 import (
         "bytes"
         "encoding/base64"
-        "encoding/json"
         "fmt"
         "io"
         "io/ioutil"
@@ -16,6 +15,7 @@ import (
         "github.com/aws/aws-sdk-go/aws"
         "github.com/aws/aws-sdk-go/aws/awserr"
         "github.com/aws/aws-sdk-go/aws/request"
+        "github.com/aws/aws-sdk-go/private/protocol"
 )
 
 // UnmarshalHandler is a named request handler for unmarshaling rest protocol requests
@@ -198,23 +198,21 @@ func unmarshalHeader(v reflect.Value, header string, tag reflect.StructTag) erro
                 }
                 v.Set(reflect.ValueOf(&f))
         case *time.Time:
-                t, err := time.Parse(RFC822, header)
+                format := tag.Get("timestampFormat")
+                if len(format) == 0 {
+                        format = protocol.RFC822TimeFormatName
+                }
+                t, err := protocol.ParseTime(format, header)
                 if err != nil {
                         return err
                 }
                 v.Set(reflect.ValueOf(&t))
         case aws.JSONValue:
-                b := []byte(header)
-                var err error
+                escaping := protocol.NoEscape
                 if tag.Get("location") == "header" {
-                        b, err = base64.StdEncoding.DecodeString(header)
-                        if err != nil {
-                                return err
-                        }
+                        escaping = protocol.Base64Escape
                 }
-
-                m := aws.JSONValue{}
-                err = json.Unmarshal(b, &m)
+                m, err := protocol.DecodeJSONValue(header, escaping)
                 if err != nil {
                         return err
                 }