From 3c570496e96cd15c15d5955148c058452b1d88b1 Mon Sep 17 00:00:00 2001 From: Michel Loiseleur Date: Thu, 7 Dec 2023 10:42:36 +0100 Subject: [PATCH] following review --- provider/ns1/ns1.go | 2 +- provider/rfc2136/rfc2136_test.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/provider/ns1/ns1.go b/provider/ns1/ns1.go index 19b08ae9a..14f2b3c84 100644 --- a/provider/ns1/ns1.go +++ b/provider/ns1/ns1.go @@ -179,7 +179,7 @@ func (p *NS1Provider) Records(ctx context.Context) ([]*endpoint.Endpoint, error) // ns1BuildRecord returns a dns.Record for a change set func (p *NS1Provider) ns1BuildRecord(zoneName string, change *ns1Change) *dns.Record { - record := dns.NewRecord(zoneName, change.Endpoint.DNSName, change.Endpoint.RecordType, nil, nil) + record := dns.NewRecord(zoneName, change.Endpoint.DNSName, change.Endpoint.RecordType, map[string]string{}, []string{}) for _, v := range change.Endpoint.Targets { record.AddAnswer(dns.NewAnswer(strings.Split(v, " "))) } diff --git a/provider/rfc2136/rfc2136_test.go b/provider/rfc2136/rfc2136_test.go index 55f18c105..26f3d7186 100644 --- a/provider/rfc2136/rfc2136_test.go +++ b/provider/rfc2136/rfc2136_test.go @@ -48,7 +48,7 @@ func newStub() *rfc2136Stub { func (r *rfc2136Stub) SendMessage(msg *dns.Msg) error { log.Info(msg.String()) - lines := extractAuthoritySectionFromMessage(msg) + lines := extractUpdateSectionFromMessage(msg) for _, line := range lines { // break at first empty line if len(strings.TrimSpace(line)) == 0 { @@ -98,10 +98,10 @@ func createRfc2136StubProvider(stub *rfc2136Stub) (provider.Provider, error) { return NewRfc2136Provider("", 0, nil, false, "key", "secret", "hmac-sha512", true, endpoint.DomainFilter{}, false, 300*time.Second, false, "", "", "", 50, stub) } -func extractAuthoritySectionFromMessage(msg fmt.Stringer) []string { +func extractUpdateSectionFromMessage(msg fmt.Stringer) []string { const searchPattern = "UPDATE SECTION:" - authoritySectionOffset := strings.Index(msg.String(), searchPattern) - return strings.Split(strings.TrimSpace(msg.String()[authoritySectionOffset+len(searchPattern):]), "\n") + updateSectionOffset := strings.Index(msg.String(), searchPattern) + return strings.Split(strings.TrimSpace(msg.String()[updateSectionOffset+len(searchPattern):]), "\n") } // TestRfc2136GetRecordsMultipleTargets simulates a single record with multiple targets. @@ -241,7 +241,7 @@ func TestRfc2136ApplyChangesWithDifferentTTLs(t *testing.T) { err = provider.ApplyChanges(context.Background(), p) assert.NoError(t, err) - createRecords := extractAuthoritySectionFromMessage(stub.createMsgs[0]) + createRecords := extractUpdateSectionFromMessage(stub.createMsgs[0]) assert.Equal(t, 3, len(createRecords)) assert.True(t, strings.Contains(createRecords[0], "v1.foo.com")) assert.True(t, strings.Contains(createRecords[0], "2.1.1.1"))