backport 5506 5546 5789

Signed-off-by: Jan Jansen <jan.jansen@gdata.de>

Author: farodin91

coredns.go

@@ -50,7 +50,7 @@ const (
 
 type CoreDNSConfig struct {
 	coreDNSPrefix                 string
-	domainFilter                  endpoint.DomainFilter
+	domainFilter                  *endpoint.DomainFilter
 	ownerID                       string
 	preFilterExternalOwnedRecords bool
 }
@@ -323,8 +323,8 @@ func (p coreDNSProvider) groupEndpoints(changes *plan.Changes) map[string][]*end
 		grouped[ep.DNSName] = append(grouped[ep.DNSName], ep)
 	}
 	for i, ep := range changes.UpdateNew {
+		log.Debugf("Updating labels (%s) with old labels (%s)", ep.Labels, changes.UpdateOld[i].Labels)
 		ep.Labels = changes.UpdateOld[i].Labels
-		log.Debugf("Updating labels (%s) with old labels(%s)", ep.Labels, changes.UpdateOld[i].Labels)
 		grouped[ep.DNSName] = append(grouped[ep.DNSName], ep)
 	}
 	return grouped

coredns_test.go

@@ -522,9 +522,7 @@ func TestCoreDNSApplyChanges_DomainDoNotMatch(t *testing.T) {
 		client: client,
 		CoreDNSConfig: CoreDNSConfig{
 			coreDNSPrefix: defaultCoreDNSPrefix,
-			domainFilter: endpoint.DomainFilter{
-				Filters: []string{"example.local"},
-			},
+			domainFilter:  endpoint.NewDomainFilter([]string{"example.local"}),
 		},
 	}
 
@@ -636,7 +634,8 @@ func TestGetServices_Duplicate(t *testing.T) {
 	}
 
 	svc := Service{Host: "example.com", Port: 80, Priority: 1, Weight: 10, Text: "hello"}
-	value, _ := json.Marshal(svc)
+	value, err := json.Marshal(svc)
+	require.NoError(t, err)
 
 	mockKV.On("Get", mock.Anything, "/prefix").Return(&etcdcv3.GetResponse{
 		Kvs: []*mvccpb.KeyValue{
@@ -863,7 +862,7 @@ func TestNewCoreDNSProvider(t *testing.T) {
 			testutils.TestHelperEnvSetter(t, tt.envs)
 
 			provider, err := NewCoreDNSProvider(CoreDNSConfig{
-				domainFilter:  endpoint.DomainFilter{},
+				domainFilter:  &endpoint.DomainFilter{},
 				coreDNSPrefix: "/prefix/",
 			}, false)
 			if tt.wantErr {