From 442648186a7c2ef8d11b21d9ea783dab174719c4 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 16 Apr 2019 13:09:51 -0400 Subject: [PATCH] switch to gopkg.in/fsnotify.v1 Can we please start using the v1 API for fsnotify explicitly: https://gopkg.in/fsnotify.v1 v1 refers to v1.4.7 version (essentially https://github.com/fsnotify/fsnotify/tree/v1.4.7) Change-Id: I872bbbc8937c065da70e5ed7641c2939aab60a41 --- go.mod | 2 +- go.sum | 4 ++-- viper.go | 2 +- viper_test.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 86e801c..1205c21 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ require ( github.com/coreos/etcd v3.3.10+incompatible // indirect github.com/coreos/go-etcd v2.0.0+incompatible // indirect github.com/coreos/go-semver v0.2.0 // indirect - github.com/fsnotify/fsnotify v1.4.7 github.com/hashicorp/hcl v1.0.0 github.com/magiconair/properties v1.8.0 github.com/mitchellh/mapstructure v1.1.2 @@ -20,5 +19,6 @@ require ( golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 // indirect golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a // indirect golang.org/x/text v0.3.0 // indirect + gopkg.in/fsnotify.v1 v1.4.7 gopkg.in/yaml.v2 v2.2.2 ) diff --git a/go.sum b/go.sum index 5c9fb7d..1508fd5 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,6 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -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/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= @@ -31,5 +29,7 @@ golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/viper.go b/viper.go index a3d37f8..ea8ec10 100644 --- a/viper.go +++ b/viper.go @@ -35,7 +35,6 @@ import ( yaml "gopkg.in/yaml.v2" - "github.com/fsnotify/fsnotify" "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/printer" "github.com/magiconair/properties" @@ -45,6 +44,7 @@ import ( "github.com/spf13/cast" jww "github.com/spf13/jwalterweatherman" "github.com/spf13/pflag" + "gopkg.in/fsnotify.v1" ) // ConfigMarshalError happens when failing to marshal the configuration. diff --git a/viper_test.go b/viper_test.go index f43a38b..84e31c4 100644 --- a/viper_test.go +++ b/viper_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "github.com/fsnotify/fsnotify" "github.com/mitchellh/mapstructure" "github.com/spf13/afero" "github.com/spf13/cast" + "gopkg.in/fsnotify.v1" "github.com/spf13/pflag" "github.com/stretchr/testify/assert"