[CLOUD-1016] Set valid_before/after for google_service_account_key

LuminalHQ · Dec 7, 2022 · 139e127 · 139e127
1 parent ffb8e61
commit 139e127
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/google/data_source_google_service_account_key.go b/google/data_source_google_service_account_key.go
@@ -2,10 +2,10 @@ package google
 
 import (
 	"fmt"
+	"regexp"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"regexp"
 )
 
 func dataSourceGoogleServiceAccountKey() *schema.Resource {
@@ -75,6 +75,12 @@ func dataSourceGoogleServiceAccountKeyRead(d *schema.ResourceData, meta interfac
 	if err := d.Set("public_key", sak.PublicKeyData); err != nil {
 		return fmt.Errorf("Error setting public_key: %s", err)
 	}
+	if err := d.Set("valid_before", sak.ValidBeforeTime); err != nil {
+		return fmt.Errorf("Error setting valid_before: %s", err)
+	}
+	if err := d.Set("valid_after", sak.ValidAfterTime); err != nil {
+		return fmt.Errorf("Error setting valid_after: %s", err)
+	}
 
 	return nil
 }
diff --git a/google/resource_google_service_account_key.go b/google/resource_google_service_account_key.go
@@ -180,6 +180,12 @@ func resourceGoogleServiceAccountKeyRead(d *schema.ResourceData, meta interface{
 	if err := d.Set("public_key", sak.PublicKeyData); err != nil {
 		return fmt.Errorf("Error setting public_key: %s", err)
 	}
+	if err := d.Set("valid_before", sak.ValidBeforeTime); err != nil {
+		return fmt.Errorf("Error setting valid_before: %s", err)
+	}
+	if err := d.Set("valid_after", sak.ValidAfterTime); err != nil {
+		return fmt.Errorf("Error setting valid_after: %s", err)
+	}
 	return nil
 }