From 73324c41a2f260a74d0c181a32073ae9b30077c1 Mon Sep 17 00:00:00 2001 From: Brian Avery Date: Thu, 30 Apr 2020 19:09:59 -0400 Subject: [PATCH] Update mini Redis version (#23439) * Update mini Redis version * Remove old redigo * Updated licenses * Update common files --- common/.commonfiles.sha | 2 +- common/config/license-lint.yml | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- licenses/github.com/{garyburd => gomodule}/redigo/LICENSE | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename licenses/github.com/{garyburd => gomodule}/redigo/LICENSE (100%) diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha index ffa548dc1576..0c6ccb099baf 100644 --- a/common/.commonfiles.sha +++ b/common/.commonfiles.sha @@ -1 +1 @@ -5047464aaf8ee94adf3c7a7da23dcda584504bfc +93c8b7d8880facdecfff3bddf6544b57b3a035f9 diff --git a/common/config/license-lint.yml b/common/config/license-lint.yml index 471a92ba5d22..3f77bae07e86 100644 --- a/common/config/license-lint.yml +++ b/common/config/license-lint.yml @@ -198,4 +198,4 @@ whitelisted_modules: - github.com/xeipuuv/gojsonschema # Apache 2.0: https://github.com/garyburd/redigo/blob/master/LICENSE - - github.com/garyburd/redigo + - github.com/gomodule/redigo diff --git a/go.mod b/go.mod index d77a83436e45..4da5c7fd6316 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/Masterminds/semver v1.4.2 github.com/Masterminds/sprig v2.20.0+incompatible github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6 // indirect - github.com/alicebob/miniredis v0.0.0-20180201100744-9d52b1fc8da9 + github.com/alicebob/miniredis v2.5.0+incompatible github.com/aws/aws-sdk-go v1.23.20 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect github.com/cactus/go-statsd-client v3.1.1+incompatible @@ -66,7 +66,6 @@ require ( github.com/fluent/fluent-logger-golang v1.3.0 github.com/frankban/quicktest v1.4.1 // indirect github.com/fsnotify/fsnotify v1.4.7 - github.com/garyburd/redigo v1.6.0 // indirect github.com/ghodss/yaml v1.0.0 github.com/go-logr/zapr v0.1.1 // indirect github.com/go-openapi/spec v0.19.5 // indirect @@ -77,6 +76,7 @@ require ( github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect github.com/golang/protobuf v1.3.5 github.com/golang/sync v0.0.0-20180314180146-1d60e4601c6f + github.com/gomodule/redigo v1.8.0 // indirect github.com/google/cel-go v0.4.1 github.com/google/go-cmp v0.4.0 github.com/google/gofuzz v1.1.0 diff --git a/go.sum b/go.sum index 9d7f98010bd5..d1608c84ae65 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,8 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6 h1:45bxf7AZMwWcqkLzDAQugVEwedisr5nRJ1r+7LYnv0U= github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= -github.com/alicebob/miniredis v0.0.0-20180201100744-9d52b1fc8da9 h1:wqvIPbcOreD8CAde3cnOydGj2rjUN/awKZcfyccW9hA= -github.com/alicebob/miniredis v0.0.0-20180201100744-9d52b1fc8da9/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk= +github.com/alicebob/miniredis v2.5.0+incompatible h1:yBHoLpsyjupjz3NL3MhKMVkR41j82Yjf3KFv7ApYzUI= +github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/antlr/antlr4 v0.0.0-20190819145818-b43a4c3a8015 h1:StuiJFxQUsxSCzcby6NFZRdEhPkXD5vxN7TZ4MD6T84= github.com/antlr/antlr4 v0.0.0-20190819145818-b43a4c3a8015/go.mod h1:T7PbCXFs94rrTttyxjbyT5+/1V8T2TYDejxUfHJjw1Y= @@ -232,8 +232,6 @@ github.com/frankban/quicktest v1.4.1 h1:Wv2VwvNn73pAdFIVUQRXYDFp31lXKbqblIXo/Q5G github.com/frankban/quicktest v1.4.1/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= 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/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc= -github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -349,6 +347,8 @@ github.com/golang/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:YCHYtYb9c8Q7 github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8= github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= +github.com/gomodule/redigo v1.8.0 h1:OXfLQ/k8XpYF8f8sZKd2Df4SDyzbLeC35OsBsB11rYg= +github.com/gomodule/redigo v1.8.0/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= diff --git a/licenses/github.com/garyburd/redigo/LICENSE b/licenses/github.com/gomodule/redigo/LICENSE similarity index 100% rename from licenses/github.com/garyburd/redigo/LICENSE rename to licenses/github.com/gomodule/redigo/LICENSE