Improve error message for bootstrap.password

Author: bbrks

rest/config_flags.go

@@ -35,7 +35,7 @@ func registerConfigFlags(config *StartupConfig, fs *flag.FlagSet) map[string]con
 		"bootstrap.config_update_frequency": {config: &config.Bootstrap.ConfigUpdateFrequency, flagValue: fs.String("bootstrap.config_update_frequency", persistentConfigDefaultUpdateFrequency.String(), "How often to poll Couchbase Server for new config changes")},
 		"bootstrap.server":                  {config: &config.Bootstrap.Server, flagValue: fs.String("bootstrap.server", "", "Couchbase Server connection string/URL")},
 		"bootstrap.username":                {config: &config.Bootstrap.Username, flagValue: fs.String("bootstrap.username", "", "Username for authenticating to server")},
-		"bootstrap.password":                {config: nil, disabled: true, disabledErrorMessage: "Use config file or X.509 auth instead.", flagValue: fs.String("bootstrap.password", "", "Deprecated and disabled. Do not use. Use config file or X.509 auth.")},
+		"bootstrap.password":                {config: nil, disabled: true, disabledErrorMessage: "Use config file to specify bootstrap password, or use X.509 cert/key path flags instead.", flagValue: fs.String("bootstrap.password", "", "Deprecated and disabled. Do not use. Use config file or X.509 auth.")},
 		"bootstrap.ca_cert_path":            {config: &config.Bootstrap.CACertPath, flagValue: fs.String("bootstrap.ca_cert_path", "", "Root CA cert path for TLS connection")},
 		"bootstrap.server_tls_skip_verify":  {config: &config.Bootstrap.ServerTLSSkipVerify, flagValue: fs.Bool("bootstrap.server_tls_skip_verify", false, "Allow empty server CA Cert Path without attempting to use system root pool")},
 		"bootstrap.x509_cert_path":          {config: &config.Bootstrap.X509CertPath, flagValue: fs.String("bootstrap.x509_cert_path", "", "Cert path (public key) for X.509 bucket auth")},

rest/config_flags_test.go

@@ -188,6 +188,8 @@ func TestDisabledFlagsErrorAndDoNotMutateConfig(t *testing.T) {
 
 	// All disabled flags should be mentioned in the error
 	assert.Contains(t, err.Error(), "bootstrap.password")
+	assert.Contains(t, err.Error(), "Use config file to specify bootstrap password")
+	assert.Contains(t, err.Error(), "use X.509 cert/key path flags instead.")
 
 	// And none should have modified the config
 	assert.Equal(t, "", config.Bootstrap.Password)