Merge branch '2500-unregister-all-runners' into 'master'

Adds an option `--all` to unregister command

Closes #2500

See merge request !622

commands/unregister.go

@@ -11,40 +11,61 @@ import (
 type UnregisterCommand struct {
 	configOptions
 	common.RunnerCredentials
-	network common.Network
-	Name    string `toml:"name" json:"name" short:"n" long:"name" description:"Name of the runner you wish to unregister"`
+	network    common.Network
+	Name       string `toml:"name" json:"name" short:"n" long:"name" description:"Name of the runner you wish to unregister"`
+	AllRunners bool   `toml:"all_runners" json:"all-runners" long:"all-runners" description:"Unregister all runners"`
 }
 
-func (c *UnregisterCommand) Execute(context *cli.Context) {
-	userModeWarning(false)
-
-	err := c.loadConfig()
-	if err != nil {
-		log.Fatalln(err)
-		return
+func (c *UnregisterCommand) unregisterAllRunners() (runners []*common.RunnerConfig) {
+	log.Warningln("Unregistering all runners")
+	for _, r := range c.config.Runners {
+		if !c.network.UnregisterRunner(r.RunnerCredentials) {
+			log.Errorln("Failed to unregister runner", r.Name)
+			//If unregister fails, leave the runner in the config
+			runners = append(runners, r)
+		}
 	}
+	return
+}
 
-	if len(c.Name) > 0 {
+func (c *UnregisterCommand) unregisterSingleRunner() (runners []*common.RunnerConfig) {
+	if len(c.Name) > 0 { // Unregister when given a name
 		runnerConfig, err := c.RunnerByName(c.Name)
 		if err != nil {
 			log.Fatalln(err)
-			return
 		}
 		c.RunnerCredentials = runnerConfig.RunnerCredentials
 	}
 
+	// Unregister given Token and URL of the runner
 	if !c.network.UnregisterRunner(c.RunnerCredentials) {
 		log.Fatalln("Failed to unregister runner", c.Name)
-		return
 	}
 
-	runners := []*common.RunnerConfig{}
 	for _, otherRunner := range c.config.Runners {
 		if otherRunner.RunnerCredentials == c.RunnerCredentials {
 			continue
 		}
 		runners = append(runners, otherRunner)
 	}
+	return
+}
+
+func (c *UnregisterCommand) Execute(context *cli.Context) {
+	userModeWarning(false)
+
+	err := c.loadConfig()
+	if err != nil {
+		log.Fatalln(err)
+		return
+	}
+
+	var runners []*common.RunnerConfig
+	if c.AllRunners {
+		runners = c.unregisterAllRunners()
+	} else {
+		runners = c.unregisterSingleRunner()
+	}
 
 	// check if anything changed
 	if len(c.config.Runners) == len(runners) {

docs/commands/README.md

@@ -248,9 +248,12 @@ gitlab-runner verify --delete
 
 ### gitlab-runner unregister
 
-This command allows to unregister one of the registered runners. It expects either
-a full URL and the runner's token, or the runner's name. First get the runner's details by
-executing `gitlab-runner list`:
+This command allows to unregister one of the registered runners. It expects
+either a full URL and the runner's token, or the runner's name. With the
+`--all-runners` option it will unregister all the attached runners.
+
+To unregister a specific runner, first get the runner's details by executing
+`gitlab-runner list`:
 
 ```bash
 test-runner     Executor=shell Token=t0k3n URL=http://gitlab.example.com
@@ -276,6 +279,12 @@ gitlab-runner unregister --url http://gitlab.example.com/ --token t0k3n
 gitlab-runner unregister --name test-runner
 ```
 
+#### All Runners:
+
+```bash
+gitlab-runner unregister --all-runners
+```
+
 ## Service-related commands
 
 The following commands allow you to manage the runner as a system or user