Skip to content
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.

Sign up for GitHub

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

fix(tem) add specific domain for webhook test #2747

Merged
merged 2 commits into from
Sep 20, 2024
Merged

fix(tem) add specific domain for webhook test #2747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
122aa28
fix(tem) add specific domain for webhook test
jremy42 Sep 19, 2024
4b410a9
fix(tem) refacto test for handle conflict
jremy42 Sep 20, 2024
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
44 changes: 28 additions & 16 deletions internal/services/tem/domain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ func TestAccDomain_Tos(t *testing.T) {
func TestAccDomain_Autoconfig(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()
subDomainName := "test-autoconfig"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
Expand All @@ -81,8 +82,14 @@ func TestAccDomain_Autoconfig(t *testing.T) {
Steps: []resource.TestStep{
{
Config: fmt.Sprintf(`

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

resource scaleway_tem_domain cr01 {
name = "%s"
name = scaleway_domain_zone.test.id
accept_tos = true
autoconfig = true
}
Expand All @@ -93,13 +100,13 @@ func TestAccDomain_Autoconfig(t *testing.T) {
timeout = 3600
}

`, domainNameValidation),
`, domainNameValidation, subDomainName),
Check: resource.ComposeTestCheckFunc(
isDomainPresent(tt, "scaleway_tem_domain.cr01"),
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", domainNameValidation),
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", subDomainName+"."+domainNameValidation),
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "autoconfig", "true"),
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dmarc_config"),
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", "_dmarc"),
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", "_dmarc"+"."+subDomainName),
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "last_error", ""), // last_error is deprecated
acctest.CheckResourceAttrUUID("scaleway_tem_domain.cr01", "id"),
resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "true"),
Expand All @@ -112,6 +119,7 @@ func TestAccDomain_Autoconfig(t *testing.T) {
func TestAccDomain_AutoconfigUpdate(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()
subDomainName := "test-autoconfig-update"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
Expand All @@ -120,41 +128,45 @@ func TestAccDomain_AutoconfigUpdate(t *testing.T) {
Steps: []resource.TestStep{
{
Config: fmt.Sprintf(`
resource "scaleway_domain_zone" "test" {
domain = "%s"
subdomain = "%s"
}

resource scaleway_tem_domain cr01 {
name = "%s"
name = scaleway_domain_zone.test.id
accept_tos = true
autoconfig = false
}

`, domainNameValidation),
`, domainNameValidation, subDomainName),
Check: resource.ComposeTestCheckFunc(
isDomainPresent(tt, "scaleway_tem_domain.cr01"),
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", domainNameValidation),
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", subDomainName+"."+domainNameValidation),
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "autoconfig", "false"),
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dmarc_config"),
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", "_dmarc"),
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", "_dmarc"+"."+subDomainName),
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "last_error", ""), // last_error is deprecated
acctest.CheckResourceAttrUUID("scaleway_tem_domain.cr01", "id"),
),
},
{
Config: fmt.Sprintf(`
resource "scaleway_domain_zone" "test" {
domain = "%s"
subdomain = "%s"
}

resource scaleway_tem_domain cr01 {
name = "%s"
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 = 3600
}
`, domainNameValidation),
`, domainNameValidation, subDomainName),
Check: resource.ComposeTestCheckFunc(
isDomainPresent(tt, "scaleway_tem_domain.cr01"),
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "autoconfig", "true"),
resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "true"),
),
},
},
Expand Down
22 changes: 18 additions & 4 deletions internal/services/tem/domain_validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const domainNameValidation = "scaleway-terraform.com"
func TestAccDomainValidation_NoValidation(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()
subDomainName := "validation-no-validation"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
Expand All @@ -21,8 +22,14 @@ func TestAccDomainValidation_NoValidation(t *testing.T) {
Steps: []resource.TestStep{
{
Config: fmt.Sprintf(`

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

resource scaleway_tem_domain cr01 {
name = "%s"
name = scaleway_domain_zone.test.id
accept_tos = true
}

Expand All @@ -31,7 +38,7 @@ func TestAccDomainValidation_NoValidation(t *testing.T) {
region = scaleway_tem_domain.cr01.region
timeout = 1
}
`, domainNameValidation),
`, domainNameValidation, subDomainName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "false"),
),
Expand All @@ -43,6 +50,7 @@ func TestAccDomainValidation_NoValidation(t *testing.T) {
func TestAccDomainValidation_Validation(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()
subDomainName := "validation-validation"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
Expand All @@ -51,8 +59,14 @@ func TestAccDomainValidation_Validation(t *testing.T) {
Steps: []resource.TestStep{
{
Config: fmt.Sprintf(`

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

resource scaleway_tem_domain cr01 {
name = "%s"
name = scaleway_domain_zone.test.id
accept_tos = true
autoconfig = true
}
Expand All @@ -62,7 +76,7 @@ func TestAccDomainValidation_Validation(t *testing.T) {
region = scaleway_tem_domain.cr01.region
timeout = 3600
}
`, domainNameValidation),
`, domainNameValidation, subDomainName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "true"),
),
Expand Down
Loading
Loading