vendor: update all dependencies to latest versions

This commit is contained in:
Nick Craig-Wood 2018-01-16 13:20:59 +00:00
parent 8e83fb6fb9
commit 7d3a17725d
4878 changed files with 1974229 additions and 201215 deletions

View file

@ -329,7 +329,7 @@ func walkMap(m map[string]interface{}) string {
str += fmt.Sprintf("%q:", k)
switch v.(type) {
case bool:
str += fmt.Sprintf("%b,\n", v.(bool))
str += fmt.Sprintf("%t,\n", v.(bool))
case string:
str += fmt.Sprintf("%q,\n", v.(string))
case int:
@ -459,7 +459,7 @@ func GenerateAssertions(out interface{}, shape *api.Shape, prefix string) string
code += GenerateAssertions(v, s, prefix+"[\""+k+"\"]")
}
} else if shape.Type == "jsonvalue" {
code += fmt.Sprintf("reflect.DeepEqual(%s, map[string]interface{}%s)", prefix, walkMap(out.(map[string]interface{})))
code += fmt.Sprintf("reflect.DeepEqual(%s, map[string]interface{}%s)\n", prefix, walkMap(out.(map[string]interface{})))
} else {
for _, k := range keys {
v := t[k]
@ -517,6 +517,7 @@ func getType(t string) uint {
}
func main() {
fmt.Println("Generating test suite", os.Args[1:])
out := generateTestSuite(os.Args[1])
if len(os.Args) == 3 {
f, err := os.Create(os.Args[2])

View file

@ -147,19 +147,55 @@
"InputShape": {
"type": "structure",
"members": {
"ListArg": {
"shape": "ListType"
"ListStrings": {
"shape": "ListStringType"
},
"ListBools": {
"shape": "ListBoolType"
},
"ListFloats": {
"shape": "ListFloatType"
},
"ListIntegers": {
"shape": "ListIntegerType"
}
}
},
"ListType": {
"ListStringType": {
"type": "list",
"member": {
"shape": "Strings"
"shape": "StringType"
}
},
"Strings": {
"ListBoolType": {
"type": "list",
"member": {
"shape": "BoolType"
}
},
"ListFloatType": {
"type": "list",
"member": {
"shape": "FloatType"
}
},
"ListIntegerType": {
"type": "list",
"member": {
"shape": "IntegerType"
}
},
"StringType": {
"type": "string"
},
"BoolType": {
"type": "boolean"
},
"FloatType": {
"type": "float"
},
"IntegerType": {
"type": "integer"
}
},
"cases": [
@ -171,15 +207,30 @@
"name": "OperationName"
},
"params": {
"ListArg": [
"ListStrings": [
"foo",
"bar",
"baz"
],
"ListBools": [
true,
false,
false
],
"ListFloats": [
1.1,
2.718,
3.14
],
"ListIntegers": [
0,
1,
2
]
},
"serialized": {
"uri": "/",
"body": "Action=OperationName&Version=2014-01-01&ListArg.1=foo&ListArg.2=bar&ListArg.3=baz"
"body": "Action=OperationName&Version=2014-01-01&ListStrings.1=foo&ListStrings.2=bar&ListStrings.3=baz&ListBools.1=true&ListBools.2=false&ListBools.3=false&ListFloats.1=1.1&ListFloats.2=2.718&ListFloats.3=3.14&ListIntegers.1=0&ListIntegers.2=1&ListIntegers.3=2"
}
}
]
@ -410,5 +461,69 @@
}
}
]
},
{
"description": "Enum",
"metadata": {
"protocol": "ec2",
"apiVersion": "2014-01-01"
},
"shapes": {
"InputShape": {
"type": "structure",
"members": {
"FooEnum": {
"shape": "EnumType"
},
"ListEnums": {
"shape": "EnumList"
}
}
},
"EnumType":{
"type":"string",
"enum":[
"foo",
"bar"
]
},
"EnumList":{
"type":"list",
"member": {"shape": "EnumType"}
}
},
"cases": [
{
"given": {
"input": {
"shape": "InputShape"
},
"name": "OperationName"
},
"params": {
"ListEnums": ["foo", "", "bar"]
},
"serialized": {
"uri": "/",
"headers": {},
"body": "Action=OperationName&Version=2014-01-01&ListEnums.1=foo&ListEnums.2=&ListEnums.3=bar"
}
},
{
"given": {
"input": {
"shape": "InputShape"
},
"name": "OperationName"
},
"params": {
},
"serialized": {
"uri": "/",
"headers": {},
"body": "Action=OperationName&Version=2014-01-01"
}
}
]
}
]

View file

@ -535,5 +535,75 @@
}
}
]
},
{
"description": "Enum",
"metadata": {
"protocol": "json",
"apiVersion": "2014-01-01"
},
"shapes": {
"InputShape": {
"type": "structure",
"members": {
"FooEnum": {
"shape": "EnumType"
},
"ListEnums": {
"shape": "EnumList"
}
}
},
"EnumType":{
"type":"string",
"enum":[
"foo",
"bar"
]
},
"EnumList":{
"type":"list",
"member": {"shape": "EnumType"}
}
},
"cases": [
{
"given": {
"input": {
"shape": "InputShape"
},
"http": {
"method": "POST"
},
"name": "OperationName"
},
"params": {
"FooEnum": "foo",
"ListEnums": ["foo", "", "bar"]
},
"serialized": {
"uri": "/",
"headers": {},
"body": "{\"FooEnum\": \"foo\", \"ListEnums\": [\"foo\", \"\", \"bar\"]}"
}
},
{
"given": {
"input": {
"shape": "InputShape"
},
"http": {
"method": "POST"
},
"name": "OperationName"
},
"params": {
},
"serialized": {
"uri": "/",
"headers": {}
}
}
]
}
]

View file

@ -880,5 +880,94 @@
}
}
]
},
{
"description": "Enum",
"metadata": {
"protocol": "query",
"apiVersion": "2014-01-01"
},
"shapes": {
"InputShape": {
"type": "structure",
"members": {
"FooEnum": {
"shape": "EnumType"
},
"ListEnums": {
"shape": "EnumList"
}
}
},
"EnumType":{
"type":"string",
"enum":[
"foo",
"bar"
]
},
"EnumList":{
"type":"list",
"member": {"shape": "EnumType"}
}
},
"cases": [
{
"given": {
"input": {
"shape": "InputShape"
},
"http": {
"method": "POST"
},
"name": "OperationName"
},
"params": {
"FooEnum": "foo",
"ListEnums": ["foo", "", "bar"]
},
"serialized": {
"uri": "/",
"headers": {},
"body": "Action=OperationName&Version=2014-01-01&FooEnum=foo&ListEnums.member.1=foo&ListEnums.member.2=&ListEnums.member.3=bar"
}
},
{
"given": {
"input": {
"shape": "InputShape"
},
"http": {
"method": "POST"
},
"name": "OperationName"
},
"params": {
"FooEnum": "foo"
},
"serialized": {
"uri": "/",
"headers": {},
"body": "Action=OperationName&Version=2014-01-01&FooEnum=foo"
}
},
{
"given": {
"input": {
"shape": "InputShape"
},
"http": {
"method": "POST"
}, "name": "OperationName"
},
"params": {
},
"serialized": {
"uri": "/",
"headers": {},
"body": "Action=OperationName&Version=2014-01-01"
}
}
]
}
]

View file

@ -1310,17 +1310,46 @@
"shapes": {
"InputShape": {
"type": "structure",
"payload": "Body",
"members": {
"Attr": {
"HeaderField": {
"shape": "StringType",
"jsonvalue": true,
"location": "header",
"locationName": "X-Amz-Foo"
"jsonvalue": true,
"location": "header",
"locationName": "X-Amz-Foo"
},
"QueryField": {
"shape": "StringType",
"jsonvalue": true,
"location": "querystring",
"locationName": "Bar"
},
"Body": {
"shape": "BodyStructure"
}
}
},
"StringType": {
"type": "string"
},
"ListType": {
"type": "list",
"member": {
"shape": "StringType",
"jsonvalue": true
}
},
"BodyStructure": {
"type": "structure",
"members": {
"BodyField": {
"shape": "StringType",
"jsonvalue": true
},
"BodyListField": {
"shape": "ListType"
}
}
}
},
"cases": [
@ -1335,12 +1364,16 @@
"name": "OperationName"
},
"params": {
"Attr": {"Foo":"Bar"}
"HeaderField": {"Foo":"Bar"},
"QueryField": {"Foo":"Bar"},
"Body": {
"BodyField": {"Foo":"Bar"}
}
},
"serialized": {
"uri": "/",
"uri": "/?Bar=%7B%22Foo%22%3A%22Bar%22%7D",
"headers": {"X-Amz-Foo": "eyJGb28iOiJCYXIifQ=="},
"body": ""
"body": "{\"BodyField\":\"{\\\"Foo\\\":\\\"Bar\\\"}\"}"
}
},
{
@ -1353,6 +1386,27 @@
},
"name": "OperationName"
},
"params": {
"Body": {
"BodyListField": [{"Foo":"Bar"}]
}
},
"serialized": {
"uri": "/",
"headers": {},
"body": "{\"BodyListField\":[\"{\\\"Foo\\\":\\\"Bar\\\"}\"]}"
}
},
{
"given": {
"input": {
"shape": "InputShape"
},
"http": {
"method": "POST"
},
"name": "OperationName"
},
"params": {
},
"serialized": {
@ -1362,5 +1416,97 @@
}
}
]
},
{
"description": "Enum",
"metadata": {
"protocol": "rest-json",
"apiVersion": "2014-01-01"
},
"shapes": {
"InputShape": {
"type": "structure",
"members": {
"HeaderEnum": {
"shape": "EnumType",
"location": "header",
"locationName": "x-amz-enum"
},
"FooEnum": {
"shape": "EnumType"
},
"QueryFooEnum": {
"shape": "EnumType",
"location": "querystring",
"locationName": "Enum"
},
"ListEnums": {
"shape": "EnumList"
},
"QueryListEnums": {
"shape": "EnumList",
"location": "querystring",
"locationName": "List"
}
}
},
"EnumType":{
"type":"string",
"enum":[
"foo",
"bar",
"0",
"1"
]
},
"EnumList":{
"type":"list",
"member": {"shape": "EnumType"}
}
},
"cases": [
{
"given": {
"input": {
"shape": "InputShape"
},
"http": {
"method": "POST",
"requestUri": "/path"
},
"name": "OperationName"
},
"params": {
"HeaderEnum": "baz",
"FooEnum": "foo",
"QueryFooEnum": "bar",
"ListEnums": ["foo", "", "bar"],
"QueryListEnums": ["0", "", "1"]
},
"serialized": {
"uri": "/path?Enum=bar&List=0&List=1&List=",
"headers": {"x-amz-enum": "baz"},
"body": "{\"FooEnum\": \"foo\", \"ListEnums\": [\"foo\", \"\", \"bar\"]}"
}
},
{
"given": {
"input": {
"shape": "InputShape"
},
"http": {
"method": "POST",
"requestUri": "/path"
},
"name": "OperationName"
},
"params": {
},
"serialized": {
"uri": "/path",
"headers": {}
}
}
]
}
]

View file

@ -1692,5 +1692,97 @@
}
}
]
},
{
"description": "Enum",
"metadata": {
"protocol": "rest-xml",
"apiVersion": "2014-01-01"
},
"shapes": {
"InputShape": {
"type": "structure",
"members": {
"HeaderEnum": {
"shape": "EnumType",
"location": "header",
"locationName": "x-amz-enum"
},
"FooEnum": {
"shape": "EnumType"
},
"URIFooEnum": {
"shape": "EnumType",
"location": "uri",
"locationName": "URIEnum"
},
"ListEnums": {
"shape": "EnumList"
},
"URIListEnums": {
"shape": "EnumList",
"location": "querystring",
"locationName": "ListEnums"
}
}
},
"EnumType":{
"type":"string",
"enum":[
"foo",
"bar",
"0",
"1"
]
},
"EnumList":{
"type":"list",
"member": {"shape": "EnumType"}
}
},
"cases": [
{
"given": {
"input": {
"shape": "InputShape"
},
"http": {
"method": "POST",
"requestUri": "/Enum/{URIEnum}"
},
"name": "OperationName"
},
"params": {
"HeaderEnum": "baz",
"FooEnum": "foo",
"URIFooEnum": "bar",
"ListEnums": ["foo", "", "bar"],
"URIListEnums": ["0", "", "1"]
},
"serialized": {
"uri": "/Enum/bar?ListEnums=0&ListEnums=&ListEnums=1",
"headers": {"x-amz-enum": "baz"},
"body": "<InputShape><FooEnum>foo</FooEnum><ListEnums><member>foo</member><member></member><member>bar</member></ListEnums></InputShape>"
}
},
{
"given": {
"input": {
"shape": "InputShape"
},
"http": {
"method": "POST",
"requestUri": "/path"
},
"name": "OperationName"
},
"params": {
},
"serialized": {
"uri": "/path",
"headers": {}
}
}
]
}
]

View file

@ -450,5 +450,54 @@
}
}
]
},
{
"description": "Enum output",
"metadata": {
"protocol": "ec2"
},
"shapes": {
"OutputShape": {
"type": "structure",
"members": {
"FooEnum": {
"shape": "EC2EnumType"
},
"ListEnums": {
"shape": "EC2EnumList"
}
}
},
"EC2EnumType":{
"type":"string",
"enum":[
"foo",
"bar"
]
},
"EC2EnumList":{
"type":"list",
"member": {"shape": "EC2EnumType"}
}
},
"cases": [
{
"given": {
"output": {
"shape": "OutputShape"
},
"name": "OperationName"
},
"result": {
"FooEnum": "foo",
"ListEnums": ["foo", "bar"]
},
"response": {
"status_code": 200,
"headers": {},
"body": "<OperationNameResponse><FooEnum>foo</FooEnum><ListEnums><member>foo</member><member>bar</member></ListEnums></OperationNameResponse>"
}
}
]
}
]

View file

@ -365,5 +365,54 @@
}
}
]
},
{
"description": "Enum output",
"metadata": {
"protocol": "json"
},
"shapes": {
"OutputShape": {
"type": "structure",
"members": {
"FooEnum": {
"shape": "JSONEnumType"
},
"ListEnums": {
"shape": "JSONEnumList"
}
}
},
"JSONEnumType":{
"type":"string",
"enum":[
"foo",
"bar"
]
},
"JSONEnumList":{
"type":"list",
"member": {"shape": "JSONEnumType"}
}
},
"cases": [
{
"given": {
"output": {
"shape": "OutputShape"
},
"name": "OperationName"
},
"result": {
"FooEnum": "foo",
"ListEnums": ["foo", "bar"]
},
"response": {
"status_code": 200,
"headers": {},
"body": "{\"FooEnum\": \"foo\", \"ListEnums\": [\"foo\", \"bar\"]}"
}
}
]
}
]

View file

@ -772,5 +772,54 @@
}
}
]
},
{
"description": "Enum output",
"metadata": {
"protocol": "query"
},
"shapes": {
"OutputShape": {
"type": "structure",
"members": {
"FooEnum": {
"shape": "EC2EnumType"
},
"ListEnums": {
"shape": "EC2EnumList"
}
}
},
"EC2EnumType":{
"type":"string",
"enum":[
"foo",
"bar"
]
},
"EC2EnumList":{
"type":"list",
"member": {"shape": "EC2EnumType"}
}
},
"cases": [
{
"given": {
"output": {
"shape": "OutputShape"
},
"name": "OperationName"
},
"result": {
"FooEnum": "foo",
"ListEnums": ["foo", "bar"]
},
"response": {
"status_code": 200,
"headers": {},
"body": "<OperationNameResponse><FooEnum>foo</FooEnum><ListEnums><member>foo</member><member>bar</member></ListEnums></OperationNameResponse>"
}
}
]
}
]

View file

@ -614,16 +614,30 @@
"OutputShape": {
"type": "structure",
"members": {
"Attr": {
"HeaderField": {
"shape": "StringType",
"jsonvalue": true,
"location": "header",
"locationName": "X-Amz-Foo"
"jsonvalue": true,
"location": "header",
"locationName": "X-Amz-Foo"
},
"BodyField":{
"shape": "StringType",
"jsonvalue": true
},
"BodyListField": {
"shape": "ListType"
}
}
},
"StringType": {
"type": "string"
},
"ListType": {
"type": "list",
"member": {
"shape": "StringType",
"jsonvalue": true
}
}
},
"cases": [
@ -635,14 +649,126 @@
"name": "OperationName"
},
"result": {
"Attr": {"Foo":"Bar"}
"HeaderField": {"Foo":"Bar"},
"BodyField": {"Foo":"Bar"}
},
"response": {
"status_code": 200,
"headers": {"X-Amz-Foo": "eyJGb28iOiJCYXIifQ=="},
"body": "{\"BodyField\":\"{\\\"Foo\\\":\\\"Bar\\\"}\"}"
}
},
{
"given": {
"output": {
"shape": "OutputShape"
},
"name": "OperationName"
},
"result": {
"BodyListField": [{"Foo":"Bar"}]
},
"response": {
"status_code": 200,
"headers": {},
"body": "{\"BodyListField\":[\"{\\\"Foo\\\":\\\"Bar\\\"}\"]}"
}
},
{
"given": {
"output": {
"shape": "OutputShape"
},
"name": "OperationName"
},
"result": {
},
"response": {
"status_code": 200,
"headers": {},
"body": ""
}
}
]
},
{
"description": "Enum",
"metadata": {
"protocol": "rest-json",
"apiVersion": "2014-01-01"
},
"shapes": {
"OutputShape": {
"type": "structure",
"members": {
"HeaderEnum": {
"shape": "RESTJSONEnumType",
"location": "header",
"locationName": "x-amz-enum"
},
"FooEnum": {
"shape": "RESTJSONEnumType"
},
"ListEnums": {
"shape": "EnumList"
}
}
},
"RESTJSONEnumType":{
"type":"string",
"enum":[
"foo",
"bar",
"0",
"1"
]
},
"EnumList":{
"type":"list",
"member": {"shape": "RESTJSONEnumType"}
}
},
"cases": [
{
"given": {
"output": {
"shape": "OutputShape"
},
"http": {
"method": "POST",
"requestUri": "/path"
},
"name": "OperationName"
},
"result": {
"HeaderEnum": "baz",
"FooEnum": "foo",
"ListEnums": ["foo", "bar"]
},
"response": {
"status_code": 200,
"headers": {"x-amz-enum": "baz"},
"body": "{\"FooEnum\": \"foo\", \"ListEnums\": [\"foo\", \"bar\"]}"
}
},
{
"given": {
"input": {
"shape": "OutputShape"
},
"http": {
"method": "POST",
"requestUri": "/path"
},
"name": "OperationName"
},
"result": {
},
"response": {
"status_code": 200,
"headers": {}
}
}
]
}
]

View file

@ -716,5 +716,166 @@
}
}
]
},
{
"description": "Enum",
"metadata": {
"protocol": "rest-xml"
},
"shapes": {
"OutputShape": {
"type": "structure",
"members": {
"HeaderEnum": {
"shape": "RESTJSONEnumType",
"location": "header",
"locationName": "x-amz-enum"
},
"FooEnum": {
"shape": "RESTJSONEnumType"
},
"ListEnums": {
"shape": "EnumList"
}
}
},
"RESTJSONEnumType":{
"type":"string",
"enum":[
"foo",
"bar",
"0",
"1"
]
},
"EnumList":{
"type":"list",
"member": {"shape": "RESTJSONEnumType"}
}
},
"cases": [
{
"given": {
"output": {
"shape": "OutputShape"
},
"http": {
"method": "POST",
"requestUri": "/path"
},
"name": "OperationName"
},
"result": {
"HeaderEnum": "baz",
"FooEnum": "foo",
"ListEnums": ["0", "1"]
},
"response": {
"status_code": 200,
"headers": {"x-amz-enum": "baz"},
"body": "<OperationNameResponse><FooEnum>foo</FooEnum><ListEnums><member>0</member><member>1</member></ListEnums></OperationNameResponse>"
}
},
{
"given": {
"input": {
"shape": "OutputShape"
},
"http": {
"method": "POST",
"requestUri": "/path"
},
"name": "OperationName"
},
"result": {
},
"response": {
"status_code": 200,
"headers": {}
}
}
]
},
{
"description": "XML Attributes",
"metadata": {
"protocol": "rest-xml"
},
"shapes": {
"OutputShape":{
"type":"structure",
"members":{
"ListItems":{
"shape":"ListItemsShape",
"locationName":"ItemsList"
}
}
},
"ListItemsShape":{
"type":"list",
"member":{
"shape":"ItemShape",
"locationName":"Item"
}
},
"ItemShape":{
"type":"structure",
"members":{
"ItemDetail":{"shape":"ItemDetailShape"}
}
},
"ItemDetailShape":{
"type":"structure",
"required":["Type"],
"members":{
"ID":{"shape":"StringShape"},
"Type":{
"shape":"ItemType",
"locationName":"xsi:type",
"xmlAttribute":true
}
},
"xmlNamespace":{
"prefix":"xsi",
"uri":"http://www.w3.org/2001/XMLSchema-instance"
}
},
"StringShape":{
"type":"string"
},
"ItemType":{
"type":"string",
"enum":[
"Type1",
"Type2",
"Type3"
]
}
},
"cases": [
{
"given": {
"output": {
"shape": "OutputShape"
},
"http": {
"method": "GET",
"requestUri": "/path"
},
"name": "OperationName"
},
"result": {
"ListItems": [
{"ItemDetail": {"ID": "id1", "Type": "Type1"}},
{"ItemDetail": {"ID": "id2", "Type": "Type2"}},
{"ItemDetail": {"ID": "id3", "Type": "Type3"}}
]
},
"response": {
"status_code": 200,
"body": "<SomeOutputDoc xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><ItemsList><Item><ItemDetail xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"Type1\"><ID>id1</ID></ItemDetail></Item><Item><ItemDetail xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"Type2\"><ID>id2</ID></ItemDetail></Item><Item><ItemDetail xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"Type3\"><ID>id3</ID></ItemDetail></Item></ItemsList></SomeOutputDoc>"
}
}
]
}
]