change github.com/aws/aws-sdk-go to be the same revision in kubernetes

This commit is contained in:
Jingfang Liu
2018-10-16 09:34:22 -07:00
parent e0958159f3
commit c6a78cee92
462 changed files with 20605 additions and 85780 deletions

View File

@@ -94,9 +94,6 @@ func (r *EventReader) ReadEvent() (event interface{}, err error) {
switch typ {
case EventMessageType:
return r.unmarshalEventMessage(msg)
case ExceptionMessageType:
err = r.unmarshalEventException(msg)
return nil, err
case ErrorMessageType:
return nil, r.unmarshalErrorMessage(msg)
default:
@@ -125,39 +122,6 @@ func (r *EventReader) unmarshalEventMessage(
return ev, nil
}
func (r *EventReader) unmarshalEventException(
msg eventstream.Message,
) (err error) {
eventType, err := GetHeaderString(msg, ExceptionTypeHeader)
if err != nil {
return err
}
ev, err := r.unmarshalerForEventType(eventType)
if err != nil {
return err
}
err = ev.UnmarshalEvent(r.payloadUnmarshaler, msg)
if err != nil {
return err
}
var ok bool
err, ok = ev.(error)
if !ok {
err = messageError{
code: "SerializationError",
msg: fmt.Sprintf(
"event stream exception %s mapped to non-error %T, %v",
eventType, ev, ev,
),
}
}
return err
}
func (r *EventReader) unmarshalErrorMessage(msg eventstream.Message) (err error) {
var msgErr messageError

View File

@@ -7,6 +7,7 @@ import (
"io/ioutil"
"testing"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/private/protocol"
"github.com/aws/aws-sdk-go/private/protocol/eventstream"
@@ -108,51 +109,12 @@ func TestEventReader_Error(t *testing.T) {
t.Fatalf("expect no event, got %v", event)
}
if e, a := "errorCode: error message occur", err.Error(); e != a {
t.Errorf("expect %v error, got %v", e, a)
aerr := err.(awserr.Error)
if e, a := "errorCode", aerr.Code(); e != a {
t.Errorf("expect %v code, got %v", e, a)
}
}
func TestEventReader_Exception(t *testing.T) {
eventMsgs := []eventstream.Message{
{
Headers: eventstream.Headers{
eventstream.Header{
Name: MessageTypeHeader,
Value: eventstream.StringValue(ExceptionMessageType),
},
eventstream.Header{
Name: ExceptionTypeHeader,
Value: eventstream.StringValue("exception"),
},
},
Payload: []byte(`{"message":"exception message"}`),
},
}
stream := createStream(eventMsgs...)
var unmarshalers request.HandlerList
unmarshalers.PushBackNamed(restjson.UnmarshalHandler)
eventReader := NewEventReader(stream,
protocol.HandlerPayloadUnmarshal{
Unmarshalers: unmarshalers,
},
unmarshalerForEventType,
)
event, err := eventReader.ReadEvent()
if err == nil {
t.Fatalf("expect error got none")
}
if event != nil {
t.Fatalf("expect no event, got %v", event)
}
et := err.(*exceptionType)
if e, a := string(eventMsgs[0].Payload), string(et.Payload); e != a {
t.Errorf("expect %v payload, got %v", e, a)
if e, a := "error message occur", aerr.Message(); e != a {
t.Errorf("expect %v message, got %v", e, a)
}
}
@@ -201,8 +163,6 @@ func unmarshalerForEventType(eventType string) (Unmarshaler, error) {
switch eventType {
case "eventABC":
return &eventABC{}, nil
case "exception":
return &exceptionType{}, nil
default:
return nil, fmt.Errorf("unknown event type, %v", eventType)
}
@@ -235,19 +195,3 @@ func createStream(msgs ...eventstream.Message) io.ReadCloser {
return ioutil.NopCloser(w)
}
type exceptionType struct {
Payload []byte
}
func (e exceptionType) Error() string {
return fmt.Sprintf("exception error message")
}
func (e *exceptionType) UnmarshalEvent(
unmarshaler protocol.PayloadUnmarshaler,
msg eventstream.Message,
) error {
e.Payload = msg.Payload
return nil
}