[#1587] Remove redundant flags

backend/cmd/stork-agent/main.go

@@ -316,15 +316,8 @@ func runRegister(settings *registerSettings) {
 	}
 }
 
-// Read environment file settings. It's parsed before the main settings.
-type environmentFileSettings struct {
-	EnvFile    string `long:"env-file" description:"Environment file location; applicable only if the use-env-file is provided" default:"/etc/stork/agent.env"`
-	UseEnvFile bool   `long:"use-env-file" description:"Read the environment variables from the environment file"`
-}
-
 // General Stork Agent settings. They are used when no command is specified.
 type generalSettings struct {
-	environmentFileSettings
 	Version                             bool   `short:"v" long:"version" description:"Show software version"`
 	Host                                string `long:"host" description:"The IP or hostname to listen on for incoming Stork Server connections" default:"0.0.0.0" env:"STORK_AGENT_HOST"`
 	Port                                int    `long:"port" description:"The TCP port to listen on for incoming Stork Server connections" default:"8080" env:"STORK_AGENT_PORT"`
@@ -337,13 +330,12 @@ type generalSettings struct {
 	PrometheusBind9ExporterPort         int    `long:"prometheus-bind9-exporter-port" description:"The port to listen on for incoming Prometheus connections" default:"9119" env:"STORK_AGENT_PROMETHEUS_BIND9_EXPORTER_PORT"`
 	SkipTLSCertVerification             bool   `long:"skip-tls-cert-verification" description:"Skip TLS certificate verification when the Stork Agent makes HTTP calls over TLS" env:"STORK_AGENT_SKIP_TLS_CERT_VERIFICATION"`
 	ServerURL                           string `long:"server-url" description:"The URL of the Stork Server, used in agent-token-based registration (optional alternative to server-token-based registration)" env:"STORK_AGENT_SERVER_URL"`
-	HookDirectory                       string `long:"hook-directory" description:"The path to the hook directory" default:"/usr/lib/stork-agent/hooks" env:"STORK_AGENT_HOOK_DIRECTORY"`
 	Bind9Path                           string `long:"bind9-path" description:"Specify the path to BIND 9 config file. Does not need to be specified, unless the location is very uncommon." env:"STORK_AGENT_BIND9_CONFIG"`
+	HookDirectory                       string
 }
 
 // Register command settings.
 type registerSettings struct {
-	environmentFileSettings
 	// It is true if the register command was specified. Otherwise, it is false.
 	commandSpecified        bool
 	NonInteractive          bool   `short:"n" long:"non-interactive" description:"Do not prompt for missing arguments" env:"STORK_AGENT_NON_INTERACTIVE"`
@@ -445,19 +437,22 @@ authorization in the server using either the UI or the ReST API (agent-token-bas
 		storkutil.SetupLogging()
 	})
 
-	_, _, isHelp, err := appParser.Parse()
+	hookDirectorySettings, _, isHelp, err := appParser.Parse()
 	if err != nil {
 		err = errors.Wrap(err, "invalid CLI argument")
 		return nil, nil, false, err
+	} else if isHelp {
+		return nil, nil, true, nil
 	}
+	generalSettings.HookDirectory = hookDirectorySettings.HookDirectory
 
 	if registerSettings.commandSpecified {
 		generalSettings = nil
 	} else {
 		registerSettings = nil
 	}
 
-	return generalSettings, registerSettings, isHelp, nil
+	return generalSettings, registerSettings, false, nil
 }
 
 // Parses the command line arguments and runs the specific Stork Agent command.