From 9f2492d30ee917735c5f53575d31ee69430affda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 17 Mar 2019 20:17:20 +0100 Subject: [PATCH] chore(backend): switch jarcoal/httpmock imports to use github This is to use v1.0.0 that was just released, gopkg.in doesn't work anymore --- go.mod | 2 +- go.sum | 4 ++-- internal/mock/mock.go | 2 +- proxy_test.go | 2 +- views_test.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 96085bd01..a176582f9 100644 --- a/go.mod +++ b/go.mod @@ -15,6 +15,7 @@ require ( github.com/go-bindata/go-bindata v1.0.0 github.com/golangci/golangci-lint v1.15.0 github.com/hansrodtang/randomcolor v0.0.0-20160512071917-d27108b3d7a5 + github.com/jarcoal/httpmock v1.0.0 github.com/mcuadros/go-gin-prometheus v0.0.0-20181030200533-58963fb32f54 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/errors v0.8.1 // indirect @@ -26,6 +27,5 @@ require ( github.com/spf13/viper v1.3.2 github.com/terinjokes/bakelite v0.2.0 gopkg.in/go-playground/colors.v1 v1.2.0 - gopkg.in/jarcoal/httpmock.v1 v1.0.0-20181117152235-275e9df93516 gopkg.in/yaml.v2 v2.2.2 ) diff --git a/go.sum b/go.sum index 1fad9a748..cf8b89bc0 100644 --- a/go.sum +++ b/go.sum @@ -124,6 +124,8 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jarcoal/httpmock v1.0.0 h1:AP/JEJFRez89+eiEDFqi6v49Oo0pGpOaM8k5wrDLyw0= +github.com/jarcoal/httpmock v1.0.0/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= @@ -283,8 +285,6 @@ gopkg.in/go-playground/colors.v1 v1.2.0 h1:SPweMUve+ywPrfwao+UvfD5Ah78aOLUkT5RlJ gopkg.in/go-playground/colors.v1 v1.2.0/go.mod h1:AvbqcMpNXVl5gBrM20jBm3VjjKBbH/kI5UnqjU7lxFI= gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ= gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= -gopkg.in/jarcoal/httpmock.v1 v1.0.0-20181117152235-275e9df93516 h1:H6trpavCIuipdInWrab8l34Mf+GGVfphniHostMdMaQ= -gopkg.in/jarcoal/httpmock.v1 v1.0.0-20181117152235-275e9df93516/go.mod h1:d3R+NllX3X5e0zlG1Rful3uLvsGC/Q3OHut5464DEQw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= diff --git a/internal/mock/mock.go b/internal/mock/mock.go index 1821f6e72..ffefd1003 100644 --- a/internal/mock/mock.go +++ b/internal/mock/mock.go @@ -8,7 +8,7 @@ import ( "path/filepath" "runtime" - httpmock "gopkg.in/jarcoal/httpmock.v1" + "github.com/jarcoal/httpmock" ) // GetAbsoluteMockPath returns absolute path for given mock file diff --git a/proxy_test.go b/proxy_test.go index f998ebe99..d6086405a 100644 --- a/proxy_test.go +++ b/proxy_test.go @@ -8,7 +8,7 @@ import ( "github.com/prymitive/karma/internal/alertmanager" - httpmock "gopkg.in/jarcoal/httpmock.v1" + "github.com/jarcoal/httpmock" ) // httptest.NewRecorder() doesn't implement http.CloseNotifier diff --git a/views_test.go b/views_test.go index 681adca4c..b510213c5 100644 --- a/views_test.go +++ b/views_test.go @@ -19,7 +19,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/gin-gonic/gin" - httpmock "gopkg.in/jarcoal/httpmock.v1" + "github.com/jarcoal/httpmock" ) var upstreamSetup = false