fix(domain_record): cname domain creation (#1480)

Codelax · web-flow · commit 3208f12e3732 · 2022-09-21T14:24:19.000+02:00
diff --git a/scaleway/helpers_domain.go b/scaleway/helpers_domain.go
@@ -38,19 +38,22 @@ func flattenDomainData(data string, recordType domain.RecordType) interface{} {
 	return data
 }
 
-func getRecordFromData(data string, records []*domain.Record) (*domain.Record, error) {
+func getRecordFromTypeAndData(dnsType domain.RecordType, data string, records []*domain.Record) (*domain.Record, error) {
 	var currentRecord *domain.Record
 	for _, r := range records {
 		flattedData := flattenDomainData(strings.ToLower(r.Data), r.Type).(string)
 		flattenCurrentData := flattenDomainData(strings.ToLower(data), r.Type).(string)
-		if flattenCurrentData == flattedData {
+		if strings.HasPrefix(flattedData, flattenCurrentData) && r.Type == dnsType {
+			if currentRecord != nil {
+				return nil, fmt.Errorf("multiple records found with same type and data")
+			}
 			currentRecord = r
 			break
 		}
 	}
 
 	if currentRecord == nil {
-		return nil, fmt.Errorf("record with data %s not found", data)
+		return nil, fmt.Errorf("record with type %s and data %s not found", dnsType.String(), data)
 	}
 
 	return currentRecord, nil
diff --git a/scaleway/resource_domain_record.go b/scaleway/resource_domain_record.go
@@ -286,7 +286,7 @@ func resourceScalewayDomainRecordCreate(ctx context.Context, d *schema.ResourceD
 		return diag.FromErr(err)
 	}
 
-	currentRecord, err := getRecordFromData(recordData, dnsZoneData.Records)
+	currentRecord, err := getRecordFromTypeAndData(recordType, recordData, dnsZoneData.Records)
 	if err != nil {
 		return diag.FromErr(err)
 	}
diff --git a/scaleway/resource_domain_record_test.go b/scaleway/resource_domain_record_test.go
@@ -720,6 +720,97 @@ func testAccCheckScalewayDomainRecordExists(tt *TestTools, n string) resource.Te
 	}
 }
 
+func TestAccScalewayDomainRecord_CNAME(t *testing.T) {
+	tt := NewTestTools(t)
+	defer tt.Cleanup()
+
+	testDNSZone := fmt.Sprintf("test-basic.%s", testDomain)
+	l.Debugf("TestAccScalewayDomainRecord_Basic: test dns zone: %s", testDNSZone)
+
+	name := "tf"
+	recordType := "CNAME"
+	data := "xxx.scw.cloud"
+	dataUpdated := "yyy.scw.cloud"
+	ttl := 3600
+	ttlUpdated := 43200
+	priority := 0
+	priorityUpdated := 10
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      testAccCheckScalewayDomainRecordDestroy(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_domain_record" "tf_CNAME" {
+						dns_zone = "%s"
+						name     = "%s"
+						type     = "%s"
+						data     = "%s"
+						ttl      = %d
+						priority = %d
+					}
+				`, testDNSZone, name, recordType, data, ttl, priority),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayDomainRecordExists(tt, "scaleway_domain_record.tf_CNAME"),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "dns_zone", testDNSZone),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "name", name),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "type", recordType),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "data", data),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "ttl", fmt.Sprint(ttl)),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "priority", fmt.Sprint(priority)),
+					testCheckResourceAttrUUID("scaleway_domain_record.tf_CNAME", "id"),
+				),
+			},
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_domain_record" "tf_CNAME" {
+						dns_zone = "%s"
+						name     = "%s"
+						type     = "%s"
+						data     = "%s"
+						ttl      = %d
+						priority = %d
+					}
+				`, testDNSZone, name, recordType, dataUpdated, ttl, priority),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayDomainRecordExists(tt, "scaleway_domain_record.tf_CNAME"),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "dns_zone", testDNSZone),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "name", name),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "type", recordType),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "data", dataUpdated),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "ttl", fmt.Sprint(ttl)),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "priority", fmt.Sprint(priority)),
+					testCheckResourceAttrUUID("scaleway_domain_record.tf_CNAME", "id"),
+				),
+			},
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_domain_record" "tf_CNAME" {
+						dns_zone = "%s"
+						name     = "%s"
+						type     = "%s"
+						data     = "%s"
+						ttl      = %d
+						priority = %d
+					}
+				`, testDNSZone, name, recordType, dataUpdated, ttlUpdated, priorityUpdated),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayDomainRecordExists(tt, "scaleway_domain_record.tf_CNAME"),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "dns_zone", testDNSZone),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "name", name),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "type", recordType),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "data", dataUpdated),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "ttl", fmt.Sprint(ttlUpdated)),
+					resource.TestCheckResourceAttr("scaleway_domain_record.tf_CNAME", "priority", fmt.Sprint(priorityUpdated)),
+					testCheckResourceAttrUUID("scaleway_domain_record.tf_CNAME", "id"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckScalewayDomainRecordDestroy(tt *TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		for _, rs := range state.RootModule().Resources {
diff --git a/scaleway/testdata/domain-record-cname.cassette.yaml b/scaleway/testdata/domain-record-cname.cassette.yaml

Original file line number	Diff line number	Diff line change
`@@ -38,19 +38,22 @@ func flattenDomainData(data string, recordType domain.RecordType) interface{} {`
`38`	`38`	`return data`
`39`	`39`	`}`
`40`	`40`
`41`		`-func getRecordFromData(data string, records []domain.Record) (domain.Record, error) {`
	`41`	`+func getRecordFromTypeAndData(dnsType domain.RecordType, data string, records []domain.Record) (domain.Record, error) {`
`42`	`42`	`var currentRecord *domain.Record`
`43`	`43`	`for _, r := range records {`
`44`	`44`	`flattedData := flattenDomainData(strings.ToLower(r.Data), r.Type).(string)`
`45`	`45`	`flattenCurrentData := flattenDomainData(strings.ToLower(data), r.Type).(string)`
`46`		`- if flattenCurrentData == flattedData {`
	`46`	`+ if strings.HasPrefix(flattedData, flattenCurrentData) && r.Type == dnsType {`
	`47`	`+ if currentRecord != nil {`
	`48`	`+ return nil, fmt.Errorf("multiple records found with same type and data")`
	`49`	`+ }`
`47`	`50`	`currentRecord = r`
`48`	`51`	`break`
`49`	`52`	`}`
`50`	`53`	`}`
`51`	`54`
`52`	`55`	`if currentRecord == nil {`
`53`		`- return nil, fmt.Errorf("record with data %s not found", data)`
	`56`	`+ return nil, fmt.Errorf("record with type %s and data %s not found", dnsType.String(), data)`
`54`	`57`	`}`
`55`	`58`
`56`	`59`	`return currentRecord, nil`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ func resourceScalewayDomainRecordCreate(ctx context.Context, d *schema.ResourceD`
`286`	`286`	`return diag.FromErr(err)`
`287`	`287`	`}`
`288`	`288`
`289`		`- currentRecord, err := getRecordFromData(recordData, dnsZoneData.Records)`
	`289`	`+ currentRecord, err := getRecordFromTypeAndData(recordType, recordData, dnsZoneData.Records)`
`290`	`290`	`if err != nil {`
`291`	`291`	`return diag.FromErr(err)`
`292`	`292`	`}`