From 083d2a871c1efb0ae81fb1803c8a43d626600fc1 Mon Sep 17 00:00:00 2001
From: Juan Font <juan.font@esa.int>
Date: Tue, 20 Sep 2022 21:02:44 +0000
Subject: [PATCH] Linting fixes

---
 cmd/headscale/cli/mockoidc.go | 27 +++++++++++++++++++--------
 integration_oidc_test.go      |  2 +-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/cmd/headscale/cli/mockoidc.go b/cmd/headscale/cli/mockoidc.go
index 07248d4c..179a7d43 100644
--- a/cmd/headscale/cli/mockoidc.go
+++ b/cmd/headscale/cli/mockoidc.go
@@ -12,6 +12,14 @@ import (
 	"github.com/spf13/cobra"
 )
 
+const (
+	errMockOidcClientIDNotDefined     = Error("MOCKOIDC_CLIENT_ID not defined")
+	errMockOidcClientSecretNotDefined = Error("MOCKOIDC_CLIENT_SECRET not defined")
+	errMockOidcPortNotDefined         = Error("MOCKOIDC_PORT not defined")
+	accessTTL                         = 10 * time.Minute
+	refreshTTL                        = 60 * time.Minute
+)
+
 func init() {
 	rootCmd.AddCommand(mockOidcCmd)
 }
@@ -32,15 +40,15 @@ var mockOidcCmd = &cobra.Command{
 func mockOIDC() error {
 	clientID := os.Getenv("MOCKOIDC_CLIENT_ID")
 	if clientID == "" {
-		return fmt.Errorf("MOCKOIDC_CLIENT_ID not set")
+		return errMockOidcClientIDNotDefined
 	}
 	clientSecret := os.Getenv("MOCKOIDC_CLIENT_SECRET")
 	if clientSecret == "" {
-		return fmt.Errorf("MOCKOIDC_CLIENT_SECRET not set")
+		return errMockOidcClientSecretNotDefined
 	}
 	portStr := os.Getenv("MOCKOIDC_PORT")
 	if portStr == "" {
-		return fmt.Errorf("MOCKOIDC_PORT not set")
+		return errMockOidcPortNotDefined
 	}
 
 	port, err := strconv.Atoi(portStr)
@@ -53,13 +61,16 @@ func mockOIDC() error {
 		return err
 	}
 
-	ln, err := net.Listen("tcp", fmt.Sprintf("mockoidc:%d", port))
+	listener, err := net.Listen("tcp", fmt.Sprintf("mockoidc:%d", port))
 	if err != nil {
 		return err
 	}
 
-	mock.Start(ln, nil)
-	log.Info().Msgf("Mock OIDC server listening on %s", ln.Addr().String())
+	err = mock.Start(listener, nil)
+	if err != nil {
+		return err
+	}
+	log.Info().Msgf("Mock OIDC server listening on %s", listener.Addr().String())
 	log.Info().Msgf("Issuer: %s", mock.Issuer())
 	c := make(chan struct{})
 	<-c
@@ -76,8 +87,8 @@ func getMockOIDC(clientID string, clientSecret string) (*mockoidc.MockOIDC, erro
 	mock := mockoidc.MockOIDC{
 		ClientID:                      clientID,
 		ClientSecret:                  clientSecret,
-		AccessTTL:                     time.Duration(10) * time.Minute,
-		RefreshTTL:                    time.Duration(60) * time.Minute,
+		AccessTTL:                     accessTTL,
+		RefreshTTL:                    refreshTTL,
 		CodeChallengeMethodsSupported: []string{"plain", "S256"},
 		Keypair:                       keypair,
 		SessionStore:                  mockoidc.NewSessionStore(),
diff --git a/integration_oidc_test.go b/integration_oidc_test.go
index a7baad7f..fc1667b2 100644
--- a/integration_oidc_test.go
+++ b/integration_oidc_test.go
@@ -225,7 +225,7 @@ oidc:
 		client := &http.Client{Transport: insecureTransport}
 		resp, err := client.Get(url)
 		if err != nil {
-			fmt.Printf("headscale for embedded OIDC tests is not ready: %s\n", err)
+			log.Printf("headscale for embedded OIDC tests is not ready: %s\n", err)
 			return err
 		}