resolve merge conflicts

logic/tags.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"regexp"
 	"sort"
-	"strings"
 	"sync"
 
 	"github.com/gravitl/netmaker/database"
@@ -194,11 +194,12 @@ func CheckIDSyntax(id string) error {
 	if len(id) < 3 {
 		return errors.New("name should have min 3 characters")
 	}
-	if HasSymbol(id) {
-		return errors.New("symbols are not allowed")
+	reg, err := regexp.Compile("^[a-zA-Z-]+$")
+	if err != nil {
+		return err
 	}
-	if strings.Contains(id, ".") {
-		return errors.New("dots not allowed")
+	if !reg.MatchString(id) {
+		return errors.New("invalid name. allowed characters are [a-zA-Z-]")
 	}
 	return nil
 }

logic/util.go

@@ -10,7 +10,6 @@ import (
 	"os"
 	"strings"
 	"time"
-	"unicode"
 
 	"github.com/c-robinson/iplib"
 	"github.com/gravitl/netmaker/database"
@@ -149,14 +148,4 @@ func IsSlicesEqual(a, b []string) bool {
 	return true
 }
 
-// HasSymbol - checks if string has symbols
-func HasSymbol(str string) bool {
-	for _, letter := range str {
-		if unicode.IsSymbol(letter) {
-			return true
-		}
-	}
-	return false
-}
-
 // == private ==