Upgrade gizmo, encoding-wrapper and related deps

go.mod

@@ -1,21 +1,19 @@
 module github.com/NYTimes/video-transcoding-api
 
 require (
-	github.com/NYTimes/encoding-wrapper/elementalconductor v0.0.0-20190102034147-271caccac2db
-	github.com/NYTimes/encoding-wrapper/encodingcom v0.0.0-20190102034147-271caccac2db
-	github.com/NYTimes/gizmo v1.0.0
-	github.com/NYTimes/gziphandler v1.0.1
-	github.com/aws/aws-sdk-go v1.16.26
+	github.com/NYTimes/encoding-wrapper v0.2.0
+	github.com/NYTimes/gizmo v1.2.1
+	github.com/NYTimes/gziphandler v1.1.1
+	github.com/aws/aws-sdk-go v1.17.4
 	github.com/bitmovin/bitmovin-go v1.26.0
 	github.com/flavioribeiro/zencoder v0.0.0-20161215190743-745874544382
-	github.com/fsouza/ctxlogger v1.4.0
+	github.com/fsouza/ctxlogger v1.5.1
 	github.com/fsouza/gizmo-stackdriver-logging v1.2.0
 	github.com/go-redis/redis v6.15.1+incompatible
 	github.com/google/go-cmp v0.2.0
-	github.com/google/gops v0.3.5
+	github.com/google/gops v0.3.6
 	github.com/gorilla/handlers v1.4.0
 	github.com/hybrik/hybrik-sdk-go v0.0.0-20170516091026-c2eee0e66af9
-	github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
 	github.com/kelseyhightower/envconfig v1.3.0
 	github.com/kr/pretty v0.1.0
 	github.com/onsi/ginkgo v1.7.0 // indirect

go.sum

@@ -17,23 +17,26 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/DataDog/zstd v1.3.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
 github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4 h1:vdT7QwBhJJEVNFMBNhRSFDRCB6O16T28VhvqRgqFyn8=
 github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4/go.mod h1:SvXOG8ElV28oAiG9zv91SDe5+9PfIr7PPccpr8YyXNs=
-github.com/NYTimes/encoding-wrapper/elementalconductor v0.0.0-20190102034147-271caccac2db h1:eoLvPOPECghQEmK+ZrJj01VNvlQeo0qUW4bgx5xnYyI=
-github.com/NYTimes/encoding-wrapper/elementalconductor v0.0.0-20190102034147-271caccac2db/go.mod h1:BdGsGSUNBRD6LP3s7au2Y31mwVOCp8z5Ye7QfT9YftM=
-github.com/NYTimes/encoding-wrapper/encodingcom v0.0.0-20190102034147-271caccac2db h1:P2WGWow/Omj6874oxTgVB0JD7ylbQDt4Yl4JqgA54oM=
-github.com/NYTimes/encoding-wrapper/encodingcom v0.0.0-20190102034147-271caccac2db/go.mod h1:xKied8LSyasAWRmvYEWFmZ3Fa2ei2qLSuW3gX/HjlE8=
-github.com/NYTimes/gizmo v1.0.0 h1:YOCKccliVETkXeWZCsy/OOZfU+ZWB40G3tp3CxKCNTU=
-github.com/NYTimes/gizmo v1.0.0/go.mod h1:2ztG7bjubqWNqnLHemuj37sV7ejgbUKUuB18+bbdEzs=
+github.com/NYTimes/encoding-wrapper v0.2.0 h1:vROHVfKOacKZraOpJ+4M+gQUJzhSm8wIm92f7AFaamQ=
+github.com/NYTimes/encoding-wrapper v0.2.0/go.mod h1:ZwppWY1bsnSUXy9aw0RblcC6mXvCwDD+qji7zqvoi2U=
+github.com/NYTimes/gizmo v1.2.1 h1:Lm6XvUm2mQd5m7KANEXF/weIBWky/D+7OD5T2RF9POM=
+github.com/NYTimes/gizmo v1.2.1/go.mod h1:pNMui/oI463y5GySVLSDVlZNZIKkX2Bj5orGO5QIVDs=
 github.com/NYTimes/gziphandler v1.0.1 h1:iLrQrdwjDd52kHDA5op2UBJFjmOb9g+7scBan4RN8F0=
 github.com/NYTimes/gziphandler v1.0.1/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
+github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/NYTimes/logrotate v0.0.0-20170824154650-2b6e866fd507 h1:S0NXkQpfmcwUz5kHr2G8fqepsknsnNr9j6uQqdTYEck=
 github.com/NYTimes/logrotate v0.0.0-20170824154650-2b6e866fd507/go.mod h1:nY7g3XV/OVxvEUGniTjBf6DFoeHz7sRl8yv/ocNx9y4=
 github.com/NYTimes/sqliface v0.0.0-20180310195202-f8e6c8b78d37/go.mod h1:kyL8Cd2vQCEDjsCaFWSARXwRfyQfXv9/mHvr59mHxD8=
 github.com/Shopify/sarama v1.20.1/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
+github.com/StackExchange/wmi v0.0.0-20170410192909-ea383cf3ba6e/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/aws/aws-sdk-go v1.15.31/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.16.26 h1:GWkl3rkRO/JGRTWoLLIqwf7AWC4/W/1hMOUZqmX0js4=
 github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
+github.com/aws/aws-sdk-go v1.17.4 h1:L2KFocQhg48kIzEAV98SnSz3nmIZ3UDFP+vU647KO3c=
+github.com/aws/aws-sdk-go v1.17.4/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/bitmovin/bitmovin-go v1.26.0 h1:fO7w346yca6X8Eatuo+/S6npZSkvGiIMXFHOdd5bC0Y=
@@ -46,6 +49,7 @@ github.com/census-instrumentation/opencensus-proto v0.1.0-0.20181214143942-ba49f
 github.com/census-instrumentation/opencensus-proto v0.1.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@@ -61,8 +65,8 @@ github.com/fluent/fluent-logger-golang v1.4.0/go.mod h1:2/HCT/jTy78yGyeNGQLGQsjF
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsouza/ctxlogger v1.4.0 h1:IHEE3CeFu+j4gNjgnK3G/i23PKlMwIdL3Sgk/6YdVt4=
-github.com/fsouza/ctxlogger v1.4.0/go.mod h1:P6r0GdTN3jIXf1CNLtUY4MhAOLiXQ/OBR0lD/jmXm+k=
+github.com/fsouza/ctxlogger v1.5.1 h1:XH14oePBsxscydpyXQeavwpFkJJ2SnUYsjtafk/O6CM=
+github.com/fsouza/ctxlogger v1.5.1/go.mod h1:wNe/FBzeaYyuOXi+TiAffuYTmSxiv7iGvahUhonaEAU=
 github.com/fsouza/gizmo-stackdriver-logging v1.2.0 h1:R1HpbIIXURfDtrFxbvEgjtCy56w8kXbkh2TiKdD14io=
 github.com/fsouza/gizmo-stackdriver-logging v1.2.0/go.mod h1:D6a1ovdGlRu5GYcGzshfagnV9E1t21yLETHYwuZ/fGk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -72,6 +76,7 @@ github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
 github.com/go-redis/redis v6.15.1+incompatible h1:BZ9s4/vHrIqwOb0OPtTQ5uABxETJ3NRuUNoSUurnkew=
 github.com/go-redis/redis v6.15.1+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
@@ -92,8 +97,8 @@ github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
-github.com/google/gops v0.3.5 h1:SIWvPLiYvy5vMwjxB3rVFTE4QBhUFj2KKWr3Xm7CKhw=
-github.com/google/gops v0.3.5/go.mod h1:pMQgrscwEK/aUSW1IFSaBPbJX82FPHWaSoJw1axQfD0=
+github.com/google/gops v0.3.6 h1:6akvbMlpZrEYOuoebn2kR+ZJekbZqJ28fJXTs84+8to=
+github.com/google/gops v0.3.6/go.mod h1:RZ1rH95wsAGX4vMWKmqBOIWynmWisBf4QFdgT/k/xOI=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
@@ -119,12 +124,12 @@ github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Ao
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=
 github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/kelseyhightower/envconfig v1.3.0 h1:IvRS4f2VcIQy6j4ORGIf9145T/AsUB+oY8LyvN8BXNM=
 github.com/kelseyhightower/envconfig v1.3.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
+github.com/keybase/go-ps v0.0.0-20161005175911-668c8856d999 h1:2d+FLQbz4xRTi36DO1qYNUwfORax9XcQ0jhbO81Vago=
+github.com/keybase/go-ps v0.0.0-20161005175911-668c8856d999/go.mod h1:hY+WOq6m2FpbvyrI93sMaypsttvaIL5nhVR92dTMUcQ=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/knq/jwt v0.0.0-20180925223530-fc44a4704737 h1:1xIW/VaRuKqTia61AXVrIFt2wDeIgXyVmSFU6wX1cx4=
 github.com/knq/jwt v0.0.0-20180925223530-fc44a4704737/go.mod h1:H6bRgq8JMACag/WS+QyO3B00Hx9JZTF/zUHxNhzkxqo=
@@ -183,6 +188,9 @@ github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7 h1:80VN+vGkqM773Br/uNNTSheo3KatTgV8IpjIKjvVLng=
+github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
 github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
 github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
 github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0=
@@ -212,12 +220,17 @@ github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME
 github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
 github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
 github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU=
 github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
+github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6 h1:YdYsPAZ2pC6Tow/nPZOPQ96O3hm/ToAkGsPLzedXERk=
+github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
 go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
 go.opencensus.io v0.18.1-0.20181204023538-aab39bd6a98b/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
@@ -258,6 +271,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20171017063910-8dbc5d05d6ed/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs=
@@ -325,5 +339,7 @@ grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJd
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+rsc.io/goversion v1.0.0 h1:/IhXBiai89TyuerPquiZZ39IQkTfAUbZB2awsyYZ/2c=
+rsc.io/goversion v1.0.0/go.mod h1:Eih9y/uIBS3ulggl7KNJ09xGSLcuNaLgmvvqa07sgfo=
 sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
 sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=

main.go

@@ -20,9 +20,6 @@ func main() {
 	agent.Listen(agent.Options{})
 	defer agent.Close()
 	cfg := config.LoadConfig()
-	if cfg.Server.RouterType == "" {
-		cfg.Server.RouterType = "fast"
-	}
 	server.Init("video-transcoding-api", cfg.Server)
 	server.Log.Out = ioutil.Discard
 

service/preset_test.go

@@ -117,7 +117,7 @@ func TestNewPreset(t *testing.T) {
 
 	for _, test := range tests {
 		name := test.givenRequestData["preset"].(map[string]interface{})["name"].(string)
-		srvr := server.NewSimpleServer(&server.Config{RouterType: "fast"})
+		srvr := server.NewSimpleServer(&server.Config{})
 		fakeDB := dbtest.NewFakeRepository(false)
 		service, err := NewTranscodingService(&config.Config{Server: &server.Config{}}, logrus.New())
 		if err != nil {
@@ -193,7 +193,7 @@ func TestNewPresetWithExistentPresetMap(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	srvr := server.NewSimpleServer(&server.Config{RouterType: "fast"})
+	srvr := server.NewSimpleServer(&server.Config{})
 	service, err := NewTranscodingService(&config.Config{Server: &server.Config{}}, logrus.New())
 	if err != nil {
 		t.Fatal(err)
@@ -250,7 +250,7 @@ func TestDeletePreset(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		srvr := server.NewSimpleServer(&server.Config{RouterType: "fast"})
+		srvr := server.NewSimpleServer(&server.Config{})
 		fakeDB := dbtest.NewFakeRepository(false)
 		fakeProviderMapping := make(map[string]string)
 		fakeProviderMapping["fake"] = "presetID_here"

service/presetmap_test.go

@@ -132,7 +132,7 @@ func TestNewPresetMap(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		srvr := server.NewSimpleServer(&server.Config{RouterType: "fast"})
+		srvr := server.NewSimpleServer(&server.Config{})
 		fakeDB := dbtest.NewFakeRepository(test.givenTriggerDBError)
 		fakeDB.CreatePresetMap(&db.PresetMap{Name: "abc-321"})
 		service, err := NewTranscodingService(&config.Config{Server: &server.Config{}}, logrus.New())
@@ -190,7 +190,7 @@ func TestGetPresetMap(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		srvr := server.NewSimpleServer(&server.Config{RouterType: "fast"})
+		srvr := server.NewSimpleServer(&server.Config{})
 		fakeDB := dbtest.NewFakeRepository(false)
 		fakeDB.CreatePresetMap(&db.PresetMap{Name: "preset-1"})
 		service, err := NewTranscodingService(&config.Config{Server: &server.Config{}}, logrus.New())
@@ -259,7 +259,7 @@ func TestUpdatePresetMap(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		srvr := server.NewSimpleServer(&server.Config{RouterType: "fast"})
+		srvr := server.NewSimpleServer(&server.Config{})
 		fakeDB := dbtest.NewFakeRepository(false)
 		fakeDB.CreatePresetMap(&db.PresetMap{
 			Name: "preset-1",
@@ -317,7 +317,7 @@ func TestDeletePresetMap(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		srvr := server.NewSimpleServer(&server.Config{RouterType: "fast"})
+		srvr := server.NewSimpleServer(&server.Config{})
 		fakeDB := dbtest.NewFakeRepository(false)
 		fakeDB.CreatePresetMap(&db.PresetMap{Name: "preset-1"})
 		service, err := NewTranscodingService(&config.Config{Server: &server.Config{}}, logrus.New())
@@ -389,7 +389,7 @@ func TestListPresetMaps(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		srvr := server.NewSimpleServer(&server.Config{RouterType: "fast"})
+		srvr := server.NewSimpleServer(&server.Config{})
 		fakeDB := dbtest.NewFakeRepository(false)
 		for i := range test.givenPresetMaps {
 			fakeDB.CreatePresetMap(&test.givenPresetMaps[i])

service/provider_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 func TestListProviders(t *testing.T) {
-	srvr := server.NewSimpleServer(&server.Config{RouterType: "fast"})
+	srvr := server.NewSimpleServer(&server.Config{})
 	service, err := NewTranscodingService(&config.Config{Server: &server.Config{}}, logrus.New())
 	if err != nil {
 		t.Fatal(err)
@@ -67,7 +67,7 @@ func TestGetProvider(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		srvr := server.NewSimpleServer(&server.Config{RouterType: "fast"})
+		srvr := server.NewSimpleServer(&server.Config{})
 		service, err := NewTranscodingService(&config.Config{Server: &server.Config{}}, logrus.New())
 		if err != nil {
 			t.Fatal(err)

service/service.go

@@ -68,31 +68,31 @@ func (s *TranscodingService) JSONEndpoints() map[string]map[string]server.JSONEn
 		"/jobs": {
 			"POST": swagger.HandlerToJSONEndpoint(s.newTranscodeJob),
 		},
-		"/jobs/:jobId": {
+		"/jobs/{jobId}": {
 			"GET": swagger.HandlerToJSONEndpoint(s.getTranscodeJob),
 		},
-		"/jobs/:jobId/cancel": {
+		"/jobs/{jobId}/cancel": {
 			"POST": swagger.HandlerToJSONEndpoint(s.cancelTranscodeJob),
 		},
 		"/presets": {
 			"POST": swagger.HandlerToJSONEndpoint(s.newPreset),
 		},
-		"/presets/:name": {
+		"/presets/{name}": {
 			"DELETE": swagger.HandlerToJSONEndpoint(s.deletePreset),
 		},
 		"/presetmaps": {
 			"POST": swagger.HandlerToJSONEndpoint(s.newPresetMap),
 			"GET":  swagger.HandlerToJSONEndpoint(s.listPresetMaps),
 		},
-		"/presetmaps/:name": {
+		"/presetmaps/{name}": {
 			"GET":    swagger.HandlerToJSONEndpoint(s.getPresetMap),
 			"PUT":    swagger.HandlerToJSONEndpoint(s.updatePresetMap),
 			"DELETE": swagger.HandlerToJSONEndpoint(s.deletePresetMap),
 		},
 		"/providers": {
 			"GET": swagger.HandlerToJSONEndpoint(s.listProviders),
 		},
-		"/providers/:name": {
+		"/providers/{name}": {
 			"GET": swagger.HandlerToJSONEndpoint(s.getProvider),
 		},
 	}