From f14d4c869d55df7b8ccb7d7881005be51ec03a50 Mon Sep 17 00:00:00 2001 From: matt maier Date: Thu, 29 Nov 2018 07:35:31 -0500 Subject: [PATCH 1/6] upd: dependencies --- go.mod | 13 ++++++++----- go.sum | 37 +++++++++++++++++++++++++------------ 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index cb0cee6..e585968 100644 --- a/go.mod +++ b/go.mod @@ -3,20 +3,23 @@ module github.com/circonus-labs/circonus-logwatch require ( github.com/BurntSushi/toml v0.3.1 // indirect github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf - github.com/circonus-labs/circonus-gometrics/v3 v3.0.0-alpha.1 + github.com/circonus-labs/circonus-gometrics/v3 v3.0.0-beta github.com/hpcloud/tail v1.0.0 github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/kr/pretty v0.1.0 // indirect github.com/maier/go-appstats v0.2.0 + github.com/mitchellh/mapstructure v1.1.2 // indirect github.com/pelletier/go-toml v1.2.0 github.com/pkg/errors v0.8.0 - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rs/zerolog v1.10.0 + github.com/rs/zerolog v1.11.0 + github.com/spf13/cast v1.3.0 // indirect github.com/spf13/cobra v0.0.3 + github.com/spf13/pflag v1.0.3 // indirect github.com/spf13/viper v1.2.1 - github.com/stretchr/testify v1.2.2 // indirect golang.org/x/net v0.0.0-20181029044818-c44066c5c816 // indirect golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f - golang.org/x/sys v0.0.0-20181031143558-9b800f95dbbc + golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35 + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/fsnotify.v1 v1.4.7 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.2.1 diff --git a/go.sum b/go.sum index c18fa8f..3ff3581 100644 --- a/go.sum +++ b/go.sum @@ -2,50 +2,61 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/circonus-labs/circonus-gometrics/v3 v3.0.0-alpha.1 h1:LpiieQEinVC+nqeapziqvCrQj/N97j61xOLgUOf2aHI= -github.com/circonus-labs/circonus-gometrics/v3 v3.0.0-alpha.1/go.mod h1:Yz3lD+BtalWoVQLMAWdxCW6cMK0zCwwUVL39pH2UOI4= -github.com/circonus-labs/circonusllhist v0.1.0 h1:3s0i9irZZhzwHAqAbx4BqbnOCVti+XiuoSiTpysNAuE= -github.com/circonus-labs/circonusllhist v0.1.0/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/circonus-labs/go-apiclient v0.5.0 h1:88sTJ4mW+XEKlKF2XYgTpIpxJXurXIzthost6kStg+k= -github.com/circonus-labs/go-apiclient v0.5.0/go.mod h1:FEKOXTaR6ZQ3aXlDtrXxT5ehfECSuuOSuA3kfqeMv6c= +github.com/circonus-labs/circonus-gometrics/v3 v3.0.0-beta h1:5tzsrGkxVu5TzSK9bVB31yy7+cQ0pDqZ5mQvF+pCcA8= +github.com/circonus-labs/circonus-gometrics/v3 v3.0.0-beta/go.mod h1:k/svG2axcc7uZJcj6Kt7a+XDGE5tZhNib5wdn290yz0= +github.com/circonus-labs/circonusllhist v0.1.3 h1:TJH+oke8D16535+jHExHj4nQvzlZrj7ug5D7I/orNUA= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= +github.com/circonus-labs/go-apiclient v0.5.3 h1:xe0eJICrWwgjS2xz/nR1exS7DLbrGNLuvdvQFp2vcXA= +github.com/circonus-labs/go-apiclient v0.5.3/go.mod h1:624vxzSv6v6YnbEJ5o3xB2mjrqiPbSvyuo+s+nVabVo= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= 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/go-cleanhttp v0.5.0 h1:wvCrVc9TjDls6+YGAF2hAifE1E5U1+b4tH6KdvN3Gig= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-retryablehttp v0.0.0-20180718195005-e651d75abec6 h1:qCv4319q2q7XKn0MQbi8p37hsJ+9Xo8e6yojA73JVxk= -github.com/hashicorp/go-retryablehttp v0.0.0-20180718195005-e651d75abec6/go.mod h1:fXcdFsQoipQa7mwORhKad5jmDCeSy/RCGzWA08PO0lM= +github.com/hashicorp/go-retryablehttp v0.5.0 h1:aVN0FYnPwAgZI/hVzqwfMiM86ttcHTlQKbBVeVmXPIs= +github.com/hashicorp/go-retryablehttp v0.5.0/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= 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/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/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/maier/go-appstats v0.2.0 h1:Ka+CGMNWaqKaqdFmh1Ilm61lRWwBAuO7wleEvjko7Zo= github.com/maier/go-appstats v0.2.0/go.mod h1:7wqGl4T89dYIsQOhSTrpMCMQL6MnyBdgyRYPu9u0nOI= github.com/mitchellh/mapstructure v1.0.0 h1:vVpGvMXJPqSDh2VYHF7gsfQj8Ncx+Xw5Y1KHeTRY+7I= github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rs/zerolog v1.10.0 h1:roFDW4AgYGbHnTOAMZ2K8mHJZ/7bSj7txPfvbABIj88= -github.com/rs/zerolog v1.10.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= +github.com/rs/zerolog v1.11.0 h1:DRuq/S+4k52uJzBQciUcofXx45GrMC6yrEbb/CoK6+M= +github.com/rs/zerolog v1.11.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.2.0 h1:HHl1DSRbEQN2i8tJmtS6ViPyHx35+p51amrdsiTCrkg= github.com/spf13/cast v1.2.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg= +github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.2 h1:Fy0orTDgHdbnzHcsOgfCN4LtHf0ec3wwtiwJqwvf3Gc= github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/viper v1.2.1 h1:bIcUwXqLseLF3BDAZduuNfekWG87ibtFxi59Bq+oI9M= github.com/spf13/viper v1.2.1/go.mod h1:P4AexN0a+C9tGAnUFNwDMYYZv3pjFuvmeiMyKRaNVlI= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= @@ -57,12 +68,14 @@ golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181031143558-9b800f95dbbc h1:SdCq5U4J+PpbSDIl9bM0V1e1Ug1jsnBkAFvTs1htn7U= -golang.org/x/sys v0.0.0-20181031143558-9b800f95dbbc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35 h1:YAFjXN64LMvktoUZH9zgY4lGc/msGN7HQfoSuKCgaDU= +golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 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 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/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/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= From 5125aad391787a7b4a8f0423ef197cb9422ebb34 Mon Sep 17 00:00:00 2001 From: matt maier Date: Thu, 29 Nov 2018 07:36:07 -0500 Subject: [PATCH 2/6] upd: disable permissions tests --- internal/config/main_test.go | 50 ++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/internal/config/main_test.go b/internal/config/main_test.go index 9c1408d..2777ee4 100644 --- a/internal/config/main_test.go +++ b/internal/config/main_test.go @@ -238,31 +238,31 @@ func TestLogConfDir(t *testing.T) { // // sudo mkdir -p testdata/no_access_dir/test && sudo chmod -R 700 testdata/no_access_dir // - t.Log("Invalid directory (perms, subdir)") - { - viper.Set(KeyLogConfDir, filepath.Join("testdata", "no_access_dir", "test")) - err := logConfDir() - if err == nil { - t.Fatalf("Expected error - check 'sudo mkdir -p testdata/no_access_dir/test && sudo chmod -R 700 testdata/no_access_dir'") - } - sfx := "internal/config/testdata/no_access_dir/test: permission denied" - if !strings.HasSuffix(err.Error(), sfx) { - t.Errorf("Expected (%s) got (%s)", sfx, err) - } - } - - t.Log("Invalid directory (perms, open)") - { - viper.Set(KeyLogConfDir, filepath.Join("testdata", "no_access_dir")) - err := logConfDir() - if err == nil { - t.Fatalf("Expected error") - } - sfx := "internal/config/testdata/no_access_dir: permission denied" - if !strings.HasSuffix(err.Error(), sfx) { - t.Errorf("Expected (%s) got (%s)", sfx, err) - } - } + // t.Log("Invalid directory (perms, subdir)") + // { + // viper.Set(KeyLogConfDir, filepath.Join("testdata", "no_access_dir", "test")) + // err := logConfDir() + // if err == nil { + // t.Fatalf("Expected error - check 'sudo mkdir -p testdata/no_access_dir/test && sudo chmod -R 700 testdata/no_access_dir'") + // } + // sfx := "internal/config/testdata/no_access_dir/test: permission denied" + // if !strings.HasSuffix(err.Error(), sfx) { + // t.Errorf("Expected (%s) got (%s)", sfx, err) + // } + // } + // + // t.Log("Invalid directory (perms, open)") + // { + // viper.Set(KeyLogConfDir, filepath.Join("testdata", "no_access_dir")) + // err := logConfDir() + // if err == nil { + // t.Fatalf("Expected error") + // } + // sfx := "internal/config/testdata/no_access_dir: permission denied" + // if !strings.HasSuffix(err.Error(), sfx) { + // t.Errorf("Expected (%s) got (%s)", sfx, err) + // } + // } t.Log("Valid directory") { From 2367c55404b79a41309ac8a8e9e02c563cdeddd8 Mon Sep 17 00:00:00 2001 From: matt maier Date: Thu, 29 Nov 2018 07:37:19 -0500 Subject: [PATCH 3/6] add: context cancel to Stop fix: calls in tests to include parent context --- internal/watcher/main.go | 9 +++++++-- internal/watcher/main_test.go | 17 +++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/internal/watcher/main.go b/internal/watcher/main.go index a92ccff..342b529 100644 --- a/internal/watcher/main.go +++ b/internal/watcher/main.go @@ -42,6 +42,8 @@ type metricLine struct { // Watcher defines a new log watcher type Watcher struct { + ctx context.Context + ctxCancel context.CancelFunc group *errgroup.Group groupCtx context.Context cfg *configs.Config @@ -67,9 +69,11 @@ func New(ctx context.Context, metricDest metrics.Destination, logConfig *configs if logConfig == nil { return nil, errors.New("invalid log config (nil)") } - - g, gctx := errgroup.WithContext(ctx) + tctx, cancel := context.WithCancel(ctx) + g, gctx := errgroup.WithContext(tctx) w := Watcher{ + ctx: tctx, + ctxCancel: cancel, group: g, groupCtx: gctx, logger: log.With().Str("pkg", "watcher").Str("log_id", logConfig.ID).Logger(), @@ -107,6 +111,7 @@ func (w *Watcher) Start() error { // Stop the watcher func (w *Watcher) Stop() error { + w.ctxCancel() return w.groupCtx.Err() } diff --git a/internal/watcher/main_test.go b/internal/watcher/main_test.go index 9d6245c..0016e1e 100644 --- a/internal/watcher/main_test.go +++ b/internal/watcher/main_test.go @@ -6,6 +6,7 @@ package watcher import ( + "context" "fmt" "os" "testing" @@ -52,7 +53,7 @@ func TestNew(t *testing.T) { t.Log("no dest, no log conf") { - _, err := New(nil, nil) + _, err := New(context.Background(), nil, nil) if err == nil { t.Fatal("expected error") } @@ -65,7 +66,7 @@ func TestNew(t *testing.T) { if err != nil { t.Fatalf("expected no error, got (%s)", err) } - if _, err := New(dest, nil); err == nil { + if _, err := New(context.Background(), dest, nil); err == nil { t.Fatal("expected error") } viper.Reset() @@ -74,7 +75,7 @@ func TestNew(t *testing.T) { t.Log("no dest, log conf") { lc := &configs.Config{} - if _, err := New(nil, lc); err == nil { + if _, err := New(context.Background(), nil, lc); err == nil { t.Fatal("expected error") } } @@ -87,7 +88,7 @@ func TestNew(t *testing.T) { if err != nil { t.Fatalf("expected no error, got (%s)", err) } - if _, err := New(dest, lc); err != nil { + if _, err := New(context.Background(), dest, lc); err != nil { t.Fatalf("expected no error, got (%s)", err) } viper.Reset() @@ -105,7 +106,7 @@ func TestStart(t *testing.T) { if err != nil { t.Fatalf("expected no error, got (%s)", err) } - w, err := New(dest, lc) + w, err := New(context.Background(), dest, lc) if err != nil { t.Fatalf("expected no error, got (%s)", err) } @@ -129,7 +130,7 @@ func TestStop(t *testing.T) { if err != nil { t.Fatalf("expected no error, got (%s)", err) } - w, err := New(dest, lc) + w, err := New(context.Background(), dest, lc) if err != nil { t.Fatalf("expected no error, got (%s)", err) } @@ -161,11 +162,11 @@ func TestFull(t *testing.T) { if err != nil { t.Fatalf("expected no error, got (%s)", err) } - w, err := New(dest, cfgs[0]) + w, err := New(context.Background(), dest, cfgs[0]) if err != nil { t.Fatalf("expected no error, got (%s)", err) } - time.AfterFunc(5*time.Second, func() { + time.AfterFunc(3*time.Second, func() { w.Stop() }) if err := w.Start(); err != nil { From 41bd040ea840bf95649b1ac2c858939560cf0637 Mon Sep 17 00:00:00 2001 From: matt maier Date: Thu, 29 Nov 2018 07:38:28 -0500 Subject: [PATCH 4/6] v0.5.1 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66a553d..aa4f6d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# v0.5.1 + +* upd: dependencies +* upd: disable dir/file permissions tests +* add: ctx cancel function for Stop to use +* fix: calls to New in tests to include a parent context + # v0.5.0 * upd: include service and example configs in release From 006e69ca8abd7a307598d36b66d7e52e569b7cce Mon Sep 17 00:00:00 2001 From: matt maier Date: Thu, 29 Nov 2018 14:06:07 -0500 Subject: [PATCH 5/6] upd: dependencies (yaml, x/sync) --- go.mod | 5 ++--- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index e585968..9dea2e4 100644 --- a/go.mod +++ b/go.mod @@ -16,11 +16,10 @@ require ( github.com/spf13/cobra v0.0.3 github.com/spf13/pflag v1.0.3 // indirect github.com/spf13/viper v1.2.1 - golang.org/x/net v0.0.0-20181029044818-c44066c5c816 // indirect - golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f + golang.org/x/sync v0.0.0-20181108010431-42b317875d0f golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/fsnotify.v1 v1.4.7 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect - gopkg.in/yaml.v2 v2.2.1 + gopkg.in/yaml.v2 v2.2.2 ) diff --git a/go.sum b/go.sum index 3ff3581..a634463 100644 --- a/go.sum +++ b/go.sum @@ -63,10 +63,8 @@ github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 h1:G3dpKMzFDjgEh2q1Z7zUUtKa8ViPtH+ocF0bE0g00O8= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -golang.org/x/net v0.0.0-20181029044818-c44066c5c816 h1:mVFkLpejdFLXVUv9E42f3XJVfMdqd0IVLVIVLjZWn5o= -golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35 h1:YAFjXN64LMvktoUZH9zgY4lGc/msGN7HQfoSuKCgaDU= golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -82,3 +80,5 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 31601e5d117ce55dccc53d47060490b771c5cdca Mon Sep 17 00:00:00 2001 From: matt maier Date: Fri, 30 Nov 2018 08:46:58 -0500 Subject: [PATCH 6/6] v0.5.2 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa4f6d0..80ab568 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v0.5.2 + +* upd: dependencies (yaml, x/sync) + # v0.5.1 * upd: dependencies