Skip to content

fix(domain): ensure scaleway_domain_record updates on apply #2972

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 3 commits into from
Mar 12, 2025
Merged

fix(domain): ensure scaleway_domain_record updates on apply #2972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b715e75
fix(domain): ensure scaleway_domain_record updates on apply
jremy42 Mar 11, 2025
0dcc12c
fix(domain): ensure scaleway_domain_record updates on apply
jremy42 Mar 12, 2025
98fa0f4
Merge branch 'master' into fix/domain-record-update
jremy42 Mar 12, 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
10 changes: 2 additions & 8 deletions internal/services/domain/record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,6 @@ func resourceDomainRecordRead(ctx context.Context, d *schema.ResourceData, m int

var err error

currentData := d.Get("data")
// check if this is an inline import. Like: "terraform import scaleway_domain_record.www subdomain.domain.tld/11111111-1111-1111-1111-111111111111"
if strings.Contains(d.Id(), "/") {
tab := strings.Split(d.Id(), "/")
Expand Down Expand Up @@ -410,18 +409,13 @@ func resourceDomainRecordRead(ctx context.Context, d *schema.ResourceData, m int

// get the default first record
projectID = dnsZones.DNSZones[0].ProjectID
_ = d.Set("root_zone", dnsZones.DNSZones[0].Subdomain == "")

// retrieve data from record
if len(currentData.(string)) == 0 {
currentData = flattenDomainData(record.Data, record.Type).(string)
}

_ = d.Set("root_zone", dnsZones.DNSZones[0].Subdomain == "")
d.SetId(record.ID)
_ = d.Set("dns_zone", dnsZone)
_ = d.Set("name", record.Name)
_ = d.Set("type", record.Type.String())
_ = d.Set("data", currentData.(string))
_ = d.Set("data", flattenDomainData(record.Data, record.Type).(string))
_ = d.Set("ttl", int(record.TTL))
_ = d.Set("priority", int(record.Priority))
_ = d.Set("geo_ip", flattenDomainGeoIP(record.GeoIPConfig))
Expand Down
15 changes: 8 additions & 7 deletions internal/services/domain/record_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func TestAccDomainRecord_Basic(t *testing.T) {
dns_zone = %[1]q
name = "record_mx"
type = "MX"
data = "ASPMX.L.GOOGLE.COM."
data = "aspmx.l.google.com."
ttl = 600
priority = 1
}
Expand All @@ -151,7 +151,7 @@ func TestAccDomainRecord_Basic(t *testing.T) {
resource.TestCheckResourceAttr("scaleway_domain_record.tf_MX", "dns_zone", testDNSZone),
resource.TestCheckResourceAttr("scaleway_domain_record.tf_MX", "name", "record_mx"),
resource.TestCheckResourceAttr("scaleway_domain_record.tf_MX", "type", "MX"),
resource.TestCheckResourceAttr("scaleway_domain_record.tf_MX", "data", "ASPMX.L.GOOGLE.COM."),
resource.TestCheckResourceAttr("scaleway_domain_record.tf_MX", "data", "aspmx.l.google.com."),
resource.TestCheckResourceAttr("scaleway_domain_record.tf_MX", "ttl", "600"),
resource.TestCheckResourceAttr("scaleway_domain_record.tf_MX", "priority", "1"),
resource.TestCheckResourceAttr("scaleway_domain_record.tf_MX", "fqdn", "record_mx."+testDNSZone),
Expand Down Expand Up @@ -194,15 +194,16 @@ func TestAccDomainRecord_Basic2(t *testing.T) {
dns_zone = %[1]q
name = ""
type = "MX"
data = "10 feedback-smtp.eu-west-1.amazonses.com."
data = "feedback-smtp.eu-west-1.amazonses.com."
priority = 10
ttl = 300
}

resource "scaleway_domain_record" "mx" {
dns_zone = %[1]q
name = ""
type = "MX"
data = "0 mail.scaleway.com."
data = "mail.scaleway.com."
ttl = 300
}

Expand All @@ -229,7 +230,7 @@ func TestAccDomainRecord_Basic2(t *testing.T) {
resource.TestCheckResourceAttr("scaleway_domain_record.aws_mx", "dns_zone", testDNSZone),
resource.TestCheckResourceAttr("scaleway_domain_record.aws_mx", "name", ""),
resource.TestCheckResourceAttr("scaleway_domain_record.aws_mx", "type", "MX"),
resource.TestCheckResourceAttr("scaleway_domain_record.aws_mx", "data", "10 feedback-smtp.eu-west-1.amazonses.com."),
resource.TestCheckResourceAttr("scaleway_domain_record.aws_mx", "data", "feedback-smtp.eu-west-1.amazonses.com."),
resource.TestCheckResourceAttr("scaleway_domain_record.aws_mx", "ttl", "300"),
resource.TestCheckResourceAttr("scaleway_domain_record.aws_mx", "priority", "10"),
acctest.CheckResourceAttrUUID("scaleway_domain_record.aws_mx", "id"),
Expand Down Expand Up @@ -728,8 +729,8 @@ func TestAccDomainRecord_CNAME(t *testing.T) {

name := "tf"
recordType := "CNAME"
data := "xxx.scw.cloud"
dataUpdated := "yyy.scw.cloud"
data := "xxx.scw.cloud."
dataUpdated := "yyy.scw.cloud."
ttl := 3600
ttlUpdated := 43200
priority := 0
Expand Down
Loading
Loading