From 1ec31d7be97fb77e090c7084dd1178a11bc65aa3 Mon Sep 17 00:00:00 2001
From: Kota Kanbe <kotakanbe@gmail.com>
Date: Wed, 3 Mar 2021 12:51:07 +0900
Subject: [PATCH] fix(configtest): all servers in the config if no args #1184
 (#1189)

---
 subcmds/configtest.go |  4 ++++
 subcmds/scan.go       | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/subcmds/configtest.go b/subcmds/configtest.go
index c451337e..525cfec8 100644
--- a/subcmds/configtest.go
+++ b/subcmds/configtest.go
@@ -119,7 +119,11 @@ func (p *ConfigtestCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interfa
 		}
 	}
 	if 0 < len(servernames) {
+		// if scan target servers are specified by args, set to the config
 		c.Conf.Servers = targets
+	} else {
+		// if not specified by args, scan all servers in the config
+		targets = c.Conf.Servers
 	}
 
 	logging.Log.Info("Validating config...")
diff --git a/subcmds/scan.go b/subcmds/scan.go
index fbc0dbf9..9b81d413 100644
--- a/subcmds/scan.go
+++ b/subcmds/scan.go
@@ -152,12 +152,12 @@ func (p *ScanCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
 		}
 	}
 
-	target := make(map[string]c.ServerInfo)
+	targets := make(map[string]c.ServerInfo)
 	for _, arg := range servernames {
 		found := false
 		for servername, info := range c.Conf.Servers {
 			if servername == arg {
-				target[servername] = info
+				targets[servername] = info
 				found = true
 				break
 			}
@@ -169,12 +169,12 @@ func (p *ScanCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
 	}
 	if 0 < len(servernames) {
 		// if scan target servers are specified by args, set to the config
-		c.Conf.Servers = target
+		c.Conf.Servers = targets
 	} else {
 		// if not specified by args, scan all servers in the config
-		target = c.Conf.Servers
+		targets = c.Conf.Servers
 	}
-	logging.Log.Debugf("%s", pp.Sprintf("%v", target))
+	logging.Log.Debugf("%s", pp.Sprintf("%v", targets))
 
 	logging.Log.Info("Validating config...")
 	if !c.Conf.ValidateOnScan() {
@@ -185,7 +185,7 @@ func (p *ScanCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
 		TimeoutSec:     p.timeoutSec,
 		ScanTimeoutSec: p.scanTimeoutSec,
 		CacheDBPath:    p.cacheDBPath,
-		Targets:        target,
+		Targets:        targets,
 		Debug:          c.Conf.Debug,
 		Quiet:          c.Conf.Quiet,
 		LogDir:         c.Conf.LogDir,