fix lint:

Author: jremy42

internal/services/domain/helpers.go

@@ -40,15 +40,19 @@ func getRecordFromTypeAndData(dnsType domain.RecordType, data string, records []
 				if currentRecord != nil {
 					return nil, errors.New("multiple records found with same type and data")
 				}
+
 				currentRecord = r
+
 				break
 			}
 		} else {
 			if strings.HasPrefix(flattedData, flattenCurrentData) && r.Type == dnsType {
 				if currentRecord != nil {
 					return nil, errors.New("multiple records found with same type and data")
 				}
+
 				currentRecord = r
+
 				break
 			}
 		}

internal/services/domain/record.go

@@ -296,7 +296,7 @@ func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, m any) di
 		return diag.FromErr(err)
 	}
 
-	currentRecord, err := getRecordFromTypeAndData(recordType, recordData, dnsZoneData.Records)
+	currentRecord, err := getRecordFromTypeAndData(recordType, flattenDomainData(recordData, recordType).(string), dnsZoneData.Records)
 	if err != nil {
 		return diag.FromErr(err)
 	}

internal/services/domain/record_test.go

@@ -701,7 +701,7 @@ func TestAccDomainRecord_SRVWithDomainDuplication(t *testing.T) {
 
 	name := "_test_srv_bug"
 	recordType := "SRV"
-	data := "0 0 1234 foo.example.com"
+	data := "0 0 1234 foo.example.com."
 	ttl := 60
 	priority := 0
 
@@ -726,7 +726,7 @@ func TestAccDomainRecord_SRVWithDomainDuplication(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "dns_zone", testDNSZone),
 					resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "name", name),
 					resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "type", recordType),
-					resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "data", "0 0 1234 foo.example.com"),
+					resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "data", "0 0 1234 foo.example.com."),
 					resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "ttl", strconv.Itoa(ttl)),
 					resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "priority", strconv.Itoa(priority)),
 					acctest.CheckResourceAttrUUID("scaleway_domain_record.srv_test", "id"),
@@ -738,7 +738,7 @@ func TestAccDomainRecord_SRVWithDomainDuplication(t *testing.T) {
 						dns_zone = "%[1]s"
 						name     = "%[2]s"
 						type     = "%[3]s"
-						data     = "10 0 5678 bar.example.com"
+						data     = "10 0 5678 bar.example.com."
 						priority = 10
 						ttl      = 300
 					}
@@ -748,7 +748,7 @@ func TestAccDomainRecord_SRVWithDomainDuplication(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "dns_zone", testDNSZone),
 					resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "name", name),
 					resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "type", recordType),
-					resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "data", "10 0 5678 bar.example.com"),
+					resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "data", "10 0 5678 bar.example.com."),
 					resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "ttl", "300"),
 					resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "priority", "10"),
 					acctest.CheckResourceAttrUUID("scaleway_domain_record.srv_test", "id"),

internal/services/domain/testdata/domain-record-srv-with-domain-duplication.cassette.yaml

@@ -8,14 +8,6 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
 )
 
-// getStringSafely safely extracts a string value from an interface
-func getStringSafely(v any) string {
-	if s, ok := v.(string); ok {
-		return s
-	}
-	return ""
-}
-
 func flattenDomainData(data string, recordType domain.RecordType) any {
 	switch recordType {
 	case domain.RecordTypeMX: // API return this format: "{priority} {data}"
@@ -39,11 +31,13 @@ func normalizeSRVData(data string) string {
 	if len(parts) >= 4 {
 		priority, weight, port, target := parts[0], parts[1], parts[2], parts[3]
 		target = removeZoneDomainSuffix(target)
+
 		return strings.Join([]string{priority, weight, port, target}, " ")
 	}
 
 	if len(parts) == 3 {
 		priority, port, target := parts[0], parts[1], parts[2]
+
 		return strings.Join([]string{priority, "0", port, target}, " ")
 	}
 
@@ -56,16 +50,26 @@ func removeZoneDomainSuffix(target string) string {
 		return target
 	}
 
+	// Check if the original target had a trailing dot
+	hadTrailingDot := strings.HasSuffix(target, ".")
+
 	targetParts := strings.Split(strings.TrimSuffix(target, "."), ".")
 
 	switch {
 	case len(targetParts) > 4:
-		return strings.Join(targetParts[:len(targetParts)-3], ".")
+		target = strings.Join(targetParts[:len(targetParts)-3], ".")
 	case len(targetParts) > 3:
-		return strings.Join(targetParts[:len(targetParts)-2], ".")
+		target = strings.Join(targetParts[:len(targetParts)-2], ".")
 	default:
-		return strings.TrimSuffix(target, ".")
+		target = strings.TrimSuffix(target, ".")
+	}
+
+	// Restore trailing dot only if it was present in the original
+	if hadTrailingDot {
+		target += "."
 	}
+
+	return target
 }
 
 func flattenDomainGeoIP(config *domain.RecordGeoIPConfig) any {
@@ -181,34 +185,22 @@ func expandDomainHTTPService(i any, ok bool) *domain.RecordHTTPServiceConfig {
 		return nil
 	}
 
-	lst, ok := i.([]any)
-	if !ok || len(lst) == 0 {
-		return nil
-	}
-
-	rawMap, ok := lst[0].(map[string]any)
-	if !ok {
-		return nil
-	}
+	rawMap := i.([]any)[0].(map[string]any)
 
 	ips := []net.IP{}
 
 	rawIPs, ok := rawMap["ips"].([]any)
 	if ok {
 		for _, rawIP := range rawIPs {
-			if s, ok := rawIP.(string); ok {
-				if ip := net.ParseIP(s); ip != nil {
-					ips = append(ips, ip)
-				}
-			}
+			ips = append(ips, net.ParseIP(rawIP.(string)))
 		}
 	}
 
 	return &domain.RecordHTTPServiceConfig{
 		MustContain: types.ExpandStringPtr(rawMap["must_contain"]),
-		URL:         getStringSafely(rawMap["url"]),
+		URL:         rawMap["url"].(string),
 		UserAgent:   types.ExpandStringPtr(rawMap["user_agent"]),
-		Strategy:    domain.RecordHTTPServiceConfigStrategy(getStringSafely(rawMap["strategy"])),
+		Strategy:    domain.RecordHTTPServiceConfigStrategy(rawMap["strategy"].(string)),
 		IPs:         ips,
 	}
 }