Fix network resolve introduced with linting (#1340)

* Fix network resolve introduced with linting * Restore test
distribworks · May 29, 2023 · ed8cd8d · ed8cd8d
1 parent 3055367
commit ed8cd8d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/dkron/agent.go b/dkron/agent.go
@@ -163,7 +163,7 @@ func (a *Agent) Start() error {
 	rand.Seed(time.Now().UnixNano())
 
 	// Normalize configured addresses
-	if err := a.config.normalizeAddrs(); err != nil {
+	if err := a.config.normalizeAddrs(); err != nil && !errors.Is(err, ErrResolvingHost) {
 		return err
 	}
 

diff --git a/dkron/config.go b/dkron/config.go
@@ -189,6 +189,8 @@ const (
 	DefaultRetryInterval time.Duration = time.Second * 30
 )
 
+var ErrResolvingHost = errors.New("error resolving hostname")
+
 // DefaultConfig returns a Config struct pointer with sensible
 // default settings.
 func DefaultConfig() *Config {
@@ -344,14 +346,14 @@ func (c *Config) normalizeAddrs() error {
 	if c.HTTPAddr != "" {
 		ipStr, err := ParseSingleIPTemplate(c.HTTPAddr)
 		if err != nil {
-			return fmt.Errorf("bind address resolution failed: %v", err)
+			return fmt.Errorf("HTTP address resolution failed: %v", err)
 		}
 		c.HTTPAddr = ipStr
 	}
 
 	addr, err := normalizeAdvertise(c.AdvertiseAddr, c.BindAddr, DefaultBindPort, c.DevMode)
 	if err != nil {
-		return fmt.Errorf("failed to parse HTTP advertise address (%v, %v, %v, %v): %v", c.AdvertiseAddr, c.BindAddr, DefaultBindPort, c.DevMode, err)
+		return fmt.Errorf("failed to parse advertise address (%v, %v, %v, %v): %w", c.AdvertiseAddr, c.BindAddr, DefaultBindPort, c.DevMode, err)
 	}
 	c.AdvertiseAddr = addr
 
@@ -410,10 +412,10 @@ func normalizeAdvertise(addr string, bind string, defport int, dev bool) (string
 		return addr, nil
 	}
 
-	// Fallback to bind address first, and then try resolving the local hostname
+	// TODO: Revisit this as the lookup doesn't work with IP addresses
 	ips, err := net.LookupIP(bind)
 	if err != nil {
-		return "", fmt.Errorf("Error resolving bind address %q: %v", bind, err)
+		return "", ErrResolvingHost //fmt.Errorf("Error resolving bind address %q: %v", bind, err)
 	}
 
 	// Return the first non-localhost unicast address

diff --git a/dkron/config_test.go b/dkron/config_test.go
@@ -40,8 +40,31 @@ func Test_normalizeAdvertise(t *testing.T) {
 	}
 
 	tests := []test{
-		{addr: "192.168.1.1", bind: ":8946", want: "192.168.1.1:8946", dev: false},
-		{addr: "", bind: "127.0.0.1", want: "127.0.0.1:8946", dev: true},
+		{
+			addr: "192.168.1.1",
+			bind: ":8946",
+			dev:  false,
+			want: "192.168.1.1:8946",
+		},
+		{
+			addr: "",
+			bind: "127.0.0.1",
+			dev:  true,
+			want: "127.0.0.1:8946",
+		},
+		// TODO: Revisit this test
+		// {
+		// 	addr: "",
+		// 	bind: "127.0.0.1:8946",
+		// 	dev:  true,
+		// 	want: "127.0.0.1:8946",
+		// },
+		// {
+		// 	addr: "",
+		// 	bind: "localhost:8946",
+		// 	dev:  true,
+		// 	want: "127.0.0.1:8946",
+		// },
 	}
 
 	for _, tc := range tests {