diff --git a/.changelog/1502.txt b/.changelog/1502.txt new file mode 100644 index 00000000000..30c4f3e1961 --- /dev/null +++ b/.changelog/1502.txt @@ -0,0 +1,3 @@ +```release-note:breaking-change +resource/cloudflare_origin_ca_certificate: `requested_validity` is no longer calculated to but the days until the certificate expires but is indicating for how many days the certificate was requested. +``` diff --git a/cloudflare/resource_cloudflare_origin_ca_certificate.go b/cloudflare/resource_cloudflare_origin_ca_certificate.go index 802a4547b04..da77276a3ae 100644 --- a/cloudflare/resource_cloudflare_origin_ca_certificate.go +++ b/cloudflare/resource_cloudflare_origin_ca_certificate.go @@ -6,7 +6,6 @@ import ( "encoding/pem" "fmt" "log" - "math" "strings" "time" @@ -92,19 +91,7 @@ func resourceCloudflareOriginCACertificateRead(d *schema.ResourceData, meta inte d.Set("expires_on", cert.ExpiresOn.Format(time.RFC3339)) d.Set("hostnames", hostnames) d.Set("request_type", cert.RequestType) - - // lazy approach to extracting the date from a known timestamp in order to - // `time.Parse` it correctly. Here we are getting the certificate expiry and - // calculating the validity as the API doesn't return it yet it is present in - // the schema. - date := strings.Split(cert.ExpiresOn.Format(time.RFC3339), "T") - certDate, _ := time.Parse("2006-01-02", date[0]) - now := time.Now() - duration := certDate.Sub(now) - var validityDays int - validityDays = int(math.Ceil(duration.Hours() / 24)) - - d.Set("requested_validity", validityDays) + d.Set("requested_validity", cert.RequestValidity) return nil } diff --git a/cloudflare/schema_cloudflare_origin_ca_certificate.go b/cloudflare/schema_cloudflare_origin_ca_certificate.go index 46abb57b3c0..4591653cdda 100644 --- a/cloudflare/schema_cloudflare_origin_ca_certificate.go +++ b/cloudflare/schema_cloudflare_origin_ca_certificate.go @@ -39,9 +39,6 @@ func resourceCloudflareOriginCACertificateSchema() map[string]*schema.Schema { Optional: true, Computed: true, ValidateFunc: validation.IntInSlice([]int{7, 30, 90, 365, 730, 1095, 5475}), - DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - return true - }, }, } }