From 86c10d53d7edac14293bd3c410f3467cdecaf971 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 17 Mar 2022 12:46:11 +0100 Subject: [PATCH] function apps: updating the read timeout to 5m This is currently set to 25m but should be fine within 5m by default, which enables the unit test to pass - which is currently blocking #15800 --- internal/services/appservice/linux_function_app_resource.go | 2 +- .../services/appservice/linux_function_app_slot_resource.go | 2 +- internal/services/appservice/windows_function_app_resource.go | 2 +- .../services/appservice/windows_function_app_slot_resource.go | 2 +- website/docs/r/linux_function_app.html.markdown | 2 +- website/docs/r/linux_function_app_slot.html.markdown | 2 +- website/docs/r/windows_function_app.html.markdown | 2 +- website/docs/r/windows_function_app_slot.html.markdown | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/services/appservice/linux_function_app_resource.go b/internal/services/appservice/linux_function_app_resource.go index a82c3a3d1bc6..67013cc88545 100644 --- a/internal/services/appservice/linux_function_app_resource.go +++ b/internal/services/appservice/linux_function_app_resource.go @@ -477,7 +477,7 @@ func (r LinuxFunctionAppResource) Create() sdk.ResourceFunc { func (r LinuxFunctionAppResource) Read() sdk.ResourceFunc { return sdk.ResourceFunc{ - Timeout: 25 * time.Minute, + Timeout: 5 * time.Minute, Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error { client := metadata.Client.AppService.WebAppsClient id, err := parse.FunctionAppID(metadata.ResourceData.Id()) diff --git a/internal/services/appservice/linux_function_app_slot_resource.go b/internal/services/appservice/linux_function_app_slot_resource.go index c12d8a20e7c1..494e1d7d26c6 100644 --- a/internal/services/appservice/linux_function_app_slot_resource.go +++ b/internal/services/appservice/linux_function_app_slot_resource.go @@ -476,7 +476,7 @@ func (r LinuxFunctionAppSlotResource) Create() sdk.ResourceFunc { func (r LinuxFunctionAppSlotResource) Read() sdk.ResourceFunc { return sdk.ResourceFunc{ - Timeout: 25 * time.Minute, + Timeout: 5 * time.Minute, Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error { client := metadata.Client.AppService.WebAppsClient id, err := parse.FunctionAppSlotID(metadata.ResourceData.Id()) diff --git a/internal/services/appservice/windows_function_app_resource.go b/internal/services/appservice/windows_function_app_resource.go index 2627fab8da85..96e53de521bd 100644 --- a/internal/services/appservice/windows_function_app_resource.go +++ b/internal/services/appservice/windows_function_app_resource.go @@ -476,7 +476,7 @@ func (r WindowsFunctionAppResource) Create() sdk.ResourceFunc { func (r WindowsFunctionAppResource) Read() sdk.ResourceFunc { return sdk.ResourceFunc{ - Timeout: 25 * time.Minute, + Timeout: 5 * time.Minute, Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error { client := metadata.Client.AppService.WebAppsClient id, err := parse.FunctionAppID(metadata.ResourceData.Id()) diff --git a/internal/services/appservice/windows_function_app_slot_resource.go b/internal/services/appservice/windows_function_app_slot_resource.go index 5b988b83fdbf..daf8dca27611 100644 --- a/internal/services/appservice/windows_function_app_slot_resource.go +++ b/internal/services/appservice/windows_function_app_slot_resource.go @@ -482,7 +482,7 @@ func (r WindowsFunctionAppSlotResource) Create() sdk.ResourceFunc { func (r WindowsFunctionAppSlotResource) Read() sdk.ResourceFunc { return sdk.ResourceFunc{ - Timeout: 25 * time.Minute, + Timeout: 5 * time.Minute, Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error { client := metadata.Client.AppService.WebAppsClient id, err := parse.FunctionAppSlotID(metadata.ResourceData.Id()) diff --git a/website/docs/r/linux_function_app.html.markdown b/website/docs/r/linux_function_app.html.markdown index c393e849605a..23642a63e5c3 100644 --- a/website/docs/r/linux_function_app.html.markdown +++ b/website/docs/r/linux_function_app.html.markdown @@ -478,7 +478,7 @@ A `site_credential` block exports the following: The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: * `create` - (Defaults to 30 minutes) Used when creating the Linux Function App. -* `read` - (Defaults to 25 minutes) Used when retrieving the Linux Function App. +* `read` - (Defaults to 5 minutes) Used when retrieving the Linux Function App. * `update` - (Defaults to 30 minutes) Used when updating the Linux Function App. * `delete` - (Defaults to 30 minutes) Used when deleting the Linux Function App. diff --git a/website/docs/r/linux_function_app_slot.html.markdown b/website/docs/r/linux_function_app_slot.html.markdown index 5447a6c6a238..301c9e240175 100644 --- a/website/docs/r/linux_function_app_slot.html.markdown +++ b/website/docs/r/linux_function_app_slot.html.markdown @@ -503,7 +503,7 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d * `create` - (Defaults to 30 minutes) Used when creating the Linux Function App Slot. * `update` - (Defaults to 30 minutes) Used when updating the Linux Function App Slot. -* `read` - (Defaults to 25 minutes) Used when retrieving the Linux Function App Slot. +* `read` - (Defaults to 5 minutes) Used when retrieving the Linux Function App Slot. * `delete` - (Defaults to 30 minutes) Used when deleting the Linux Function App Slot. ## Import diff --git a/website/docs/r/windows_function_app.html.markdown b/website/docs/r/windows_function_app.html.markdown index bcde75a68266..40e13c5f401c 100644 --- a/website/docs/r/windows_function_app.html.markdown +++ b/website/docs/r/windows_function_app.html.markdown @@ -450,7 +450,7 @@ A `site_credential` block exports the following: The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: * `create` - (Defaults to 30 minutes) Used when creating the Windows Function App. -* `read` - (Defaults to 25 minutes) Used when retrieving the Windows Function App. +* `read` - (Defaults to 5 minutes) Used when retrieving the Windows Function App. * `update` - (Defaults to 30 minutes) Used when updating the Windows Function App. * `delete` - (Defaults to 30 minutes) Used when deleting the Windows Function App. diff --git a/website/docs/r/windows_function_app_slot.html.markdown b/website/docs/r/windows_function_app_slot.html.markdown index fca04b609f31..084c6c91aae8 100644 --- a/website/docs/r/windows_function_app_slot.html.markdown +++ b/website/docs/r/windows_function_app_slot.html.markdown @@ -476,7 +476,7 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d * `create` - (Defaults to 30 minutes) Used when creating the Windows Function App Slot. * `update` - (Defaults to 30 minutes) Used when updating the Windows Function App Slot. -* `read` - (Defaults to 25 minutes) Used when retrieving the Windows Function App Slot. +* `read` - (Defaults to 5 minutes) Used when retrieving the Windows Function App Slot. * `delete` - (Defaults to 30 minutes) Used when deleting the Windows Function App Slot. ## Import