From dd3e971ac418baf10c1b33005acc7e6f66fb0d85 Mon Sep 17 00:00:00 2001 From: aeneasr Date: Wed, 27 May 2020 16:56:25 +0200 Subject: [PATCH] fix: move deps to go_mod_indirect_pins --- go.mod | 1 + go.sum | 5 +++++ cmd/tools.go => go_mod_indirect_pins.go | 17 +++++++++-------- 3 files changed, 15 insertions(+), 8 deletions(-) rename cmd/tools.go => go_mod_indirect_pins.go (63%) diff --git a/go.mod b/go.mod index 4c5bdc849..dcf63df8e 100644 --- a/go.mod +++ b/go.mod @@ -16,6 +16,7 @@ require ( github.com/gobwas/glob v0.2.3 // indirect github.com/gorilla/mux v1.7.1 // indirect github.com/gorilla/sessions v1.1.3 + github.com/gorilla/websocket v1.4.2 github.com/jackc/pgx/v4 v4.4.1 github.com/jmoiron/sqlx v1.2.0 github.com/julienschmidt/httprouter v1.2.0 diff --git a/go.sum b/go.sum index 8b6da5c27..3e19988f3 100644 --- a/go.sum +++ b/go.sum @@ -128,6 +128,7 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/go-bindata/go-bindata v3.1.1+incompatible h1:tR4f0e4VTO7LK6B2YWyAoVEzG9ByG1wrXB4TL9+jiYg= github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= @@ -492,6 +493,7 @@ github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= @@ -537,7 +539,10 @@ github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+ github.com/gorilla/sessions v1.1.2/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w= github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU= github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w= +github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gotestyourself/gotestyourself v1.3.0/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= github.com/gotestyourself/gotestyourself v2.2.0+incompatible h1:AQwinXlbQR2HvPjQZOmDhRqsv5mZf+Jb1RnSLxcqZcI= github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= diff --git a/cmd/tools.go b/go_mod_indirect_pins.go similarity index 63% rename from cmd/tools.go rename to go_mod_indirect_pins.go index 1d572bad5..f49e3fd3f 100644 --- a/cmd/tools.go +++ b/go_mod_indirect_pins.go @@ -1,18 +1,19 @@ -// +build tools +// +build go_mod_indirect_pins -package cmd +package main import ( - _ "golang.org/x/tools/cmd/cover" - _ "golang.org/x/tools/cmd/goimports" - - _ "github.com/ory/go-acc" - _ "github.com/go-swagger/go-swagger/cmd/swagger" _ "github.com/gobuffalo/packr/packr" _ "github.com/sqs/goreturns" + _ "golang.org/x/tools/cmd/cover" + _ "golang.org/x/tools/cmd/goimports" - _ "github.com/ory/sdk/swagutil" + // FIXME pins websocket to 1.4.2 + // FIXME See https://github.com/gobuffalo/buffalo/pull/1999 + _ "github.com/gorilla/websocket" + _ "github.com/ory/go-acc" + _ "github.com/ory/sdk/swagutil" _ "github.com/ory/x/tools/listx" )