Merge pull request #679 from ovh/dev/aamstutz/fix-domain-zone-record-ttl

amstuta · web-flow · commit 2fb7ff3f6698 · 2024-07-08T11:21:44.000+02:00
fix: ovh_domain_zone_record: wrong assertion in test + 0 ttl not sent
diff --git a/ovh/resource_domain_zone_record.go b/ovh/resource_domain_zone_record.go
@@ -18,7 +18,7 @@ type OvhDomainZoneRecord struct {
 	Id        int64  `json:"id,omitempty"`
 	Zone      string `json:"zone,omitempty"`
 	Target    string `json:"target"`
-	Ttl       int    `json:"ttl,omitempty"`
+	Ttl       int    `json:"ttl"`
 	FieldType string `json:"fieldType,omitempty"`
 	SubDomain string `json:"subDomain,omitempty"`
 }
diff --git a/ovh/resource_domain_zone_record_test.go b/ovh/resource_domain_zone_record_test.go
@@ -108,7 +108,7 @@ func TestAccDomainZoneRecord_Basic(t *testing.T) {
 			// provider shall send an error if the TTL is less than 60
 			{
 				Config:      testAccCheckOvhDomainZoneRecordConfig_CNAME(zone, subdomain, "google.com.", 10),
-				ExpectError: regexp.MustCompile(`must be greater`),
+				ExpectError: regexp.MustCompile(`must be either equal to 0 or, greater than or equal to 60`),
 			},
 			{
 				Config: testAccCheckOvhDomainZoneRecordConfig_A(zone, subdomain, "192.168.0.10", 3600),

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ type OvhDomainZoneRecord struct {`
`18`	`18`	Id int64 `json:"id,omitempty"`
`19`	`19`	Zone string `json:"zone,omitempty"`
`20`	`20`	Target string `json:"target"`
`21`		- Ttl int `json:"ttl,omitempty"`
	`21`	+ Ttl int `json:"ttl"`
`22`	`22`	FieldType string `json:"fieldType,omitempty"`
`23`	`23`	SubDomain string `json:"subDomain,omitempty"`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func TestAccDomainZoneRecord_Basic(t *testing.T) {`
`108`	`108`	`// provider shall send an error if the TTL is less than 60`
`109`	`109`	`{`
`110`	`110`	`Config: testAccCheckOvhDomainZoneRecordConfig_CNAME(zone, subdomain, "google.com.", 10),`
`111`		- ExpectError: regexp.MustCompile(`must be greater`),
	`111`	+ ExpectError: regexp.MustCompile(`must be either equal to 0 or, greater than or equal to 60`),
`112`	`112`	`},`
`113`	`113`	`{`
`114`	`114`	`Config: testAccCheckOvhDomainZoneRecordConfig_A(zone, subdomain, "192.168.0.10", 3600),`