fix(domain): domain basic2 test subdomain name collide with basic (scaleway#1322)

Co-authored-by: Rémy Léone <[email protected]>

Author: Codelax

scaleway/resource_domain_record.go

@@ -534,11 +534,11 @@ func resourceScalewayDomainRecordDelete(ctx context.Context, d *schema.ResourceD
 
 		if !hasRecords {
 			_, err = waitForDNSZone(ctx, domainAPI, d.Get("dns_zone").(string), d.Timeout(schema.TimeoutDelete))
-			if err != nil && !ErrCodeEquals(err, domain.ErrCodeNoSuchDNSZone) {
-				if is404Error(err) {
+			if err != nil {
+				if errorCheck(err, domain.ErrCodeNoSuchDNSZone) {
 					return nil
 				}
-				return diag.FromErr(err)
+				return diag.FromErr(fmt.Errorf("failed to wait for dns zone before deleting: %w", err))
 			}
 
 			_, err = domainAPI.DeleteDNSZone(&domain.DeleteDNSZoneRequest{

scaleway/resource_domain_record_test.go

@@ -210,7 +210,7 @@ func TestAccScalewayDomainRecord_Basic2(t *testing.T) {
 	tt := NewTestTools(t)
 	defer tt.Cleanup()
 
-	testDNSZone := fmt.Sprintf("test-basic.%s", testDomain)
+	testDNSZone := fmt.Sprintf("test-basic2.%s", testDomain)
 	l.Debugf("TestAccScalewayDomainRecord_Basic: test dns zone: %s", testDNSZone)
 
 	recordType := "A"
@@ -694,7 +694,7 @@ func testAccCheckScalewayDomainRecordDestroy(tt *TestTools) resource.TestCheckFu
 			}
 
 			if err != nil {
-				return err
+				return fmt.Errorf("failed to check if domain zone exists: %w", err)
 			}
 
 			if listDNSZones.TotalCount > 0 {