From 6eecaa1019f0468e3d4c9cf90be45fca928fcd28 Mon Sep 17 00:00:00 2001 From: Zachary Wasserman Date: Mon, 11 Jun 2018 12:14:21 -0700 Subject: [PATCH] Update redigo import (#1821) - Use new repo path (old repo archived) - Update version to 2.0.0 Closes #1820 --- Gopkg.lock | 20 ++++++++++---------- Gopkg.toml | 4 ++-- server/pubsub/redis_query_results.go | 2 +- server/sso/session_store.go | 2 +- server/sso/session_store_test.go | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index f3aaba7b9f..8843949f0d 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -72,15 +72,6 @@ revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9" version = "v1.4.7" -[[projects]] - name = "github.com/garyburd/redigo" - packages = [ - "internal", - "redis" - ] - revision = "a69d19351219b6dd56f274f96d85a7014a2ec34e" - version = "v1.6.0" - [[projects]] name = "github.com/ghodss/yaml" packages = ["."] @@ -132,6 +123,15 @@ revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" version = "v1.1.0" +[[projects]] + name = "github.com/gomodule/redigo" + packages = [ + "internal", + "redis" + ] + revision = "9c11da706d9b7902c6da69c592f75637793fe121" + version = "v2.0.0" + [[projects]] name = "github.com/google/uuid" packages = ["."] @@ -518,6 +518,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "814581eac74f8110241b3cfb693b245364d99ca14c58b8f2afd51f423867168d" + inputs-digest = "955fd47824b6af4291d6a6cde5b57f9713cc335179bf453150255f5d34111bad" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index ae6092c73e..aee1e20897 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -23,8 +23,8 @@ version = "1.0.0" [[constraint]] - name = "github.com/garyburd/redigo" - version = "1.4.0" + name = "github.com/gomodule/redigo" + version = "2.0.0" [[constraint]] name = "github.com/go-kit/kit" diff --git a/server/pubsub/redis_query_results.go b/server/pubsub/redis_query_results.go index 84a52133ff..4bfa3af453 100644 --- a/server/pubsub/redis_query_results.go +++ b/server/pubsub/redis_query_results.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/garyburd/redigo/redis" + "github.com/gomodule/redigo/redis" "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/sso/session_store.go b/server/sso/session_store.go index 30f12a8452..e2473c0bef 100644 --- a/server/sso/session_store.go +++ b/server/sso/session_store.go @@ -5,7 +5,7 @@ import ( "encoding/json" "time" - "github.com/garyburd/redigo/redis" + "github.com/gomodule/redigo/redis" "github.com/pkg/errors" ) diff --git a/server/sso/session_store_test.go b/server/sso/session_store_test.go index f31383695a..53cf9d7ad9 100644 --- a/server/sso/session_store_test.go +++ b/server/sso/session_store_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/garyburd/redigo/redis" + "github.com/gomodule/redigo/redis" "github.com/kolide/fleet/server/pubsub" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require"