From 256946cbfce83c5ba3fb581f05bb7b4b6703a5be Mon Sep 17 00:00:00 2001 From: Joshua Geissler Date: Sun, 7 Jan 2024 09:37:34 -0500 Subject: [PATCH 1/4] update the appstream fleet idle timeout per aws docs --- internal/service/appstream/fleet.go | 4 ++-- website/docs/r/appstream_fleet.html.markdown | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/appstream/fleet.go b/internal/service/appstream/fleet.go index 56a3821d644..623509f1ec3 100644 --- a/internal/service/appstream/fleet.go +++ b/internal/service/appstream/fleet.go @@ -138,8 +138,8 @@ func ResourceFleet() *schema.Resource { "idle_disconnect_timeout_in_seconds": { Type: schema.TypeInt, Optional: true, - Default: 0, - ValidateFunc: validation.IntBetween(60, 3600), + Default: 60, + ValidateFunc: validation.IntBetween(60, 360000), }, "image_arn": { Type: schema.TypeString, diff --git a/website/docs/r/appstream_fleet.html.markdown b/website/docs/r/appstream_fleet.html.markdown index 5ce739669f8..8da7f56804f 100644 --- a/website/docs/r/appstream_fleet.html.markdown +++ b/website/docs/r/appstream_fleet.html.markdown @@ -56,7 +56,7 @@ The following arguments are optional: * `enable_default_internet_access` - (Optional) Enables or disables default internet access for the fleet. * `fleet_type` - (Optional) Fleet type. Valid values are: `ON_DEMAND`, `ALWAYS_ON` * `iam_role_arn` - (Optional) ARN of the IAM role to apply to the fleet. -* `idle_disconnect_timeout_in_seconds` - (Optional) Amount of time that users can be idle (inactive) before they are disconnected from their streaming session and the `disconnect_timeout_in_seconds` time interval begins. +* `idle_disconnect_timeout_in_seconds` - (Optional) Amount of time that users can be idle (inactive) before they are disconnected from their streaming session and the `disconnect_timeout_in_seconds` time interval begins. Defaults to 60 seconds. * `image_name` - (Optional) Name of the image used to create the fleet. * `image_arn` - (Optional) ARN of the public, private, or shared image to use. * `stream_view` - (Optional) AppStream 2.0 view that is displayed to your users when they stream from the fleet. When `APP` is specified, only the windows of applications opened by users display. When `DESKTOP` is specified, the standard desktop that is provided by the operating system displays. If not specified, defaults to `APP`. From 067353e02626ce685839e1f0bc9a46f8dbcd6bed Mon Sep 17 00:00:00 2001 From: Joshua Geissler Date: Sun, 7 Jan 2024 09:45:10 -0500 Subject: [PATCH 2/4] add changelog for pr --- .changelog/35173.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/35173.txt diff --git a/.changelog/35173.txt b/.changelog/35173.txt new file mode 100644 index 00000000000..9781ad2db30 --- /dev/null +++ b/.changelog/35173.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/appstream: Updated the max idle timeout for appstream fleet to be 360000, from 3600, to match aws documentation. https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Fleet.html See DisconnectTimeoutInSecond +``` \ No newline at end of file From 6b06bb37cb152212deb1065bfb0153a488b5337b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Jan 2024 11:29:14 -0500 Subject: [PATCH 3/4] Update 35173.txt --- .changelog/35173.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.changelog/35173.txt b/.changelog/35173.txt index 9781ad2db30..1c89b8f70ef 100644 --- a/.changelog/35173.txt +++ b/.changelog/35173.txt @@ -1,3 +1,3 @@ ```release-note:enhancement -resource/appstream: Updated the max idle timeout for appstream fleet to be 360000, from 3600, to match aws documentation. https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Fleet.html See DisconnectTimeoutInSecond -``` \ No newline at end of file +resource/aws_appstream_fleet: Increase `idle_disconnect_timeout_in_seconds` max value for validation to 360000 +``` From d25e16a7f3d3586eb5c7d5e70f824cc8a8b646a3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Jan 2024 11:36:28 -0500 Subject: [PATCH 4/4] Restore `idle_disconnect_timeout_in_seconds` default value Otherwise a breaking change. But see https://github.com/hashicorp/terraform-provider-aws/issues/24014. --- internal/service/appstream/fleet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/appstream/fleet.go b/internal/service/appstream/fleet.go index 623509f1ec3..82d64a70967 100644 --- a/internal/service/appstream/fleet.go +++ b/internal/service/appstream/fleet.go @@ -138,7 +138,7 @@ func ResourceFleet() *schema.Resource { "idle_disconnect_timeout_in_seconds": { Type: schema.TypeInt, Optional: true, - Default: 60, + Default: 0, ValidateFunc: validation.IntBetween(60, 360000), }, "image_arn": {