From 5f384c63239d5fe2ce0313e9b16580ed5122369c Mon Sep 17 00:00:00 2001
From: Juan Font Alonso <juanfontalonso@gmail.com>
Date: Thu, 8 Sep 2022 18:11:41 +0200
Subject: [PATCH] Removed old code and minor changes

---
 integration_oidc_test.go | 33 +++++----------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/integration_oidc_test.go b/integration_oidc_test.go
index 0fc3f610..9b4766de 100644
--- a/integration_oidc_test.go
+++ b/integration_oidc_test.go
@@ -25,8 +25,9 @@ import (
 )
 
 const (
-	oidcNamespaceName   = "oidcnamespace"
-	totalOidcContainers = 3
+	oidcHeadscaleHostname = "headscale"
+	oidcNamespaceName     = "oidcnamespace"
+	totalOidcContainers   = 3
 )
 
 type IntegrationOIDCTestSuite struct {
@@ -143,7 +144,7 @@ oidc:
 	err = os.WriteFile(configPath, []byte(config), 0644)
 
 	headscaleOptions := &dockertest.RunOptions{
-		Name: "headscale",
+		Name: oidcHeadscaleHostname,
 		Mounts: []string{
 			fmt.Sprintf(
 				"%s/integration_test/etc_oidc:/etc/headscale",
@@ -158,7 +159,7 @@ oidc:
 		},
 	}
 
-	err = s.pool.RemoveContainerByName("headscale")
+	err = s.pool.RemoveContainerByName(oidcHeadscaleHostname)
 	if err != nil {
 		s.FailNow(
 			fmt.Sprintf(
@@ -225,30 +226,6 @@ oidc:
 	log.Println("headscale create namespace result: ", result)
 	assert.Nil(s.T(), err)
 
-	// log.Printf("Creating pre auth key for %s\n", oidcNamespaceName)
-	// preAuthResult, err := ExecuteCommand(
-	// 	&s.headscale,
-	// 	[]string{
-	// 		"headscale",
-	// 		"--namespace",
-	// 		oidcNamespaceName,
-	// 		"preauthkeys",
-	// 		"create",
-	// 		"--reusable",
-	// 		"--expiration",
-	// 		"24h",
-	// 		"--output",
-	// 		"json",
-	// 	},
-	// 	[]string{"LOG_LEVEL=error"},
-	// )
-	// assert.Nil(s.T(), err)
-
-	// var preAuthKey v1.PreAuthKey
-	// err = json.Unmarshal([]byte(preAuthResult), &preAuthKey)
-	// assert.Nil(s.T(), err)
-	// assert.True(s.T(), preAuthKey.Reusable)
-
 	headscaleEndpoint := fmt.Sprintf(
 		"https://headscale:%s",
 		s.headscale.GetPort("8443/tcp"),