Merge pull request #567 from Scalingo/feature/554/add_log_drains_del_cmd

Log drains: delete command

CHANGELOG.md

@@ -8,6 +8,9 @@
 * Add log drains add command
   [#561](https://github.com/Scalingo/cli/pull/561)
   [go-scalingo #164](https://github.com/Scalingo/go-scalingo/pull/164)
+* Add log drains delete command
+  [#567](https://github.com/Scalingo/cli/pull/567)
+  [go-scalingo #167](https://github.com/Scalingo/go-scalingo/pull/167)
 
 ### 1.17.0
 

Gopkg.toml

@@ -26,7 +26,7 @@
 
 [[constraint]]
   name = "github.com/Scalingo/go-scalingo"
-  version = "^4"
+   version = "^4"
 
 [[constraint]]
   branch = "master"

cmd/autocomplete/domains_remove.go

@@ -19,11 +19,12 @@ func DomainsRemoveAutoComplete(c *cli.Context) error {
 		return errgo.Notef(err, "fail to get Scalingo client")
 	}
 	domains, err := client.DomainsList(appName)
-	if err == nil {
+	if err != nil {
+		return errgo.Notef(err, "fail to get domains list")
+	}
 
-		for _, domain := range domains {
-			fmt.Println(domain.Name)
-		}
+	for _, domain := range domains {
+		fmt.Println(domain.Name)
 	}
 
 	return nil

cmd/autocomplete/log_drains_remove.go

@@ -0,0 +1,31 @@
+package autocomplete
+
+import (
+	"fmt"
+
+	"github.com/Scalingo/cli/config"
+	"github.com/urfave/cli"
+	"gopkg.in/errgo.v1"
+)
+
+func LogDrainsRemoveAutoComplete(c *cli.Context) error {
+	appName := CurrentAppCompletion(c)
+	if appName == "" {
+		return nil
+	}
+
+	client, err := config.ScalingoClient()
+	if err != nil {
+		return errgo.Notef(err, "fail to get Scalingo client")
+	}
+	drains, err := client.LogDrainsList(appName)
+	if err != nil {
+		return errgo.Notef(err, "fail to get log drains list")
+	}
+
+	for _, drain := range drains {
+		fmt.Println(drain.URL)
+	}
+
+	return nil
+}

cmd/commands.go

@@ -221,6 +221,7 @@ var (
 		// Log drains
 		logDrainsAddCommand,
 		logDrainsListCommand,
+		logDrainsRemoveCommand,
 
 		gitSetup,
 		gitShow,

cmd/log_drains.go

@@ -18,7 +18,7 @@ var (
 
 	$ scalingo --app my-app log-drains
 
-	# See also commands 'log-drains-add'`,
+	# See also commands 'log-drains-add', 'log-drains-remove'`,
 
 		Action: func(c *cli.Context) {
 			currentApp := appdetect.CurrentApp(c)
@@ -59,7 +59,7 @@ var (
 		$ scalingo --app my-app log-drains-add --type syslog --host custom.logstash.com --port 12345
 		$ scalingo --app my-app log-drains-add --type elk --url https://my-user:[email protected]
 
-	# See also commands 'log-drains'`,
+	# See also commands 'log-drains', 'log-drains-remove'`,
 
 		Action: func(c *cli.Context) {
 			currentApp := appdetect.CurrentApp(c)
@@ -80,4 +80,34 @@ var (
 			autocomplete.CmdFlagsAutoComplete(c, "log-drains")
 		},
 	}
+
+	logDrainsRemoveCommand = cli.Command{
+		Name:     "log-drains-remove",
+		Category: "Log drains",
+		Flags:    []cli.Flag{appFlag},
+		Usage:    "Remove a log drain from an application",
+		Description: `Remove a log drain from an application:
+
+	$ scalingo --app my-app log-drains-remove syslog://custom.logstash.com:12345
+
+	# See also commands 'log-drains-add', 'log-drains'`,
+
+		Action: func(c *cli.Context) {
+			currentApp := appdetect.CurrentApp(c)
+			var err error
+			if len(c.Args()) == 1 {
+				err = log_drains.Remove(currentApp, c.Args()[0])
+			} else {
+				cli.ShowCommandHelp(c, "log-drains-remove")
+			}
+
+			if err != nil {
+				errorQuit(err)
+			}
+		},
+		BashComplete: func(c *cli.Context) {
+			autocomplete.CmdFlagsAutoComplete(c, "log-drains-remove")
+			autocomplete.LogDrainsRemoveAutoComplete(c)
+		},
+	}
 )

log_drains/remove.go

@@ -0,0 +1,22 @@
+package log_drains
+
+import (
+	"github.com/Scalingo/cli/config"
+	"github.com/Scalingo/cli/io"
+	"gopkg.in/errgo.v1"
+)
+
+func Remove(app string, URL string) error {
+	c, err := config.ScalingoClient()
+	if err != nil {
+		return errgo.Notef(err, "fail to get Scalingo client to remove a log drain from the application")
+	}
+
+	err = c.LogDrainRemove(app, URL)
+	if err != nil {
+		return errgo.Notef(err, "fail to remove the log drain from the application")
+	}
+
+	io.Status("The log drain:", URL, "has been deleted")
+	return nil
+}