zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-03 07:57:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactoring for ee

Browse Source
This commit is contained in:
afeiszli
2022-09-14 13:26:31 -04:00
parent 8a1ba674a7
commit b670755cce
35 changed files with 473 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
functions/helpers.go
View File

@@ -8,17 +8,6 @@ import (
"github.com/gravitl/netmaker/models"
)
// NetworkExists - check if network exists
func NetworkExists(name string) (bool, error) {
var network string
var err error
if network, err = database.FetchRecord(database.NETWORKS_TABLE_NAME, name); err != nil {
return false, err
}
return len(network) > 0, nil
}
// NameInDNSCharSet - name in dns char set
func NameInDNSCharSet(name string) bool {

4
functions/helpers_test.go
View File

@@ -26,7 +26,7 @@ func TestNetworkExists(t *testing.T) {
}
database.DeleteRecord(database.NETWORKS_TABLE_NAME, testNetwork.NetID)
defer database.CloseDB()
exists, err := NetworkExists(testNetwork.NetID)
exists, err := logic.NetworkExists(testNetwork.NetID)
if err == nil {
t.Fatalf("expected error, received nil")
}
@@ -38,7 +38,7 @@ func TestNetworkExists(t *testing.T) {
if err != nil {
t.Fatalf("failed to save test network in databse: %s", err)
}
exists, err = NetworkExists(testNetwork.NetID)
exists, err = logic.NetworkExists(testNetwork.NetID)
if err != nil {
t.Fatalf("expected nil, received err: %s", err)
}