From 36ad0003a9e10ece2ecc903f6d43cd8ad4e54afd Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby <kristoffer@tailscale.com>
Date: Tue, 18 Oct 2022 12:09:10 +0200
Subject: [PATCH] golangci-lint --fix

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
---
 integration/hsic/hsic.go     |  9 +++++---
 integration/scenario.go      | 44 +++++++++++++++++++-----------------
 integration/scenario_test.go |  2 --
 integration/tsic/tsic.go     | 20 +++++++++-------
 4 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/integration/hsic/hsic.go b/integration/hsic/hsic.go
index 2b1eedc8..afe9b62c 100644
--- a/integration/hsic/hsic.go
+++ b/integration/hsic/hsic.go
@@ -15,8 +15,10 @@ import (
 	"github.com/ory/dockertest/v3"
 )
 
-const hsicHashLength = 6
-const dockerContextPath = "../."
+const (
+	hsicHashLength    = 6
+	dockerContextPath = "../."
+)
 
 var errHeadscaleStatusCodeNotOk = errors.New("headscale status code not ok")
 
@@ -32,7 +34,8 @@ type HeadscaleInContainer struct {
 func New(
 	pool *dockertest.Pool,
 	port int,
-	network *dockertest.Network) (*HeadscaleInContainer, error) {
+	network *dockertest.Network,
+) (*HeadscaleInContainer, error) {
 	hash, err := headscale.GenerateRandomStringDNSSafe(hsicHashLength)
 	if err != nil {
 		return nil, err
diff --git a/integration/scenario.go b/integration/scenario.go
index 3d664b5f..36c8a430 100644
--- a/integration/scenario.go
+++ b/integration/scenario.go
@@ -19,27 +19,29 @@ import (
 
 const scenarioHashLength = 6
 
-var errNoHeadscaleAvailable = errors.New("no headscale available")
-var errNoNamespaceAvailable = errors.New("no namespace available")
-var TailscaleVersions = []string{
-	"head",
-	"unstable",
-	"1.32.0",
-	"1.30.2",
-	"1.28.0",
-	"1.26.2",
-	"1.24.2",
-	"1.22.2",
-	"1.20.4",
-	"1.18.2",
-	"1.16.2",
+var (
+	errNoHeadscaleAvailable = errors.New("no headscale available")
+	errNoNamespaceAvailable = errors.New("no namespace available")
+	TailscaleVersions       = []string{
+		"head",
+		"unstable",
+		"1.32.0",
+		"1.30.2",
+		"1.28.0",
+		"1.26.2",
+		"1.24.2",
+		"1.22.2",
+		"1.20.4",
+		"1.18.2",
+		"1.16.2",
 
-	// These versions seem to fail when fetching from apt.
-	// "1.14.6",
-	// "1.12.4",
-	// "1.10.2",
-	// "1.8.7",
-}
+		// These versions seem to fail when fetching from apt.
+		// "1.14.6",
+		// "1.12.4",
+		// "1.10.2",
+		// "1.8.7",
+	}
+)
 
 type Namespace struct {
 	Clients map[string]*tsic.TailscaleInContainer
@@ -272,7 +274,7 @@ func (s *Scenario) WaitForTailscaleSync() error {
 
 // CreateHeadscaleEnv is a conventient method returning a set up Headcale
 // test environment with nodes of all versions, joined to the server with X
-// namespaces
+// namespaces.
 func (s *Scenario) CreateHeadscaleEnv(namespaces map[string]int) error {
 	err := s.StartHeadscale()
 	if err != nil {
diff --git a/integration/scenario_test.go b/integration/scenario_test.go
index e94e1d93..c1a51f30 100644
--- a/integration/scenario_test.go
+++ b/integration/scenario_test.go
@@ -44,7 +44,6 @@ func TestHeadscale(t *testing.T) {
 		if err != nil {
 			t.Errorf("headscale failed to become ready: %s", err)
 		}
-
 	})
 
 	t.Run("create-namespace", func(t *testing.T) {
@@ -129,7 +128,6 @@ func TestTailscaleNodesJoiningHeadcale(t *testing.T) {
 		if err != nil {
 			t.Errorf("headscale failed to become ready: %s", err)
 		}
-
 	})
 
 	t.Run("create-namespace", func(t *testing.T) {
diff --git a/integration/tsic/tsic.go b/integration/tsic/tsic.go
index 2dfd852c..ef89b229 100644
--- a/integration/tsic/tsic.go
+++ b/integration/tsic/tsic.go
@@ -16,11 +16,15 @@ import (
 	"tailscale.com/ipn/ipnstate"
 )
 
-const tsicHashLength = 6
-const dockerContextPath = "../."
+const (
+	tsicHashLength    = 6
+	dockerContextPath = "../."
+)
 
-var errTailscalePingFailed = errors.New("ping failed")
-var errTailscaleNotLoggedIn = errors.New("tailscale not logged in")
+var (
+	errTailscalePingFailed  = errors.New("ping failed")
+	errTailscaleNotLoggedIn = errors.New("tailscale not logged in")
+)
 
 type TailscaleInContainer struct {
 	version  string
@@ -34,7 +38,8 @@ type TailscaleInContainer struct {
 func New(
 	pool *dockertest.Pool,
 	version string,
-	network *dockertest.Network) (*TailscaleInContainer, error) {
+	network *dockertest.Network,
+) (*TailscaleInContainer, error) {
 	hash, err := headscale.GenerateRandomStringDNSSafe(tsicHashLength)
 	if err != nil {
 		return nil, err
@@ -130,7 +135,7 @@ func (t *TailscaleInContainer) Up(
 	return nil
 }
 
-// TODO(kradalby): Make cached/lazy
+// TODO(kradalby): Make cached/lazy.
 func (t *TailscaleInContainer) IPs() ([]netip.Addr, error) {
 	ips := make([]netip.Addr, 0)
 
@@ -213,7 +218,7 @@ func (t *TailscaleInContainer) WaitForPeers(expected int) error {
 	})
 }
 
-// TODO(kradalby): Make multiping, go routine magic
+// TODO(kradalby): Make multiping, go routine magic.
 func (t *TailscaleInContainer) Ping(ip netip.Addr) error {
 	return t.pool.Retry(func() error {
 		command := []string{
@@ -245,7 +250,6 @@ func (t *TailscaleInContainer) Ping(ip netip.Addr) error {
 
 		return nil
 	})
-
 }
 
 func createTailscaleBuildOptions(version string) *dockertest.BuildOptions {