Merge branch 'develop' of https://github.com/gravitl/netmaker into NET-1923

controllers/hosts.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"os"
 
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
@@ -181,7 +182,11 @@ func pull(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 	if sendPeerUpdate {
-		if err := mq.PublishPeerUpdate(true); err != nil {
+		reset := true
+		if os.Getenv("RESET_PEER_UPDATE") != "" {
+			reset = os.Getenv("RESET_PEER_UPDATE") == "true"
+		}
+		if err := mq.PublishPeerUpdate(reset); err != nil {
 			logger.Log(0, "fail to publish peer update: ", err.Error())
 		}
 	}

logic/tags.go

@@ -259,7 +259,7 @@ func CheckIDSyntax(id string) error {
 	if len(id) < 3 {
 		return errors.New("name should have min 3 characters")
 	}
-	reg, err := regexp.Compile("^[a-zA-Z-]+$")
+	reg, err := regexp.Compile("^[a-zA-Z0-9- ]+$")
 	if err != nil {
 		return err
 	}