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

feat(NET-591): allow generic DNS entries (#2568)

Browse Source
This commit is contained in:
pwillis7
2023-09-20 12:20:08 +00:00
committed by GitHub
parent 7c4870e82f
commit fe842e0f05
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/dns_test.go
View File

@@ -238,7 +238,7 @@ func TestSetDNS(t *testing.T) {
assert.False(t, info.IsDir()) assert.False(t, info.IsDir())
content, err := os.ReadFile("./config/dnsconfig/netmaker.hosts") content, err := os.ReadFile("./config/dnsconfig/netmaker.hosts")
assert.Nil(t, err) assert.Nil(t, err)
assert.Contains(t, string(content), "linuxhost.skynet") assert.Contains(t, string(content), "linuxhost")
}) })
t.Run("EntryExists", func(t *testing.T) { t.Run("EntryExists", func(t *testing.T) {
entry := models.DNSEntry{Address: "10.0.0.3", Name: "newhost", Network: "skynet"} entry := models.DNSEntry{Address: "10.0.0.3", Name: "newhost", Network: "skynet"}
@@ -251,7 +251,7 @@ func TestSetDNS(t *testing.T) {
assert.False(t, info.IsDir()) assert.False(t, info.IsDir())
content, err := os.ReadFile("./config/dnsconfig/netmaker.hosts") content, err := os.ReadFile("./config/dnsconfig/netmaker.hosts")
assert.Nil(t, err) assert.Nil(t, err)
assert.Contains(t, string(content), "newhost.skynet") assert.Contains(t, string(content), "newhost")
}) })
} }

2
logic/dns.go
View File

@@ -32,7 +32,7 @@ func SetDNS() error {
return err return err
} }
for _, entry := range dns { for _, entry := range dns {
hostfile.AddHost(entry.Address, entry.Name+"."+entry.Network) hostfile.AddHost(entry.Address, entry.Name)
} }
} }
if corefilestring == "" { if corefilestring == "" {

2
mq/publishers.go
View File

@@ -315,7 +315,7 @@ func PublishDeleteExtClientDNS(client *models.ExtClient) error {
func PublishCustomDNS(entry *models.DNSEntry) error { func PublishCustomDNS(entry *models.DNSEntry) error {
dns := models.DNSUpdate{ dns := models.DNSUpdate{
Action: models.DNSInsert, Action: models.DNSInsert,
Name: entry.Name + "." + entry.Network, Name: entry.Name,
//entry.Address6 is never used //entry.Address6 is never used
Address: entry.Address, Address: entry.Address,
} }