Merge pull request #568 from antekresic/fix/archiveConfigFlag

Add config file flag to archive command

cmd/archive.go

@@ -97,5 +97,6 @@ func init() {
 	archiveCmd.Flags().SortFlags = false
 	archiveCmd.Flags().AddFlagSet(optionFlagSet())
 	archiveCmd.Flags().AddFlagSet(runtimeOptionFlagSet(false))
+	archiveCmd.Flags().AddFlagSet(configFileFlagSet())
 	archiveCmd.Flags().StringVarP(&archiveOut, "archive-out", "O", archiveOut, "archive output filename")
 }

cmd/config.go

@@ -40,14 +40,22 @@ const configFilename = "config.json"
 var configDirs = configdir.New("loadimpact", "k6")
 var configFile = os.Getenv("K6_CONFIG") // overridden by `-c` flag!
 
+// configFileFlagSet returns a FlagSet that contains flags needed for specifying a config file.
+func configFileFlagSet() *pflag.FlagSet {
+	flags := pflag.NewFlagSet("", 0)
+	flags.StringVarP(&configFile, "config", "c", configFile, "specify config file to read")
+	return flags
+}
+
+// configFlagSet returns a FlagSet with the default run configuration flags.
 func configFlagSet() *pflag.FlagSet {
 	flags := pflag.NewFlagSet("", 0)
 	flags.SortFlags = false
 	flags.StringP("out", "o", "", "`uri` for an external metrics database")
 	flags.BoolP("linger", "l", false, "keep the API server alive past test end")
 	flags.Bool("no-usage-report", false, "don't send anonymous stats to the developers")
 	flags.Bool("no-thresholds", false, "don't run thresholds")
-	flags.StringVarP(&configFile, "config", "c", configFile, "specify config file to read")
+	flags.AddFlagSet(configFileFlagSet())
 	return flags
 }