From 5561d916b177f63bb9d32b5294a0accb45de8abd Mon Sep 17 00:00:00 2001 From: Michel Loiseleur Date: Sun, 19 Jan 2025 12:16:41 +0100 Subject: [PATCH] refactor test following review --- endpoint/endpoint.go | 8 -------- internal/testutils/endpoint.go | 10 ++++++++++ source/service_test.go | 5 +++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/endpoint/endpoint.go b/endpoint/endpoint.go index 69813bd7f..1bd2d54fb 100644 --- a/endpoint/endpoint.go +++ b/endpoint/endpoint.go @@ -66,14 +66,6 @@ func NewTargets(target ...string) Targets { 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 { return strings.Join(t, ";") } diff --git a/internal/testutils/endpoint.go b/internal/testutils/endpoint.go index f8b465795..76697e690 100644 --- a/internal/testutils/endpoint.go +++ b/internal/testutils/endpoint.go @@ -17,6 +17,7 @@ limitations under the License. package testutils import ( + "net/netip" "reflect" "sort" @@ -122,3 +123,12 @@ func SameProviderSpecific(a, b endpoint.ProviderSpecific) bool { sort.Sort(byNames(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 +} diff --git a/source/service_test.go b/source/service_test.go index 125a29d15..b992cb139 100644 --- a/source/service_test.go +++ b/source/service_test.go @@ -32,6 +32,7 @@ import ( "k8s.io/client-go/kubernetes/fake" "sigs.k8s.io/external-dns/endpoint" + "sigs.k8s.io/external-dns/internal/testutils" ) type ServiceSuite struct { @@ -411,8 +412,8 @@ func testServiceSourceEndpoints(t *testing.T) { serviceTypesFilter: []string{}, resolveLoadBalancerHostname: true, expected: []*endpoint.Endpoint{ - {DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.NewTargetsFromAddr(exampleDotComIP4)}, - {DNSName: "foo.example.org", RecordType: endpoint.RecordTypeAAAA, Targets: endpoint.NewTargetsFromAddr(exampleDotComIP6)}, + {DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: testutils.NewTargetsFromAddr(exampleDotComIP4)}, + {DNSName: "foo.example.org", RecordType: endpoint.RecordTypeAAAA, Targets: testutils.NewTargetsFromAddr(exampleDotComIP6)}, }, }, {