change interface of resolveConfigForRetire and refactor

commands.go

@@ -71,7 +71,10 @@ func doConfigtest(fs *flag.FlagSet, argv []string) error {
 retire the host
 */
 func doRetire(fs *flag.FlagSet, argv []string) error {
-	conf, force := resolveConfigForRetire(fs, argv)
+	conf, force, err := resolveConfigForRetire(fs, argv)
+	if err != nil {
+		return fmt.Errorf("failed to load config: %s", err)
+	}
 
 	hostID, err := conf.LoadHostID()
 	if err != nil {

main.go

@@ -63,15 +63,11 @@ func printRetireUsage() {
 	os.Exit(2)
 }
 
-func resolveConfigForRetire(fs *flag.FlagSet, argv []string) (*config.Config, bool) {
+func resolveConfigForRetire(fs *flag.FlagSet, argv []string) (*config.Config, bool, error) {
 	var force = fs.Bool("force", false, "force retirement without prompting")
 	fs.Usage = printRetireUsage
 	conf, err := resolveConfig(fs, argv)
-	if err != nil {
-		logger.Criticalf("failed to load config: %s", err)
-		printRetireUsage()
-	}
-	return conf, *force
+	return conf, *force, err
 }
 
 // resolveConfig parses command line arguments and loads config file to

main_test.go

@@ -71,7 +71,7 @@ func TestDetectForce(t *testing.T) {
 	defer os.Remove(confFile.Name())
 
 	argv := []string{"-conf=" + confFile.Name()}
-	conf, force := resolveConfigForRetire(&flag.FlagSet{}, argv)
+	conf, force, err := resolveConfigForRetire(&flag.FlagSet{}, argv)
 	if force {
 		t.Errorf("force should be false")
 	}
@@ -80,7 +80,7 @@ func TestDetectForce(t *testing.T) {
 	}
 
 	argv = append(argv, "-force")
-	conf, force = resolveConfigForRetire(&flag.FlagSet{}, argv)
+	conf, force, err = resolveConfigForRetire(&flag.FlagSet{}, argv)
 	if !force {
 		t.Errorf("force should be true")
 	}
@@ -113,7 +113,7 @@ func TestResolveConfigForRetire(t *testing.T) {
 		"-role=hoge:fuga",
 	}
 
-	conf, force := resolveConfigForRetire(&flag.FlagSet{}, argv)
+	conf, force, err := resolveConfigForRetire(&flag.FlagSet{}, argv)
 	if force {
 		t.Errorf("force should be false")
 	}