Skip to content

Commit 9b759f0

Browse files
committed
Update changes to match latest state of external-dns code
1 parent b2d678f commit 9b759f0

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

provider/cached_provider_test.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ package provider
1717

1818
import (
1919
"context"
20+
"errors"
2021
"testing"
2122
"time"
2223

@@ -30,7 +31,7 @@ type testProviderFunc struct {
3031
records func(ctx context.Context) ([]*endpoint.Endpoint, error)
3132
applyChanges func(ctx context.Context, changes *plan.Changes) error
3233
propertyValuesEqual func(name string, previous string, current string) bool
33-
adjustEndpoints func(endpoints []*endpoint.Endpoint) []*endpoint.Endpoint
34+
adjustEndpoints func(endpoints []*endpoint.Endpoint) ([]*endpoint.Endpoint, error)
3435
getDomainFilter func() endpoint.DomainFilterInterface
3536
}
3637

@@ -46,7 +47,7 @@ func (p *testProviderFunc) PropertyValuesEqual(name string, previous string, cur
4647
return p.propertyValuesEqual(name, previous, current)
4748
}
4849

49-
func (p *testProviderFunc) AdjustEndpoints(endpoints []*endpoint.Endpoint) []*endpoint.Endpoint {
50+
func (p *testProviderFunc) AdjustEndpoints(endpoints []*endpoint.Endpoint) ([]*endpoint.Endpoint, error) {
5051
return p.adjustEndpoints(endpoints)
5152
}
5253

@@ -75,10 +76,10 @@ func propertyValuesEqualNotCalled(t *testing.T) func(name string, previous strin
7576
}
7677
}
7778

78-
func adjustEndpointsNotCalled(t *testing.T) func(endpoints []*endpoint.Endpoint) []*endpoint.Endpoint {
79-
return func(endpoints []*endpoint.Endpoint) []*endpoint.Endpoint {
79+
func adjustEndpointsNotCalled(t *testing.T) func(endpoints []*endpoint.Endpoint) ([]*endpoint.Endpoint, error) {
80+
return func(endpoints []*endpoint.Endpoint) ([]*endpoint.Endpoint, error) {
8081
t.Errorf("unexpected call to AdjustEndpoints")
81-
return endpoints
82+
return endpoints, errors.New("unexpected call to AdjustEndpoints")
8283
}
8384
}
8485

provider/webhook/api/httpapi_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (p FakeWebhookProvider) AdjustEndpoints(endpoints []*endpoint.Endpoint) ([]
6262
return endpoints, nil
6363
}
6464

65-
func (p FakeWebhookProvider) GetDomainFilter() endpoint.DomainFilter {
65+
func (p FakeWebhookProvider) GetDomainFilter() endpoint.DomainFilterInterface {
6666
return p.domainFilter
6767
}
6868

provider/webhook/webhook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ func (p WebhookProvider) AdjustEndpoints(e []*endpoint.Endpoint) ([]*endpoint.En
296296
}
297297

298298
// GetDomainFilter make calls to get the serialized version of the domain filter
299-
func (p WebhookProvider) GetDomainFilter() endpoint.DomainFilter {
299+
func (p WebhookProvider) GetDomainFilter() endpoint.DomainFilterInterface {
300300
return p.DomainFilter
301301
}
302302

0 commit comments

Comments
 (0)