Skip to content

Commit 1bca5ae

Browse files
committed
feat(domain_record): add fqdn attribute
1 parent 538c279 commit 1bca5ae

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

scaleway/resource_domain_record.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,11 @@ func resourceScalewayDomainRecord() *schema.Resource {
251251
},
252252
},
253253
},
254+
"fqdn": {
255+
Type: schema.TypeString,
256+
Description: "The FQDN of the record",
257+
Computed: true,
258+
},
254259
"project_id": projectIDSchema(),
255260
},
256261
}
@@ -318,7 +323,6 @@ func resourceScalewayDomainRecordCreate(ctx context.Context, d *schema.ResourceD
318323

319324
d.SetId(recordID)
320325
tflog.Debug(ctx, fmt.Sprintf("record ID[%s]", recordID))
321-
322326
return resourceScalewayDomainRecordRead(ctx, d, meta)
323327
}
324328

@@ -421,7 +425,11 @@ func resourceScalewayDomainRecordRead(ctx context.Context, d *schema.ResourceDat
421425
_ = d.Set("weighted", flattenDomainWeighted(record.WeightedConfig))
422426
_ = d.Set("view", flattenDomainView(record.ViewConfig))
423427
_ = d.Set("project_id", projectID)
424-
428+
if record.Name == "" || record.Name == "@" {
429+
_ = d.Set("fqdn", dnsZone)
430+
} else {
431+
_ = d.Set("fqdn", fmt.Sprintf("%s.%s", record.Name, dnsZone))
432+
}
425433
return nil
426434
}
427435

scaleway/resource_domain_record_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ func TestAccScalewayDomainRecord_Basic(t *testing.T) {
102102
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "data", data),
103103
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "ttl", fmt.Sprint(ttl)),
104104
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "priority", fmt.Sprint(priority)),
105+
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "fqdn", testDNSZone),
105106
testCheckResourceAttrUUID("scaleway_domain_record.tf_A", "id"),
106107
),
107108
},
@@ -124,6 +125,7 @@ func TestAccScalewayDomainRecord_Basic(t *testing.T) {
124125
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "data", data),
125126
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "ttl", fmt.Sprint(ttl)),
126127
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "priority", fmt.Sprint(priority)),
128+
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "fqdn", name+"."+testDNSZone),
127129
testCheckResourceAttrUUID("scaleway_domain_record.tf_A", "id"),
128130
),
129131
},
@@ -146,6 +148,7 @@ func TestAccScalewayDomainRecord_Basic(t *testing.T) {
146148
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "data", dataUpdated),
147149
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "ttl", fmt.Sprint(ttl)),
148150
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "priority", fmt.Sprint(priority)),
151+
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "fqdn", name+"."+testDNSZone),
149152
testCheckResourceAttrUUID("scaleway_domain_record.tf_A", "id"),
150153
),
151154
},
@@ -168,6 +171,7 @@ func TestAccScalewayDomainRecord_Basic(t *testing.T) {
168171
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "data", dataUpdated),
169172
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "ttl", fmt.Sprint(ttlUpdated)),
170173
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "priority", fmt.Sprint(priorityUpdated)),
174+
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "fqdn", name+"."+testDNSZone),
171175
testCheckResourceAttrUUID("scaleway_domain_record.tf_A", "id"),
172176
),
173177
},
@@ -199,6 +203,8 @@ func TestAccScalewayDomainRecord_Basic(t *testing.T) {
199203
resource.TestCheckResourceAttr("scaleway_domain_record.tf_MX", "data", "ASPMX.L.GOOGLE.COM."),
200204
resource.TestCheckResourceAttr("scaleway_domain_record.tf_MX", "ttl", "600"),
201205
resource.TestCheckResourceAttr("scaleway_domain_record.tf_MX", "priority", "1"),
206+
resource.TestCheckResourceAttr("scaleway_domain_record.tf_MX", "fqdn", "record_mx."+testDNSZone),
207+
resource.TestCheckResourceAttr("scaleway_domain_record.tf_A", "fqdn", name+"."+testDNSZone),
202208
testCheckResourceAttrUUID("scaleway_domain_record.tf_MX", "id"),
203209
),
204210
},

0 commit comments

Comments
 (0)