Fix integration tests. Changed default nodeManagement.keyExpiry to "0"

hopleus · Oct 6, 2024 · 2bf5519 · 2bf5519
1 parent 6a9cb6e
commit 2bf5519
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/hscontrol/types/config.go b/hscontrol/types/config.go
@@ -292,7 +292,7 @@ func LoadConfig(path string, isFile bool) error {
 	viper.SetDefault("tuning.node_mapsession_buffered_chan_size", 30)
 
 	viper.SetDefault("node_management.manual_approve_new_node", false)
-	viper.SetDefault("node_management.key_expiry", "180d")
+	viper.SetDefault("node_management.key_expiry", "0")
 
 	viper.SetDefault("prefixes.allocation", string(IPAllocationStrategySequential))
 

diff --git a/integration/control.go b/integration/control.go
@@ -16,7 +16,7 @@ type ControlServer interface {
 	GetEndpoint() string
 	WaitForRunning() error
 	CreateUser(user string) error
-	CreateAuthKey(user string, reusable bool, ephemeral bool) (*v1.PreAuthKey, error)
+	CreateAuthKey(user string, reusable bool, ephemeral bool, preauthorized bool) (*v1.PreAuthKey, error)
 	ListNodesInUser(user string) ([]*v1.Node, error)
 	GetCert() []byte
 	GetHostname() string

diff --git a/integration/embedded_derp_test.go b/integration/embedded_derp_test.go
@@ -251,7 +251,7 @@ func (s *EmbeddedDERPServerScenario) CreateHeadscaleEnv(
 			}
 		}
 
-		key, err := s.CreatePreAuthKey(userName, true, false)
+		key, err := s.CreatePreAuthKey(userName, true, false, true)
 		if err != nil {
 			return err
 		}

diff --git a/integration/general_test.go b/integration/general_test.go
@@ -173,7 +173,7 @@ func TestAuthKeyLogoutAndRelogin(t *testing.T) {
 			}
 
 			for userName := range spec {
-				key, err := scenario.CreatePreAuthKey(userName, true, false)
+				key, err := scenario.CreatePreAuthKey(userName, true, false, true)
 				if err != nil {
 					t.Fatalf("failed to create pre-auth key for user %s: %s", userName, err)
 				}
@@ -272,7 +272,7 @@ func testEphemeralWithOptions(t *testing.T, opts ...hsic.Option) {
 			t.Fatalf("failed to create tailscale nodes in user %s: %s", userName, err)
 		}
 
-		key, err := scenario.CreatePreAuthKey(userName, true, true)
+		key, err := scenario.CreatePreAuthKey(userName, true, true, true)
 		if err != nil {
 			t.Fatalf("failed to create pre-auth key for user %s: %s", userName, err)
 		}
@@ -362,7 +362,7 @@ func TestEphemeral2006DeletedTooQuickly(t *testing.T) {
 			t.Fatalf("failed to create tailscale nodes in user %s: %s", userName, err)
 		}
 
-		key, err := scenario.CreatePreAuthKey(userName, true, true)
+		key, err := scenario.CreatePreAuthKey(userName, true, true, true)
 		if err != nil {
 			t.Fatalf("failed to create pre-auth key for user %s: %s", userName, err)
 		}

diff --git a/integration/hsic/hsic.go b/integration/hsic/hsic.go
@@ -661,6 +661,7 @@ func (t *HeadscaleInContainer) CreateAuthKey(
 	user string,
 	reusable bool,
 	ephemeral bool,
+	preauthorized bool,
 ) (*v1.PreAuthKey, error) {
 	command := []string{
 		"headscale",
@@ -682,6 +683,10 @@ func (t *HeadscaleInContainer) CreateAuthKey(
 		command = append(command, "--ephemeral")
 	}
 
+	if preauthorized {
+		command = append(command, "--preauthorized")
+	}
+
 	result, _, err := dockertestutil.ExecuteCommand(
 		t.container,
 		command,

diff --git a/integration/scenario.go b/integration/scenario.go
@@ -292,9 +292,10 @@ func (s *Scenario) CreatePreAuthKey(
 	user string,
 	reusable bool,
 	ephemeral bool,
+	preauthorized bool,
 ) (*v1.PreAuthKey, error) {
 	if headscale, err := s.Headscale(); err == nil {
-		key, err := headscale.CreateAuthKey(user, reusable, ephemeral)
+		key, err := headscale.CreateAuthKey(user, reusable, ephemeral, preauthorized)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create user: %w", err)
 		}
@@ -503,7 +504,7 @@ func (s *Scenario) CreateHeadscaleEnv(
 			return err
 		}
 
-		key, err := s.CreatePreAuthKey(userName, true, false)
+		key, err := s.CreatePreAuthKey(userName, true, false, true)
 		if err != nil {
 			return err
 		}

diff --git a/integration/scenario_test.go b/integration/scenario_test.go
@@ -61,7 +61,7 @@ func TestHeadscale(t *testing.T) {
 	})
 
 	t.Run("create-auth-key", func(t *testing.T) {
-		_, err := scenario.CreatePreAuthKey(user, true, false)
+		_, err := scenario.CreatePreAuthKey(user, true, false, true)
 		if err != nil {
 			t.Fatalf("failed to create preauthkey: %s", err)
 		}
@@ -153,7 +153,7 @@ func TestTailscaleNodesJoiningHeadcale(t *testing.T) {
 	})
 
 	t.Run("join-headscale", func(t *testing.T) {
-		key, err := scenario.CreatePreAuthKey(user, true, false)
+		key, err := scenario.CreatePreAuthKey(user, true, false, true)
 		if err != nil {
 			t.Fatalf("failed to create preauthkey: %s", err)
 		}