Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix network resolve introduced with linting #1340

Merged
merged 2 commits into from
May 29, 2023
Merged

Fix network resolve introduced with linting #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5409dc7
Fix network resolve introduced with linting
May 29, 2023
f810506
Restore test
May 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dkron/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
10 changes: 6 additions & 4 deletions dkron/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
27 changes: 25 additions & 2 deletions dkron/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down