Origin CA certificate validity not applied (provider version >= v2.22.0)

[onematchfox]

Confirmation

• My issue isn't already found on the issue tracker.
• I have replicated my issue using the latest version of the provider and it is still present.

Terraform and Cloudflare provider version

Terraform v0.14.11
Cloudflare Provider >= v2.22.0

Affected resource(s)

cloudflare_origin_ca_certificate

Terraform configuration files

resource "tls_private_key" "example" {
  algorithm = "RSA"
}

resource "tls_cert_request" "example" {
  key_algorithm   = tls_private_key.example.algorithm
  private_key_pem = tls_private_key.example.private_key_pem

  subject {
    common_name  = ""
    organization = "Terraform Test"
  }
}

resource "cloudflare_origin_ca_certificate" "example" {
  csr                = tls_cert_request.example.cert_request_pem
  hostnames          = [ "example.com" ]
  request_type       = "origin-rsa"
  requested_validity = 30
}

Debug output

Should be reproducible by running Terraform acceptance tests?

Panic output

No response

Expected output

Expect a certificate to be created that is valid for 30 days

Actual output

Certificate that is created is valid for 5475 days

Steps to reproduce

The easiest way would be to run the Terraform acceptance tests within this repository. I was going to extend the tests to showcase this but it looks like they are already failing:

=== RUN   TestAccCloudflareOriginCACertificate_Basic
    testing.go:705: Step 0 error: Check failed: Check 6/6 error: cloudflare_origin_ca_certificate.hfjigatemd: Attribute 'requested_validity' expected "7", got "5475"
--- FAIL: TestAccCloudflareOriginCACertificate_Basic (7.76s)
FAIL
exit status 1
FAIL    github.com/cloudflare/terraform-provider-cloudflare/cloudflare  7.767s

Additional factoids

No response

References

Issue was introduced with change in #1078

[jacobbednarz]

This is an issue in terraform-plugin-sdk (see hashicorp/terraform-plugin-sdk#806). I'll see what I can do about mitigating in the meantime.