make auth-token environment variable configurable

pkg/mimirtool/commands/alerts.go

@@ -72,7 +72,7 @@ func (a *AlertmanagerCommand) Register(app *kingpin.Application, envVars EnvVarN
 	alertCmd.Flag("tls-ca-path", "TLS CA certificate to verify Grafana Mimir API as part of mTLS; alternatively, set "+envVars.TLSCAPath+".").Default("").Envar(envVars.TLSCAPath).StringVar(&a.ClientConfig.TLS.CAPath)
 	alertCmd.Flag("tls-cert-path", "TLS client certificate to authenticate with the Grafana Mimir API as part of mTLS; alternatively, set "+envVars.TLSCertPath+".").Default("").Envar(envVars.TLSCertPath).StringVar(&a.ClientConfig.TLS.CertPath)
 	alertCmd.Flag("tls-key-path", "TLS client certificate private key to authenticate with the Grafana Mimir API as part of mTLS; alternatively, set "+envVars.TLSKeyPath+".").Default("").Envar(envVars.TLSKeyPath).StringVar(&a.ClientConfig.TLS.KeyPath)
-	alertCmd.Flag("auth-token", "Authentication token bearer authentication; alternatively, set MIMIR_AUTH_TOKEN.").Default("").Envar("MIMIR_AUTH_TOKEN").StringVar(&a.ClientConfig.AuthToken)
+	alertCmd.Flag("auth-token", "Authentication token bearer authentication; alternatively, set "+envVars.AuthToken+".").Default("").Envar(envVars.AuthToken).StringVar(&a.ClientConfig.AuthToken)
 	// Get Alertmanager Configs Command
 	getAlertsCmd := alertCmd.Command("get", "Get the Alertmanager configuration that is currently in the Grafana Mimir Alertmanager.").Action(a.getConfig)
 	getAlertsCmd.Flag("disable-color", "disable colored output").BoolVar(&a.DisableColor)
@@ -147,7 +147,7 @@ func (a *AlertCommand) Register(app *kingpin.Application, envVars EnvVarNames) {
 	alertCmd.Flag("id", "Mimir tenant id, alternatively set "+envVars.TenantID+".").Envar(envVars.TenantID).Required().StringVar(&a.ClientConfig.ID)
 	alertCmd.Flag("user", fmt.Sprintf("API user to use when contacting Grafana Mimir, alternatively set %s. If empty, %s will be used instead.", envVars.APIUser, envVars.TenantID)).Default("").Envar(envVars.APIUser).StringVar(&a.ClientConfig.User)
 	alertCmd.Flag("key", "API key to use when contacting Grafana Mimir; alternatively, set "+envVars.APIKey+".").Default("").Envar(envVars.APIKey).StringVar(&a.ClientConfig.Key)
-	alertCmd.Flag("authToken", "Authentication token for bearer token or JWT auth, alternatively set MIMIR_AUTH_TOKEN.").Default("").Envar("MIMIR_AUTH_TOKEN").StringVar(&a.ClientConfig.AuthToken)
+	alertCmd.Flag("auth-token", "Authentication token for bearer token or JWT auth, alternatively set "+envVars.AuthToken+".").Default("").Envar(envVars.AuthToken).StringVar(&a.ClientConfig.AuthToken)
 
 	verifyAlertsCmd := alertCmd.Command("verify", "Verifies whether or not alerts in an Alertmanager cluster are deduplicated; useful for verifying correct configuration when transferring from Prometheus to Grafana Mimir alert evaluation.").Action(a.verifyConfig)
 	verifyAlertsCmd.Flag("ignore-alerts", "A comma separated list of Alert names to ignore in deduplication checks.").StringVar(&a.IgnoreString)

pkg/mimirtool/commands/env_var.go

@@ -11,6 +11,7 @@ type EnvVarNames struct {
 	TLSKeyPath      string
 	TenantID        string
 	UseLegacyRoutes string
+	AuthToken       string
 }
 
 func NewEnvVarsWithPrefix(prefix string) EnvVarNames {
@@ -23,6 +24,7 @@ func NewEnvVarsWithPrefix(prefix string) EnvVarNames {
 		tlsCertPath     = "TLS_CERT_PATH"
 		tlsKeyPath      = "TLS_KEY_PATH"
 		useLegacyRoutes = "USE_LEGACY_ROUTES"
+		authToken       = "AUTH_TOKEN"
 	)
 
 	if len(prefix) > 0 && prefix[len(prefix)-1] != '_' {
@@ -38,5 +40,6 @@ func NewEnvVarsWithPrefix(prefix string) EnvVarNames {
 		TLSKeyPath:      prefix + tlsKeyPath,
 		TenantID:        prefix + tenantID,
 		UseLegacyRoutes: prefix + useLegacyRoutes,
+		AuthToken:       prefix + authToken,
 	}
 }

pkg/mimirtool/commands/rules.go

@@ -97,7 +97,7 @@ func (r *RuleCommand) Register(app *kingpin.Application, envVars EnvVarNames) {
 	rulesCmd.Flag("user", fmt.Sprintf("API user to use when contacting Grafana Mimir; alternatively, set %s. If empty, %s is used instead.", envVars.APIUser, envVars.TenantID)).Default("").Envar(envVars.APIUser).StringVar(&r.ClientConfig.User)
 	rulesCmd.Flag("key", "API key to use when contacting Grafana Mimir; alternatively, set "+envVars.APIKey+".").Default("").Envar(envVars.APIKey).StringVar(&r.ClientConfig.Key)
 	rulesCmd.Flag("backend", "Backend type to interact with (deprecated)").Default(rules.MimirBackend).EnumVar(&r.Backend, backends...)
-	rulesCmd.Flag("authToken", "Authentication token for bearer token or JWT auth, alternatively set MIMIR_AUTH_TOKEN.").Default("").Envar("MIMIR_AUTH_TOKEN").StringVar(&r.ClientConfig.AuthToken)
+	rulesCmd.Flag("auth-token", "Authentication token for bearer token or JWT auth, alternatively set "+envVars.AuthToken+".").Default("").Envar(envVars.AuthToken).StringVar(&r.ClientConfig.AuthToken)
 
 	// Register rule commands
 	listCmd := rulesCmd.