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
77 lines
1.6 KiB
Go
77 lines
1.6 KiB
Go
package protocol
|
|
|
|
import (
|
|
"encoding/base64"
|
|
"encoding/json"
|
|
"fmt"
|
|
"strconv"
|
|
|
|
"github.com/aws/aws-sdk-go/aws"
|
|
)
|
|
|
|
// EscapeMode is the mode that should be use for escaping a value
|
|
type EscapeMode uint
|
|
|
|
// The modes for escaping a value before it is marshaled, and unmarshaled.
|
|
const (
|
|
NoEscape EscapeMode = iota
|
|
Base64Escape
|
|
QuotedEscape
|
|
)
|
|
|
|
// EncodeJSONValue marshals the value into a JSON string, and optionally base64
|
|
// encodes the string before returning it.
|
|
//
|
|
// Will panic if the escape mode is unknown.
|
|
func EncodeJSONValue(v aws.JSONValue, escape EscapeMode) (string, error) {
|
|
b, err := json.Marshal(v)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
switch escape {
|
|
case NoEscape:
|
|
return string(b), nil
|
|
case Base64Escape:
|
|
return base64.StdEncoding.EncodeToString(b), nil
|
|
case QuotedEscape:
|
|
return strconv.Quote(string(b)), nil
|
|
}
|
|
|
|
panic(fmt.Sprintf("EncodeJSONValue called with unknown EscapeMode, %v", escape))
|
|
}
|
|
|
|
// DecodeJSONValue will attempt to decode the string input as a JSONValue.
|
|
// Optionally decoding base64 the value first before JSON unmarshaling.
|
|
//
|
|
// Will panic if the escape mode is unknown.
|
|
func DecodeJSONValue(v string, escape EscapeMode) (aws.JSONValue, error) {
|
|
var b []byte
|
|
var err error
|
|
|
|
switch escape {
|
|
case NoEscape:
|
|
b = []byte(v)
|
|
case Base64Escape:
|
|
b, err = base64.StdEncoding.DecodeString(v)
|
|
case QuotedEscape:
|
|
var u string
|
|
u, err = strconv.Unquote(v)
|
|
b = []byte(u)
|
|
default:
|
|
panic(fmt.Sprintf("DecodeJSONValue called with unknown EscapeMode, %v", escape))
|
|
}
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
m := aws.JSONValue{}
|
|
err = json.Unmarshal(b, &m)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return m, nil
|
|
}
|