fix incorrect zone matches

Author: maxbischoff

internal/designate/provider/provider.go

@@ -111,12 +111,12 @@ func (p designateProvider) getZones(ctx context.Context) (map[string]string, err
 }
 
 // finds best suitable DNS zone for the hostname
-func (p designateProvider) getHostZoneID(hostname string, managedZones map[string]string) (string, error) {
+func getHostZoneID(hostname string, managedZones map[string]string) string {
 	longestZoneLength := 0
 	resultID := ""
 
 	for zoneID, zoneName := range managedZones {
-		if !strings.HasSuffix(hostname, zoneName) {
+		if !strings.HasSuffix(hostname, "." + zoneName) && hostname != zoneName {
 			continue
 		}
 		ln := len(zoneName)
@@ -126,7 +126,7 @@ func (p designateProvider) getHostZoneID(hostname string, managedZones map[strin
 		}
 	}
 
-	return resultID, nil
+	return resultID
 }
 
 // Records returns the list of records.
@@ -266,11 +266,7 @@ func (p designateProvider) ApplyChanges(ctx context.Context, changes *plan.Chang
 // apply recordset changes by inserting/updating/deleting recordsets
 func (p designateProvider) upsertRecordSet(ctx context.Context, rs *recordSet, managedZones map[string]string) error {
 	if rs.zoneID == "" {
-		var err error
-		rs.zoneID, err = p.getHostZoneID(rs.dnsName, managedZones)
-		if err != nil {
-			return err
-		}
+		rs.zoneID = getHostZoneID(rs.dnsName, managedZones)
 		if rs.zoneID == "" {
 			log.Debugf("Skipping record %s because no hosted zone matching record DNS Name was detected", rs.dnsName)
 			return nil

internal/designate/provider/provider_test.go

@@ -608,3 +608,62 @@ func testDesignateDeleteRecords(t *testing.T, client *fakeDesignateClient) {
 		t.Errorf("not all expected record-sets were deleted. Remained: %v", expected)
 	}
 }
+
+func TestGetHostZoneID(t *testing.T) {
+	tests := []struct {
+		name     string
+		zones    []string
+		hostname string
+		want     string
+	}{
+		{
+			name:     "no zone",
+			zones:    []string{},
+			hostname: "example.com",
+			want:     "",
+		},
+		{
+			name:     "one mismatched zone",
+			zones:    []string{"foo.com."},
+			hostname: "example.com",
+			want:     "",
+		},
+		{
+			name:     "one matching zone",
+			zones:    []string{"example.com"},
+			hostname: "example.com",
+			want:     "example.com",
+		},
+		{
+			name:     "one matching zone, multiple mismatched ones",
+			zones:    []string{"example.com", "foo.com", "bar.com"},
+			hostname: "example.com",
+			want:     "example.com",
+		},
+		{
+			name:     "should use longer of two matching zones",
+			zones:    []string{"example.com", "test.example.com"},
+			hostname: "foo.test.example.com",
+			want:     "test.example.com",
+		},
+		{
+			name:     "should not match on suffix",
+			zones:    []string{"example.com", "test.example.com"},
+			hostname: "first-test.example.com",
+			want:     "example.com",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			zoneMap := map[string]string{}
+			for _, zone := range tt.zones {
+				zoneMap[zone] = zone
+			}
+			got := getHostZoneID(tt.hostname, zoneMap)
+			if got != tt.want {
+				t.Errorf("got=%s, want=%s for hostname=%s and zones=%s", got, tt.want, tt.hostname, tt.zones)
+			}
+		})
+	}
+}