fix(serverless): retry domain creation instead of resolving (#1932)

Codelax · web-flow · commit 245c94ab3f72 · 2023-05-12T16:11:44.000Z
diff --git a/scaleway/helpers_container.go b/scaleway/helpers_container.go
@@ -2,6 +2,8 @@ package scaleway
 
 import (
 	"context"
+	"errors"
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -183,7 +185,33 @@ func expandContainerSecrets(secretsRawMap interface{}) []*container.Secret {
 	return secrets
 }
 
-func isContainerDomainResolved(ctx context.Context, ctnr *container.Container, hostname string, timeout time.Duration) bool {
-	// Add a trailing dot to domain_name to follow cname format
-	return cnameResolver(ctx, timeout, hostname, ctnr.DomainName+".")
+func isContainerDNSResolveError(err error) bool {
+	responseError := &scw.ResponseError{}
+
+	if !errors.As(err, &responseError) {
+		return false
+	}
+
+	if strings.HasPrefix(responseError.Message, "could not validate domain") {
+		return true
+	}
+
+	return false
+}
+
+func retryCreateContainerDomain(ctx context.Context, containerAPI *container.API, req *container.CreateDomainRequest, timeout time.Duration) (*container.Domain, error) {
+	timeoutChannel := time.After(timeout)
+
+	for {
+		select {
+		case <-time.After(defaultContainerRetryInterval):
+			domain, err := containerAPI.CreateDomain(req, scw.WithContext(ctx))
+			if err != nil && isContainerDNSResolveError(err) {
+				continue
+			}
+			return domain, err
+		case <-timeoutChannel:
+			return containerAPI.CreateDomain(req, scw.WithContext(ctx))
+		}
+	}
 }
diff --git a/scaleway/helpers_domain.go b/scaleway/helpers_domain.go
@@ -274,55 +274,6 @@ func waitForDNSZone(ctx context.Context, domainAPI *domain.API, dnsZone string,
 	}, scw.WithContext(ctx))
 }
 
-func newDNSResolver() *net.Resolver {
-	return &net.Resolver{
-		PreferGo: true,
-		Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
-			d := net.Dialer{
-				Timeout: time.Millisecond * time.Duration(500),
-			}
-			conn, err := d.DialContext(ctx, network, "ns0.dom.scw.cloud:53")
-			if err != nil {
-				conn, err = d.DialContext(ctx, network, "ns1.dom.scw.cloud:53")
-			}
-			return conn, err
-		},
-	}
-}
-
-var (
-	dnsResolverTickDelay = time.Millisecond * 500
-	disableDNSResolver   bool
-)
-
-func cnameResolver(ctx context.Context, timeout time.Duration, hostname, expectedCNAME string) bool {
-	if disableDNSResolver {
-		return true
-	}
-	ticker := time.Tick(dnsResolverTickDelay)
-	ctx, cancel := context.WithTimeout(ctx, timeout)
-	defer cancel()
-
-	r := newDNSResolver()
-
-	for range ticker {
-		cname, err := r.LookupCNAME(ctx, hostname)
-		if err != nil {
-			select {
-			case <-ctx.Done():
-				return false
-			default:
-				continue
-			}
-		}
-		if cname == expectedCNAME {
-			return true
-		}
-	}
-
-	return false
-}
-
 func findDefaultReverse(address string) string {
 	parts := strings.Split(address, ".")
 	for i, j := 0, len(parts)-1; i < j; i, j = i+1, j-1 {
diff --git a/scaleway/helpers_function.go b/scaleway/helpers_function.go
@@ -2,10 +2,12 @@ package scaleway
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/http/httputil"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-log/tflog"
@@ -199,7 +201,33 @@ func expandFunctionsSecrets(secretsRawMap interface{}) []*function.Secret {
 	return secrets
 }
 
-func isFunctionDomainResolved(ctx context.Context, fc *function.Function, hostname string, timeout time.Duration) bool {
-	// Add a trailing dot to domain_name to follow cname format
-	return cnameResolver(ctx, timeout, hostname, fc.DomainName+".")
+func isFunctionDNSResolveError(err error) bool {
+	responseError := &scw.ResponseError{}
+
+	if !errors.As(err, &responseError) {
+		return false
+	}
+
+	if strings.HasPrefix(responseError.Message, "could not validate domain") {
+		return true
+	}
+
+	return false
+}
+
+func retryCreateFunctionDomain(ctx context.Context, functionAPI *function.API, req *function.CreateDomainRequest, timeout time.Duration) (*function.Domain, error) {
+	timeoutChannel := time.After(timeout)
+
+	for {
+		select {
+		case <-time.After(defaultFunctionRetryInterval):
+			domain, err := functionAPI.CreateDomain(req, scw.WithContext(ctx))
+			if err != nil && isFunctionDNSResolveError(err) {
+				continue
+			}
+			return domain, err
+		case <-timeoutChannel:
+			return functionAPI.CreateDomain(req, scw.WithContext(ctx))
+		}
+	}
 }
diff --git a/scaleway/provider_test.go b/scaleway/provider_test.go
@@ -572,7 +572,6 @@ func NewTestTools(t *testing.T) *TestTools {
 	require.NoError(t, err)
 
 	if !*UpdateCassettes {
-		disableDNSResolver = true
 		tmp := 0 * time.Second
 		DefaultWaitRetryInterval = &tmp
 	}
diff --git a/scaleway/resource_container_domain.go b/scaleway/resource_container_domain.go
@@ -2,7 +2,6 @@ package scaleway
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -61,20 +60,18 @@ func resourceScalewayContainerDomainCreate(ctx context.Context, d *schema.Resour
 	hostname := d.Get("hostname").(string)
 	containerID := expandID(d.Get("container_id"))
 
-	ctnr, err := waitForContainer(ctx, api, containerID, region, d.Timeout(schema.TimeoutCreate))
+	_, err = waitForContainer(ctx, api, containerID, region, d.Timeout(schema.TimeoutCreate))
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	if !isContainerDomainResolved(ctx, ctnr, hostname, d.Timeout(schema.TimeoutCreate)) {
-		return diag.FromErr(fmt.Errorf("your reverse must resolve. Ensure the command 'dig +short %s' matches your container domain", hostname))
-	}
-
-	domain, err := api.CreateDomain(&container.CreateDomainRequest{
+	req := &container.CreateDomainRequest{
 		Region:      region,
 		Hostname:    hostname,
 		ContainerID: containerID,
-	})
+	}
+
+	domain, err := retryCreateContainerDomain(ctx, api, req, d.Timeout(schema.TimeoutCreate))
 	if err != nil {
 		return diag.FromErr(err)
 	}
diff --git a/scaleway/resource_function_domain.go b/scaleway/resource_function_domain.go
@@ -2,7 +2,6 @@ package scaleway
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -59,24 +58,20 @@ func resourceScalewayFunctionDomainCreate(ctx context.Context, d *schema.Resourc
 	}
 
 	functionID := expandRegionalID(d.Get("function_id").(string)).ID
-	fc, err := waitForFunction(ctx, api, region, functionID, d.Timeout(schema.TimeoutCreate))
+	_, err = waitForFunction(ctx, api, region, functionID, d.Timeout(schema.TimeoutCreate))
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
 	hostname := d.Get("hostname").(string)
 
-	if !isFunctionDomainResolved(ctx, fc, hostname, d.Timeout(schema.TimeoutCreate)) {
-		return diag.FromErr(fmt.Errorf("your reverse must resolve. Ensure the command 'dig +short %s' matches your function domain", hostname))
-	}
-
 	req := &function.CreateDomainRequest{
 		Region:     region,
 		FunctionID: functionID,
 		Hostname:   hostname,
 	}
 
-	domain, err := api.CreateDomain(req, scw.WithContext(ctx))
+	domain, err := retryCreateFunctionDomain(ctx, api, req, d.Timeout(schema.TimeoutCreate))
 	if err != nil {
 		return diag.FromErr(err)
 	}
diff --git a/scaleway/testdata/container-domain-basic.cassette.yaml b/scaleway/testdata/container-domain-basic.cassette.yaml
diff --git a/scaleway/testdata/function-domain-basic.cassette.yaml b/scaleway/testdata/function-domain-basic.cassette.yaml

Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,6 @@ func NewTestTools(t testing.T) TestTools {`
`572`	`572`	`require.NoError(t, err)`
`573`	`573`
`574`	`574`	`if !*UpdateCassettes {`
`575`		`- disableDNSResolver = true`
`576`	`575`	`tmp := 0 * time.Second`
`577`	`576`	`DefaultWaitRetryInterval = &tmp`
`578`	`577`	`}`