fix lint

Signed-off-by: Kristoffer Dalby <[email protected]>
kradalby · Aug 26, 2023 · 817997a · 817997a
1 parent 0f38521
commit 817997a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/hscontrol/db/routes.go b/hscontrol/db/routes.go
@@ -340,6 +340,8 @@ func (hsdb *HSDatabase) handlePrimarySubnetFailover() error {
  continue
  }
 
+ machine := &route.Machine
+
  if !route.IsPrimary {
  _, err := hsdb.getPrimaryRoute(netip.Prefix(route.Prefix))
  if hsdb.isUniquePrefix(route) || errors.Is(err, gorm.ErrRecordNotFound) {
@@ -355,7 +357,7 @@ func (hsdb *HSDatabase) handlePrimarySubnetFailover() error {
  return err
  }
 
- changedMachines = append(changedMachines, &route.Machine)
+ changedMachines = append(changedMachines, machine)
 
  continue
  }
@@ -429,7 +431,7 @@ func (hsdb *HSDatabase) handlePrimarySubnetFailover() error {
  return err
  }
 
- changedMachines = append(changedMachines, &route.Machine)
+ changedMachines = append(changedMachines, machine)
  }
  }
 

diff --git a/hscontrol/poll.go b/hscontrol/poll.go
@@ -55,6 +55,8 @@ func logPollFunc(
 
 // handlePoll is the common code for the legacy and Noise protocols to
 // managed the poll loop.
+//
+//nolint:gocyclo
 func (h *Headscale) handlePoll(
  writer http.ResponseWriter,
  ctx context.Context,

diff --git a/integration/tsic/tsic.go b/integration/tsic/tsic.go
@@ -20,10 +20,11 @@ import (
 )
 
 const (
- tsicHashLength = 6
- defaultPingCount = 10
- dockerContextPath = "../."
- headscaleCertPath = "/usr/local/share/ca-certificates/headscale.crt"
+ tsicHashLength = 6
+ defaultPingTimeout = 300 * time.Millisecond
+ defaultPingCount = 10
+ dockerContextPath = "../."
+ headscaleCertPath = "/usr/local/share/ca-certificates/headscale.crt"
 )
 
 var (
@@ -561,7 +562,7 @@ func WithPingUntilDirect(direct bool) PingOption {
 // TODO(kradalby): Make multiping, go routine magic.
 func (t *TailscaleInContainer) Ping(hostnameOrIP string, opts ...PingOption) error {
  args := pingArgs{
- timeout: 300 * time.Millisecond,
+ timeout: defaultPingTimeout,
  count: defaultPingCount,
  direct: true,
  }