Bugfix for annotations & labels flags (#2881)

Signed-off-by: Simon Plourde <simon@sensu.io>

CHANGELOG.md

@@ -7,6 +7,9 @@ Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [5.6.0] - TBD
 
+### Fixed
+- Fixed the agent `--annotations` and `--labels` flags.
+
 ## [5.5.1] - 2019-04-15
 
 ### Changed

agent/cmd/start.go

@@ -25,6 +25,9 @@ import (
 
 var (
 	logger *logrus.Entry
+
+	annotations map[string]string
+	labels      map[string]string
 )
 
 const (
@@ -164,6 +167,16 @@ func newStartCommand() *cobra.Command {
 			cfg.Redact = viper.GetStringSlice(flagRedact)
 			cfg.Subscriptions = viper.GetStringSlice(flagSubscriptions)
 
+			// Workaround for https://github.com/sensu/sensu-go/issues/2357. Detect if
+			// the flags for labels and annotations were changed. If so, use their
+			// values since flags take precedence over config
+			if flag := cmd.Flags().Lookup(flagLabels); flag != nil && flag.Changed {
+				cfg.Labels = labels
+			}
+			if flag := cmd.Flags().Lookup(flagAnnotations); flag != nil && flag.Changed {
+				cfg.Annotations = annotations
+			}
+
 			sensuAgent, err := agent.NewAgent(cfg)
 			if err != nil {
 				return err
@@ -279,8 +292,8 @@ func newStartCommand() *cobra.Command {
 	cmd.Flags().String(flagTrustedCAFile, viper.GetString(flagTrustedCAFile), "TLS CA certificate bundle in PEM format")
 	cmd.Flags().Bool(flagInsecureSkipTLSVerify, viper.GetBool(flagInsecureSkipTLSVerify), "skip TLS verification (not recommended!)")
 	cmd.Flags().String(flagLogLevel, viper.GetString(flagLogLevel), "logging level [panic, fatal, error, warn, info, debug]")
-	cmd.Flags().StringToString(flagLabels, viper.GetStringMapString(flagLabels), "entity labels map")
-	cmd.Flags().StringToString(flagAnnotations, viper.GetStringMapString(flagAnnotations), "entity annotations map")
+	cmd.Flags().StringToStringVar(&labels, flagLabels, nil, "entity labels map")
+	cmd.Flags().StringToStringVar(&annotations, flagAnnotations, nil, "entity annotations map")
 
 	cmd.Flags().SetNormalizeFunc(aliasNormalizeFunc)