Deogierize consul

config/config.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"encoding/json"
+	"flag"
 	"io/ioutil"
 	"os"
 	"strings"
@@ -14,7 +15,6 @@ import (
 	"github.com/allegro/marathon-consul/sentry"
 	"github.com/allegro/marathon-consul/sync"
 	"github.com/allegro/marathon-consul/web"
-	flag "github.com/ogier/pflag"
 )
 
 type Config struct {
@@ -35,9 +35,6 @@ type Config struct {
 var config = &Config{}
 
 func New() (*Config, error) {
-	if !flag.Parsed() {
-		config.parseFlags()
-	}
 	flag.Parse()
 	err := config.loadConfigFromFile()
 
@@ -58,7 +55,7 @@ func New() (*Config, error) {
 	return config, err
 }
 
-func (config *Config) parseFlags() {
+func init() {
 	// Consul
 	flag.StringVar(&config.Consul.Port, "consul-port", "8500", "Consul port")
 	flag.BoolVar(&config.Consul.Auth.Enabled, "consul-auth", false, "Use Consul with authentication")
@@ -71,8 +68,8 @@ func (config *Config) parseFlags() {
 	flag.StringVar(&config.Consul.Token, "consul-token", "", "The Consul ACL token")
 	flag.StringVar(&config.Consul.Tag, "consul-tag", "marathon", "Common tag name added to every service registered in Consul, should be unique for every Marathon-cluster connected to Consul")
 	flag.DurationVar(&config.Consul.Timeout.Duration, "consul-timeout", 3*time.Second, "Time limit for requests made by the Consul HTTP client. A Timeout of zero means no timeout")
-	flag.Uint32Var(&config.Consul.AgentFailuresTolerance, "consul-max-agent-failures", 3, "Max number of consecutive request failures for agent before removal from cache")
-	flag.Uint32Var(&config.Consul.RequestRetries, "consul-get-services-retry", 3, "Number of retries on failure when performing requests to Consul. Each retry uses different cached agent")
+	flag.Uint64Var(&config.Consul.AgentFailuresTolerance, "consul-max-agent-failures", 3, "Max number of consecutive request failures for agent before removal from cache")
+	flag.Uint64Var(&config.Consul.RequestRetries, "consul-get-services-retry", 3, "Number of retries on failure when performing requests to Consul. Each retry uses different cached agent")
 	flag.StringVar(&config.Consul.ConsulNameSeparator, "consul-name-separator", ".", "Separator used to create default service name for Consul")
 	flag.StringVar(&config.Consul.IgnoredHealthChecks, "consul-ignored-healthchecks", "", "A comma separated blacklist of Marathon health check types that will not be migrated to Consul, e.g. command,tcp")
 

config/config_test.go

@@ -20,7 +20,7 @@ func TestConfig_NewReturnsErrorWhenFileNotExist(t *testing.T) {
 	clear()
 
 	// given
-	os.Args = []string{"./marathon-consul", "--config-file=unknown.json"}
+	os.Args = []string{"./marathon-consul", "-config-file=unknown.json"}
 
 	// when
 	_, err := New()
@@ -33,7 +33,7 @@ func TestConfig_NewReturnsErrorWhenFileIsNotJson(t *testing.T) {
 	clear()
 
 	// given
-	os.Args = []string{"./marathon-consul", "--config-file=config.go"}
+	os.Args = []string{"./marathon-consul", "-config-file=config.go"}
 
 	// when
 	_, err := New()
@@ -46,7 +46,7 @@ func TestConfig_ShouldReturnErrorForBadLogLevel(t *testing.T) {
 	clear()
 
 	// given
-	os.Args = []string{"./marathon-consul", "--log-level=bad"}
+	os.Args = []string{"./marathon-consul", "-log-level=bad"}
 
 	// when
 	_, err := New()
@@ -59,7 +59,7 @@ func TestConfig_ShouldParseFlags(t *testing.T) {
 	clear()
 
 	// given
-	os.Args = []string{"./marathon-consul", "--log-level=debug", "--marathon-location=test.host:8080", "--log-format=json"}
+	os.Args = []string{"./marathon-consul", "-log-level=debug", "-marathon-location=test.host:8080", "-log-format=json"}
 
 	// when
 	actual, err := New()
@@ -75,7 +75,7 @@ func TestConfig_ShouldUseTextFormatterWhenFormatterIsUnknown(t *testing.T) {
 	clear()
 
 	// given
-	os.Args = []string{"./marathon-consul", "--log-level=debug", "--log-format=unknown"}
+	os.Args = []string{"./marathon-consul", "-log-level=debug", "-log-format=unknown"}
 
 	// when
 	_, err := New()
@@ -142,7 +142,7 @@ func TestConfig_ShouldBeMergedWithFileDefaultsAndFlags(t *testing.T) {
 		configFile: "../debian/config.json",
 	}
 
-	os.Args = []string{"./marathon-consul", "--log-level=debug", "--config-file=../debian/config.json", "--marathon-location=localhost:8080"}
+	os.Args = []string{"./marathon-consul", "-log-level=debug", "-config-file=../debian/config.json", "-marathon-location=localhost:8080"}
 	actual, err := New()
 
 	assert.NoError(t, err)

consul/agent.go

@@ -11,15 +11,15 @@ import (
 type Agent struct {
 	Client   *consulapi.Client
 	IP       string
-	failures uint32
+	failures uint64
 }
 
-func (a *Agent) IncFailures() uint32 {
-	return atomic.AddUint32(&a.failures, 1)
+func (a *Agent) IncFailures() uint64 {
+	return atomic.AddUint64(&a.failures, 1)
 }
 
 func (a *Agent) ClearFailures() {
-	atomic.StoreUint32(&a.failures, 0)
+	atomic.StoreUint64(&a.failures, 0)
 }
 
 func (a *ConcurrentAgents) createAgent(ipAddress string) (*Agent, error) {

consul/config.go

@@ -12,8 +12,8 @@ type Config struct {
 	Token                  string
 	Tag                    string
 	Timeout                time.Interval
-	RequestRetries         uint32
-	AgentFailuresTolerance uint32
+	RequestRetries         uint64
+	AgentFailuresTolerance uint64
 	ConsulNameSeparator    string
 	IgnoredHealthChecks    string
 }

consul/consul.go

@@ -37,7 +37,7 @@ func (c *Consul) GetServices(name string) ([]*service.Service, error) {
 }
 
 func (c *Consul) getServicesUsingProviderWithRetriesOnAgentFailure(provide ServicesProvider) ([]*service.Service, error) {
-	for retry := uint32(0); retry <= c.config.RequestRetries; retry++ {
+	for retry := uint64(0); retry <= c.config.RequestRetries; retry++ {
 		agent, err := c.agents.GetAnyAgent()
 		if err != nil {
 			return nil, err

consul/consul_test.go

@@ -149,7 +149,7 @@ func TestGetServices_RemovingFailingAgentsAndRetrying(t *testing.T) {
 	server1.AddService("serviceB", "passing", []string{"marathon"})
 
 	// add failing clients
-	for i := uint32(2); i < consul.config.RequestRetries; i++ {
+	for i := uint64(2); i < consul.config.RequestRetries; i++ {
 		consul.AddAgent(fmt.Sprintf("127.0.0.%d", i))
 	}
 
@@ -251,7 +251,7 @@ func TestGetServicesUsingProviderWithRetriesOnAgentFailure_ShouldRetryConfigured
 	consul.config.AgentFailuresTolerance = 2
 	consul.config.RequestRetries = 4
 
-	var called uint32
+	var called uint64
 	provider := func(agent *consulapi.Client) ([]*service.Service, error) {
 		called++
 		return nil, fmt.Errorf("error")
@@ -301,7 +301,7 @@ func TestGetAllServices_RemovingFailingAgentsAndRetrying(t *testing.T) {
 	consul.config.RequestRetries = 100
 
 	// add failing clients
-	for i := uint32(2); i < consul.config.RequestRetries; i++ {
+	for i := uint64(2); i < consul.config.RequestRetries; i++ {
 		consul.AddAgent(fmt.Sprintf("127.0.0.%d", i))
 	}
 

debian/marathon-consul.service

@@ -4,7 +4,7 @@ Requires=network-online.target
 After=network-online.target
 
 [Service]
-ExecStart=/usr/bin/marathon-consul --config-file=/etc/marathon-consul.d/config.json
+ExecStart=/usr/bin/marathon-consul -config-file=/etc/marathon-consul.d/config.json
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 KillSignal=SIGINT

debian/marathon-consul.upstart

@@ -7,7 +7,7 @@ respawn
 
 script
    echo $$ > /var/run/marathon-consul.pid
-   exec marathon-consul --config-file=/etc/marathon-consul.d/config.json
+   exec marathon-consul -config-file=/etc/marathon-consul.d/config.json
 end script
 
 post-stop script

glide.yaml

@@ -8,8 +8,6 @@ import:
   subpackages:
   - api
   - testutil
-- package: github.com/ogier/pflag
-  version: 0.0.1
 - package: github.com/rcrowley/go-metrics
   version: bdb33529eca3e55eac7328e07c57012a797af602
 - package: github.com/stretchr/testify

sync/sync.go

@@ -223,4 +223,4 @@ func marathonTaskIdsSet(marathonApps []*apps.App) map[apps.TaskID]struct{} {
 		}
 	}
 	return tasksSet
-}
+}

sync/sync_test.go

@@ -406,7 +406,7 @@ func TestSync_WithDeregisteringFallback(t *testing.T) {
 		consulStub.Register(&task, marathonApp)
 	}
 	marathon.TasksStub = map[apps.AppID][]apps.Task{
-		apps.AppID("/test/app"): []apps.Task{marathonApp.Tasks[0]},
+		apps.AppID("/test/app"): {marathonApp.Tasks[0]},
 	}
 	sync := newSyncWithDefaultConfig(marathon, consulStub)