config: remove deprecated flags

config/config.go

@@ -286,40 +286,10 @@ func (c *Config) LoadFlags(arguments []string) error {
 	f.StringVar(&path, "config", "", "")
 	// BEGIN IGNORED FLAGS
 
-	// BEGIN DEPRECATED FLAGS
-	f.StringVar(&peers, "C", "", "(deprecated)")
-	f.StringVar(&c.PeersFile, "CF", c.PeersFile, "(deprecated)")
-	f.StringVar(&c.Name, "n", c.Name, "(deprecated)")
-	f.StringVar(&c.Addr, "c", c.Addr, "(deprecated)")
-	f.StringVar(&c.BindAddr, "cl", c.BindAddr, "(deprecated)")
-	f.StringVar(&c.Peer.Addr, "s", c.Peer.Addr, "(deprecated)")
-	f.StringVar(&c.Peer.BindAddr, "sl", c.Peer.BindAddr, "(deprecated)")
-	f.StringVar(&c.Peer.CAFile, "serverCAFile", c.Peer.CAFile, "(deprecated)")
-	f.StringVar(&c.Peer.CertFile, "serverCert", c.Peer.CertFile, "(deprecated)")
-	f.StringVar(&c.Peer.KeyFile, "serverKey", c.Peer.KeyFile, "(deprecated)")
-	f.StringVar(&c.CAFile, "clientCAFile", c.CAFile, "(deprecated)")
-	f.StringVar(&c.CertFile, "clientCert", c.CertFile, "(deprecated)")
-	f.StringVar(&c.KeyFile, "clientKey", c.KeyFile, "(deprecated)")
-	f.StringVar(&c.DataDir, "d", c.DataDir, "(deprecated)")
-	f.IntVar(&c.MaxResultBuffer, "m", c.MaxResultBuffer, "(deprecated)")
-	f.IntVar(&c.MaxRetryAttempts, "r", c.MaxRetryAttempts, "(deprecated)")
-	f.IntVar(&c.SnapshotCount, "snapshotCount", c.SnapshotCount, "(deprecated)")
-	f.IntVar(&c.Peer.HeartbeatInterval, "peer-heartbeat-timeout", c.Peer.HeartbeatInterval, "(deprecated)")
-	f.IntVar(&c.Cluster.ActiveSize, "max-cluster-size", c.Cluster.ActiveSize, "(deprecated)")
-	f.IntVar(&c.Cluster.ActiveSize, "maxsize", c.Cluster.ActiveSize, "(deprecated)")
-	// END DEPRECATED FLAGS
-
 	if err := f.Parse(arguments); err != nil {
 		return err
 	}
 
-	// Print deprecation warnings on STDERR.
-	f.Visit(func(f *flag.Flag) {
-		if len(newFlagNameLookup[f.Name]) > 0 {
-			fmt.Fprintf(os.Stderr, "[deprecated] use -%s, not -%s\n", newFlagNameLookup[f.Name], f.Name)
-		}
-	})
-
 	// Convert some parameters to lists.
 	if peers != "" {
 		c.Peers = ustrings.TrimSplit(peers, ",")

config/config_test.go

@@ -608,150 +608,6 @@ func TestConfigCLIArgsOverrideEnvVar(t *testing.T) {
 	assert.Equal(t, c.Addr, "127.0.0.1:2000", "")
 }
 
-//--------------------------------------
-// DEPRECATED (v1)
-//--------------------------------------
-
-func TestConfigDeprecatedAddrFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-c", "127.0.0.1:4002"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Addr, "127.0.0.1:4002")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -addr, not -c\n")
-}
-
-func TestConfigDeprecatedBindAddrFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-cl", "127.0.0.1:4003"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.BindAddr, "127.0.0.1:4003", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -bind-addr, not -cl\n", "")
-}
-
-func TestConfigDeprecatedCAFileFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-clientCAFile", "/tmp/file.ca"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.CAFile, "/tmp/file.ca", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -ca-file, not -clientCAFile\n", "")
-}
-
-func TestConfigDeprecatedCertFileFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-clientCert", "/tmp/file.cert"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.CertFile, "/tmp/file.cert", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -cert-file, not -clientCert\n", "")
-}
-
-func TestConfigDeprecatedKeyFileFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-clientKey", "/tmp/file.key"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.KeyFile, "/tmp/file.key", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -key-file, not -clientKey\n", "")
-}
-
-func TestConfigDeprecatedPeersFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-C", "coreos.com:4001,coreos.com:4002"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Peers, []string{"coreos.com:4001", "coreos.com:4002"}, "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -peers, not -C\n", "")
-}
-
-func TestConfigDeprecatedPeersFileFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-CF", "/tmp/machines"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.PeersFile, "/tmp/machines", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -peers-file, not -CF\n", "")
-}
-
-func TestConfigDeprecatedMaxRetryAttemptsFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-r", "10"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.MaxRetryAttempts, 10, "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -max-retry-attempts, not -r\n", "")
-}
-
-func TestConfigDeprecatedNameFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-n", "test-name"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Name, "test-name", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -name, not -n\n", "")
-}
-
-func TestConfigDeprecatedPeerAddrFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-s", "localhost:7002"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Peer.Addr, "localhost:7002", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -peer-addr, not -s\n", "")
-}
-
-func TestConfigDeprecatedPeerBindAddrFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-sl", "127.0.0.1:4003"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Peer.BindAddr, "127.0.0.1:4003", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -peer-bind-addr, not -sl\n", "")
-}
-
-func TestConfigDeprecatedPeerCAFileFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-serverCAFile", "/tmp/peer/file.ca"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Peer.CAFile, "/tmp/peer/file.ca", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -peer-ca-file, not -serverCAFile\n", "")
-}
-
-func TestConfigDeprecatedPeerCertFileFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-serverCert", "/tmp/peer/file.cert"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Peer.CertFile, "/tmp/peer/file.cert", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -peer-cert-file, not -serverCert\n", "")
-}
-
-func TestConfigDeprecatedPeerKeyFileFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-serverKey", "/tmp/peer/file.key"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Peer.KeyFile, "/tmp/peer/file.key", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -peer-key-file, not -serverKey\n", "")
-}
-
 //--------------------------------------
 // Helpers
 //--------------------------------------