cfc65a13f6
This commit includes updates that affects the build, testing, and
deployment of Tile38.
- The root level build.sh has been broken up into multiple scripts
and placed in the "scripts" directory.
- The vendor directory has been updated to follow the Go modules
rules, thus `make` should work on isolated environments. Also
some vendored packages may have been updated to a later
version, if needed.
- The Makefile has been updated to allow for making single
binaries such as `make tile38-server`. There is some scaffolding
during the build process, so from now on all binaries should be
made using make. For example, to run a development version of
the tile38-cli binary, do this:
make tile38-cli && ./tile38-cli
not this:
go run cmd/tile38-cli/main.go
- Travis.CI docker push script has been updated to address a
change to Docker's JSON repo meta output, which in turn fixes
a bug where new Tile38 versions were not being properly pushed
to Docker
82 lines
2.0 KiB
Go
82 lines
2.0 KiB
Go
package protocol
|
|
|
|
import (
|
|
"io"
|
|
"io/ioutil"
|
|
"net/http"
|
|
|
|
"github.com/aws/aws-sdk-go/aws"
|
|
"github.com/aws/aws-sdk-go/aws/client/metadata"
|
|
"github.com/aws/aws-sdk-go/aws/request"
|
|
)
|
|
|
|
// PayloadUnmarshaler provides the interface for unmarshaling a payload's
|
|
// reader into a SDK shape.
|
|
type PayloadUnmarshaler interface {
|
|
UnmarshalPayload(io.Reader, interface{}) error
|
|
}
|
|
|
|
// HandlerPayloadUnmarshal implements the PayloadUnmarshaler from a
|
|
// HandlerList. This provides the support for unmarshaling a payload reader to
|
|
// a shape without needing a SDK request first.
|
|
type HandlerPayloadUnmarshal struct {
|
|
Unmarshalers request.HandlerList
|
|
}
|
|
|
|
// UnmarshalPayload unmarshals the io.Reader payload into the SDK shape using
|
|
// the Unmarshalers HandlerList provided. Returns an error if unable
|
|
// unmarshaling fails.
|
|
func (h HandlerPayloadUnmarshal) UnmarshalPayload(r io.Reader, v interface{}) error {
|
|
req := &request.Request{
|
|
HTTPRequest: &http.Request{},
|
|
HTTPResponse: &http.Response{
|
|
StatusCode: 200,
|
|
Header: http.Header{},
|
|
Body: ioutil.NopCloser(r),
|
|
},
|
|
Data: v,
|
|
}
|
|
|
|
h.Unmarshalers.Run(req)
|
|
|
|
return req.Error
|
|
}
|
|
|
|
// PayloadMarshaler provides the interface for marshaling a SDK shape into and
|
|
// io.Writer.
|
|
type PayloadMarshaler interface {
|
|
MarshalPayload(io.Writer, interface{}) error
|
|
}
|
|
|
|
// HandlerPayloadMarshal implements the PayloadMarshaler from a HandlerList.
|
|
// This provides support for marshaling a SDK shape into an io.Writer without
|
|
// needing a SDK request first.
|
|
type HandlerPayloadMarshal struct {
|
|
Marshalers request.HandlerList
|
|
}
|
|
|
|
// MarshalPayload marshals the SDK shape into the io.Writer using the
|
|
// Marshalers HandlerList provided. Returns an error if unable if marshal
|
|
// fails.
|
|
func (h HandlerPayloadMarshal) MarshalPayload(w io.Writer, v interface{}) error {
|
|
req := request.New(
|
|
aws.Config{},
|
|
metadata.ClientInfo{},
|
|
request.Handlers{},
|
|
nil,
|
|
&request.Operation{HTTPMethod: "GET"},
|
|
v,
|
|
nil,
|
|
)
|
|
|
|
h.Marshalers.Run(req)
|
|
|
|
if req.Error != nil {
|
|
return req.Error
|
|
}
|
|
|
|
io.Copy(w, req.GetBody())
|
|
|
|
return nil
|
|
}
|