Apply suggestions from code review

Renamed AlreadyUsed to Used Co-authored-by: Kristoffer Dalby <kradalby@kradalby.no>
juanfont · Oct 13, 2021 · 93517aa · 93517aa
1 parent 30788e1
commit 93517aa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/api.go b/api.go
@@ -395,7 +395,7 @@ func (h *Headscale) handleAuthKey(c *gin.Context, db *gorm.DB, idKey wgkey.Key,
 	m.RegisterMethod = "authKey"
 	db.Save(&m)
 
-	pak.AlreadyUsed = true
+	pak.Used = true
 	db.Save(&pak)
 
 	resp.MachineAuthorized = true

diff --git a/cmd/headscale/cli/preauthkeys.go b/cmd/headscale/cli/preauthkeys.go
@@ -57,7 +57,7 @@ var listPreAuthKeys = &cobra.Command{
 			return
 		}
 
-		d := pterm.TableData{{"ID", "Key", "Reusable", "Ephemeral", "AlreadyUsed", "Expiration", "Created"}}
+		d := pterm.TableData{{"ID", "Key", "Reusable", "Ephemeral", "Used", "Expiration", "Created"}}
 		for _, k := range *keys {
 			expiration := "-"
 			if k.Expiration != nil {
@@ -76,7 +76,7 @@ var listPreAuthKeys = &cobra.Command{
 				k.Key,
 				reusable,
 				strconv.FormatBool(k.Ephemeral),
-				fmt.Sprintf("%v", k.AlreadyUsed),
+				fmt.Sprintf("%v", k.Used),
 				expiration,
 				k.CreatedAt.Format("2006-01-02 15:04:05"),
 			})

diff --git a/preauth_keys.go b/preauth_keys.go
@@ -21,7 +21,7 @@ type PreAuthKey struct {
 	Namespace   Namespace
 	Reusable    bool
 	Ephemeral   bool `gorm:"default:false"`
-	AlreadyUsed bool `gorm:"default:false"`
+	Used bool `gorm:"default:false"`
 
 	CreatedAt  *time.Time
 	Expiration *time.Time
@@ -111,7 +111,7 @@ func (h *Headscale) checkKeyValidity(k string) (*PreAuthKey, error) {
 		return nil, err
 	}
 
-	if len(machines) != 0 || pak.AlreadyUsed {
+	if len(machines) != 0 || pak.Used {
 		return nil, errorAuthKeyNotReusableAlreadyUsed
 	}
 

diff --git a/preauth_keys_test.go b/preauth_keys_test.go
@@ -181,13 +181,13 @@ func (*Suite) TestExpirePreauthKey(c *check.C) {
 	c.Assert(p, check.IsNil)
 }
 
-func (*Suite) TestNotReusableMarkedAsAlreadyUsed(c *check.C) {
+func (*Suite) TestNotReusableMarkedAsUsed(c *check.C) {
 	n, err := h.CreateNamespace("test6")
 	c.Assert(err, check.IsNil)
 
 	pak, err := h.CreatePreAuthKey(n.Name, false, false, nil)
 	c.Assert(err, check.IsNil)
-	pak.AlreadyUsed = true
+	pak.Used = true
 	h.db.Save(&pak)
 
 	_, err = h.checkKeyValidity(pak.Key)