From cb3cc56a97b80eb7f45f8a5aeebd6c6cda0020c6 Mon Sep 17 00:00:00 2001 From: Joshua Rubin Date: Tue, 27 Feb 2018 10:16:19 -0700 Subject: [PATCH 1/5] allow server-timing response header Signed-off-by: Joshua Rubin --- graphql_relay.go | 1 + 1 file changed, 1 insertion(+) diff --git a/graphql_relay.go b/graphql_relay.go index b5f65c6..9a28ad9 100644 --- a/graphql_relay.go +++ b/graphql_relay.go @@ -79,6 +79,7 @@ var incomingHeaders = map[string]string{ var outgoingHeaders = map[string]string{ "zvelo-trace-id": "zvelo-trace-id", + "server-timing": "server-timing", "content-type": "", "trailer": "", } From a51bc156e98a0b4e48afdf6a8ce9afeeb033efe4 Mon Sep 17 00:00:00 2001 From: Joshua Rubin Date: Tue, 27 Feb 2018 10:42:56 -0700 Subject: [PATCH 2/5] status.Convert to keep in line with upstream grpc Signed-off-by: Joshua Rubin --- Gopkg.lock | 2 +- Gopkg.toml | 2 +- status/status.go | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 63e527f..0997861 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -301,6 +301,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "3e34fa2bb5e3ab127ad478ea5f6ae62dc37766a7c2bda541dc17cb3d354f2a60" + inputs-digest = "3ee9e826d4b37c178559af5047f57774d7050dd81658aac176215830cd7f61fe" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 578ea02..89d1d24 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -34,7 +34,7 @@ [[constraint]] name = "google.golang.org/grpc" - version = "1.9.2" + version = "1.10.0" [[constraint]] name = "zvelo.io/zmage" diff --git a/status/status.go b/status/status.go index 3e9da48..e47b404 100644 --- a/status/status.go +++ b/status/status.go @@ -87,3 +87,10 @@ func FromError(err error) (s *Status, ok bool) { return New(st.Code(), st.Message()), true } + +// Convert is a convenience function which removes the need to handle the +// boolean return value from FromError. +func Convert(err error) *Status { + s, _ := FromError(err) + return s +} From 106785e9c7cba1f3a7391a4d5521706eb0ba1313 Mon Sep 17 00:00:00 2001 From: Joshua Rubin Date: Tue, 27 Feb 2018 16:42:59 -0700 Subject: [PATCH 3/5] update zmage Signed-off-by: Joshua Rubin --- Gopkg.lock | 12 ++++++------ Gopkg.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 0997861..2108060 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -245,7 +245,7 @@ "googleapis/api/annotations", "googleapis/rpc/status" ] - revision = "2b5a72b8730b0b16380010cfe5286c42108d88e7" + revision = "2d9486acae19cf9bd0c093d7dc236a323726a9e4" [[projects]] name = "google.golang.org/grpc" @@ -287,20 +287,20 @@ revision = "3f83fa5005286a7fe593b055f0d7771a7dce4655" [[projects]] - branch = "v2" name = "gopkg.in/yaml.v2" packages = ["."] - revision = "d670f9405373e636a5a2765eea47fac0c9bc91a4" + revision = "7f97868eec74b32b0982dd158a51a446d1da7eb5" + version = "v2.1.1" [[projects]] name = "zvelo.io/zmage" packages = ["."] - revision = "86e17aad4ef99a18e0c0a3aacf02b5de4aea48ce" - version = "v3.0.1" + revision = "335cf1990ad2938db95ade8a60ed8c3e8597d47a" + version = "v3.1.0" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "3ee9e826d4b37c178559af5047f57774d7050dd81658aac176215830cd7f61fe" + inputs-digest = "7ed8cc523c62399f8c157e6229402dded0a5b1e3e673102ce23ec005300a200f" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 89d1d24..fd25d2e 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -38,4 +38,4 @@ [[constraint]] name = "zvelo.io/zmage" - version = "3.0.1" + version = "3.1.0" From 43aa15ce0c6504c693500b7ea176e23c78581119 Mon Sep 17 00:00:00 2001 From: Joshua Rubin Date: Tue, 27 Feb 2018 17:06:15 -0700 Subject: [PATCH 4/5] add protoset target to mage Signed-off-by: Joshua Rubin --- Gopkg.lock | 6 +++--- Gopkg.toml | 2 +- apiv1.protoset | Bin 0 -> 19031 bytes internal/static/static.go | 4 ++-- magefile.go | 8 +++++++- 5 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 apiv1.protoset diff --git a/Gopkg.lock b/Gopkg.lock index 2108060..f5b8c8a 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -295,12 +295,12 @@ [[projects]] name = "zvelo.io/zmage" packages = ["."] - revision = "335cf1990ad2938db95ade8a60ed8c3e8597d47a" - version = "v3.1.0" + revision = "08a6854872f37a26ef1ef6c90b60d0ce16aaff2a" + version = "v3.2.0" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "7ed8cc523c62399f8c157e6229402dded0a5b1e3e673102ce23ec005300a200f" + inputs-digest = "788d505173db928d7c02831d762f74dc0b86d61998c521a3f0a70aca9441985d" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index fd25d2e..fc72620 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -38,4 +38,4 @@ [[constraint]] name = "zvelo.io/zmage" - version = "3.1.0" + version = "3.2.0" diff --git a/apiv1.protoset b/apiv1.protoset new file mode 100644 index 0000000000000000000000000000000000000000..41d5c5d397c655087571338b0c01f184c597031a GIT binary patch literal 19031 zcmc&+dw642wYQzN)9#i|=F9-KzA!#O)Q%Jd9lYLqlAI)Gn&f0ol6E@ZcfZ_Bd!|!p zliH+%!@c+We81oLKtxnfKzyO{5Jg3NqoRl}6cqsl@%_g4{jJ~LIZ2yT=6>JR%OCS) zuf1M-?X}lhd+k%yy-!tR=Nt}}YP*)}3%lkjjbNd+dSqf{wbrOvL!6nw%*mHORSm|? zthG}`O1Y_=H^r|fJjlihd zD<#~b%%7(@dAhmQr5$|;(*KknlK}N8sm?e@&1CB6wx0euUN^=i0aqVXi4l@ zq3DY7N zb&9s^(`U7H((sBnhM#NdhodDL-KeeQ6kXp*ds*4Y&r``l+Rf+n>G}czu~GrPSrF&@ zBK6t>*H29A<9ZX>zK3|;-})S&2O;$AjeD#}8>K@^-wh!M5FsWqaK7~ZON zPGf6qEKVrCMJ?jKn=MSa88P3t$s-Mi)>_;~OT)_r{X4XD!Y`$S{dc(`c~7?ed&Y%) zXFo=_>$8$5#nX;0)8E%7b~4Gd?PmeFgJR(HzLOJ#J1IsK!Qd_q>>S5iG-m4ikzH8>GV@3G5j?xU?&il z00ZDRWQXXM#+gNq0O+^Gfd|fSdy=nwCyD9j5Vw$b8$p$*LjlOr%pqz)2HF}nhl4JBc5ZE%i)re<2xFjRco5>+*7t*<` zTM&c2g(Q2N87D)JeJe={Gl(B0R}69y5rjk+Iu~nm#p8_BZ_{pK=fq9kPVTW3Jb4=F z0gy{Lo$(k>FV&pfoY~{cnqw1g-$C-UlSnzqQcis7azfl(p@cKaD&(D9aLE5%bW8-x zlASR$?33{q7E=0E)FYb_V{M5-0cwc_w`$^P?PQyqP59?Z-HDi)QwE z4)@q*_;C)i`^@kLeSVx2_wN&wHSMI3mwlI@Pnz>gZ9m0VwUmaMy^q!sP7hC*^SR@ghDZ$wK4pH9+ogEspX4g7jyF_i{3b~Lgi7R%BlS-w>z1Uc>gu- zW**LoI$bRPbpjHOjYPyM;~SKoKnP$V^GzBs;pAB|GZ)@UZ4pYiv~Ot!t{ro<_kP;| zaNL0d5w{WG787x%gW;}ee6w@@dK{J&BY~P>y!CI8q&=r;i}LM{O%?s>*PXX-$QZ8 zW8%6$B1c@H(h{8S)n1X?he=u2k2#B!;>w=?grVD)^Y~MW&ZlRKP}|N6?$0!CVU|_b z&nebUB;2^UoBe_dEBK)vza$DSK?ocA&h#s?C}bQ*3h-ZZelG%GA?r=aT7E+o({2$# zp4Xq>YM!&Xgs*GP-*ExO^sMi(Jp4WNoN?S#x|s3k4)>95(#eL3{DIpM4*#f);1^9P z{wE5-S%~{KYwM(@%b4pYX5`ueP5(-k`O^OV+=RcG4bLH;VfLAMNla4F z;O;4aXXPdF0#Nkmkk8IbzDAWtjh~}OZi)r!b2ToC7bh+|_&h!9W$7)?&r8LS@a-8) zy?|3QIKm?2g?UM$DF+ur6mYU-FCwda3D;j1F)z+b)sTY4Dd{D7DLABB@trt)9~3Vo zMjmA=v-Zo#GHXvc%w0fuIYnme6t#H;IpiD%>o&G}B@yHxi}J6cC0IkIS>C^z(-$u#4ll2n3L%*GyZq&GhYRjS| zY+p)lh_!{hE-5b~Zqb{S*>`Xtvlv`XZ4(H&tWw@dAqjUHH)wI6cX8S&rgPldcaw3} z_K}2GtGphI%jP9CUqiyIoiWz&Cd&_zCCnoE>%$}~ z3B{72-!2NkJi zcQ03x;W_^?HIq&r5Pw24#0IkbDWyV5H>K|xKht``+q|qq!Jlg@pzGwB9P$gjZnP+M zPWdG_8Yk7x3Bj+7+71qZZdLu7kd))096|vBoZpZIAcnmZmL55+*?q)7XH+T@VEln&qzh9S{ZVt6%wvOOOa8<$3@phI<3Hp0BWNQtuBucv%3Gn+;KRydwVkt{Qe(r+LNJHlFr^EHZ(_G3XC4kZy1RjfWN|dlzrgqf&|$!G(KSoRs7|zgcgyzE8e|k_x!n7-PJZbcJ{+CS~+R z+Dl}qF%Pu?Ko^r0dWHD?HY!oTLq~J=?PQ)VG3s2RCF$sWsUDzD0K&^CR(h@QS#jxi z&_*cLa=gJ^PPx-kIL;cIyp!}Zc1B$1U8F|^>-buecat7XJAG|?j~?ccXvD(rB|9Es znEX^(#uZeZNx&5S?=uiIyj{N}WbZfbh$a_CA0W>-{Kgm4TuBuW`124cyMC2+R{(TN z=V}T?&)&_;#Y2wFH3SKb@1Pkab?*ns29=C0M+<;!$p%;WDHOXHe<&QI0>t>k980~g zL;H1lqn*4bDu0CRnkxn1quj2Cnak+t^W<2-D6M7YCl2E zWq>-?W#j9U6pW)^l3UiNC?{)6{QoqO@w-sU%N79i85%F^#q>?@vl=^pDyBZiDaed7 zeBIa_#vHNw=bJ;V@)tNn`$PBOzeqm$gs6BE_b=Zj^hJso~E?2a( zV=UvoLgeYZ9Fbc%iJ;+_TH~vP(VOL$|)LSXcEr@2{BK8b&qsLC>w<*h9=x)HFN9SRz#n3GN^P8n7YcPOhIEG|#)J6MSD3{sA>W zO^fFy41Y*+#5OmEd#0H0ZjIohEhQd(4@EjQ+9f5_7y|kcF~Z@!9HQFQx0N4rh<8GV zndc`okTj8I_}ckXIv#rYT<*^}!Zk3%q|ebF)IOrfFUTnC>~r~C`Acdl<*3xea$J5z z)pGVU>Om6*e$BNP@eTank^?Vh!UB-r5rS(;XuRKR<4uKt`=~`Y{KMYZ z=>8G?a=gfAnQslK_|d@$B?LeEM4K7U(d zYU^@PuU8g=v0i|O{N`{|p|=jG<6BbaD~(D$Xmp4j-}DuHd=s6c7xt^I39u^!4a-%d z=Iwm(oJwP{R;ALzlMkN=pU@`^?u2SO&_tHGs8bzx0xIY@#Bbs@+Y6hA~BUs0p$*I+$H z^&hS*tp#ISPS|qN=;V$zKFyB?e2rn9sQQD|)!OP-jx>gFTU6{M#GZ zGM-X{O+D6m#gOrekg52@@Z_dU$6wK-hC<7=bkWP-l+4;!85`Psi6K(E^7y?a z(uaThBK`QcKQe%S2O?YX@7BoRxUKqRPf%-aSzBGA+YI^gv!&hrEDDTZBmCPg2CPp` zt6}4F#Um>L3^!`N)^PVT8sM9aV_*(M(YWiC3Xwi*5X#`qEYgoUcCh*Q71_G!*?Qif zI<|GTp1u}z`E+D_v(vZf!8%zD`2m>K8*ajSh*GP1P+puj<{2^&cRu>E9yPpI{uepPQ;t_O$NSZ-HKd@rEGlgG9ht);r()Joi7uClarpfYzB7E3p1 zj;$xCtybIe?Hn!iU1KkLyd$I z7K1ucM*nI6VKC>$MTdAte2ued9JsirJ;&D978Y=LJ9F%2ksz8;s-TH*rdoRwdiCR4 z=G4Kk+v#YUa#Jm@?^DMv)M^V$!LG{6;;uuD#){EVY48NV(Mi>p#*B3`470Wr)Qw?w zPPA|)1i{B7>>?=9t9sR76DEF950-+t29lhVE(j0JF=FtRg`lBJm-GXC83=4;t)X2= zU>Lxm`&Mf8hCT=Ya)c8yFb~cMZBiEu0dB_DajJi%f{4Y;FB5u*96vC(R&UgnO@@C+ z`zqp`5xw)3Mk83Q3PX)9S@u9}{s@B+vaI~J9JQk|Kffq(ud-A=uvnd6tS;2YhUqxn z?PIkFVg^4pq_#p=kq2ko-l2quJ`1?UcKj_c&>S)~AAiTrM9o!OZd*`nh-;Bg7xO*) zZL?nsHK}qYYO4#o7J@1((Or59yIrRzRI1e)N=~e+en#8x`+9mV>g`L}c{i+JZ`iF) z(8RmQ>A>2-UGqVGZgp`5+ikpQn~~hah-TIHf~dB$`-H zk(X8Zq=??tr*?Fi6(dzE%R292&*ZlR)fEJ&wtCqNt%oW#AFKq``Jg&?gwcA)Z-XE( zY+qSBfI_s~hNiIB{eDDGBtmk8qHSjfm9yGW#Vz{%Q31Ch#?^?a-^&feKRCEVofA4% z-?Ein`LLm4C1b0hpt`oKIY@jRp6s-r1B{Ja28GP9*jf)(4=>III5NWE#10h-dVV91 zCY=?B7SBK$tVSAZ8{)4hg98NLhQQAP$tT&?GiKArDW<*;JSCMdndF>H$2{{^{QktmKrLlSddqND$%j_u0Y+NXA|RToh`udb{jk51^pfC zSZLtMLxcBhjXV?o^+wMdP&>N?p039i#~(rQ04sL6=$MgZtNx|RfnbR>$mrx_J8aiY z!bC<$d`)RRP4zLzOSLjOdGgV5kmKl+&U%m<5_;_$($hdGB>?dYDYJM?=7VM{C>&dG ztoh(z1sAZg?n{Wn!?6r-T6z`M!_=@oRVX%sXE1v9`}&}{0uk|N)@#+KYf`)bDE{=8 zbLs9uSX#AZa74w8J{7&X7vEfB5qN(ZF3zG|nDFq`hZE_+Ymg!!iSGl8k=}5OruAu0 zjBE)BN*d7Dj&SNEF6|LDq8YgRoCHV))wfhus+3O+&4%g3wW}vw{#7 z80XJcz8Kal>sN=dCp5=z3SMm%)2Uz9@t_PS5aM3ncf2-3|?Iy%N5E9w;rxW&a51+l$&=YeQzHYSYBVBAY>;|u*P7uJhxP-*IBdZ=9?vRo=nA? zGuD&T4pJ;54=ti4S(f`=oh`Xgv+aVBH3*_n9o61LNQT>Lu!=vqE2I61b(bsE`SPJk z{m|G>Sz4@jtjB+#Af^nSLo~ZOp9T`15so7l*boLR&m9Wp&ML1p4nBG8LG6~IhOi58 z;(}5FhE-4_HC#BB7tevt=wislVzf(WYO~;kSW*bGxMu9`$KO8SkL`w=T#~g_X=W|d zLIV$j<&ZzLP-~hO#+sWebIrJN%6{Q)Rv(MBE4zJej*DHKGd^C&c{sLZtaiff?Sx$A zMp8&zInpW7YA4*ja%3af>1yZ7p_NX$liTSmpll?36ffMXfxINlj~(BRF86LTfwzVT z3=vc-2jDT4Rs5)rJ**vhbZ*Y!tj$R@smRX zT`meT!IT4|g+7L8BLKD}{=;hH=x#OA?w|Ox7ww@a98eF%@l8p&fIrYd&43aL&)!bi z$0r_c)`@IstEWHQNq){(_o?h zGXoqP3!qpT^{{G98ur!s%IZ8WdCh)OxiW_{P{#?B_#1M0aJ7b(J&{{!!ZxVZdN-56 z91^y>8H(HG$_o4pEqHeM@KOQ*Tk`*uTMDc>7#YI9@~&{l7B#~AglrSqaB};YlTx2| zywS-=bR>^+vAhR{zSa505srv&(otM`YEmp$M`Ca(w{~2mVFX&ODCL?!O@8SQi>fPR}j#*c0ZrI~ZwR^hSzBnH&uhh`xojX!q3h+Nl z7>hD!boTVtNtke3bQvMry#s%AnZ;ic;~Uu7viZL!_>ngDMEeIG`@D*5RLVMDbyEu` zdxzSV^Nq#6~$ZU&DJyU{sLY(c=$mm}V#yldiV4meO<@@rN}`qu`ySvaql! zVw;Tg{b4i&6LEYG{`VHf4$_B`!U?rAd!D^0>;?rOMv^jZv0i2;j1LjLC-j~)=npT} z!~SFRQWPxf-vDsO2tQdc4^Ss{?9F!l{@Gr z?C@F9Z(}gNjQ>wcIJ2qQkf-!J4R4LiQ@CJjkleeZO>!VuSgg`$=z?>A?9DE?7)N)( zWBBB02iCuFdt;GS?Z_v#db(%-(-syRht>{E03UCp@^0FC=44xQ?(qvj_3;a}wnxu1 zTJpge@($m!ZS!luw&(cq?l1P^ z_xlRFdrI{kl6U<3={t;FapQFo(uXIzzhIL|tlII`9BJ)gos0ZGd2-(P-h54udeFxA zW+bFW^Z(G(@zlIk^*b^jJKTNO6=$0YpZNFoTT0~mE=p_L*oSW1*qLByX{uT~yDDXJ zJ$xzu)0Xy6!?4eXPchHqt^cdgc=wOT+P@fE_btiz-*ubuzh|k*TY6PLUh)s0V&zpo zzihF_+CK0x-?}_qzB;Rqw|_Yqeg%WCWuiNueal_v_Krq}b{#%t7m!zv?Cv?)npOko zg`$aL?QCNie#182{_&4tC)m-4lG~VdT*z(Lf3`k$`)_Ev)qECXwSSD%`cwv-wRdRK u$~oiyMvo)sNOV{@8ykwIIr+F&nrhZ2l$+{mk>iM^$dNpr(6ia6Hva=;cvsE< literal 0 HcmV?d00001 diff --git a/internal/static/static.go b/internal/static/static.go index f650045..34327ec 100644 --- a/internal/static/static.go +++ b/internal/static/static.go @@ -193,7 +193,7 @@ var _escData = map[string]*_escFile{ "/apiv1.swagger.json": { local: "apiv1.swagger.json", size: 19568, - modtime: 1518805807, + modtime: 1519776208, compressed: ` H4sIAAAAAAAC/9xcX5PbNpJ/z6dA6e5ht8qZiZ2rXJXv5UAQJGGRBAOA0sjrlENLmBE3GlIhKXsnrvnu VyA1M1I3558T723WT54m/jS6G92/bgD6/A0hk2VdtbtL205ek799Qwghk2K73ZTLoivr6vTvbV1NviHk @@ -275,7 +275,7 @@ jn8ux2m453j4xRHi7/OtCf6phG+u/y8AAP//ZNIRpnBMAAA= "/schema.graphql": { local: "schema.graphql", size: 7059, - modtime: 1518805807, + modtime: 1519753039, compressed: ` H4sIAAAAAAAC/5RY3W/cNhJ/379CeWuBvrQ99AC/jciRNF6KZPih9booij13LwnOsVN7XSBX9H8/SJyh lDS9wz2JnzPD+frN6Pnu7fn9qfl91zS/vpyfPl414Om3b3d/7HaXjx/OZbZu56f7r16e7q+aeHl69/Dm diff --git a/magefile.go b/magefile.go index dd0f827..edbb152 100644 --- a/magefile.go +++ b/magefile.go @@ -36,6 +36,12 @@ func ProtoGRPCGateway(ctx context.Context) error { return err } +// Protoset generates .protoset files from .proto files +func Protoset(ctx context.Context) error { + _, err := zmage.Protoset("apiv1.proto") + return err +} + // Swagger generates .swagger.json files from .proto files func ProtoSwagger(ctx context.Context) error { files, err := zmage.ProtoSwagger() @@ -79,7 +85,7 @@ func Static(ctx context.Context) error { // Generate all necessary files func Generate(ctx context.Context) error { - mg.CtxDeps(ctx, CheckImports, ProtoGo, ProtoPython, ProtoGRPCGateway, ProtoSwagger, Static) + mg.CtxDeps(ctx, CheckImports, ProtoGo, ProtoPython, ProtoGRPCGateway, ProtoSwagger, Protoset, Static) return nil } From f1ee3a7309ba2e00a9f17e403a2dc3f5ec7522b2 Mon Sep 17 00:00:00 2001 From: Joshua Rubin Date: Tue, 27 Feb 2018 17:08:05 -0700 Subject: [PATCH 5/5] lint fix Signed-off-by: Joshua Rubin --- mock/request.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mock/request.go b/mock/request.go index 9ef4ee4..1ec4fb7 100644 --- a/mock/request.go +++ b/mock/request.go @@ -185,7 +185,7 @@ func parseOpts(ctx context.Context, url string, content bool, ds []msg.DataSetTy } for _, t := range ds { - switch msg.DataSetType(t) { + switch t { case msg.CATEGORIZATION: if r.ResponseDataset == nil { r.ResponseDataset = &msg.DataSet{}