Skip to content

fix(tem): properly fail scaleway_tem_domain_validation on timeout #2998

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.

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 4 commits into from
Mar 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 10 additions & 0 deletions internal/services/tem/domain_validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,16 @@ func ResourceDomainValidationCreate(ctx context.Context, d *schema.ResourceData,
return nil
})

domainCheck, _ := api.CheckDomain(&tem.CheckDomainRequest{
Region: region,
DomainID: domain.ID,
})
if domainCheck == nil || domainCheck.Status == "pending" || domainCheck.Status == "unchecked" || domainCheck.Status == "autoconfiguring" {
d.SetId("")

return diag.Errorf("domain validation did not complete in %d seconds", duration)
}

return ResourceDomainValidationRead(ctx, d, meta)
}

Expand Down
47 changes: 23 additions & 24 deletions internal/services/tem/domain_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package tem_test

import (
"fmt"
"regexp"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
Expand All @@ -10,11 +11,11 @@ import (

const domainNameValidation = "scaleway-terraform.com"

func TestAccDomainValidation_NoValidation(t *testing.T) {
func TestAccDomainValidation_Validation(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

subDomainName := "validation-no-validation"
subDomainName := "validation-validation"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
Expand All @@ -32,27 +33,28 @@ func TestAccDomainValidation_NoValidation(t *testing.T) {
resource scaleway_tem_domain cr01 {
name = scaleway_domain_zone.test.id
accept_tos = true
autoconfig = true
}

resource scaleway_tem_domain_validation valid {
domain_id = scaleway_tem_domain.cr01.id
region = scaleway_tem_domain.cr01.region
timeout = 1
timeout = 3600
}
`, domainNameValidation, subDomainName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "false"),
resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "true"),
),
},
},
})
}

func TestAccDomainValidation_Validation(t *testing.T) {
func TestAccDomainValidation_TimeoutError(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

subDomainName := "validation-validation"
subDomainName := "validation-timeout"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
Expand All @@ -62,26 +64,23 @@ func TestAccDomainValidation_Validation(t *testing.T) {
{
Config: fmt.Sprintf(`

resource "scaleway_domain_zone" "test" {
domain = "%s"
subdomain = "%s"
}
resource "scaleway_domain_zone" "test" {
domain = "%s"
subdomain = "%s"
}

resource scaleway_tem_domain cr01 {
name = scaleway_domain_zone.test.id
accept_tos = true
autoconfig = true
}
resource scaleway_tem_domain cr01 {
name = scaleway_domain_zone.test.id
accept_tos = true
}

resource scaleway_tem_domain_validation valid {
domain_id = scaleway_tem_domain.cr01.id
region = scaleway_tem_domain.cr01.region
timeout = 3600
}
`, domainNameValidation, subDomainName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "true"),
),
resource scaleway_tem_domain_validation valid {
domain_id = scaleway_tem_domain.cr01.id
region = scaleway_tem_domain.cr01.region
timeout = 1
}
`, domainNameValidation, subDomainName),
ExpectError: regexp.MustCompile("(?i)domain validation did not complete"),
},
},
})
Expand Down
Loading
Loading