Adding expiration_date field to IAM and Service Credentials

ibm/service/secretsmanager/data_source_ibm_sm_iam_credentials_secret.go

@@ -120,6 +120,11 @@ func DataSourceIbmSmIamCredentialsSecret() *schema.Resource {
 				Computed:    true,
 				Description: "The time-to-live (TTL) or lease duration to assign to generated credentials.For `iam_credentials` secrets, the TTL defines for how long each generated API key remains valid. The value can be either an integer that specifies the number of seconds, or the string representation of a duration, such as `120m` or `24h`.Minimum duration is 1 minute. Maximum is 90 days.",
 			},
+			"expiration_date": &schema.Schema{
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The date a secret is expired. The date format follows RFC 3339.",
+			},
 			"access_groups": &schema.Schema{
 				Type:        schema.TypeList,
 				Computed:    true,
@@ -307,6 +312,11 @@ func dataSourceIbmSmIamCredentialsSecretRead(context context.Context, d *schema.
 		return diag.FromErr(fmt.Errorf("Error setting api_key: %s", err))
 	}
 
+	if iAMCredentialsSecret.ExpirationDate != nil {
+		if err = d.Set("expiration_date", DateTimeToRFC3339(iAMCredentialsSecret.ExpirationDate)); err != nil {
+			return diag.FromErr(fmt.Errorf("Error setting expiration_date: %s", err))
+		}
+	}
 	return nil
 }
 

ibm/service/secretsmanager/data_source_ibm_sm_iam_credentials_secret_metadata.go

@@ -112,6 +112,11 @@ func DataSourceIbmSmIamCredentialsSecretMetadata() *schema.Resource {
 				Computed:    true,
 				Description: "The time-to-live (TTL) or lease duration to assign to generated credentials.For `iam_credentials` secrets, the TTL defines for how long each generated API key remains valid. The value can be either an integer that specifies the number of seconds, or the string representation of a duration, such as `120m` or `24h`.Minimum duration is 1 minute. Maximum is 90 days.",
 			},
+			"expiration_date": &schema.Schema{
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The date a secret is expired. The date format follows RFC 3339.",
+			},
 			"access_groups": &schema.Schema{
 				Type:        schema.TypeList,
 				Computed:    true,
@@ -302,6 +307,12 @@ func dataSourceIbmSmIamCredentialsSecretMetadataRead(context context.Context, d
 		return diag.FromErr(fmt.Errorf("Error setting next_rotation_date: %s", err))
 	}
 
+	if iAMCredentialsSecretMetadata.ExpirationDate != nil {
+		if err = d.Set("expiration_date", DateTimeToRFC3339(iAMCredentialsSecretMetadata.ExpirationDate)); err != nil {
+			return diag.FromErr(fmt.Errorf("Error setting expiration_date: %s", err))
+		}
+	}
+
 	return nil
 }
 

ibm/service/secretsmanager/data_source_ibm_sm_service_credentials_secret.go

@@ -118,6 +118,11 @@ func DataSourceIbmSmServiceCredentialsSecret() *schema.Resource {
 				Computed:    true,
 				Description: "The time-to-live (TTL) or lease duration to assign to generated credentials.",
 			},
+			"expiration_date": &schema.Schema{
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The date a secret is expired. The date format follows RFC 3339.",
+			},
 			"rotation": &schema.Schema{
 				Type:        schema.TypeList,
 				Computed:    true,
@@ -398,6 +403,12 @@ func dataSourceIbmSmServiceCredentialsSecretRead(context context.Context, d *sch
 		}
 	}
 
+	if ServiceCredentialsSecret.ExpirationDate != nil {
+		if err = d.Set("expiration_date", DateTimeToRFC3339(ServiceCredentialsSecret.ExpirationDate)); err != nil {
+			return diag.FromErr(fmt.Errorf("Error setting expiration_date: %s", err))
+		}
+	}
+
 	return nil
 }
 

ibm/service/secretsmanager/data_source_ibm_sm_service_credentials_secret_metadata.go

@@ -107,6 +107,11 @@ func DataSourceIbmSmServiceCredentialsSecretMetadata() *schema.Resource {
 				Computed:    true,
 				Description: "The time-to-live (TTL) or lease duration to assign to generated credentials.",
 			},
+			"expiration_date": &schema.Schema{
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The date a secret is expired. The date format follows RFC 3339.",
+			},
 			"rotation": &schema.Schema{
 				Type:        schema.TypeList,
 				Computed:    true,
@@ -386,6 +391,12 @@ func dataSourceIbmSmServiceCredentialsSecretMetadataRead(context context.Context
 		}
 	}
 
+	if ServiceCredentialsSecretMetadata.ExpirationDate != nil {
+		if err = d.Set("expiration_date", DateTimeToRFC3339(ServiceCredentialsSecretMetadata.ExpirationDate)); err != nil {
+			return diag.FromErr(fmt.Errorf("Error setting expiration_date: %s", err))
+		}
+	}
+
 	return nil
 }
 

ibm/service/secretsmanager/resource_ibm_sm_iam_credentials_secret.go

@@ -65,6 +65,11 @@ func ResourceIbmSmIamCredentialsSecret() *schema.Resource {
 				ValidateFunc: StringIsIntBetween(60, 7776000),
 				Description:  "The time-to-live (TTL) or lease duration to assign to generated credentials.For `iam_credentials` secrets, the TTL defines for how long each generated API key remains valid. The value is an integer that specifies the number of seconds .Minimum duration is 1 minute. Maximum is 90 days.",
 			},
+			"expiration_date": &schema.Schema{
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The date a secret is expired. The date format follows RFC 3339.",
+			},
 			"access_groups": &schema.Schema{
 				Type:        schema.TypeList,
 				Optional:    true,
@@ -425,6 +430,12 @@ func resourceIbmSmIamCredentialsSecretRead(context context.Context, d *schema.Re
 		}
 	}
 
+	if secret.ExpirationDate != nil {
+		if err = d.Set("expiration_date", DateTimeToRFC3339(secret.ExpirationDate)); err != nil {
+			return diag.FromErr(fmt.Errorf("Error setting expiration_date: %s", err))
+		}
+	}
+
 	return nil
 }
 

ibm/service/secretsmanager/resource_ibm_sm_service_credentials_secret.go

@@ -276,9 +276,15 @@ func ResourceIbmSmServiceCredentialsSecret() *schema.Resource {
 			},
 			"ttl": &schema.Schema{
 				Type:        schema.TypeString,
-				Required:    true,
+				Optional:    true,
+				Computed:    true,
 				Description: "The time-to-live (TTL) or lease duration to assign to generated credentials.",
 			},
+			"expiration_date": &schema.Schema{
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The date a secret is expired. The date format follows RFC 3339.",
+			},
 			"updated_at": &schema.Schema{
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -464,6 +470,12 @@ func resourceIbmSmServiceCredentialsSecretRead(context context.Context, d *schem
 		}
 	}
 
+	if secret.ExpirationDate != nil {
+		if err = d.Set("expiration_date", DateTimeToRFC3339(secret.ExpirationDate)); err != nil {
+			return diag.FromErr(fmt.Errorf("Error setting expiration_date: %s", err))
+		}
+	}
+
 	return nil
 }
 

ibm/service/secretsmanager/resource_ibm_sm_service_credentials_secret_test.go

@@ -76,6 +76,7 @@ func TestAccIbmSmServiceCredentialsSecretAllArgs(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "next_rotation_date"),
 					resource.TestCheckResourceAttr(resourceName, "state", "1"),
 					resource.TestCheckResourceAttr(resourceName, "versions_total", "1"),
+					resource.TestCheckResourceAttr(resourceName, "ttl", serviceCredentialsTtl),
 				),
 			},
 			resource.TestStep{

website/docs/d/sm_iam_credentials_secret.html.markdown

@@ -121,3 +121,4 @@ Nested scheme for **rotation**:
 * `versions_total` - (Integer) The number of versions of the secret.
   * Constraints: The maximum value is `50`. The minimum value is `0`.
 
+* `expiration_date` - (String) The date a secret is expired. The date format follows RFC 3339.

website/docs/d/sm_iam_credentials_secret_metadata.html.markdown

@@ -102,3 +102,4 @@ Nested scheme for **rotation**:
 * `versions_total` - (Integer) The number of versions of the secret.
   * Constraints: The maximum value is `50`. The minimum value is `0`.
 
+* `expiration_date` - (String) The date a secret is expired. The date format follows RFC 3339.

website/docs/d/sm_service_credentials_secret.html.markdown

@@ -154,3 +154,4 @@ In addition to all argument references listed, you can access the following attr
 * `versions_total` - (Integer) The number of versions of the secret.
     * Constraints: The maximum value is `50`. The minimum value is `0`.
 
+* `expiration_date` - (String) The date a secret is expired. The date format follows RFC 3339.

website/docs/d/sm_service_credentials_secret_metadata.html.markdown

@@ -111,3 +111,4 @@ In addition to all argument references listed, you can access the following attr
 * `versions_total` - (Integer) The number of versions of the secret.
     * Constraints: The maximum value is `50`. The minimum value is `0`.
 
+* `expiration_date` - (String) The date a secret is expired. The date format follows RFC 3339.

website/docs/r/sm_iam_credentials_secret.html.markdown

@@ -90,7 +90,8 @@ In addition to all argument references listed, you can access the following attr
     * Constraints: Allowable values are: `arbitrary`, `imported_cert`, `public_cert`, `iam_credentials`, `kv`, `username_password`, `private_cert`.
 * `updated_at` - (String) The date when a resource was recently modified. The date format follows RFC 3339.
 * `versions_total` - (Integer) The number of versions of the secret.
-  * Constraints: The maximum value is `50`. The minimum value is `0`.
+    * Constraints: The maximum value is `50`. The minimum value is `0`.
+* `expiration_date` - (String) The date a secret is expired. The date format follows RFC 3339.
 
 ## Provider Configuration
 

website/docs/r/sm_service_credentials_secret.html.markdown

@@ -155,7 +155,8 @@ In addition to all argument references listed, you can access the following attr
     * Constraints: Allowable values are: `arbitrary`, `imported_cert`, `public_cert`, `iam_credentials`, `kv`, `username_password`, `private_cert`.
 * `updated_at` - (String) The date when a resource was recently modified. The date format follows RFC 3339.
 * `versions_total` - (Integer) The number of versions of the secret.
-  * Constraints: The maximum value is `50`. The minimum value is `0`.
+    * Constraints: The maximum value is `50`. The minimum value is `0`.
+* `expiration_date` - (String) The date a secret is expired. The date format follows RFC 3339.
 
 ## Provider Configuration