mirror of
https://github.com/gravitl/netmaker.git
synced 2025-09-04 04:04:17 +08:00
chore: fix some comments (#2918)
This commit is contained in:
parent
1b86e80299
commit
7e2b5b196a
8 changed files with 12 additions and 12 deletions
|
@ -279,7 +279,7 @@ func handleHostRegister(w http.ResponseWriter, r *http.Request) {
|
|||
return
|
||||
}
|
||||
// version check
|
||||
if !logic.IsVersionComptatible(newHost.Version) {
|
||||
if !logic.IsVersionCompatible(newHost.Version) {
|
||||
err := fmt.Errorf("bad client version on register: %s", newHost.Version)
|
||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
||||
return
|
||||
|
|
|
@ -51,7 +51,7 @@ func migrate(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
var legacyNode models.LegacyNode
|
||||
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"))
|
||||
return
|
||||
}
|
||||
|
|
|
@ -106,7 +106,7 @@ func FetchTelemetryData() telemetryData {
|
|||
func getServerCount() int {
|
||||
data, err := database.FetchRecords(database.SERVER_UUID_TABLE_NAME)
|
||||
if err != nil {
|
||||
logger.Log(0, "errror retrieving server data", err.Error())
|
||||
logger.Log(0, "error retrieving server data", err.Error())
|
||||
}
|
||||
return len(data)
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@ import (
|
|||
const MinVersion = "v0.17.0"
|
||||
|
||||
// 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
|
||||
if ver == "dev" {
|
||||
return true
|
||||
|
|
|
@ -9,27 +9,27 @@ import (
|
|||
func TestVersion(t *testing.T) {
|
||||
t.Run("valid version", func(t *testing.T) {
|
||||
is := is.New(t)
|
||||
valid := IsVersionComptatible("v0.17.1-testing")
|
||||
valid := IsVersionCompatible("v0.17.1-testing")
|
||||
is.Equal(valid, true)
|
||||
})
|
||||
t.Run("dev version", func(t *testing.T) {
|
||||
is := is.New(t)
|
||||
valid := IsVersionComptatible("dev")
|
||||
valid := IsVersionCompatible("dev")
|
||||
is.Equal(valid, true)
|
||||
})
|
||||
t.Run("invalid version", func(t *testing.T) {
|
||||
is := is.New(t)
|
||||
valid := IsVersionComptatible("v0.14.2-refactor")
|
||||
valid := IsVersionCompatible("v0.14.2-refactor")
|
||||
is.Equal(valid, false)
|
||||
})
|
||||
t.Run("no version", func(t *testing.T) {
|
||||
is := is.New(t)
|
||||
valid := IsVersionComptatible("testing")
|
||||
valid := IsVersionCompatible("testing")
|
||||
is.Equal(valid, false)
|
||||
})
|
||||
t.Run("incomplete version", func(t *testing.T) {
|
||||
is := is.New(t)
|
||||
valid := IsVersionComptatible("0.18")
|
||||
valid := IsVersionCompatible("0.18")
|
||||
is.Equal(valid, true)
|
||||
})
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ func CheckZombies(newnode *models.Node) {
|
|||
func checkForZombieHosts(h *models.Host) {
|
||||
hosts, err := GetAllHosts()
|
||||
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 {
|
||||
if existing.ID == h.ID {
|
||||
|
|
|
@ -148,7 +148,7 @@ func GetNetworkIngresses(network string) ([]models.Node, error) {
|
|||
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 {
|
||||
var allowedips = []net.IPNet{}
|
||||
|
||||
|
|
|
@ -620,7 +620,7 @@ func GetNetmakerTenantID() string {
|
|||
return netmakerTenantID
|
||||
}
|
||||
|
||||
// GetNetworkLimit - fetches free tier limits on users
|
||||
// GetUserLimit - fetches free tier limits on users
|
||||
func GetUserLimit() int {
|
||||
var userslimit int
|
||||
if os.Getenv("USERS_LIMIT") != "" {
|
||||
|
|
Loading…
Add table
Reference in a new issue