From b4c63a7e0a7caefa2d74677d7107ba0e7883443f Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby <kristoffer@tailscale.com>
Date: Thu, 24 Nov 2022 17:26:52 +0100
Subject: [PATCH] Mark the flag properly experimental

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
---
 acls.go                 |  4 ++--
 integration/ssh_test.go | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/acls.go b/acls.go
index 34b213c9..c6b65a1e 100644
--- a/acls.go
+++ b/acls.go
@@ -56,7 +56,7 @@ const (
 	ProtocolFC       = 133 // Fibre Channel
 )
 
-var featureEnableSSH = envknob.RegisterBool("HEADSCALE_FEATURE_SSH")
+var featureEnableSSH = envknob.RegisterBool("HEADSCALE_EXPERIMENTAL_FEATURE_SSH")
 
 // LoadACLPolicy loads the ACL policy from the specify path, and generates the ACL rules.
 func (h *Headscale) LoadACLPolicy(path string) error {
@@ -135,7 +135,7 @@ func (h *Headscale) UpdateACLRules() error {
 		}
 		h.sshPolicy.Rules = sshRules
 	} else if h.aclPolicy != nil && len(h.aclPolicy.SSHs) > 0 {
-		log.Info().Msg("SSH ACLs has been defined, but HEADSCALE_FEATURE_SSH is not enabled, this is a unstable feature, check docs before activating")
+		log.Info().Msg("SSH ACLs has been defined, but HEADSCALE_EXPERIMENTAL_FEATURE_SSH is not enabled, this is a unstable feature, check docs before activating")
 	}
 
 	return nil
diff --git a/integration/ssh_test.go b/integration/ssh_test.go
index 69bcb7ba..47c47333 100644
--- a/integration/ssh_test.go
+++ b/integration/ssh_test.go
@@ -79,7 +79,7 @@ func TestSSHOneNamespaceAllToAll(t *testing.T) {
 			},
 		),
 		hsic.WithConfigEnv(map[string]string{
-			"HEADSCALE_FEATURE_SSH": "1",
+			"HEADSCALE_EXPERIMENTAL_FEATURE_SSH": "1",
 		}),
 	)
 	if err != nil {
@@ -156,7 +156,7 @@ func TestSSHMultipleNamespacesAllToAll(t *testing.T) {
 			},
 		),
 		hsic.WithConfigEnv(map[string]string{
-			"HEADSCALE_FEATURE_SSH": "1",
+			"HEADSCALE_EXPERIMENTAL_FEATURE_SSH": "1",
 		}),
 	)
 	if err != nil {
@@ -232,7 +232,7 @@ func TestSSHNoSSHConfigured(t *testing.T) {
 		),
 		hsic.WithTestName("sshnoneconfigured"),
 		hsic.WithConfigEnv(map[string]string{
-			"HEADSCALE_FEATURE_SSH": "1",
+			"HEADSCALE_EXPERIMENTAL_FEATURE_SSH": "1",
 		}),
 	)
 	if err != nil {
@@ -309,7 +309,7 @@ func TestSSHIsBlockedInACL(t *testing.T) {
 		),
 		hsic.WithTestName("sshisblockedinacl"),
 		hsic.WithConfigEnv(map[string]string{
-			"HEADSCALE_FEATURE_SSH": "1",
+			"HEADSCALE_EXPERIMENTAL_FEATURE_SSH": "1",
 		}),
 	)
 	if err != nil {
@@ -394,7 +394,7 @@ func TestSSNamespaceOnlyIsolation(t *testing.T) {
 		),
 		hsic.WithTestName("sshtwonamespaceaclblock"),
 		hsic.WithConfigEnv(map[string]string{
-			"HEADSCALE_FEATURE_SSH": "1",
+			"HEADSCALE_EXPERIMENTAL_FEATURE_SSH": "1",
 		}),
 	)
 	if err != nil {