chore

plan/plan.go

@@ -79,7 +79,7 @@ type planTableRow struct {
 }
 
 func (t planTable) addCurrent(e *endpoint.Endpoint) {
-	dnsName := validateDNSName(e.DNSName)
+	dnsName := sanitizeDNSName(e.DNSName)
 	if _, ok := t.rows[dnsName]; !ok {
 		t.rows[dnsName] = &planTableRow{}
 	}
@@ -87,7 +87,7 @@ func (t planTable) addCurrent(e *endpoint.Endpoint) {
 }
 
 func (t planTable) addCandidate(e *endpoint.Endpoint) {
-	dnsName := validateDNSName(e.DNSName)
+	dnsName := sanitizeDNSName(e.DNSName)
 	if _, ok := t.rows[dnsName]; !ok {
 		t.rows[dnsName] = &planTableRow{}
 	}
@@ -180,10 +180,8 @@ func shouldUpdateTTL(desired, current *endpoint.Endpoint) bool {
 	return desired.RecordTTL != current.RecordTTL
 }
 
-// validateDNSName checks if the DNS name is correct
+// sanitizeDNSName checks if the DNS name is correct
 // for now it only removes space and lower case
-func validateDNSName(dnsName string) string {
-	dnsName = strings.ToLower(dnsName)
-	dnsName = strings.TrimSpace(dnsName)
-	return dnsName
+func sanitizeDNSName(dnsName string) string {
+	return strings.TrimSpace(strings.ToLower(dnsName))
 }

plan/plan_test.go

@@ -359,66 +359,54 @@ func validateEntries(t *testing.T, entries, expected []*endpoint.Endpoint) {
 	}
 }
 
-func TestValidateDNSName(t *testing.T) {
+func TestSanitizeDNSName(t *testing.T) {
 	records := []struct {
 		dnsName string
 		expect  string
-		err     error
 	}{
 		{
 			"3AAAA.FOO.BAR.COM    ",
 			"3aaaa.foo.bar.com",
-			nil,
 		},
 		{
 			"   example.foo.com",
 			"example.foo.com",
-			nil,
 		},
 		{
 			"example123.foo.com ",
 			"example123.foo.com",
-			nil,
 		},
 		{
 			"foo",
 			"foo",
-			nil,
 		},
 		{
 			"123foo.bar",
 			"123foo.bar",
-			nil,
 		},
 		{
 			"foo.com",
 			"foo.com",
-			nil,
 		},
 		{
 			"foo123.COM",
 			"foo123.com",
-			nil,
 		},
 		{
 			"my-exaMple3.FOO.BAR.COM",
 			"my-example3.foo.bar.com",
-			nil,
 		},
 		{
 			"   my-example1214.FOO-1235.BAR-foo.COM   ",
 			"my-example1214.foo-1235.bar-foo.com",
-			nil,
 		},
 		{
 			"my-example-my-example-1214.FOO-1235.BAR-foo.COM",
 			"my-example-my-example-1214.foo-1235.bar-foo.com",
-			nil,
 		},
 	}
 	for _, r := range records {
-		gotName, err := validateDNSName(r.dnsName)
+		gotName := sanitizeDNSName(r.dnsName)
 		assert.Equal(t, r.expect, gotName)
-		assert.Equal(t, r.err, err)
 	}
 }