diff options
| author | Christine Dodrill <me@christine.website> | 2017-01-27 21:51:21 -0800 |
|---|---|---|
| committer | Christine Dodrill <me@christine.website> | 2017-01-27 21:51:21 -0800 |
| commit | 3e95e24dd0c5893e3e203579b2e00c31fb57727a (patch) | |
| tree | 746c300a15cfd2a09b2c5557b8900d2a1cdc05d6 | |
| parent | 0210fc845a0f47b7c41aca2a492e4b321a5877e9 (diff) | |
| download | x-3e95e24dd0c5893e3e203579b2e00c31fb57727a.tar.xz x-3e95e24dd0c5893e3e203579b2e00c31fb57727a.zip | |
svc/proto: update protocol
| -rw-r--r-- | svc/proto/svc.pb.go | 91 | ||||
| -rw-r--r-- | svc/proto/svc.pb.gw.go | 18 | ||||
| -rw-r--r-- | svc/proto/svc.proto | 2 | ||||
| -rw-r--r-- | svc/proto/svc.swagger.json | 18 |
4 files changed, 71 insertions, 58 deletions
diff --git a/svc/proto/svc.pb.go b/svc/proto/svc.pb.go index ae2af13..7647ce2 100644 --- a/svc/proto/svc.pb.go +++ b/svc/proto/svc.pb.go @@ -548,50 +548,51 @@ var _Apps_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("svc.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 717 bytes of a gzipped FileDescriptorProto + // 724 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xc4, 0x55, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0x56, 0x1c, 0x37, 0x89, 0x27, 0xd0, 0x86, 0x2d, 0x05, 0xe3, 0x96, 0x12, 0x99, 0x4b, 0x54, - 0x09, 0x47, 0x2d, 0x88, 0x9f, 0x42, 0x2b, 0x59, 0xa5, 0x87, 0x8a, 0xa2, 0x22, 0x4b, 0xed, 0x89, - 0xcb, 0x36, 0x5e, 0x82, 0x15, 0x7b, 0xbd, 0xf2, 0x3a, 0x46, 0x05, 0x71, 0xe1, 0xcc, 0x8d, 0x97, - 0xe0, 0x2d, 0x78, 0x08, 0x5e, 0x81, 0x17, 0xe0, 0x0d, 0x90, 0x77, 0xd7, 0x3f, 0x29, 0x41, 0x90, - 0x13, 0xb7, 0x9d, 0x9f, 0x6f, 0xf2, 0xcd, 0x37, 0xe3, 0x09, 0x18, 0x3c, 0x1b, 0x39, 0x2c, 0x89, - 0xd3, 0xd8, 0xda, 0x18, 0xc7, 0xf1, 0x38, 0x24, 0x43, 0xcc, 0x82, 0x21, 0xa6, 0x34, 0x4e, 0x71, - 0x1a, 0xc4, 0x94, 0xcb, 0xa8, 0xfd, 0x1a, 0x96, 0x5d, 0xc6, 0xf8, 0x71, 0xc0, 0xd3, 0x57, 0x38, - 0xc1, 0x11, 0x47, 0x16, 0x74, 0x42, 0x7c, 0x4e, 0xc2, 0x17, 0xe4, 0xc2, 0x6c, 0xf4, 0x1b, 0x03, - 0xc3, 0x2b, 0xed, 0x32, 0x76, 0x86, 0x43, 0x53, 0xab, 0xc5, 0xce, 0x70, 0x88, 0x10, 0xe8, 0x14, - 0x47, 0xc4, 0x6c, 0x0a, 0xbf, 0x78, 0xdb, 0xfb, 0xd0, 0x29, 0xaa, 0x23, 0x13, 0xda, 0x11, 0xe1, - 0x1c, 0x8f, 0x89, 0x2a, 0x5b, 0x98, 0xc8, 0x04, 0x1d, 0x33, 0xc6, 0x4d, 0xad, 0xdf, 0x1c, 0x74, - 0x77, 0x74, 0xc7, 0x65, 0xcc, 0x13, 0x1e, 0xfb, 0xab, 0x06, 0x9d, 0x97, 0x98, 0x06, 0x6f, 0x08, - 0x4f, 0xd1, 0x33, 0xe8, 0x12, 0x9a, 0x05, 0x49, 0x4c, 0x23, 0x42, 0x53, 0xb3, 0x21, 0xb2, 0x2d, - 0xa7, 0x88, 0x3b, 0x87, 0x55, 0xf0, 0x90, 0xa6, 0xc9, 0x85, 0x57, 0x4f, 0x47, 0xf7, 0xa0, 0x25, - 0xa8, 0x16, 0x3f, 0xb3, 0x56, 0x01, 0x8f, 0x85, 0x5f, 0x62, 0x54, 0x12, 0xea, 0x43, 0xd7, 0x8f, - 0x47, 0x13, 0x92, 0x1c, 0x45, 0x39, 0x63, 0xd9, 0x54, 0xdd, 0x55, 0xf6, 0xab, 0x57, 0xfd, 0x5a, - 0xfb, 0xd0, 0xbb, 0xcc, 0x02, 0xf5, 0xa0, 0x39, 0x29, 0xa5, 0xcc, 0x9f, 0xe8, 0x3a, 0x2c, 0x65, - 0x38, 0x9c, 0x12, 0x25, 0xa1, 0x34, 0x76, 0xb5, 0xc7, 0x0d, 0xeb, 0x09, 0x74, 0x6b, 0x64, 0x16, - 0x81, 0xda, 0x3f, 0x35, 0x68, 0xba, 0x8c, 0xa1, 0x65, 0xd0, 0x02, 0x5f, 0x41, 0xb4, 0xc0, 0x2f, - 0x69, 0x6a, 0x15, 0xcd, 0x7f, 0x68, 0xee, 0xd1, 0xac, 0xd6, 0xba, 0x92, 0xcc, 0x65, 0xec, 0x2f, - 0x32, 0x0f, 0x4a, 0x99, 0x97, 0x04, 0xa6, 0x27, 0x30, 0xf3, 0x14, 0x1e, 0xc0, 0x0a, 0x9e, 0xa6, - 0x6f, 0xe3, 0x24, 0x78, 0x4f, 0xfc, 0x53, 0x4e, 0x12, 0x6e, 0xb6, 0xfa, 0xcd, 0x81, 0xe1, 0x5d, - 0x76, 0xa3, 0x0d, 0x30, 0x02, 0xca, 0x53, 0x4c, 0x47, 0x84, 0x9b, 0xed, 0x7e, 0x63, 0xb0, 0xe4, - 0x55, 0x8e, 0xff, 0xa9, 0xf9, 0x67, 0x1d, 0x0c, 0x97, 0xb1, 0x53, 0xe6, 0xe3, 0xb4, 0x5a, 0x88, - 0x46, 0x4d, 0x69, 0x0b, 0x3a, 0x94, 0xbc, 0x93, 0x32, 0xab, 0x0f, 0xa6, 0xb0, 0x91, 0x03, 0x2d, - 0x42, 0x33, 0xd7, 0xf7, 0xcd, 0xa6, 0x90, 0xea, 0x86, 0x53, 0xd6, 0xca, 0x45, 0x76, 0x7d, 0x5f, - 0x09, 0x26, 0xb3, 0x72, 0x1e, 0x84, 0x66, 0x5e, 0x24, 0xa6, 0x61, 0x78, 0xd2, 0x40, 0x0f, 0xd4, - 0x27, 0x99, 0xd7, 0x91, 0x92, 0x9b, 0xb5, 0x3a, 0xc7, 0x2a, 0x24, 0x2b, 0x95, 0x99, 0x68, 0x1b, - 0xda, 0xe2, 0xed, 0x45, 0x42, 0xf4, 0xee, 0xce, 0xcd, 0xcb, 0x20, 0x2f, 0x92, 0x98, 0x22, 0x0f, - 0x6d, 0x02, 0x8c, 0x13, 0x4c, 0x53, 0x39, 0xaa, 0xb6, 0xe0, 0x50, 0xf3, 0xe4, 0x4b, 0x95, 0x90, - 0x2c, 0x9e, 0x10, 0x99, 0xd0, 0x11, 0x09, 0x75, 0x17, 0xda, 0x82, 0x5e, 0xde, 0xbc, 0x9a, 0xdc, - 0x41, 0x3c, 0xa5, 0xa9, 0x69, 0x88, 0x71, 0xfe, 0xe6, 0xcf, 0xa7, 0x52, 0xd3, 0x60, 0xa1, 0x81, - 0x3e, 0x85, 0xab, 0x33, 0x6d, 0x2f, 0x04, 0xde, 0x85, 0x2b, 0xf5, 0xf6, 0x17, 0x5a, 0x87, 0x3e, - 0x80, 0xcb, 0xd8, 0x11, 0xe5, 0x8c, 0x8c, 0xd2, 0x79, 0xeb, 0x60, 0xdf, 0x11, 0xfb, 0xf2, 0x9c, - 0x84, 0x64, 0xfe, 0xbe, 0xd8, 0x9b, 0xa0, 0x9d, 0x4c, 0xfe, 0x7c, 0x2a, 0x77, 0xbe, 0x69, 0xa0, - 0xe7, 0x17, 0x15, 0xed, 0x81, 0x2e, 0xae, 0xea, 0x8a, 0x33, 0x7b, 0xbe, 0x2d, 0xa3, 0x74, 0xd8, - 0xb7, 0x3e, 0x7d, 0xff, 0xf1, 0x45, 0x5b, 0x45, 0xd7, 0xc4, 0xed, 0xcf, 0xb6, 0x87, 0xf9, 0x4d, - 0x1d, 0x86, 0x39, 0xec, 0x21, 0xb4, 0x0e, 0x12, 0x92, 0x6f, 0xad, 0x51, 0xde, 0x41, 0x4b, 0x5c, - 0x5e, 0x7b, 0x5d, 0xa0, 0xd6, 0xec, 0xd5, 0x19, 0xd4, 0x48, 0x66, 0xef, 0x43, 0x4b, 0x6d, 0x3b, - 0x54, 0x0b, 0xa3, 0x80, 0xb6, 0x00, 0x6e, 0xd8, 0xd6, 0x0c, 0xf0, 0x43, 0xde, 0xd7, 0xc7, 0xe1, - 0x54, 0xa2, 0x5c, 0x68, 0x17, 0xfa, 0x74, 0x9d, 0x4a, 0x2c, 0x55, 0xe1, 0xae, 0xa8, 0x70, 0x1b, - 0xad, 0xcf, 0xab, 0x10, 0x28, 0xdc, 0x1e, 0xb4, 0x94, 0x80, 0x82, 0x82, 0x7c, 0x5b, 0x4d, 0xe7, - 0x64, 0x52, 0x30, 0xd8, 0x9a, 0xcb, 0xc0, 0x17, 0x89, 0xe7, 0x2d, 0xf1, 0xbf, 0x77, 0xff, 0x57, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xe2, 0xd2, 0x9c, 0x49, 0x22, 0x07, 0x00, 0x00, + 0x10, 0x56, 0x1c, 0x37, 0x89, 0x27, 0xd0, 0x86, 0x2d, 0x3f, 0xc6, 0x94, 0x36, 0x32, 0x42, 0x8a, + 0x2a, 0xe1, 0xa8, 0x05, 0x09, 0x5a, 0x68, 0x25, 0xab, 0xf4, 0x50, 0x51, 0x54, 0x64, 0xa9, 0x3d, + 0x71, 0xd9, 0xc6, 0x4b, 0xb0, 0x62, 0xaf, 0x57, 0xb6, 0x13, 0x54, 0x10, 0x17, 0xce, 0xdc, 0x78, + 0x09, 0x5e, 0x84, 0x27, 0xe0, 0x15, 0x78, 0x01, 0xde, 0x00, 0x79, 0x76, 0x63, 0x3b, 0x25, 0x08, + 0x72, 0xe2, 0xb6, 0x33, 0xf3, 0x7d, 0x93, 0x99, 0x6f, 0xc6, 0x13, 0x30, 0xd2, 0xc9, 0xc0, 0x11, + 0x49, 0x9c, 0xc5, 0xd6, 0xda, 0x30, 0x8e, 0x87, 0x21, 0xeb, 0x53, 0x11, 0xf4, 0x29, 0xe7, 0x71, + 0x46, 0xb3, 0x20, 0xe6, 0xa9, 0x8c, 0xda, 0xaf, 0x61, 0xd9, 0x15, 0x22, 0x3d, 0x0e, 0xd2, 0xec, + 0x15, 0x4d, 0x68, 0x94, 0x12, 0x0b, 0x5a, 0x21, 0x3d, 0x67, 0xe1, 0x0b, 0x76, 0x61, 0xd6, 0xba, + 0xb5, 0x9e, 0xe1, 0x15, 0x76, 0x11, 0x3b, 0xa3, 0xa1, 0xa9, 0x55, 0x62, 0x67, 0x34, 0x24, 0x04, + 0x74, 0x4e, 0x23, 0x66, 0xd6, 0xd1, 0x8f, 0x6f, 0x7b, 0x1f, 0x5a, 0xd3, 0xec, 0xc4, 0x84, 0x66, + 0xc4, 0xd2, 0x94, 0x0e, 0x99, 0x4a, 0x3b, 0x35, 0x89, 0x09, 0x3a, 0x15, 0x22, 0x35, 0xb5, 0x6e, + 0xbd, 0xd7, 0xde, 0xd6, 0x1d, 0x57, 0x08, 0x0f, 0x3d, 0xf6, 0x57, 0x0d, 0x5a, 0x2f, 0x29, 0x0f, + 0xde, 0xb0, 0x34, 0x23, 0xcf, 0xa0, 0xcd, 0xf8, 0x24, 0x48, 0x62, 0x1e, 0x31, 0x9e, 0x99, 0x35, + 0x44, 0x5b, 0xce, 0x34, 0xee, 0x1c, 0x96, 0xc1, 0x43, 0x9e, 0x25, 0x17, 0x5e, 0x15, 0x4e, 0x1e, + 0x40, 0x03, 0x4b, 0x9d, 0xfe, 0xcc, 0x8d, 0x92, 0x78, 0x8c, 0x7e, 0xc9, 0x51, 0x20, 0xd2, 0x85, + 0xb6, 0x1f, 0x0f, 0x46, 0x2c, 0x39, 0x8a, 0xf2, 0x8a, 0x65, 0x53, 0x55, 0x57, 0xd1, 0xaf, 0x5e, + 0xf6, 0x6b, 0xed, 0x43, 0xe7, 0x72, 0x15, 0xa4, 0x03, 0xf5, 0x51, 0x21, 0x65, 0xfe, 0x24, 0xd7, + 0x61, 0x69, 0x42, 0xc3, 0x31, 0x53, 0x12, 0x4a, 0x63, 0x57, 0x7b, 0x52, 0xb3, 0x76, 0xa0, 0x5d, + 0x29, 0x66, 0x11, 0xaa, 0xfd, 0x53, 0x83, 0xba, 0x2b, 0x04, 0x59, 0x06, 0x2d, 0xf0, 0x15, 0x45, + 0x0b, 0xfc, 0xa2, 0x4c, 0xad, 0x2c, 0xf3, 0x1f, 0x9a, 0x7b, 0x3c, 0xab, 0xb5, 0xae, 0x24, 0x73, + 0x85, 0xf8, 0x8b, 0xcc, 0xbd, 0x42, 0xe6, 0x25, 0xe4, 0x74, 0x90, 0x33, 0x4f, 0xe1, 0x1e, 0xac, + 0xd0, 0x71, 0xf6, 0x36, 0x4e, 0x82, 0xf7, 0xcc, 0x3f, 0x4d, 0x59, 0x92, 0x9a, 0x8d, 0x6e, 0xbd, + 0x67, 0x78, 0x97, 0xdd, 0x64, 0x0d, 0x8c, 0x80, 0xa7, 0x19, 0xe5, 0x03, 0x96, 0x9a, 0xcd, 0x6e, + 0xad, 0xb7, 0xe4, 0x95, 0x8e, 0xff, 0xa9, 0xf9, 0x67, 0x1d, 0x0c, 0x57, 0x88, 0x53, 0xe1, 0xd3, + 0xac, 0x5c, 0x88, 0x5a, 0x45, 0x69, 0x0b, 0x5a, 0x9c, 0xbd, 0x93, 0x32, 0xab, 0x0f, 0x66, 0x6a, + 0x13, 0x07, 0x1a, 0x8c, 0x4f, 0x5c, 0xdf, 0x37, 0xeb, 0x28, 0xd5, 0x4d, 0xa7, 0xc8, 0x95, 0x8b, + 0xec, 0xfa, 0xbe, 0x12, 0x4c, 0xa2, 0xf2, 0x3a, 0x18, 0x9f, 0x78, 0x11, 0x4e, 0xc3, 0xf0, 0xa4, + 0x41, 0x1e, 0xa9, 0x4f, 0x32, 0xcf, 0x23, 0x25, 0x37, 0x2b, 0x79, 0x8e, 0x55, 0x48, 0x66, 0x2a, + 0x90, 0x64, 0x0b, 0x9a, 0xf8, 0xf6, 0x22, 0x14, 0xbd, 0xbd, 0x7d, 0xeb, 0x32, 0xc9, 0x8b, 0x24, + 0x67, 0x8a, 0x23, 0xeb, 0x00, 0xc3, 0x84, 0xf2, 0x4c, 0x8e, 0xaa, 0x89, 0x35, 0x54, 0x3c, 0xf9, + 0x52, 0x25, 0x6c, 0x12, 0x8f, 0x98, 0x04, 0xb4, 0x10, 0x50, 0x75, 0x91, 0x4d, 0xe8, 0xe4, 0xcd, + 0xab, 0xc9, 0x1d, 0xc4, 0x63, 0x9e, 0x99, 0x06, 0x8e, 0xf3, 0x37, 0x7f, 0x3e, 0x95, 0x8a, 0x06, + 0x0b, 0x0d, 0xf4, 0x29, 0x5c, 0x9d, 0x69, 0x7b, 0x21, 0xf2, 0x2e, 0x5c, 0xa9, 0xb6, 0xbf, 0xd0, + 0x3a, 0x74, 0x01, 0x5c, 0x21, 0x8e, 0x78, 0x2a, 0xd8, 0x20, 0x9b, 0xb7, 0x0e, 0xf6, 0x06, 0xee, + 0xcb, 0x73, 0x16, 0xb2, 0xf9, 0xfb, 0x62, 0xaf, 0x83, 0x76, 0x32, 0xfa, 0xf3, 0xa9, 0xdc, 0xfe, + 0xa6, 0x81, 0x9e, 0x5f, 0x54, 0xb2, 0x07, 0x3a, 0x5e, 0xd5, 0x15, 0x67, 0xf6, 0x7c, 0x5b, 0x46, + 0xe1, 0xb0, 0x6f, 0x7f, 0xfa, 0xfe, 0xe3, 0x8b, 0xb6, 0x4a, 0xae, 0xe1, 0xed, 0x9f, 0x6c, 0xf5, + 0xf3, 0x9b, 0xda, 0x0f, 0x73, 0xda, 0x0e, 0x34, 0x0e, 0x12, 0x96, 0x6f, 0xad, 0x51, 0xdc, 0x41, + 0x0b, 0x2f, 0xaf, 0xbd, 0x8e, 0x2c, 0xd3, 0x5e, 0x9d, 0x61, 0x0d, 0x10, 0xbd, 0x5b, 0xdb, 0x24, + 0x2e, 0x34, 0xd4, 0xc2, 0x43, 0xb9, 0x33, 0x8a, 0x7b, 0x1f, 0xb9, 0x1b, 0xb6, 0x35, 0xc3, 0xfd, + 0x90, 0xb7, 0xf6, 0xb1, 0x3f, 0x46, 0xa4, 0x4c, 0xd1, 0x9c, 0xaa, 0xd4, 0x76, 0x4a, 0xc9, 0x54, + 0x92, 0x7b, 0x98, 0xe4, 0x2e, 0xb9, 0x33, 0x2f, 0x49, 0xa0, 0x78, 0x7b, 0xd0, 0x50, 0x32, 0x62, + 0x15, 0xf2, 0x6d, 0xd5, 0x9d, 0x93, 0x91, 0x6d, 0x23, 0x7f, 0x6d, 0x73, 0x6e, 0x11, 0x3e, 0x02, + 0xcf, 0x1b, 0xf8, 0xef, 0xf7, 0xf0, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x99, 0x9f, 0xef, 0x71, + 0x28, 0x07, 0x00, 0x00, } diff --git a/svc/proto/svc.pb.gw.go b/svc/proto/svc.pb.gw.go index 62fba24..baa29c8 100644 --- a/svc/proto/svc.pb.gw.go +++ b/svc/proto/svc.pb.gw.go @@ -44,15 +44,11 @@ func request_Apps_List_0(ctx context.Context, marshaler runtime.Marshaler, clien } -var ( - filter_Apps_Create_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) - func request_Apps_Create_0(ctx context.Context, marshaler runtime.Marshaler, client AppsClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq Manifest var metadata runtime.ServerMetadata - if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_Apps_Create_0); err != nil { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil { return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } @@ -61,14 +57,14 @@ func request_Apps_Create_0(ctx context.Context, marshaler runtime.Marshaler, cli } -var ( - filter_Apps_Update_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} -) - func request_Apps_Update_0(ctx context.Context, marshaler runtime.Marshaler, client AppsClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq AppUpdate var metadata runtime.ServerMetadata + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil { + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) + } + var ( val string ok bool @@ -87,10 +83,6 @@ func request_Apps_Update_0(ctx context.Context, marshaler runtime.Marshaler, cli return nil, metadata, err } - if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_Apps_Update_0); err != nil { - return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) - } - msg, err := client.Update(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err diff --git a/svc/proto/svc.proto b/svc/proto/svc.proto index 638efe0..b40f867 100644 --- a/svc/proto/svc.proto +++ b/svc/proto/svc.proto @@ -13,12 +13,14 @@ service Apps { rpc Create(Manifest) returns (App) { option (google.api.http) = { post: "/api/v1/apps/create" + body: "*" }; } rpc Update(AppUpdate) returns (App) { option (google.api.http) = { post: "/api/v1/apps/{name}/update" + body: "*" }; } diff --git a/svc/proto/svc.swagger.json b/svc/proto/svc.swagger.json index bc9839e..cfdad7b 100644 --- a/svc/proto/svc.swagger.json +++ b/svc/proto/svc.swagger.json @@ -26,6 +26,16 @@ } } }, + "parameters": [ + { + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Manifest" + } + } + ], "tags": [ "Apps" ] @@ -133,6 +143,14 @@ "in": "path", "required": true, "type": "string" + }, + { + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/AppUpdate" + } } ], "tags": [ |
