Backport of structs: fix test for empty DNS configuration into releas…

…e/1.6.x (#20254) Co-authored-by: Tim Gross <tgross@hashicorp.com>
hashicorp · Mar 29, 2024 · 9820941 · 9820941
1 parent e8da6cb
commit 9820941
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -2871,7 +2871,7 @@ func (d *DNSConfig) IsZero() bool {
 	if d == nil {
 		return true
 	}
-	return len(d.Options) == 0 || len(d.Searches) == 0 || len(d.Servers) == 0
+	return len(d.Options) == 0 && len(d.Searches) == 0 && len(d.Servers) == 0
 }
 
 // NetworkResource is used to represent available network

diff --git a/nomad/structs/structs_test.go b/nomad/structs/structs_test.go
@@ -7580,6 +7580,7 @@ func TestDNSConfig_Equal(t *testing.T) {
 
 	must.Equal[*DNSConfig](t, nil, nil)
 	must.NotEqual[*DNSConfig](t, nil, new(DNSConfig))
+	must.NotEqual[*DNSConfig](t, nil, &DNSConfig{Servers: []string{"8.8.8.8"}})
 
 	must.StructEqual(t, &DNSConfig{
 		Servers:  []string{"8.8.8.8", "8.8.4.4"},