Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added Defaults to Cognito OAuth Token Lifespan #34362

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+15 −2
Open

Added Defaults to Cognito OAuth Token Lifespan #34362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34247fb
Added defaults to access_token_validity, id_token_validity, and refre…
jtyrus Nov 11, 2023
5d97a35
Fixed test and added changedlog
jtyrus Nov 11, 2023
adacaec
Replaced default cognito user pool client values with constants
jtyrus Nov 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/34362.txt
View file
Open in desktop
@@ -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
```
10 changes: 10 additions & 0 deletions internal/service/cognitoidp/user_pool_client.go
View file
Open in desktop
Expand Up @@ -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"
Expand All @@ -39,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{}
Expand All @@ -62,6 +69,7 @@ func (r *resourceUserPoolClient) Schema(ctx context.Context, request resource.Sc
"access_token_validity": schema.Int64Attribute{
Optional: true,
Computed: true,
Default: int64default.StaticInt64(accessTokenValidityDefaultValue),
PlanModifiers: []planmodifier.Int64{
int64planmodifier.UseStateForUnknown(),
},
Expand Down Expand Up @@ -174,6 +182,7 @@ func (r *resourceUserPoolClient) Schema(ctx context.Context, request resource.Sc
"id_token_validity": schema.Int64Attribute{
Optional: true,
Computed: true,
Default: int64default.StaticInt64(idTokenValidityDefaultValue),
PlanModifiers: []planmodifier.Int64{
int64planmodifier.UseStateForUnknown(),
},
Expand Down Expand Up @@ -217,6 +226,7 @@ func (r *resourceUserPoolClient) Schema(ctx context.Context, request resource.Sc
"refresh_token_validity": schema.Int64Attribute{
Optional: true,
Computed: true,
Default: int64default.StaticInt64(refreshTokenValidityDefaultValue),
PlanModifiers: []planmodifier.Int64{
int64planmodifier.UseStateForUnknown(),
},
Expand Down
4 changes: 2 additions & 2 deletions internal/service/cognitoidp/user_pool_client_test.go
View file
Open in desktop
Expand Up @@ -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"),
Expand All @@ -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"),
Expand Down