From 34247fb99e48f3a19eebc944f0a9bbae026e51c2 Mon Sep 17 00:00:00 2001 From: JT Date: Sat, 11 Nov 2023 15:15:48 -0800 Subject: [PATCH 1/3] Added defaults to access_token_validity, id_token_validity, and refresh_token_validity --- internal/service/cognitoidp/user_pool_client.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/service/cognitoidp/user_pool_client.go b/internal/service/cognitoidp/user_pool_client.go index 02e0f7fa9fbf..aadda36fc149 100644 --- a/internal/service/cognitoidp/user_pool_client.go +++ b/internal/service/cognitoidp/user_pool_client.go @@ -23,6 +23,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default" "github.com/hashicorp/terraform-plugin-framework/resource/schema/int64planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/setplanmodifier" @@ -62,6 +63,7 @@ func (r *resourceUserPoolClient) Schema(ctx context.Context, request resource.Sc "access_token_validity": schema.Int64Attribute{ Optional: true, Computed: true, + Default: int64default.StaticInt64(1), PlanModifiers: []planmodifier.Int64{ int64planmodifier.UseStateForUnknown(), }, @@ -174,6 +176,7 @@ func (r *resourceUserPoolClient) Schema(ctx context.Context, request resource.Sc "id_token_validity": schema.Int64Attribute{ Optional: true, Computed: true, + Default: int64default.StaticInt64(1), PlanModifiers: []planmodifier.Int64{ int64planmodifier.UseStateForUnknown(), }, @@ -217,6 +220,7 @@ func (r *resourceUserPoolClient) Schema(ctx context.Context, request resource.Sc "refresh_token_validity": schema.Int64Attribute{ Optional: true, Computed: true, + Default: int64default.StaticInt64(30), PlanModifiers: []planmodifier.Int64{ int64planmodifier.UseStateForUnknown(), }, From 5d97a350a0d51e9172273e06e7dc48b0853971fd Mon Sep 17 00:00:00 2001 From: JT Date: Sat, 11 Nov 2023 15:40:32 -0800 Subject: [PATCH 2/3] Fixed test and added changedlog --- .changelog/34362.txt | 3 +++ internal/service/cognitoidp/user_pool_client_test.go | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .changelog/34362.txt diff --git a/.changelog/34362.txt b/.changelog/34362.txt new file mode 100644 index 000000000000..6a916179249f --- /dev/null +++ b/.changelog/34362.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_cognito_user_pool_client: Added default values to access_token_validity, id_token_validity, and refresh_token_validity +``` diff --git a/internal/service/cognitoidp/user_pool_client_test.go b/internal/service/cognitoidp/user_pool_client_test.go index 8ab1b46bec7b..9c94ec91b7e0 100644 --- a/internal/service/cognitoidp/user_pool_client_test.go +++ b/internal/service/cognitoidp/user_pool_client_test.go @@ -38,7 +38,7 @@ func TestAccCognitoIDPUserPoolClient_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserPoolClientExists(ctx, resourceName, &client), resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttr(resourceName, "access_token_validity", "0"), + resource.TestCheckResourceAttr(resourceName, "access_token_validity", "1"), resource.TestCheckResourceAttr(resourceName, "allowed_oauth_flows.#", "0"), resource.TestCheckResourceAttr(resourceName, "allowed_oauth_flows_user_pool_client", "false"), resource.TestCheckResourceAttr(resourceName, "allowed_oauth_scopes.#", "0"), @@ -52,7 +52,7 @@ func TestAccCognitoIDPUserPoolClient_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "explicit_auth_flows.#", "1"), resource.TestCheckTypeSetElemAttr(resourceName, "explicit_auth_flows.*", "ADMIN_NO_SRP_AUTH"), resource.TestCheckNoResourceAttr(resourceName, "generate_secret"), - resource.TestCheckResourceAttr(resourceName, "id_token_validity", "0"), + resource.TestCheckResourceAttr(resourceName, "id_token_validity", "1"), resource.TestCheckResourceAttr(resourceName, "logout_urls.#", "0"), resource.TestCheckResourceAttr(resourceName, "prevent_user_existence_errors", ""), resource.TestCheckResourceAttr(resourceName, "read_attributes.#", "0"), From adacaec99d34d84f8be66def8119ea94289583c6 Mon Sep 17 00:00:00 2001 From: JT Date: Sat, 11 Nov 2023 16:54:37 -0800 Subject: [PATCH 3/3] Replaced default cognito user pool client values with constants --- internal/service/cognitoidp/user_pool_client.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/internal/service/cognitoidp/user_pool_client.go b/internal/service/cognitoidp/user_pool_client.go index aadda36fc149..5bec38fe73a6 100644 --- a/internal/service/cognitoidp/user_pool_client.go +++ b/internal/service/cognitoidp/user_pool_client.go @@ -40,6 +40,12 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) +const ( + accessTokenValidityDefaultValue = 1 + idTokenValidityDefaultValue = 1 + refreshTokenValidityDefaultValue = 30 +) + // @FrameworkResource func newResourceUserPoolClient(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceUserPoolClient{} @@ -63,7 +69,7 @@ func (r *resourceUserPoolClient) Schema(ctx context.Context, request resource.Sc "access_token_validity": schema.Int64Attribute{ Optional: true, Computed: true, - Default: int64default.StaticInt64(1), + Default: int64default.StaticInt64(accessTokenValidityDefaultValue), PlanModifiers: []planmodifier.Int64{ int64planmodifier.UseStateForUnknown(), }, @@ -176,7 +182,7 @@ func (r *resourceUserPoolClient) Schema(ctx context.Context, request resource.Sc "id_token_validity": schema.Int64Attribute{ Optional: true, Computed: true, - Default: int64default.StaticInt64(1), + Default: int64default.StaticInt64(idTokenValidityDefaultValue), PlanModifiers: []planmodifier.Int64{ int64planmodifier.UseStateForUnknown(), }, @@ -220,7 +226,7 @@ func (r *resourceUserPoolClient) Schema(ctx context.Context, request resource.Sc "refresh_token_validity": schema.Int64Attribute{ Optional: true, Computed: true, - Default: int64default.StaticInt64(30), + Default: int64default.StaticInt64(refreshTokenValidityDefaultValue), PlanModifiers: []planmodifier.Int64{ int64planmodifier.UseStateForUnknown(), },