Add expire_time output field to multiple ssl certificate resources (#…

…7007) (#13392) * Add `expire_time` output field to global `google_compute_ssl_certificate` resource * Add `expire_time` output field to regional `google_compute_region_ssl_certificate` resource * Add `expire_time` output field to global `google_compute_managed_ssl_certificate` resource * Remove duplicate `expire_time` field from `google_compute_managed_ssl_certificate`, update description in original entry Signed-off-by: Modular Magician <magic-modules@google.com> Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Jan 5, 2023 · 9e336b1 · 9e336b1
1 parent 373ad89
commit 9e336b1
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 2 deletions.
diff --git a/.changelog/7007.txt b/.changelog/7007.txt
@@ -0,0 +1,6 @@
+```release-note:enhancement
+compute: added field `expire_time` to resource `google_compute_ssl_certificate`
+```
+```release-note:enhancement
+compute: added field `expire_time` to resource `google_compute_region_ssl_certificate`
+```
diff --git a/google/resource_compute_managed_ssl_certificate.go b/google/resource_compute_managed_ssl_certificate.go
@@ -107,7 +107,7 @@ which type this is. Default value: "MANAGED" Possible values: ["MANAGED"]`,
 			"expire_time": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: `Expire time of the certificate.`,
+				Description: `Expire time of the certificate in RFC3339 text format.`,
 			},
 			"subject_alternative_names": {
 				Type:        schema.TypeList,

diff --git a/google/resource_compute_region_ssl_certificate.go b/google/resource_compute_region_ssl_certificate.go
@@ -99,6 +99,11 @@ If it is not provided, the provider region is used.`,
 				Computed:    true,
 				Description: `Creation timestamp in RFC3339 text format.`,
 			},
+			"expire_time": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: `Expire time of the certificate in RFC3339 text format.`,
+			},
 			"name_prefix": {
 				Type:          schema.TypeString,
 				Optional:      true,
@@ -260,6 +265,9 @@ func resourceComputeRegionSslCertificateRead(d *schema.ResourceData, meta interf
 	if err := d.Set("description", flattenComputeRegionSslCertificateDescription(res["description"], d, config)); err != nil {
 		return fmt.Errorf("Error reading RegionSslCertificate: %s", err)
 	}
+	if err := d.Set("expire_time", flattenComputeRegionSslCertificateExpireTime(res["expireTime"], d, config)); err != nil {
+		return fmt.Errorf("Error reading RegionSslCertificate: %s", err)
+	}
 	if err := d.Set("certificate_id", flattenComputeRegionSslCertificateCertificateId(res["id"], d, config)); err != nil {
 		return fmt.Errorf("Error reading RegionSslCertificate: %s", err)
 	}
@@ -354,6 +362,10 @@ func flattenComputeRegionSslCertificateDescription(v interface{}, d *schema.Reso
 	return v
 }
 
+func flattenComputeRegionSslCertificateExpireTime(v interface{}, d *schema.ResourceData, config *Config) interface{} {
+	return v
+}
+
 func flattenComputeRegionSslCertificateCertificateId(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	// Handles the string fixed64 format
 	if strVal, ok := v.(string); ok {

diff --git a/google/resource_compute_ssl_certificate.go b/google/resource_compute_ssl_certificate.go
@@ -90,6 +90,11 @@ These are in the same namespace as the managed SSL certificates.`,
 				Computed:    true,
 				Description: `Creation timestamp in RFC3339 text format.`,
 			},
+			"expire_time": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: `Expire time of the certificate in RFC3339 text format.`,
+			},
 			"name_prefix": {
 				Type:          schema.TypeString,
 				Optional:      true,
@@ -245,6 +250,9 @@ func resourceComputeSslCertificateRead(d *schema.ResourceData, meta interface{})
 	if err := d.Set("description", flattenComputeSslCertificateDescription(res["description"], d, config)); err != nil {
 		return fmt.Errorf("Error reading SslCertificate: %s", err)
 	}
+	if err := d.Set("expire_time", flattenComputeSslCertificateExpireTime(res["expireTime"], d, config)); err != nil {
+		return fmt.Errorf("Error reading SslCertificate: %s", err)
+	}
 	if err := d.Set("certificate_id", flattenComputeSslCertificateCertificateId(res["id"], d, config)); err != nil {
 		return fmt.Errorf("Error reading SslCertificate: %s", err)
 	}
@@ -335,6 +343,10 @@ func flattenComputeSslCertificateDescription(v interface{}, d *schema.ResourceDa
 	return v
 }
 
+func flattenComputeSslCertificateExpireTime(v interface{}, d *schema.ResourceData, config *Config) interface{} {
+	return v
+}
+
 func flattenComputeSslCertificateCertificateId(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	// Handles the string fixed64 format
 	if strVal, ok := v.(string); ok {

diff --git a/website/docs/r/compute_managed_ssl_certificate.html.markdown b/website/docs/r/compute_managed_ssl_certificate.html.markdown
@@ -256,7 +256,7 @@ In addition to the arguments listed above, the following computed attributes are
   Domains associated with the certificate via Subject Alternative Name.
 
 * `expire_time` -
-  Expire time of the certificate.
+  Expire time of the certificate in RFC3339 text format.
 * `self_link` - The URI of the created resource.
 
 

diff --git a/website/docs/r/compute_region_ssl_certificate.html.markdown b/website/docs/r/compute_region_ssl_certificate.html.markdown
@@ -226,6 +226,9 @@ In addition to the arguments listed above, the following computed attributes are
 * `creation_timestamp` -
   Creation timestamp in RFC3339 text format.
 
+* `expire_time` -
+  Expire time of the certificate in RFC3339 text format.
+
 * `certificate_id` -
   The unique identifier for the resource.
 * `self_link` - The URI of the created resource.

diff --git a/website/docs/r/compute_ssl_certificate.html.markdown b/website/docs/r/compute_ssl_certificate.html.markdown
@@ -213,6 +213,9 @@ In addition to the arguments listed above, the following computed attributes are
 * `creation_timestamp` -
   Creation timestamp in RFC3339 text format.
 
+* `expire_time` -
+  Expire time of the certificate in RFC3339 text format.
+
 * `certificate_id` -
   The unique identifier for the resource.
 * `self_link` - The URI of the created resource.