From b8db9c23816388a9169fa25fe97a260633dadac1 Mon Sep 17 00:00:00 2001 From: njharter Date: Thu, 25 Jan 2018 13:24:31 -0800 Subject: [PATCH 1/2] bumped webpa-common. updated webhook.NewFactory --- src/glide.yaml | 2 +- src/tr1d1um/tr1d1um.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/glide.yaml b/src/glide.yaml index 8d385185..5c753086 100644 --- a/src/glide.yaml +++ b/src/glide.yaml @@ -2,6 +2,6 @@ package: . homepage: https://github.com/Comcast/tr1d1um import: - package: github.com/Comcast/webpa-common - version: 77f04798b7e3f33770818d7490b5dc3210c1c926 + version: ff81f093033bfdf7c8d71b36697f9895026dc78b - package: github.com/go-ozzo/ozzo-validation version: v3.3 diff --git a/src/tr1d1um/tr1d1um.go b/src/tr1d1um/tr1d1um.go index e8ccfd7e..7ca1d9f3 100644 --- a/src/tr1d1um/tr1d1um.go +++ b/src/tr1d1um/tr1d1um.go @@ -154,7 +154,7 @@ func tr1d1um(arguments []string) (exitCode int) { //baseRouter is pre-configured with the api/v2 prefix path //root is the original router used by webHookFactory.Initialize() func ConfigureWebHooks(baseRouter *mux.Router, root *mux.Router, preHandler *alice.Chain, v *viper.Viper, logger log.Logger, registry xmetrics.Registry) (*webhook.Factory, int) { - webHookFactory, err := webhook.NewFactory(v, ®istry) + webHookFactory, err := webhook.NewFactory(v) if err != nil { fmt.Fprintf(os.Stderr, "Error creating new webHook factory: %s\n", err) From a7beb6c2cbd618e0f45068a66ba836fdcaef3333 Mon Sep 17 00:00:00 2001 From: njharter Date: Thu, 25 Jan 2018 13:40:36 -0800 Subject: [PATCH 2/2] adding missed glide.lock --- src/glide.lock | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/src/glide.lock b/src/glide.lock index 8f6c01b3..b560679f 100644 --- a/src/glide.lock +++ b/src/glide.lock @@ -1,5 +1,5 @@ -hash: 8a41616d777b84076ad6a0e742fb8e83cc83a0fa1e0b21561d39b47424526c10 -updated: 2018-01-24T23:25:14.079122-08:00 +hash: 714353a67b5d0840d640483a31b05330bb4cb30c75aebb380f01ad7b94f8d42e +updated: 2018-01-25T13:40:05.780887129-08:00 imports: - name: github.com/aws/aws-sdk-go version: 7be45195c3af1b54a609812f90c05a7e492e2491 @@ -38,7 +38,7 @@ imports: subpackages: - linux - name: github.com/Comcast/webpa-common - version: b486a73b4faef9cb15d777c61032b3ca35bcde06 + version: ff81f093033bfdf7c8d71b36697f9895026dc78b subpackages: - concurrent - convey @@ -62,9 +62,9 @@ imports: subpackages: - spew - name: github.com/fsnotify/fsnotify - version: 4da3e2cfbabc9f751898f250b49f2439785783a1 + version: c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9 - name: github.com/go-ini/ini - version: 3d73f4b845efdf9989fffd4b4e562727744a34ba + version: 32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a - name: github.com/go-kit/kit version: a9ca6725cbbea455e61c6bc8a1ed28e81eb3493b subpackages: @@ -90,7 +90,7 @@ imports: - name: github.com/go-stack/stack version: 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf - name: github.com/golang/protobuf - version: b50ceb1fa9818fa4d78b016c2d4ae025593a7ce3 + version: 1e59b77b52bf8e4b449a57e6f79f21226d571845 subpackages: - proto - name: github.com/gorilla/context @@ -100,7 +100,7 @@ imports: - name: github.com/gorilla/websocket version: ea4d1f681babbce9545c9c5f3d5194a789c89f5b - name: github.com/hashicorp/hcl - version: a4b07c25de5ff55ad3b8936cea69a79a3d95a855 + version: 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8 subpackages: - hcl/ast - hcl/parser @@ -111,13 +111,13 @@ imports: - json/scanner - json/token - name: github.com/influxdata/influxdb - version: fd11e200c8b2e4d23c31945e330b2768b83d46f5 + version: 28f3912491a564677bfafc4602aa126023d1bfb2 subpackages: - client/v2 - models - pkg/escape - name: github.com/jmespath/go-jmespath - version: bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d + version: dd801d4f4ce7ac746e7e7b4489d2fa600b3b096b - name: github.com/jtacoma/uritemplates version: 307ae868f90f4ee1b73ebe4596e0394237dacce8 - name: github.com/justinas/alice @@ -125,17 +125,15 @@ imports: - name: github.com/kr/logfmt version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0 - name: github.com/magiconair/properties - version: 51463bfca2576e06c62a8504b5c0f06d61312647 + version: 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934 - name: github.com/matttproud/golang_protobuf_extensions version: c12348ce28de40eed0136aa2b644d0ee0650e56c subpackages: - pbutil - name: github.com/mitchellh/mapstructure - version: cc8532a8e9a55ea36402aa21efdf403a60d34096 -- name: github.com/pelletier/go-buffruneio - version: c37440a7cf42ac63b919c752ca73a85067e05992 + version: b4575eea38cca1123ec2dc90c26529b5c5acfcff - name: github.com/pelletier/go-toml - version: 23f644976aa7c724adf4aec911dadf4af17840ab + version: acdc4509485b587f5e675510c4f2c63e90ff68a8 - name: github.com/pmezard/go-difflib version: d8ed2627bdf02c080bf22230dbb337003b7aba2d subpackages: @@ -150,7 +148,7 @@ imports: subpackages: - go - name: github.com/prometheus/common - version: 2e54d0b93cba2fd133edc32211dcc32c06ef72ca + version: 89604d197083d4781071d3c65855d24ecfb0a563 subpackages: - expfmt - internal/bitbucket.org/ww/goautoneg @@ -166,13 +164,13 @@ imports: - jws - jwt - name: github.com/spf13/afero - version: 9be650865eab0c12963d8753212f4f9c66cdcf12 + version: bb8f1927f2a9d3ab41c9340aa034f6b803f4359c subpackages: - mem - name: github.com/spf13/cast version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4 - name: github.com/spf13/jwalterweatherman - version: fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66 + version: 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394 - name: github.com/spf13/pflag version: e57e3eeb33f795204c1ca35f56c44f83227c6e66 - name: github.com/spf13/viper @@ -193,20 +191,20 @@ imports: - name: github.com/VividCortex/gohistogram version: 51564d9861991fb0ad0f531c99ef602d0f9866e6 - name: golang.org/x/net - version: d866cfc389cec985d6fda2859936a575a55a3ab6 + version: 5ccada7d0a7ba9aeb5d3aca8d3501b4c2a509fec subpackages: - netutil - name: golang.org/x/sys - version: 9ccfe848b9db8435a24c424abbc07a921adf1df5 + version: af50095a40f9041b3b38960738837185c26e9419 subpackages: - unix - name: golang.org/x/text - version: 470f45bf29f4147d6fbd7dfd0a02a848e49f5bf4 + version: e19ae1496984b1c655b8044a65c0300a3c878dd3 subpackages: - transform - unicode/norm - name: gopkg.in/natefinch/lumberjack.v2 version: a96e63847dc3c67d17befa69c303767e2f84e54f - name: gopkg.in/yaml.v2 - version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b + version: d670f9405373e636a5a2765eea47fac0c9bc91a4 testImports: []