gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-05 20:54:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

chore: fix some comments (#2918)

Browse source
This commit is contained in:
momantech 2024-05-08 14:47:23 +08:00 • committed by GitHub
parent 1b86e80299
commit 7e2b5b196a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/enrollmentkeys.go
View file

@ -279,7 +279,7 @@ func handleHostRegister(w http.ResponseWriter, r *http.Request) {
return return
} }
// version check // version check
if !logic.IsVersionComptatible(newHost.Version) { if !logic.IsVersionCompatible(newHost.Version) {
err := fmt.Errorf("bad client version on register: %s", newHost.Version) err := fmt.Errorf("bad client version on register: %s", newHost.Version)
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest")) logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
return return

2
controllers/migrate.go
View file

@ -51,7 +51,7 @@ func migrate(w http.ResponseWriter, r *http.Request) {
} }
var legacyNode models.LegacyNode var legacyNode models.LegacyNode
if err = json.Unmarshal([]byte(record), &legacyNode); err != nil { if err = json.Unmarshal([]byte(record), &legacyNode); err != nil {
slog.Error("decoding legacy node", "errror", err) slog.Error("decoding legacy node", "error", err)
logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("decode legacy node %w", err), "badrequest")) logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("decode legacy node %w", err), "badrequest"))
return return
} }

2
logic/telemetry.go
View file

@ -106,7 +106,7 @@ func FetchTelemetryData() telemetryData {
func getServerCount() int { func getServerCount() int {
data, err := database.FetchRecords(database.SERVER_UUID_TABLE_NAME) data, err := database.FetchRecords(database.SERVER_UUID_TABLE_NAME)
if err != nil { if err != nil {
logger.Log(0, "errror retrieving server data", err.Error()) logger.Log(0, "error retrieving server data", err.Error())
} }
return len(data) return len(data)
} }

2
logic/version.go
View file

@ -10,7 +10,7 @@ import (
const MinVersion = "v0.17.0" const MinVersion = "v0.17.0"
// IsVersionCompatible checks that the version passed is compabtible (>=) with MinVersion // IsVersionCompatible checks that the version passed is compabtible (>=) with MinVersion
func IsVersionComptatible(ver string) bool { func IsVersionCompatible(ver string) bool {
// during dev, assume developers know what they are doing // during dev, assume developers know what they are doing
if ver == "dev" { if ver == "dev" {
return true return true

10
logic/version_test.go
View file

@ -9,27 +9,27 @@ import (
func TestVersion(t *testing.T) { func TestVersion(t *testing.T) {
t.Run("valid version", func(t *testing.T) { t.Run("valid version", func(t *testing.T) {
is := is.New(t) is := is.New(t)
valid := IsVersionComptatible("v0.17.1-testing") valid := IsVersionCompatible("v0.17.1-testing")
is.Equal(valid, true) is.Equal(valid, true)
}) })
t.Run("dev version", func(t *testing.T) { t.Run("dev version", func(t *testing.T) {
is := is.New(t) is := is.New(t)
valid := IsVersionComptatible("dev") valid := IsVersionCompatible("dev")
is.Equal(valid, true) is.Equal(valid, true)
}) })
t.Run("invalid version", func(t *testing.T) { t.Run("invalid version", func(t *testing.T) {
is := is.New(t) is := is.New(t)
valid := IsVersionComptatible("v0.14.2-refactor") valid := IsVersionCompatible("v0.14.2-refactor")
is.Equal(valid, false) is.Equal(valid, false)
}) })
t.Run("no version", func(t *testing.T) { t.Run("no version", func(t *testing.T) {
is := is.New(t) is := is.New(t)
valid := IsVersionComptatible("testing") valid := IsVersionCompatible("testing")
is.Equal(valid, false) is.Equal(valid, false)
}) })
t.Run("incomplete version", func(t *testing.T) { t.Run("incomplete version", func(t *testing.T) {
is := is.New(t) is := is.New(t)
valid := IsVersionComptatible("0.18") valid := IsVersionCompatible("0.18")
is.Equal(valid, true) is.Equal(valid, true)
}) })
} }

2
logic/zombie.go
View file

@ -49,7 +49,7 @@ func CheckZombies(newnode *models.Node) {
func checkForZombieHosts(h *models.Host) { func checkForZombieHosts(h *models.Host) {
hosts, err := GetAllHosts() hosts, err := GetAllHosts()
if err != nil { if err != nil {
logger.Log(3, "errror retrieving all hosts", err.Error()) logger.Log(3, "error retrieving all hosts", err.Error())
} }
for _, existing := range hosts { for _, existing := range hosts {
if existing.ID == h.ID { if existing.ID == h.ID {

2
pro/logic/nodes.go
View file

@ -148,7 +148,7 @@ func GetNetworkIngresses(network string) ([]models.Node, error) {
return ingresses, nil return ingresses, nil
} }
// GetAllowedIpsForInet - get inet cidr for node using a inet gw // GetAllowedIpForInetNodeClient - get inet cidr for node using a inet gw
func GetAllowedIpForInetNodeClient(node, peer *models.Node) []net.IPNet { func GetAllowedIpForInetNodeClient(node, peer *models.Node) []net.IPNet {
var allowedips = []net.IPNet{} var allowedips = []net.IPNet{}

2
servercfg/serverconf.go
View file

@ -620,7 +620,7 @@ func GetNetmakerTenantID() string {
return netmakerTenantID return netmakerTenantID
} }
// GetNetworkLimit - fetches free tier limits on users // GetUserLimit - fetches free tier limits on users
func GetUserLimit() int { func GetUserLimit() int {
var userslimit int var userslimit int
if os.Getenv("USERS_LIMIT") != "" { if os.Getenv("USERS_LIMIT") != "" {