Merge 303252b into 701932a

mackerelio · Aug 8, 2019 · 582761b · 582761b
2 parents 701932a + 303252b
commit 582761b
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 28 deletions.
diff --git a/alerts.go b/alerts.go
@@ -14,7 +14,7 @@ import (
 	"github.com/mackerelio/mkr/format"
 	"github.com/mackerelio/mkr/logger"
 	"github.com/mackerelio/mkr/mackerelclient"
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 var commandAlerts = cli.Command{

diff --git a/annotations.go b/annotations.go
@@ -7,7 +7,7 @@ import (
 	"github.com/mackerelio/mkr/format"
 	"github.com/mackerelio/mkr/logger"
 	"github.com/mackerelio/mkr/mackerelclient"
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 var commandAnnotations = cli.Command{

diff --git a/checks/checker.go b/checks/checker.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/mackerelio/checkers"
 	"github.com/mackerelio/mackerel-agent/config"
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 	yaml "gopkg.in/yaml.v2"
 )
 

diff --git a/commands.go b/commands.go
@@ -16,7 +16,7 @@ import (
 	"github.com/mackerelio/mkr/plugin"
 	"github.com/mackerelio/mkr/services"
 	"github.com/mackerelio/mkr/wrap"
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 // Commands cli.Command object list

diff --git a/commands_test.go b/commands_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 func TestCommands_requirements(t *testing.T) {

diff --git a/dashboards.go b/dashboards.go
@@ -10,7 +10,7 @@ import (
 	mackerel "github.com/mackerelio/mackerel-client-go"
 	"github.com/mackerelio/mkr/logger"
 	"github.com/mackerelio/mkr/mackerelclient"
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 	yaml "gopkg.in/yaml.v2"
 )
 

diff --git a/go.mod b/go.mod
@@ -32,6 +32,7 @@ require (
 	github.com/sergi/go-diff v1.0.0 // indirect
 	github.com/stretchr/testify v1.3.0
 	github.com/tcnksm/go-gitconfig v0.1.2
+	github.com/urfave/cli v1.21.0
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/yudai/gojsondiff v1.0.0
 	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
@@ -40,6 +41,5 @@ require (
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
 	google.golang.org/appengine v1.6.1 // indirect
-	gopkg.in/urfave/cli.v1 v1.20.0
 	gopkg.in/yaml.v2 v2.2.2
 )
diff --git a/go.sum b/go.sum
@@ -69,8 +69,6 @@ github.com/mackerelio/go-osstat v0.0.0-20190712033226-e9f3fb840708 h1:uRV0NlSC2d
 github.com/mackerelio/go-osstat v0.0.0-20190712033226-e9f3fb840708/go.mod h1:1K3NeYLhMHPvzUu+ePYXtoB58wkaRpxZsGClZBJyIFw=
 github.com/mackerelio/golib v0.0.0-20190411032134-c87047ca454e h1:MwWzFCq2tENDy2YPU01FDOSkt0At4mpLyvAFsFdB66A=
 github.com/mackerelio/golib v0.0.0-20190411032134-c87047ca454e/go.mod h1:kbqYA8VcFqcMt07v+GPSZQwqtwc7Wr0V0vzxUNMrk7E=
-github.com/mackerelio/mackerel-agent v0.61.1 h1:CJdbVdl0hYEAD135BHEiPFf4zWWJrX7NYledIqPla+I=
-github.com/mackerelio/mackerel-agent v0.61.1/go.mod h1:faJj6p6CZ4DzeKdkxxEMyeDeMw3xUR/k7CcXYeIfJzk=
 github.com/mackerelio/mackerel-agent v0.62.0 h1:B6u+9inFwu+hVor/fJcsjquHsZhdL1LdHV6quUAeStg=
 github.com/mackerelio/mackerel-agent v0.62.0/go.mod h1:faJj6p6CZ4DzeKdkxxEMyeDeMw3xUR/k7CcXYeIfJzk=
 github.com/mackerelio/mackerel-client-go v0.5.0 h1:j+H/RKELHLAHbXOtc+R04v9DYSFjzPJs+7RCO/E7G1g=
@@ -119,6 +117,8 @@ github.com/tcnksm/go-gitconfig v0.1.2 h1:iiDhRitByXAEyjgBqsKi9QU4o2TNtv9kPP3RgPg
 github.com/tcnksm/go-gitconfig v0.1.2/go.mod h1:/8EhP4H7oJZdIPyT+/UIsG87kTzrzM4UsLGSItWYCpE=
 github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
+github.com/urfave/cli v1.21.0 h1:wYSSj06510qPIzGSua9ZqsncMmWE3Zr55KBERygyrxE=
+github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
 github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA=
@@ -173,8 +173,6 @@ 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=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0=
-gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
 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=
diff --git a/hosts/commandCreate.go b/hosts/commandCreate.go
@@ -3,10 +3,9 @@ package hosts
 import (
 	"os"
 
-	cli "gopkg.in/urfave/cli.v1"
-
 	"github.com/mackerelio/mkr/logger"
 	"github.com/mackerelio/mkr/mackerelclient"
+	"github.com/urfave/cli"
 )
 
 // CommandCreate is definition of mkr create subcommand

diff --git a/hosts/commandHosts.go b/hosts/commandHosts.go
@@ -3,7 +3,7 @@ package hosts
 import (
 	"os"
 
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 
 	"github.com/mackerelio/mkr/logger"
 	"github.com/mackerelio/mkr/mackerelclient"

diff --git a/mackerelclient/new.go b/mackerelclient/new.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 
 	"github.com/mackerelio/mackerel-agent/config"
 	mackerel "github.com/mackerelio/mackerel-client-go"

diff --git a/mkr.go b/mkr.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/mackerelio/mackerel-agent/config"
 	"github.com/mackerelio/mkr/logger"
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 func main() {

diff --git a/monitors.go b/monitors.go
@@ -13,9 +13,9 @@ import (
 	"github.com/mackerelio/mkr/format"
 	"github.com/mackerelio/mkr/logger"
 	"github.com/mackerelio/mkr/mackerelclient"
+	"github.com/urfave/cli"
 	"github.com/yudai/gojsondiff"
 	"github.com/yudai/gojsondiff/formatter"
-	cli "gopkg.in/urfave/cli.v1"
 )
 
 var commandMonitors = cli.Command{

diff --git a/org/command.go b/org/command.go
@@ -3,9 +3,8 @@ package org
 import (
 	"os"
 
-	cli "gopkg.in/urfave/cli.v1"
-
 	"github.com/mackerelio/mkr/mackerelclient"
+	"github.com/urfave/cli"
 )
 
 // Command is the definition of org subcommand

diff --git a/plugin/commands.go b/plugin/commands.go
@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 // CommandPlugin is definition of mkr plugin

diff --git a/plugin/install.go b/plugin/install.go
@@ -13,7 +13,7 @@ import (
 	"github.com/mackerelio/mkr/logger"
 	"github.com/mholt/archiver"
 	"github.com/pkg/errors"
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 // The reason why an immediate function, not `init()` is used here is that

diff --git a/plugin/install_test.go b/plugin/install_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 func tempd(t *testing.T) string {

diff --git a/services/command.go b/services/command.go
@@ -3,9 +3,8 @@ package services
 import (
 	"os"
 
-	cli "gopkg.in/urfave/cli.v1"
-
 	"github.com/mackerelio/mkr/mackerelclient"
+	"github.com/urfave/cli"
 )
 
 // Command is the definition of services subcommand

diff --git a/throw.go b/throw.go
@@ -12,7 +12,7 @@ import (
 	mkr "github.com/mackerelio/mackerel-client-go"
 	"github.com/mackerelio/mkr/logger"
 	"github.com/mackerelio/mkr/mackerelclient"
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 var commandThrow = cli.Command{

diff --git a/wrap/command.go b/wrap/command.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/mackerelio/mackerel-agent/config"
 	"github.com/mackerelio/mkr/logger"
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 // Command is definition of mkr wrap

diff --git a/wrap/wrap.go b/wrap/wrap.go
@@ -12,8 +12,8 @@ import (
 	"github.com/Songmu/wrapcommander"
 	mackerel "github.com/mackerelio/mackerel-client-go"
 	"github.com/mackerelio/mkr/logger"
+	"github.com/urfave/cli"
 	"golang.org/x/sync/errgroup"
-	cli "gopkg.in/urfave/cli.v1"
 )
 
 type wrap struct {

diff --git a/wrap/wrap_test.go b/wrap/wrap_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	mackerel "github.com/mackerelio/mackerel-client-go"
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 func newWrapContext(args []string) *cli.Context {