From 11144496015a2ee6dfd80046aace3c5e68c3d12b Mon Sep 17 00:00:00 2001
From: Adrien Raffin-Caboisse <adrien.raffin@sekoia.fr>
Date: Sun, 6 Mar 2022 20:46:17 +0100
Subject: [PATCH] change: update name of method to check and normalize Domain
 name

---
 acls.go            |  2 +-
 namespaces.go      | 14 +++++++-------
 namespaces_test.go |  8 ++++----
 oidc.go            |  2 +-
 poll.go            |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/acls.go b/acls.go
index 95484806..e542a0f3 100644
--- a/acls.go
+++ b/acls.go
@@ -444,7 +444,7 @@ func expandGroup(
 				errInvalidGroup,
 			)
 		}
-		grp, err := NormalizeNamespaceName(group, stripEmailDomain)
+		grp, err := NormalizeName(group, stripEmailDomain)
 		if err != nil {
 			return []string{}, fmt.Errorf(
 				"failed to normalize group %q, err: %w",
diff --git a/namespaces.go b/namespaces.go
index 31517841..74b125d3 100644
--- a/namespaces.go
+++ b/namespaces.go
@@ -41,7 +41,7 @@ type Namespace struct {
 // CreateNamespace creates a new Namespace. Returns error if could not be created
 // or another namespace already exists.
 func (h *Headscale) CreateNamespace(name string) (*Namespace, error) {
-	err := CheckNamespaceName(name)
+	err := CheckName(name)
 	if err != nil {
 		return nil, err
 	}
@@ -104,7 +104,7 @@ func (h *Headscale) RenameNamespace(oldName, newName string) error {
 	if err != nil {
 		return err
 	}
-	err = CheckNamespaceName(newName)
+	err = CheckName(newName)
 	if err != nil {
 		return err
 	}
@@ -150,7 +150,7 @@ func (h *Headscale) ListNamespaces() ([]Namespace, error) {
 
 // ListMachinesInNamespace gets all the nodes in a given namespace.
 func (h *Headscale) ListMachinesInNamespace(name string) ([]Machine, error) {
-	err := CheckNamespaceName(name)
+	err := CheckName(name)
 	if err != nil {
 		return nil, err
 	}
@@ -169,7 +169,7 @@ func (h *Headscale) ListMachinesInNamespace(name string) ([]Machine, error) {
 
 // SetMachineNamespace assigns a Machine to a namespace.
 func (h *Headscale) SetMachineNamespace(machine *Machine, namespaceName string) error {
-	err := CheckNamespaceName(namespaceName)
+	err := CheckName(namespaceName)
 	if err != nil {
 		return err
 	}
@@ -237,9 +237,9 @@ func (n *Namespace) toProto() *v1.Namespace {
 	}
 }
 
-// NormalizeNamespaceName will replace forbidden chars in namespace
+// NormalizeName will replace forbidden chars in namespace
 // it can also return an error if the namespace doesn't respect RFC 952 and 1123.
-func NormalizeNamespaceName(name string, stripEmailDomain bool) (string, error) {
+func NormalizeName(name string, stripEmailDomain bool) (string, error) {
 	name = strings.ToLower(name)
 	name = strings.ReplaceAll(name, "'", "")
 	atIdx := strings.Index(name, "@")
@@ -263,7 +263,7 @@ func NormalizeNamespaceName(name string, stripEmailDomain bool) (string, error)
 	return name, nil
 }
 
-func CheckNamespaceName(name string) error {
+func CheckName(name string) error {
 	if len(name) > labelHostnameLength {
 		return fmt.Errorf(
 			"Namespace must not be over 63 chars. %v doesn't comply with this rule: %w",
diff --git a/namespaces_test.go b/namespaces_test.go
index 1710f7d6..406dccfc 100644
--- a/namespaces_test.go
+++ b/namespaces_test.go
@@ -233,7 +233,7 @@ func (s *Suite) TestGetMapResponseUserProfiles(c *check.C) {
 	c.Assert(found, check.Equals, true)
 }
 
-func TestNormalizeNamespaceName(t *testing.T) {
+func TestNormalizeName(t *testing.T) {
 	type args struct {
 		name             string
 		stripEmailDomain bool
@@ -310,7 +310,7 @@ func TestNormalizeNamespaceName(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := NormalizeNamespaceName(tt.args.name, tt.args.stripEmailDomain)
+			got, err := NormalizeName(tt.args.name, tt.args.stripEmailDomain)
 			if (err != nil) != tt.wantErr {
 				t.Errorf(
 					"NormalizeNamespaceName() error = %v, wantErr %v",
@@ -327,7 +327,7 @@ func TestNormalizeNamespaceName(t *testing.T) {
 	}
 }
 
-func TestCheckNamespaceName(t *testing.T) {
+func TestCheckName(t *testing.T) {
 	type args struct {
 		name string
 	}
@@ -366,7 +366,7 @@ func TestCheckNamespaceName(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := CheckNamespaceName(tt.args.name); (err != nil) != tt.wantErr {
+			if err := CheckName(tt.args.name); (err != nil) != tt.wantErr {
 				t.Errorf("CheckNamespaceName() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})
diff --git a/oidc.go b/oidc.go
index 987bc8b2..a81c4b59 100644
--- a/oidc.go
+++ b/oidc.go
@@ -253,7 +253,7 @@ func (h *Headscale) OIDCCallback(ctx *gin.Context) {
 		return
 	}
 
-	namespaceName, err := NormalizeNamespaceName(
+	namespaceName, err := NormalizeName(
 		claims.Email,
 		h.cfg.OIDC.StripEmaildomain,
 	)
diff --git a/poll.go b/poll.go
index 5723a3d6..0bdd80c6 100644
--- a/poll.go
+++ b/poll.go
@@ -83,7 +83,7 @@ func (h *Headscale) PollNetMapHandler(ctx *gin.Context) {
 		Str("machine", machine.Name).
 		Msg("Found machine in database")
 
-	hname, err := NormalizeNamespaceName(
+	hname, err := NormalizeName(
 		req.Hostinfo.Hostname,
 		h.cfg.OIDC.StripEmaildomain,
 	)