refactor test following review

This commit is contained in:
Michel Loiseleur 2025-01-19 12:16:41 +01:00
parent cc546820dc
commit 5561d916b1
3 changed files with 13 additions and 10 deletions

View File

@ -66,14 +66,6 @@ func NewTargets(target ...string) Targets {
return t return t
} }
func NewTargetsFromAddr(targets []netip.Addr) Targets {
t := make(Targets, 0, len(targets))
for _, target := range targets {
t = append(t, target.String())
}
return t
}
func (t Targets) String() string { func (t Targets) String() string {
return strings.Join(t, ";") return strings.Join(t, ";")
} }

View File

@ -17,6 +17,7 @@ limitations under the License.
package testutils package testutils
import ( import (
"net/netip"
"reflect" "reflect"
"sort" "sort"
@ -122,3 +123,12 @@ func SameProviderSpecific(a, b endpoint.ProviderSpecific) bool {
sort.Sort(byNames(sb)) sort.Sort(byNames(sb))
return reflect.DeepEqual(sa, sb) return reflect.DeepEqual(sa, sb)
} }
// NewTargetsFromAddr convert an array of netip.Addr to Targets (array of string)
func NewTargetsFromAddr(targets []netip.Addr) endpoint.Targets {
t := make(endpoint.Targets, len(targets))
for i, target := range targets {
t[i] = target.String()
}
return t
}

View File

@ -32,6 +32,7 @@ import (
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
"sigs.k8s.io/external-dns/endpoint" "sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/internal/testutils"
) )
type ServiceSuite struct { type ServiceSuite struct {
@ -411,8 +412,8 @@ func testServiceSourceEndpoints(t *testing.T) {
serviceTypesFilter: []string{}, serviceTypesFilter: []string{},
resolveLoadBalancerHostname: true, resolveLoadBalancerHostname: true,
expected: []*endpoint.Endpoint{ expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.NewTargetsFromAddr(exampleDotComIP4)}, {DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: testutils.NewTargetsFromAddr(exampleDotComIP4)},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeAAAA, Targets: endpoint.NewTargetsFromAddr(exampleDotComIP6)}, {DNSName: "foo.example.org", RecordType: endpoint.RecordTypeAAAA, Targets: testutils.NewTargetsFromAddr(exampleDotComIP6)},
}, },
}, },
{ {