diff --git a/components/playground/playground.go b/components/playground/playground.go index cd249989ed..09bbefd569 100644 --- a/components/playground/playground.go +++ b/components/playground/playground.go @@ -17,7 +17,6 @@ import ( "context" "encoding/json" "fmt" - "github.com/pingcap/tiup/pkg/cliutil/progress" "io" "io/ioutil" "net/http" @@ -37,6 +36,7 @@ import ( "github.com/fatih/color" "github.com/pingcap/errors" "github.com/pingcap/tiup/components/playground/instance" + "github.com/pingcap/tiup/pkg/cliutil/progress" "github.com/pingcap/tiup/pkg/cluster/api" "github.com/pingcap/tiup/pkg/environment" pkgver "github.com/pingcap/tiup/pkg/repository/version" diff --git a/go.mod b/go.mod index bf8e12c5d5..23f8211f6e 100644 --- a/go.mod +++ b/go.mod @@ -66,7 +66,7 @@ require ( github.com/xo/usql v0.7.8 go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 go.uber.org/atomic v1.6.0 - go.uber.org/zap v1.15.0 + go.uber.org/zap v1.16.0 golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72 golang.org/x/mod v0.2.0 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e diff --git a/go.sum b/go.sum index ae7b459cbd..b9200d06a5 100644 --- a/go.sum +++ b/go.sum @@ -911,8 +911,9 @@ go.uber.org/zap v1.12.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.14.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= -go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM= go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= +go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= +go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/pkg/cluster/manager.go b/pkg/cluster/manager.go index 2353f26010..4ac4dc37eb 100644 --- a/pkg/cluster/manager.go +++ b/pkg/cluster/manager.go @@ -1592,7 +1592,7 @@ func (m *Manager) ScaleOut( return nil } -// DestroyTombstone destory and remove instances that is in tombstone state +// DestroyTombstone destroy and remove instances that is in tombstone state func (m *Manager) DestroyTombstone( clusterName string, gOpt operator.Options,