Skip to content

fix(domain): fix SRV domain duplication bug #3287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 2, 2025
Merged

fix(domain): fix SRV domain duplication bug #3287

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4fd6475
fix(domain): fix SRV domain duplication bug
jremy42 Aug 27, 2025
9b26ab8
fix lint:
jremy42 Aug 27, 2025
d38165f
Merge branch 'master' into fix/SRV_ducplication_bug
jremy42 Aug 29, 2025
49a9901
Merge branch 'master' into fix/SRV_ducplication_bug
jremy42 Sep 1, 2025
52cac96
add unit test and better help messages
jremy42 Sep 2, 2025
f737272
Merge branch 'master' into fix/SRV_ducplication_bug
jremy42 Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions internal/services/domain/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,26 @@ func getRecordFromTypeAndData(dnsType domain.RecordType, data string, records []
flattedData := flattenDomainData(strings.ToLower(r.Data), r.Type).(string)
flattenCurrentData := flattenDomainData(strings.ToLower(data), r.Type).(string)

if strings.HasPrefix(flattedData, flattenCurrentData) && r.Type == dnsType {
if currentRecord != nil {
return nil, errors.New("multiple records found with same type and data")
if dnsType == domain.RecordTypeSRV {
if flattedData == flattenCurrentData {
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
currentRecord = r

break
break
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion internal/services/domain/record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
66 changes: 66 additions & 0 deletions internal/services/domain/record_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,72 @@ func TestAccDomainRecord_SRVZone(t *testing.T) {
})
}

func TestAccDomainRecord_SRVWithDomainDuplication(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

testDNSZone := "test-srv-duplication." + acctest.TestDomain
logging.L.Debugf("TestAccDomainRecord_SRVWithDomainDuplication: test dns zone: %s", testDNSZone)

name := "_test_srv_bug"
recordType := "SRV"
data := "0 0 1234 foo.example.com."
ttl := 60
priority := 0

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: testAccCheckDomainRecordDestroy(tt),
Steps: []resource.TestStep{
{
Config: fmt.Sprintf(`
resource "scaleway_domain_record" "srv_test" {
dns_zone = "%[1]s"
name = "%[2]s"
type = "%[3]s"
data = "%[4]s"
priority = %[5]d
ttl = %[6]d
}
`, testDNSZone, name, recordType, data, priority, ttl),
Check: resource.ComposeTestCheckFunc(
testAccCheckDomainRecordExists(tt, "scaleway_domain_record.srv_test"),
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", "ttl", strconv.Itoa(ttl)),
resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "priority", strconv.Itoa(priority)),
acctest.CheckResourceAttrUUID("scaleway_domain_record.srv_test", "id"),
),
},
{
Config: fmt.Sprintf(`
resource "scaleway_domain_record" "srv_test" {
dns_zone = "%[1]s"
name = "%[2]s"
type = "%[3]s"
data = "10 0 5678 bar.example.com."
priority = 10
ttl = 300
}
`, testDNSZone, name, recordType),
Check: resource.ComposeTestCheckFunc(
testAccCheckDomainRecordExists(tt, "scaleway_domain_record.srv_test"),
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", "ttl", "300"),
resource.TestCheckResourceAttr("scaleway_domain_record.srv_test", "priority", "10"),
acctest.CheckResourceAttrUUID("scaleway_domain_record.srv_test", "id"),
),
},
},
})
}

func testAccCheckDomainRecordExists(tt *acctest.TestTools, n string) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
Expand Down
Loading
Loading