From e5ea1d5409a42f86a5cf5aa8c9b2d8242035dc6a Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Aug 2022 16:53:16 -0400 Subject: [PATCH 01/10] ec2: Allow customizable timeouts for data sources --- .../ec2/ebs_default_kms_key_data_source.go | 5 ++ .../ebs_encryption_by_default_data_source.go | 5 ++ .../service/ec2/ebs_snapshot_data_source.go | 5 ++ .../ec2/ebs_snapshot_ids_data_source.go | 5 ++ .../service/ec2/ebs_volume_data_source.go | 5 ++ .../service/ec2/ebs_volumes_data_source.go | 6 +++ internal/service/ec2/ec2_ami_data_source.go | 4 ++ .../service/ec2/ec2_ami_ids_data_source.go | 4 ++ .../ec2/ec2_availability_zone_data_source.go | 5 ++ .../ec2/ec2_availability_zones_data_source.go | 5 ++ internal/service/ec2/ec2_eip_data_source.go | 5 ++ internal/service/ec2/ec2_eips_data_source.go | 5 ++ internal/service/ec2/ec2_host_data_source.go | 5 ++ .../service/ec2/ec2_instance_data_source.go | 5 ++ .../ec2/ec2_instance_data_source_test.go | 49 +++++++++++++++++++ .../ec2/ec2_instance_type_data_source.go | 6 +++ .../ec2_instance_type_offering_data_source.go | 5 ++ ...ec2_instance_type_offerings_data_source.go | 5 ++ .../ec2/ec2_instance_types_data_source.go | 5 ++ .../service/ec2/ec2_instances_data_source.go | 5 ++ .../ec2/ec2_instances_data_source_test.go | 48 ++++++++++++++++++ .../service/ec2/ec2_key_pair_data_source.go | 4 ++ .../ec2/ec2_launch_template_data_source.go | 5 ++ .../ec2_serial_console_access_data_source.go | 5 ++ .../service/ec2/ec2_spot_price_data_source.go | 4 ++ internal/service/ec2/ipam_pool_data_source.go | 5 ++ .../ec2/ipam_preview_next_cidr_data_source.go | 5 ++ .../ec2/outposts_coip_pool_data_source.go | 5 ++ .../ec2/outposts_coip_pools_data_source.go | 5 ++ .../ec2/outposts_local_gateway_data_source.go | 5 ++ ...s_local_gateway_route_table_data_source.go | 5 ++ ..._local_gateway_route_tables_data_source.go | 5 ++ ...l_gateway_virtual_interface_data_source.go | 5 ++ ...way_virtual_interface_group_data_source.go | 5 ++ ...ay_virtual_interface_groups_data_source.go | 5 ++ .../outposts_local_gateways_data_source.go | 6 +++ .../ec2/transitgateway_connect_data_source.go | 5 ++ ...transitgateway_connect_peer_data_source.go | 5 ++ .../service/ec2/transitgateway_data_source.go | 5 ++ ...teway_dx_gateway_attachment_data_source.go | 5 ++ ...sitgateway_multicast_domain_data_source.go | 5 ++ ...tgateway_peering_attachment_data_source.go | 5 ++ .../transitgateway_route_table_data_source.go | 5 ++ ...transitgateway_route_tables_data_source.go | 5 ++ ...ansitgateway_vpc_attachment_data_source.go | 5 ++ ...nsitgateway_vpc_attachments_data_source.go | 5 ++ ...ansitgateway_vpn_attachment_data_source.go | 5 ++ internal/service/ec2/vpc_data_source.go | 5 ++ .../ec2/vpc_dhcp_options_data_source.go | 5 ++ .../service/ec2/vpc_endpoint_data_source.go | 5 ++ .../ec2/vpc_endpoint_service_data_source.go | 5 ++ .../ec2/vpc_internet_gateway_data_source.go | 5 ++ .../vpc_managed_prefix_list_data_source.go | 6 +++ .../ec2/vpc_nat_gateway_data_source.go | 5 ++ .../ec2/vpc_nat_gateways_data_source.go | 5 ++ .../ec2/vpc_network_acls_data_source.go | 6 +++ .../ec2/vpc_network_interface_data_source.go | 6 +++ .../ec2/vpc_network_interfaces_data_source.go | 5 ++ .../ec2/vpc_peering_connection_data_source.go | 5 ++ .../vpc_peering_connections_data_source.go | 5 ++ .../ec2/vpc_prefix_list_data_source.go | 6 +++ internal/service/ec2/vpc_route_data_source.go | 5 ++ .../ec2/vpc_route_table_data_source.go | 5 ++ .../ec2/vpc_route_tables_data_source.go | 5 ++ .../ec2/vpc_security_group_data_source.go | 5 ++ .../ec2/vpc_security_groups_data_source.go | 5 ++ .../service/ec2/vpc_subnet_data_source.go | 5 ++ .../service/ec2/vpc_subnet_ids_data_source.go | 6 +++ .../service/ec2/vpc_subnets_data_source.go | 6 +++ internal/service/ec2/vpc_vpcs_data_source.go | 6 +++ .../ec2/vpnclient_endpoint_data_source.go | 5 ++ .../vpnsite_customer_gateway_data_source.go | 5 ++ .../ec2/vpnsite_gateway_data_source.go | 5 ++ 73 files changed, 458 insertions(+) diff --git a/internal/service/ec2/ebs_default_kms_key_data_source.go b/internal/service/ec2/ebs_default_kms_key_data_source.go index bd0115f91df..5dba8ac318b 100644 --- a/internal/service/ec2/ebs_default_kms_key_data_source.go +++ b/internal/service/ec2/ebs_default_kms_key_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -12,6 +13,10 @@ func DataSourceEBSDefaultKMSKey() *schema.Resource { return &schema.Resource{ Read: dataSourceEBSDefaultKMSKeyRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "key_arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/ebs_encryption_by_default_data_source.go b/internal/service/ec2/ebs_encryption_by_default_data_source.go index f50c670173a..9baa5453f60 100644 --- a/internal/service/ec2/ebs_encryption_by_default_data_source.go +++ b/internal/service/ec2/ebs_encryption_by_default_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -12,6 +13,10 @@ func DataSourceEBSEncryptionByDefault() *schema.Resource { return &schema.Resource{ Read: dataSourceEBSEncryptionByDefaultRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "enabled": { Type: schema.TypeBool, diff --git a/internal/service/ec2/ebs_snapshot_data_source.go b/internal/service/ec2/ebs_snapshot_data_source.go index 4db0bf4e101..288a1c99990 100644 --- a/internal/service/ec2/ebs_snapshot_data_source.go +++ b/internal/service/ec2/ebs_snapshot_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "sort" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -17,6 +18,10 @@ func DataSourceEBSSnapshot() *schema.Resource { return &schema.Resource{ Read: dataSourceEBSSnapshotRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/ebs_snapshot_ids_data_source.go b/internal/service/ec2/ebs_snapshot_ids_data_source.go index 4c2d3de2873..99ce965bc08 100644 --- a/internal/service/ec2/ebs_snapshot_ids_data_source.go +++ b/internal/service/ec2/ebs_snapshot_ids_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "sort" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -15,6 +16,10 @@ func DataSourceEBSSnapshotIDs() *schema.Resource { return &schema.Resource{ Read: dataSourceEBSSnapshotIDsRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/ebs_volume_data_source.go b/internal/service/ec2/ebs_volume_data_source.go index 9396169ae4f..e4c2e922a81 100644 --- a/internal/service/ec2/ebs_volume_data_source.go +++ b/internal/service/ec2/ebs_volume_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "sort" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -16,6 +17,10 @@ func DataSourceEBSVolume() *schema.Resource { return &schema.Resource{ Read: dataSourceEBSVolumeRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/ebs_volumes_data_source.go b/internal/service/ec2/ebs_volumes_data_source.go index 2c5c9360601..5dda53e68ed 100644 --- a/internal/service/ec2/ebs_volumes_data_source.go +++ b/internal/service/ec2/ebs_volumes_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -13,6 +14,11 @@ import ( func DataSourceEBSVolumes() *schema.Resource { return &schema.Resource{ Read: dataSourceEBSVolumesRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/ec2_ami_data_source.go b/internal/service/ec2/ec2_ami_data_source.go index 6e1ff00b97d..075cec5aae4 100644 --- a/internal/service/ec2/ec2_ami_data_source.go +++ b/internal/service/ec2/ec2_ami_data_source.go @@ -23,6 +23,10 @@ func DataSourceAMI() *schema.Resource { return &schema.Resource{ Read: dataSourceAMIRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "architecture": { Type: schema.TypeString, diff --git a/internal/service/ec2/ec2_ami_ids_data_source.go b/internal/service/ec2/ec2_ami_ids_data_source.go index 3b057efebfe..363d370de0c 100644 --- a/internal/service/ec2/ec2_ami_ids_data_source.go +++ b/internal/service/ec2/ec2_ami_ids_data_source.go @@ -20,6 +20,10 @@ func DataSourceAMIIDs() *schema.Resource { return &schema.Resource{ Read: dataSourceAMIIDsRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "executable_users": { diff --git a/internal/service/ec2/ec2_availability_zone_data_source.go b/internal/service/ec2/ec2_availability_zone_data_source.go index beda741d92e..f5e688a9929 100644 --- a/internal/service/ec2/ec2_availability_zone_data_source.go +++ b/internal/service/ec2/ec2_availability_zone_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "strings" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceAvailabilityZone() *schema.Resource { return &schema.Resource{ Read: dataSourceAvailabilityZoneRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "all_availability_zones": { Type: schema.TypeBool, diff --git a/internal/service/ec2/ec2_availability_zones_data_source.go b/internal/service/ec2/ec2_availability_zones_data_source.go index af6929624fe..cac08a742aa 100644 --- a/internal/service/ec2/ec2_availability_zones_data_source.go +++ b/internal/service/ec2/ec2_availability_zones_data_source.go @@ -4,6 +4,7 @@ import ( "fmt" "log" "sort" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -16,6 +17,10 @@ func DataSourceAvailabilityZones() *schema.Resource { return &schema.Resource{ Read: dataSourceAvailabilityZonesRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "all_availability_zones": { Type: schema.TypeBool, diff --git a/internal/service/ec2/ec2_eip_data_source.go b/internal/service/ec2/ec2_eip_data_source.go index 2bc25f0b0dc..bafe7a7cb2a 100644 --- a/internal/service/ec2/ec2_eip_data_source.go +++ b/internal/service/ec2/ec2_eip_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "log" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -15,6 +16,10 @@ func DataSourceEIP() *schema.Resource { return &schema.Resource{ Read: dataSourceEIPRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "association_id": { Type: schema.TypeString, diff --git a/internal/service/ec2/ec2_eips_data_source.go b/internal/service/ec2/ec2_eips_data_source.go index 75e5c10185b..54b63d38fdf 100644 --- a/internal/service/ec2/ec2_eips_data_source.go +++ b/internal/service/ec2/ec2_eips_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceEIPs() *schema.Resource { return &schema.Resource{ Read: dataSourceEIPsRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "allocation_ids": { Type: schema.TypeList, diff --git a/internal/service/ec2/ec2_host_data_source.go b/internal/service/ec2/ec2_host_data_source.go index da5653c23a4..afed000602f 100644 --- a/internal/service/ec2/ec2_host_data_source.go +++ b/internal/service/ec2/ec2_host_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -16,6 +17,10 @@ func DataSourceHost() *schema.Resource { return &schema.Resource{ Read: dataSourceHostRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/ec2_instance_data_source.go b/internal/service/ec2/ec2_instance_data_source.go index 33d2e018cda..8552112691b 100644 --- a/internal/service/ec2/ec2_instance_data_source.go +++ b/internal/service/ec2/ec2_instance_data_source.go @@ -4,6 +4,7 @@ import ( "bytes" "fmt" "log" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -20,6 +21,10 @@ func DataSourceInstance() *schema.Resource { return &schema.Resource{ Read: dataSourceInstanceRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "ami": { Type: schema.TypeString, diff --git a/internal/service/ec2/ec2_instance_data_source_test.go b/internal/service/ec2/ec2_instance_data_source_test.go index d6a30983f2d..35ad044f602 100644 --- a/internal/service/ec2/ec2_instance_data_source_test.go +++ b/internal/service/ec2/ec2_instance_data_source_test.go @@ -684,6 +684,29 @@ func TestAccEC2InstanceDataSource_disableAPIStopTermination(t *testing.T) { }) } +func TestAccEC2InstanceDataSource_timeout(t *testing.T) { + resourceName := "aws_instance.test" + datasourceName := "data.aws_instance.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(t) }, + ErrorCheck: acctest.ErrorCheck(t, ec2.EndpointsID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + Config: testAccInstanceDataSourceConfig_timeout(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"), + resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"), + resource.TestCheckResourceAttrPair(datasourceName, "instance_type", resourceName, "instance_type"), + resource.TestCheckResourceAttrPair(datasourceName, "arn", resourceName, "arn"), + ), + }, + }, + }) +} + // Lookup based on InstanceID func testAccInstanceDataSourceConfig_basic(rName string) string { return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(` @@ -1380,3 +1403,29 @@ data "aws_instance" "test" { } `, rName, disableApiStopTermination)) } + +func testAccInstanceDataSourceConfig_timeout(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + fmt.Sprintf(` +resource "aws_instance" "test" { + ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id + instance_type = "t2.small" + + tags = { + Name = %[1]q + } +} + +data "aws_instance" "test" { + filter { + name = "instance-id" + values = [aws_instance.test.id] + } + + timeouts { + read = "60m" + } +} +`, rName)) +} diff --git a/internal/service/ec2/ec2_instance_type_data_source.go b/internal/service/ec2/ec2_instance_type_data_source.go index c22ab56c6cd..eba93757dd1 100644 --- a/internal/service/ec2/ec2_instance_type_data_source.go +++ b/internal/service/ec2/ec2_instance_type_data_source.go @@ -1,6 +1,8 @@ package ec2 import ( + "time" + "github.com/aws/aws-sdk-go/aws" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -11,6 +13,10 @@ func DataSourceInstanceType() *schema.Resource { return &schema.Resource{ Read: dataSourceInstanceTypeRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "auto_recovery_supported": { Type: schema.TypeBool, diff --git a/internal/service/ec2/ec2_instance_type_offering_data_source.go b/internal/service/ec2/ec2_instance_type_offering_data_source.go index e4c43c96aba..5b82be5d9d1 100644 --- a/internal/service/ec2/ec2_instance_type_offering_data_source.go +++ b/internal/service/ec2/ec2_instance_type_offering_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceInstanceTypeOffering() *schema.Resource { return &schema.Resource{ Read: dataSourceInstanceTypeOfferingRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "instance_type": { diff --git a/internal/service/ec2/ec2_instance_type_offerings_data_source.go b/internal/service/ec2/ec2_instance_type_offerings_data_source.go index d2eababc3a0..601de939573 100644 --- a/internal/service/ec2/ec2_instance_type_offerings_data_source.go +++ b/internal/service/ec2/ec2_instance_type_offerings_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceInstanceTypeOfferings() *schema.Resource { return &schema.Resource{ Read: dataSourceInstanceTypeOfferingsRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "instance_types": { diff --git a/internal/service/ec2/ec2_instance_types_data_source.go b/internal/service/ec2/ec2_instance_types_data_source.go index e9ca20c4457..e2b76d51db3 100644 --- a/internal/service/ec2/ec2_instance_types_data_source.go +++ b/internal/service/ec2/ec2_instance_types_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -13,6 +14,10 @@ func DataSourceInstanceTypes() *schema.Resource { return &schema.Resource{ Read: dataSourceInstanceTypesRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "instance_types": { diff --git a/internal/service/ec2/ec2_instances_data_source.go b/internal/service/ec2/ec2_instances_data_source.go index 4f9d9b2e1e0..61ca4259560 100644 --- a/internal/service/ec2/ec2_instances_data_source.go +++ b/internal/service/ec2/ec2_instances_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -16,6 +17,10 @@ func DataSourceInstances() *schema.Resource { return &schema.Resource{ Read: dataSourceInstancesRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/ec2_instances_data_source_test.go b/internal/service/ec2/ec2_instances_data_source_test.go index 66141670520..8ad1fc55fd5 100644 --- a/internal/service/ec2/ec2_instances_data_source_test.go +++ b/internal/service/ec2/ec2_instances_data_source_test.go @@ -87,6 +87,26 @@ func TestAccEC2InstancesDataSource_empty(t *testing.T) { }) } +func TestAccEC2InstancesDataSource_timeout(t *testing.T) { + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(t) }, + ErrorCheck: acctest.ErrorCheck(t, ec2.EndpointsID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + Config: testAccInstancesDataSourceConfig_timeout(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr("data.aws_instances.test", "ids.#", "2"), + resource.TestCheckResourceAttr("data.aws_instances.test", "private_ips.#", "2"), + resource.TestCheckResourceAttrSet("data.aws_instances.test", "public_ips.#"), + ), + }, + }, + }) +} + func testAccInstancesDataSourceConfig_ids(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), @@ -173,3 +193,31 @@ data "aws_instances" "test" { } `, rName) } + +func testAccInstancesDataSourceConfig_timeout(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), + acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), + fmt.Sprintf(` +resource "aws_instance" "test" { + count = 2 + ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id + instance_type = data.aws_ec2_instance_type_offering.available.instance_type + + tags = { + Name = %[1]q + } +} + +data "aws_instances" "test" { + filter { + name = "instance-id" + values = aws_instance.test[*].id + } + + timeouts { + read = "60m" + } +} +`, rName)) +} diff --git a/internal/service/ec2/ec2_key_pair_data_source.go b/internal/service/ec2/ec2_key_pair_data_source.go index a7e2e8c4e5f..2e5c21e5154 100644 --- a/internal/service/ec2/ec2_key_pair_data_source.go +++ b/internal/service/ec2/ec2_key_pair_data_source.go @@ -17,6 +17,10 @@ func DataSourceKeyPair() *schema.Resource { return &schema.Resource{ Read: dataSourceKeyPairRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/ec2_launch_template_data_source.go b/internal/service/ec2/ec2_launch_template_data_source.go index 5c0c7949b4e..daf705e61f2 100644 --- a/internal/service/ec2/ec2_launch_template_data_source.go +++ b/internal/service/ec2/ec2_launch_template_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "strconv" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -17,6 +18,10 @@ func DataSourceLaunchTemplate() *schema.Resource { return &schema.Resource{ Read: dataSourceLaunchTemplateRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/ec2_serial_console_access_data_source.go b/internal/service/ec2/ec2_serial_console_access_data_source.go index e485eac736a..e4807cb1856 100644 --- a/internal/service/ec2/ec2_serial_console_access_data_source.go +++ b/internal/service/ec2/ec2_serial_console_access_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "context" + "time" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" @@ -13,6 +14,10 @@ func DataSourceSerialConsoleAccess() *schema.Resource { return &schema.Resource{ ReadWithoutTimeout: dataSourceSerialConsoleAccessRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "enabled": { Type: schema.TypeBool, diff --git a/internal/service/ec2/ec2_spot_price_data_source.go b/internal/service/ec2/ec2_spot_price_data_source.go index 3fdcc067607..bd0f12c44f0 100644 --- a/internal/service/ec2/ec2_spot_price_data_source.go +++ b/internal/service/ec2/ec2_spot_price_data_source.go @@ -14,6 +14,10 @@ func DataSourceSpotPrice() *schema.Resource { return &schema.Resource{ Read: dataSourceSpotPriceRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "instance_type": { diff --git a/internal/service/ec2/ipam_pool_data_source.go b/internal/service/ec2/ipam_pool_data_source.go index da2c4473404..2bfeec58e89 100644 --- a/internal/service/ec2/ipam_pool_data_source.go +++ b/internal/service/ec2/ipam_pool_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "strings" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -16,6 +17,10 @@ func DataSourceIPAMPool() *schema.Resource { return &schema.Resource{ Read: dataSourceIPAMPoolRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ipam_pool_id": { diff --git a/internal/service/ec2/ipam_preview_next_cidr_data_source.go b/internal/service/ec2/ipam_preview_next_cidr_data_source.go index f6ba7678f9e..caf998d91ef 100644 --- a/internal/service/ec2/ipam_preview_next_cidr_data_source.go +++ b/internal/service/ec2/ipam_preview_next_cidr_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -17,6 +18,10 @@ func DataSourceIPAMPreviewNextCIDR() *schema.Resource { return &schema.Resource{ Read: dataSourceIPAMPreviewNextCIDRRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "cidr": { Type: schema.TypeString, diff --git a/internal/service/ec2/outposts_coip_pool_data_source.go b/internal/service/ec2/outposts_coip_pool_data_source.go index ce82d2efc45..9726f96c7d1 100644 --- a/internal/service/ec2/outposts_coip_pool_data_source.go +++ b/internal/service/ec2/outposts_coip_pool_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "log" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -15,6 +16,10 @@ func DataSourceCoIPPool() *schema.Resource { return &schema.Resource{ Read: dataSourceCoIPPoolRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "local_gateway_route_table_id": { Type: schema.TypeString, diff --git a/internal/service/ec2/outposts_coip_pools_data_source.go b/internal/service/ec2/outposts_coip_pools_data_source.go index 1c8a2848afd..680a66f0d60 100644 --- a/internal/service/ec2/outposts_coip_pools_data_source.go +++ b/internal/service/ec2/outposts_coip_pools_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceCoIPPools() *schema.Resource { return &schema.Resource{ Read: dataSourceCoIPPoolsRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "pool_ids": { diff --git a/internal/service/ec2/outposts_local_gateway_data_source.go b/internal/service/ec2/outposts_local_gateway_data_source.go index 69536daa2bf..fb0533c26b2 100644 --- a/internal/service/ec2/outposts_local_gateway_data_source.go +++ b/internal/service/ec2/outposts_local_gateway_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "log" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -15,6 +16,10 @@ func DataSourceLocalGateway() *schema.Resource { return &schema.Resource{ Read: dataSourceLocalGatewayRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "id": { Type: schema.TypeString, diff --git a/internal/service/ec2/outposts_local_gateway_route_table_data_source.go b/internal/service/ec2/outposts_local_gateway_route_table_data_source.go index bfd582ea4fd..397388b41a1 100644 --- a/internal/service/ec2/outposts_local_gateway_route_table_data_source.go +++ b/internal/service/ec2/outposts_local_gateway_route_table_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "log" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -15,6 +16,10 @@ func DataSourceLocalGatewayRouteTable() *schema.Resource { return &schema.Resource{ Read: dataSourceLocalGatewayRouteTableRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "local_gateway_route_table_id": { Type: schema.TypeString, diff --git a/internal/service/ec2/outposts_local_gateway_route_tables_data_source.go b/internal/service/ec2/outposts_local_gateway_route_tables_data_source.go index 4db12ee2680..6ee34d2d395 100644 --- a/internal/service/ec2/outposts_local_gateway_route_tables_data_source.go +++ b/internal/service/ec2/outposts_local_gateway_route_tables_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceLocalGatewayRouteTables() *schema.Resource { return &schema.Resource{ Read: dataSourceLocalGatewayRouteTablesRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/outposts_local_gateway_virtual_interface_data_source.go b/internal/service/ec2/outposts_local_gateway_virtual_interface_data_source.go index a9ad609a4f2..f8ae58eba7f 100644 --- a/internal/service/ec2/outposts_local_gateway_virtual_interface_data_source.go +++ b/internal/service/ec2/outposts_local_gateway_virtual_interface_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceLocalGatewayVirtualInterface() *schema.Resource { return &schema.Resource{ Read: dataSourceLocalGatewayVirtualInterfaceRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": CustomFiltersSchema(), "id": { diff --git a/internal/service/ec2/outposts_local_gateway_virtual_interface_group_data_source.go b/internal/service/ec2/outposts_local_gateway_virtual_interface_group_data_source.go index 4c58141feba..38289a5779e 100644 --- a/internal/service/ec2/outposts_local_gateway_virtual_interface_group_data_source.go +++ b/internal/service/ec2/outposts_local_gateway_virtual_interface_group_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceLocalGatewayVirtualInterfaceGroup() *schema.Resource { return &schema.Resource{ Read: dataSourceLocalGatewayVirtualInterfaceGroupRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": CustomFiltersSchema(), "id": { diff --git a/internal/service/ec2/outposts_local_gateway_virtual_interface_groups_data_source.go b/internal/service/ec2/outposts_local_gateway_virtual_interface_groups_data_source.go index b4481123d48..5dcf0e0b9b2 100644 --- a/internal/service/ec2/outposts_local_gateway_virtual_interface_groups_data_source.go +++ b/internal/service/ec2/outposts_local_gateway_virtual_interface_groups_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceLocalGatewayVirtualInterfaceGroups() *schema.Resource { return &schema.Resource{ Read: dataSourceLocalGatewayVirtualInterfaceGroupsRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/outposts_local_gateways_data_source.go b/internal/service/ec2/outposts_local_gateways_data_source.go index 9a4ae075086..bb2a564128b 100644 --- a/internal/service/ec2/outposts_local_gateways_data_source.go +++ b/internal/service/ec2/outposts_local_gateways_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -13,6 +14,11 @@ import ( func DataSourceLocalGateways() *schema.Resource { return &schema.Resource{ Read: dataSourceLocalGatewaysRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/transitgateway_connect_data_source.go b/internal/service/ec2/transitgateway_connect_data_source.go index 570a9e376ab..52408cfc78b 100644 --- a/internal/service/ec2/transitgateway_connect_data_source.go +++ b/internal/service/ec2/transitgateway_connect_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "context" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -16,6 +17,10 @@ func DataSourceTransitGatewayConnect() *schema.Resource { return &schema.Resource{ ReadWithoutTimeout: dataSourceTransitGatewayConnectRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "protocol": { diff --git a/internal/service/ec2/transitgateway_connect_peer_data_source.go b/internal/service/ec2/transitgateway_connect_peer_data_source.go index d41e2eac045..561b5262917 100644 --- a/internal/service/ec2/transitgateway_connect_peer_data_source.go +++ b/internal/service/ec2/transitgateway_connect_peer_data_source.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "strconv" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -19,6 +20,10 @@ func DataSourceTransitGatewayConnectPeer() *schema.Resource { return &schema.Resource{ ReadWithoutTimeout: dataSourceTransitGatewayConnectPeerRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/transitgateway_data_source.go b/internal/service/ec2/transitgateway_data_source.go index cdd70238c4b..776e7b570fd 100644 --- a/internal/service/ec2/transitgateway_data_source.go +++ b/internal/service/ec2/transitgateway_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -15,6 +16,10 @@ func DataSourceTransitGateway() *schema.Resource { return &schema.Resource{ Read: dataSourceTransitGatewayRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "amazon_side_asn": { Type: schema.TypeInt, diff --git a/internal/service/ec2/transitgateway_dx_gateway_attachment_data_source.go b/internal/service/ec2/transitgateway_dx_gateway_attachment_data_source.go index da870676bee..01efdfa8854 100644 --- a/internal/service/ec2/transitgateway_dx_gateway_attachment_data_source.go +++ b/internal/service/ec2/transitgateway_dx_gateway_attachment_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -15,6 +16,10 @@ func DataSourceTransitGatewayDxGatewayAttachment() *schema.Resource { return &schema.Resource{ Read: dataSourceTransitGatewayDxGatewayAttachmentRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "dx_gateway_id": { Type: schema.TypeString, diff --git a/internal/service/ec2/transitgateway_multicast_domain_data_source.go b/internal/service/ec2/transitgateway_multicast_domain_data_source.go index ae8f8353f96..c09ca5b5114 100644 --- a/internal/service/ec2/transitgateway_multicast_domain_data_source.go +++ b/internal/service/ec2/transitgateway_multicast_domain_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "context" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -16,6 +17,10 @@ func DataSourceTransitGatewayMulticastDomain() *schema.Resource { return &schema.Resource{ ReadWithoutTimeout: dataSourceTransitGatewayMulticastDomainRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/transitgateway_peering_attachment_data_source.go b/internal/service/ec2/transitgateway_peering_attachment_data_source.go index 1e4d7d64df5..f4479ee5d01 100644 --- a/internal/service/ec2/transitgateway_peering_attachment_data_source.go +++ b/internal/service/ec2/transitgateway_peering_attachment_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -15,6 +16,10 @@ func DataSourceTransitGatewayPeeringAttachment() *schema.Resource { return &schema.Resource{ Read: dataSourceTransitGatewayPeeringAttachmentRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": CustomFiltersSchema(), "id": { diff --git a/internal/service/ec2/transitgateway_route_table_data_source.go b/internal/service/ec2/transitgateway_route_table_data_source.go index 27ce01e45b7..5e008cbbda3 100644 --- a/internal/service/ec2/transitgateway_route_table_data_source.go +++ b/internal/service/ec2/transitgateway_route_table_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -16,6 +17,10 @@ func DataSourceTransitGatewayRouteTable() *schema.Resource { return &schema.Resource{ Read: dataSourceTransitGatewayRouteTableRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/transitgateway_route_tables_data_source.go b/internal/service/ec2/transitgateway_route_tables_data_source.go index 8e8177d8048..f74cc88c5c2 100644 --- a/internal/service/ec2/transitgateway_route_tables_data_source.go +++ b/internal/service/ec2/transitgateway_route_tables_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceTransitGatewayRouteTables() *schema.Resource { return &schema.Resource{ Read: dataSourceTransitGatewayRouteTablesRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/transitgateway_vpc_attachment_data_source.go b/internal/service/ec2/transitgateway_vpc_attachment_data_source.go index 13d6b8d8fef..b4c6f433b23 100644 --- a/internal/service/ec2/transitgateway_vpc_attachment_data_source.go +++ b/internal/service/ec2/transitgateway_vpc_attachment_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -15,6 +16,10 @@ func DataSourceTransitGatewayVPCAttachment() *schema.Resource { return &schema.Resource{ Read: dataSourceTransitGatewayVPCAttachmentRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "appliance_mode_support": { Type: schema.TypeString, diff --git a/internal/service/ec2/transitgateway_vpc_attachments_data_source.go b/internal/service/ec2/transitgateway_vpc_attachments_data_source.go index ab334a16fbf..7aef9f857da 100644 --- a/internal/service/ec2/transitgateway_vpc_attachments_data_source.go +++ b/internal/service/ec2/transitgateway_vpc_attachments_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "context" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceTransitGatewayVPCAttachments() *schema.Resource { return &schema.Resource{ ReadWithoutTimeout: dataSourceTransitGatewayVPCAttachmentsRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/transitgateway_vpn_attachment_data_source.go b/internal/service/ec2/transitgateway_vpn_attachment_data_source.go index c67c41cc37c..57e167639eb 100644 --- a/internal/service/ec2/transitgateway_vpn_attachment_data_source.go +++ b/internal/service/ec2/transitgateway_vpn_attachment_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -15,6 +16,10 @@ func DataSourceTransitGatewayVPNAttachment() *schema.Resource { return &schema.Resource{ Read: dataSourceTransitGatewayVPNAttachmentRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": CustomFiltersSchema(), "tags": tftags.TagsSchemaComputed(), diff --git a/internal/service/ec2/vpc_data_source.go b/internal/service/ec2/vpc_data_source.go index 08f224f39e0..d3444e55ae9 100644 --- a/internal/service/ec2/vpc_data_source.go +++ b/internal/service/ec2/vpc_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "log" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -17,6 +18,10 @@ func DataSourceVPC() *schema.Resource { return &schema.Resource{ Read: dataSourceVPCRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_dhcp_options_data_source.go b/internal/service/ec2/vpc_dhcp_options_data_source.go index 23d93715a26..15c466a3a68 100644 --- a/internal/service/ec2/vpc_dhcp_options_data_source.go +++ b/internal/service/ec2/vpc_dhcp_options_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -16,6 +17,10 @@ func DataSourceVPCDHCPOptions() *schema.Resource { return &schema.Resource{ Read: dataSourceVPCDHCPOptionsRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_endpoint_data_source.go b/internal/service/ec2/vpc_endpoint_data_source.go index 7f60ca0528d..eda5b68774f 100644 --- a/internal/service/ec2/vpc_endpoint_data_source.go +++ b/internal/service/ec2/vpc_endpoint_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -17,6 +18,10 @@ func DataSourceVPCEndpoint() *schema.Resource { return &schema.Resource{ Read: dataSourceVPCEndpointRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_endpoint_service_data_source.go b/internal/service/ec2/vpc_endpoint_service_data_source.go index c331c86682b..bfbcf3ad95f 100644 --- a/internal/service/ec2/vpc_endpoint_service_data_source.go +++ b/internal/service/ec2/vpc_endpoint_service_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "strconv" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -18,6 +19,10 @@ func DataSourceVPCEndpointService() *schema.Resource { return &schema.Resource{ Read: dataSourceVPCEndpointServiceRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "acceptance_required": { Type: schema.TypeBool, diff --git a/internal/service/ec2/vpc_internet_gateway_data_source.go b/internal/service/ec2/vpc_internet_gateway_data_source.go index 38ff847d6be..6d983b3b63e 100644 --- a/internal/service/ec2/vpc_internet_gateway_data_source.go +++ b/internal/service/ec2/vpc_internet_gateway_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -16,6 +17,10 @@ func DataSourceInternetGateway() *schema.Resource { return &schema.Resource{ Read: dataSourceInternetGatewayRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_managed_prefix_list_data_source.go b/internal/service/ec2/vpc_managed_prefix_list_data_source.go index 4ef2260a8ba..5eb4489a765 100644 --- a/internal/service/ec2/vpc_managed_prefix_list_data_source.go +++ b/internal/service/ec2/vpc_managed_prefix_list_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "context" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,11 @@ import ( func DataSourceManagedPrefixList() *schema.Resource { return &schema.Resource{ ReadContext: dataSourceManagedPrefixListRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "address_family": { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_nat_gateway_data_source.go b/internal/service/ec2/vpc_nat_gateway_data_source.go index 5c626732fb7..8f6af12d64a 100644 --- a/internal/service/ec2/vpc_nat_gateway_data_source.go +++ b/internal/service/ec2/vpc_nat_gateway_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -15,6 +16,10 @@ func DataSourceNATGateway() *schema.Resource { return &schema.Resource{ Read: dataSourceNATGatewayRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "allocation_id": { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_nat_gateways_data_source.go b/internal/service/ec2/vpc_nat_gateways_data_source.go index be29d107bd9..3894c8a8630 100644 --- a/internal/service/ec2/vpc_nat_gateways_data_source.go +++ b/internal/service/ec2/vpc_nat_gateways_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceNATGateways() *schema.Resource { return &schema.Resource{ Read: dataSourceNATGatewaysRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/vpc_network_acls_data_source.go b/internal/service/ec2/vpc_network_acls_data_source.go index 7de247c6ace..2d71419c48e 100644 --- a/internal/service/ec2/vpc_network_acls_data_source.go +++ b/internal/service/ec2/vpc_network_acls_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -13,6 +14,11 @@ import ( func DataSourceNetworkACLs() *schema.Resource { return &schema.Resource{ Read: dataSourceNetworkACLsRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/vpc_network_interface_data_source.go b/internal/service/ec2/vpc_network_interface_data_source.go index 5562ac3a4f7..67065d8fcb7 100644 --- a/internal/service/ec2/vpc_network_interface_data_source.go +++ b/internal/service/ec2/vpc_network_interface_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -14,6 +15,11 @@ import ( func DataSourceNetworkInterface() *schema.Resource { return &schema.Resource{ Read: dataSourceNetworkInterfaceRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_network_interfaces_data_source.go b/internal/service/ec2/vpc_network_interfaces_data_source.go index fcbe3e8ecfb..5b25cc006e4 100644 --- a/internal/service/ec2/vpc_network_interfaces_data_source.go +++ b/internal/service/ec2/vpc_network_interfaces_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceNetworkInterfaces() *schema.Resource { return &schema.Resource{ Read: dataSourceNetworkInterfacesRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/vpc_peering_connection_data_source.go b/internal/service/ec2/vpc_peering_connection_data_source.go index 0889a4715a2..c7689ab8a34 100644 --- a/internal/service/ec2/vpc_peering_connection_data_source.go +++ b/internal/service/ec2/vpc_peering_connection_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -15,6 +16,10 @@ func DataSourceVPCPeeringConnection() *schema.Resource { return &schema.Resource{ Read: dataSourceVPCPeeringConnectionRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "accepter": { Type: schema.TypeMap, diff --git a/internal/service/ec2/vpc_peering_connections_data_source.go b/internal/service/ec2/vpc_peering_connections_data_source.go index a73bc621cf5..ca6cb1d617e 100644 --- a/internal/service/ec2/vpc_peering_connections_data_source.go +++ b/internal/service/ec2/vpc_peering_connections_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceVPCPeeringConnections() *schema.Resource { return &schema.Resource{ Read: dataSourceVPCPeeringConnectionsRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/vpc_prefix_list_data_source.go b/internal/service/ec2/vpc_prefix_list_data_source.go index 7becf31eb53..a46c407ae86 100644 --- a/internal/service/ec2/vpc_prefix_list_data_source.go +++ b/internal/service/ec2/vpc_prefix_list_data_source.go @@ -1,6 +1,8 @@ package ec2 import ( + "time" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -12,6 +14,10 @@ func DataSourcePrefixList() *schema.Resource { return &schema.Resource{ Read: dataSourcePrefixListRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "cidr_blocks": { Type: schema.TypeList, diff --git a/internal/service/ec2/vpc_route_data_source.go b/internal/service/ec2/vpc_route_data_source.go index 1e37d02220a..1a8f99bd883 100644 --- a/internal/service/ec2/vpc_route_data_source.go +++ b/internal/service/ec2/vpc_route_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "strings" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceRoute() *schema.Resource { return &schema.Resource{ Read: dataSourceRouteRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "route_table_id": { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_route_table_data_source.go b/internal/service/ec2/vpc_route_table_data_source.go index 9930ef0307c..1b1d971badc 100644 --- a/internal/service/ec2/vpc_route_table_data_source.go +++ b/internal/service/ec2/vpc_route_table_data_source.go @@ -4,6 +4,7 @@ import ( "fmt" "log" "strings" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -17,6 +18,10 @@ func DataSourceRouteTable() *schema.Resource { return &schema.Resource{ Read: dataSourceRouteTableRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "subnet_id": { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_route_tables_data_source.go b/internal/service/ec2/vpc_route_tables_data_source.go index 1779aa1e74b..7665cf8a522 100644 --- a/internal/service/ec2/vpc_route_tables_data_source.go +++ b/internal/service/ec2/vpc_route_tables_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,10 @@ func DataSourceRouteTables() *schema.Resource { return &schema.Resource{ Read: dataSourceRouteTablesRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/vpc_security_group_data_source.go b/internal/service/ec2/vpc_security_group_data_source.go index 7fe5d86c1ed..fdf377f6f0b 100644 --- a/internal/service/ec2/vpc_security_group_data_source.go +++ b/internal/service/ec2/vpc_security_group_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -16,6 +17,10 @@ func DataSourceSecurityGroup() *schema.Resource { return &schema.Resource{ Read: dataSourceSecurityGroupRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_security_groups_data_source.go b/internal/service/ec2/vpc_security_groups_data_source.go index 8dc1cc5e8c5..d6e2b46b6a1 100644 --- a/internal/service/ec2/vpc_security_groups_data_source.go +++ b/internal/service/ec2/vpc_security_groups_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -15,6 +16,10 @@ func DataSourceSecurityGroups() *schema.Resource { return &schema.Resource{ Read: dataSourceSecurityGroupsRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arns": { Type: schema.TypeList, diff --git a/internal/service/ec2/vpc_subnet_data_source.go b/internal/service/ec2/vpc_subnet_data_source.go index 96736dcaca6..13cde0028e2 100644 --- a/internal/service/ec2/vpc_subnet_data_source.go +++ b/internal/service/ec2/vpc_subnet_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -15,6 +16,10 @@ func DataSourceSubnet() *schema.Resource { return &schema.Resource{ Read: dataSourceSubnetRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_subnet_ids_data_source.go b/internal/service/ec2/vpc_subnet_ids_data_source.go index 8185b2d40d5..ac70978cd34 100644 --- a/internal/service/ec2/vpc_subnet_ids_data_source.go +++ b/internal/service/ec2/vpc_subnet_ids_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "errors" "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -14,6 +15,11 @@ import ( func DataSourceSubnetIDs() *schema.Resource { return &schema.Resource{ Read: dataSourceSubnetIDsRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": CustomFiltersSchema(), "ids": { diff --git a/internal/service/ec2/vpc_subnets_data_source.go b/internal/service/ec2/vpc_subnets_data_source.go index 06cea4c2161..8793cffd6b3 100644 --- a/internal/service/ec2/vpc_subnets_data_source.go +++ b/internal/service/ec2/vpc_subnets_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -13,6 +14,11 @@ import ( func DataSourceSubnets() *schema.Resource { return &schema.Resource{ Read: dataSourceSubnetsRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/vpc_vpcs_data_source.go b/internal/service/ec2/vpc_vpcs_data_source.go index 6f00ce37845..e38dd6ec327 100644 --- a/internal/service/ec2/vpc_vpcs_data_source.go +++ b/internal/service/ec2/vpc_vpcs_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" @@ -13,6 +14,11 @@ import ( func DataSourceVPCs() *schema.Resource { return &schema.Resource{ Read: dataSourceVPCsRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "filter": DataSourceFiltersSchema(), "ids": { diff --git a/internal/service/ec2/vpnclient_endpoint_data_source.go b/internal/service/ec2/vpnclient_endpoint_data_source.go index d0aa4615af3..30064ad1706 100644 --- a/internal/service/ec2/vpnclient_endpoint_data_source.go +++ b/internal/service/ec2/vpnclient_endpoint_data_source.go @@ -2,6 +2,7 @@ package ec2 import ( "fmt" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -16,6 +17,10 @@ func DataSourceClientVPNEndpoint() *schema.Resource { return &schema.Resource{ Read: dataSourceClientVPNEndpointRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/vpnsite_customer_gateway_data_source.go b/internal/service/ec2/vpnsite_customer_gateway_data_source.go index 7ddc26ca711..5755d369320 100644 --- a/internal/service/ec2/vpnsite_customer_gateway_data_source.go +++ b/internal/service/ec2/vpnsite_customer_gateway_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "strconv" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -17,6 +18,10 @@ func DataSourceCustomerGateway() *schema.Resource { return &schema.Resource{ Read: dataSourceCustomerGatewayRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/ec2/vpnsite_gateway_data_source.go b/internal/service/ec2/vpnsite_gateway_data_source.go index 9f15a46d67d..ea3ae3cf946 100644 --- a/internal/service/ec2/vpnsite_gateway_data_source.go +++ b/internal/service/ec2/vpnsite_gateway_data_source.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "strconv" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -17,6 +18,10 @@ func DataSourceVPNGateway() *schema.Resource { return &schema.Resource{ Read: dataSourceVPNGatewayRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "amazon_side_asn": { Type: schema.TypeString, From 30b98d2917321910ddf91f6880972cf475f2c0d4 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Aug 2022 17:08:27 -0400 Subject: [PATCH 02/10] Add changelog --- .changelog/26121.txt | 283 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) create mode 100644 .changelog/26121.txt diff --git a/.changelog/26121.txt b/.changelog/26121.txt new file mode 100644 index 00000000000..5b9ece57425 --- /dev/null +++ b/.changelog/26121.txt @@ -0,0 +1,283 @@ +```release-note:enhancement +data-source/aws_ebs_default_kms_key: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ebs_encryption_by_default: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ebs_snapshot: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ebs_snapshot_ids: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ebs_volume: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ebs_volumes: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ami: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ami_ids: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_availability_zone: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_availability_zones: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_eip: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_eips: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_host: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_instance: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_instance_type: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_instance_type_offering: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_instance_type_offerings: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_instance_types: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_instances: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_key_pair: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_launch_template: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_serial_console_access: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_spot_price: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_vpc_ipam_pool: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_vpc_ipam_preview_next_cidr: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_coip_pool: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_coip_pools: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_local_gateway: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_local_gateway_route_table: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_local_gateway_route_tables: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_local_gateway_virtual_interface: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_local_gateway_virtual_interface_group: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_local_gateway_virtual_interface_groups: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_local_gateways: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_transit_gateway_connect: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_transit_gateway_connect_peer: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_transit_gateway: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_transit_gateway_dx_gateway_attachment: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_transit_gateway_multicast_domain: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_transit_gateway_peering_attachment: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_transit_gateway_route_table: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_transit_gateway_route_tables: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_transit_gateway_vpc_attachment: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_transit_gateway_vpc_attachments: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_transit_gateway_vpn_attachment: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_vpc: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_vpc_dhcp_options: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_vpc_endpoint: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_vpc_endpoint_service: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_internet_gateway: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_managed_prefix_list: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_nat_gateway: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_nat_gateways: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_network_acls: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_network_interface: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_network_interfaces: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_vpc_peering_connection: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_vpc_peering_connections: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_prefix_list: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_route: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_route_table: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_route_tables: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_security_group: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_security_groups: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_subnet: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_subnet_ids: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_subnets: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_vpcs: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_ec2_client_vpn_endpoint: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_customer_gateway: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_vpn_gateway: Allow customizable read timeout +``` From a118b776b2842ff469848db42c8236da17096f00 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Aug 2022 19:25:32 -0400 Subject: [PATCH 03/10] Add configurable timeouts --- .changelog/26121.txt | 28 +++++++ internal/service/ec2/vpc_internet_gateway.go | 30 ++++--- .../ec2/vpc_internet_gateway_attachment.go | 12 ++- internal/service/ec2/wait.go | 6 -- .../service/elbv2/listener_data_source.go | 5 ++ .../elbv2/load_balancer_data_source.go | 6 ++ .../service/elbv2/target_group_data_source.go | 6 ++ internal/service/s3/bucket.go | 83 ++++++++++--------- skaff/resource/websitedoc.tmpl | 8 +- website/docs/r/internet_gateway.html.markdown | 8 ++ .../internet_gateway_attachment.html.markdown | 7 ++ website/docs/r/s3_bucket.html.markdown | 9 ++ 12 files changed, 147 insertions(+), 61 deletions(-) diff --git a/.changelog/26121.txt b/.changelog/26121.txt index 5b9ece57425..a9abf533735 100644 --- a/.changelog/26121.txt +++ b/.changelog/26121.txt @@ -1,3 +1,15 @@ +```release-note:enhancement +resource/aws_internet_gateway: Allow customizable timeouts +``` + +```release-note:enhancement +resource/aws_internet_gateway_attachment: Allow customizable timeouts +``` + +```release-note:enhancement +resource/aws_s3_bucket: Allow customizable timeouts +``` + ```release-note:enhancement data-source/aws_ebs_default_kms_key: Allow customizable read timeout ``` @@ -281,3 +293,19 @@ data-source/aws_customer_gateway: Allow customizable read timeout ```release-note:enhancement data-source/aws_vpn_gateway: Allow customizable read timeout ``` + +```release-note:enhancement +data-source/aws_lb_listener: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_lb: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_alb: Allow customizable read timeout +``` + +```release-note:enhancement +data-source/aws_lb_target_group: Allow customizable read timeout +``` diff --git a/internal/service/ec2/vpc_internet_gateway.go b/internal/service/ec2/vpc_internet_gateway.go index 6c2e4f8c103..4504d2670aa 100644 --- a/internal/service/ec2/vpc_internet_gateway.go +++ b/internal/service/ec2/vpc_internet_gateway.go @@ -3,6 +3,7 @@ package ec2 import ( "fmt" "log" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -21,6 +22,13 @@ func ResourceInternetGateway() *schema.Resource { Read: resourceInternetGatewayRead, Update: resourceInternetGatewayUpdate, Delete: resourceInternetGatewayDelete, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(20 * time.Minute), + Update: schema.DefaultTimeout(20 * time.Minute), + Delete: schema.DefaultTimeout(20 * time.Minute), + }, + Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -66,7 +74,7 @@ func resourceInternetGatewayCreate(d *schema.ResourceData, meta interface{}) err d.SetId(aws.StringValue(output.InternetGateway.InternetGatewayId)) if v, ok := d.GetOk("vpc_id"); ok { - if err := attachInternetGateway(conn, d.Id(), v.(string)); err != nil { + if err := attachInternetGateway(conn, d.Id(), v.(string), d.Timeout(schema.TimeoutCreate)); err != nil { return err } } @@ -133,13 +141,13 @@ func resourceInternetGatewayUpdate(d *schema.ResourceData, meta interface{}) err o, n := d.GetChange("vpc_id") if v := o.(string); v != "" { - if err := detachInternetGateway(conn, d.Id(), v); err != nil { + if err := detachInternetGateway(conn, d.Id(), v, d.Timeout(schema.TimeoutUpdate)); err != nil { return err } } if v := n.(string); v != "" { - if err := attachInternetGateway(conn, d.Id(), v); err != nil { + if err := attachInternetGateway(conn, d.Id(), v, d.Timeout(schema.TimeoutUpdate)); err != nil { return err } } @@ -161,7 +169,7 @@ func resourceInternetGatewayDelete(d *schema.ResourceData, meta interface{}) err // Detach if it is attached. if v, ok := d.GetOk("vpc_id"); ok { - if err := detachInternetGateway(conn, d.Id(), v.(string)); err != nil { + if err := detachInternetGateway(conn, d.Id(), v.(string), d.Timeout(schema.TimeoutDelete)); err != nil { return err } } @@ -171,7 +179,7 @@ func resourceInternetGatewayDelete(d *schema.ResourceData, meta interface{}) err } log.Printf("[INFO] Deleting Internet Gateway: %s", d.Id()) - _, err := tfresource.RetryWhenAWSErrCodeEquals(internetGatewayDeletedTimeout, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutDelete), func() (interface{}, error) { return conn.DeleteInternetGateway(input) }, errCodeDependencyViolation) @@ -186,14 +194,14 @@ func resourceInternetGatewayDelete(d *schema.ResourceData, meta interface{}) err return nil } -func attachInternetGateway(conn *ec2.EC2, internetGatewayID, vpcID string) error { +func attachInternetGateway(conn *ec2.EC2, internetGatewayID, vpcID string, timeout time.Duration) error { input := &ec2.AttachInternetGatewayInput{ InternetGatewayId: aws.String(internetGatewayID), VpcId: aws.String(vpcID), } log.Printf("[INFO] Attaching EC2 Internet Gateway: %s", input) - _, err := tfresource.RetryWhenAWSErrCodeEquals(propagationTimeout, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(timeout, func() (interface{}, error) { return conn.AttachInternetGateway(input) }, errCodeInvalidInternetGatewayIDNotFound) @@ -201,7 +209,7 @@ func attachInternetGateway(conn *ec2.EC2, internetGatewayID, vpcID string) error return fmt.Errorf("error attaching EC2 Internet Gateway (%s) to VPC (%s): %w", internetGatewayID, vpcID, err) } - _, err = WaitInternetGatewayAttached(conn, internetGatewayID, vpcID, internetGatewayAttachedTimeout) + _, err = WaitInternetGatewayAttached(conn, internetGatewayID, vpcID, timeout) if err != nil { return fmt.Errorf("error waiting for EC2 Internet Gateway (%s) to attach to VPC (%s): %w", internetGatewayID, vpcID, err) @@ -210,14 +218,14 @@ func attachInternetGateway(conn *ec2.EC2, internetGatewayID, vpcID string) error return nil } -func detachInternetGateway(conn *ec2.EC2, internetGatewayID, vpcID string) error { +func detachInternetGateway(conn *ec2.EC2, internetGatewayID, vpcID string, timeout time.Duration) error { input := &ec2.DetachInternetGatewayInput{ InternetGatewayId: aws.String(internetGatewayID), VpcId: aws.String(vpcID), } log.Printf("[INFO] Detaching EC2 Internet Gateway: %s", input) - _, err := tfresource.RetryWhenAWSErrCodeEquals(internetGatewayDetachedTimeout, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(timeout, func() (interface{}, error) { return conn.DetachInternetGateway(input) }, errCodeDependencyViolation) @@ -229,7 +237,7 @@ func detachInternetGateway(conn *ec2.EC2, internetGatewayID, vpcID string) error return fmt.Errorf("error detaching EC2 Internet Gateway (%s) from VPC (%s): %w", internetGatewayID, vpcID, err) } - _, err = WaitInternetGatewayDetached(conn, internetGatewayID, vpcID, internetGatewayDetachedTimeout) + _, err = WaitInternetGatewayDetached(conn, internetGatewayID, vpcID, timeout) if err != nil { return fmt.Errorf("error waiting for EC2 Internet Gateway (%s) to detach from VPC (%s): %w", internetGatewayID, vpcID, err) diff --git a/internal/service/ec2/vpc_internet_gateway_attachment.go b/internal/service/ec2/vpc_internet_gateway_attachment.go index e53252105d2..b84adb02ebb 100644 --- a/internal/service/ec2/vpc_internet_gateway_attachment.go +++ b/internal/service/ec2/vpc_internet_gateway_attachment.go @@ -4,6 +4,7 @@ import ( "fmt" "log" "strings" + "time" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -16,6 +17,13 @@ func ResourceInternetGatewayAttachment() *schema.Resource { Create: resourceInternetGatewayAttachmentCreate, Read: resourceInternetGatewayAttachmentRead, Delete: resourceInternetGatewayAttachmentDelete, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(20 * time.Minute), + Update: schema.DefaultTimeout(20 * time.Minute), + Delete: schema.DefaultTimeout(20 * time.Minute), + }, + Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -41,7 +49,7 @@ func resourceInternetGatewayAttachmentCreate(d *schema.ResourceData, meta interf igwID := d.Get("internet_gateway_id").(string) vpcID := d.Get("vpc_id").(string) - if err := attachInternetGateway(conn, igwID, vpcID); err != nil { + if err := attachInternetGateway(conn, igwID, vpcID, d.Timeout(schema.TimeoutCreate)); err != nil { return err } @@ -90,7 +98,7 @@ func resourceInternetGatewayAttachmentDelete(d *schema.ResourceData, meta interf return err } - if err := detachInternetGateway(conn, igwID, vpcID); err != nil { + if err := detachInternetGateway(conn, igwID, vpcID, d.Timeout(schema.TimeoutDelete)); err != nil { return err } diff --git a/internal/service/ec2/wait.go b/internal/service/ec2/wait.go index fd6268fdd69..ab023150070 100644 --- a/internal/service/ec2/wait.go +++ b/internal/service/ec2/wait.go @@ -2167,12 +2167,6 @@ const ( dhcpOptionSetDeletedTimeout = 3 * time.Minute ) -const ( - internetGatewayAttachedTimeout = 4 * time.Minute - internetGatewayDeletedTimeout = 10 * time.Minute - internetGatewayDetachedTimeout = 15 * time.Minute -) - func WaitInternetGatewayAttached(conn *ec2.EC2, internetGatewayID, vpcID string, timeout time.Duration) (*ec2.InternetGatewayAttachment, error) { stateConf := &resource.StateChangeConf{ Pending: []string{ec2.AttachmentStatusAttaching}, diff --git a/internal/service/elbv2/listener_data_source.go b/internal/service/elbv2/listener_data_source.go index 29a2f477455..35ddb0a8a45 100644 --- a/internal/service/elbv2/listener_data_source.go +++ b/internal/service/elbv2/listener_data_source.go @@ -5,6 +5,7 @@ import ( "fmt" "log" "sort" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elbv2" @@ -18,6 +19,10 @@ func DataSourceListener() *schema.Resource { return &schema.Resource{ Read: dataSourceListenerRead, + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "alpn_policy": { Type: schema.TypeString, diff --git a/internal/service/elbv2/load_balancer_data_source.go b/internal/service/elbv2/load_balancer_data_source.go index 3e8e08e2558..604c4478af7 100644 --- a/internal/service/elbv2/load_balancer_data_source.go +++ b/internal/service/elbv2/load_balancer_data_source.go @@ -4,6 +4,7 @@ import ( "fmt" "log" "strconv" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elbv2" @@ -18,6 +19,11 @@ import ( func DataSourceLoadBalancer() *schema.Resource { return &schema.Resource{ Read: dataSourceLoadBalancerRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/elbv2/target_group_data_source.go b/internal/service/elbv2/target_group_data_source.go index 558ade8e18b..dad70c73517 100644 --- a/internal/service/elbv2/target_group_data_source.go +++ b/internal/service/elbv2/target_group_data_source.go @@ -4,6 +4,7 @@ import ( "fmt" "log" "strconv" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elbv2" @@ -16,6 +17,11 @@ import ( func DataSourceTargetGroup() *schema.Resource { return &schema.Resource{ Read: dataSourceTargetGroupRead, + + Timeouts: &schema.ResourceTimeout{ + Read: schema.DefaultTimeout(20 * time.Minute), + }, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, diff --git a/internal/service/s3/bucket.go b/internal/service/s3/bucket.go index 38ffe9be167..b03c34e7d9a 100644 --- a/internal/service/s3/bucket.go +++ b/internal/service/s3/bucket.go @@ -43,6 +43,13 @@ func ResourceBucket() *schema.Resource { Update: resourceBucketUpdate, DeleteWithoutTimeout: resourceBucketDelete, + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(20 * time.Minute), + Read: schema.DefaultTimeout(20 * time.Minute), + Update: schema.DefaultTimeout(20 * time.Minute), + Delete: schema.DefaultTimeout(60 * time.Minute), + }, + Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -774,7 +781,7 @@ func resourceBucketCreate(d *schema.ResourceData, meta interface{}) error { req.ObjectLockEnabledForBucket = aws.Bool(true) } - err := resource.Retry(5*time.Minute, func() *resource.RetryError { + err := resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { _, err := conn.CreateBucket(req) if tfawserr.ErrCodeEquals(err, ErrCodeOperationAborted) { @@ -806,7 +813,7 @@ func resourceBucketUpdate(d *schema.ResourceData, meta interface{}) error { o, n := d.GetChange("tags_all") // Retry due to S3 eventual consistency - _, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { terr := BucketUpdateTags(conn, d.Id(), o, n) return nil, terr }, s3.ErrCodeNoSuchBucket) @@ -840,13 +847,13 @@ func resourceBucketUpdate(d *schema.ResourceData, meta interface{}) error { if d.IsNewResource() { if versioning := expandVersioningWhenIsNewResource(v); versioning != nil { - err := resourceBucketInternalVersioningUpdate(conn, d.Id(), versioning) + err := resourceBucketInternalVersioningUpdate(conn, d.Id(), versioning, d.Timeout(schema.TimeoutUpdate)) if err != nil { return fmt.Errorf("error updating (new) S3 Bucket (%s) Versioning: %w", d.Id(), err) } } } else { - if err := resourceBucketInternalVersioningUpdate(conn, d.Id(), expandVersioning(v)); err != nil { + if err := resourceBucketInternalVersioningUpdate(conn, d.Id(), expandVersioning(v), d.Timeout(schema.TimeoutUpdate)); err != nil { return fmt.Errorf("error updating S3 Bucket (%s) Versioning: %w", d.Id(), err) } } @@ -918,7 +925,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { Bucket: aws.String(d.Id()), } - err := resource.Retry(bucketCreatedTimeout, func() *resource.RetryError { + err := resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { _, err := conn.HeadBucket(input) if d.IsNewResource() && tfawserr.ErrStatusCodeEquals(err, http.StatusNotFound) { @@ -961,7 +968,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { d.Set("bucket_domain_name", meta.(*conns.AWSClient).PartitionHostname(fmt.Sprintf("%s.s3", d.Get("bucket").(string)))) // Read the policy if configured outside this resource e.g. with aws_s3_bucket_policy resource - pol, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + pol, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return conn.GetBucketPolicy(&s3.GetBucketPolicyInput{ Bucket: aws.String(d.Id()), }) @@ -988,7 +995,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { // Read the Grant ACL. // In the event grants are not configured on the bucket, the API returns an empty array - apResponse, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + apResponse, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return conn.GetBucketAcl(&s3.GetBucketAclInput{ Bucket: aws.String(d.Id()), }) @@ -1016,7 +1023,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { } // Read the CORS - corsResponse, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + corsResponse, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return conn.GetBucketCors(&s3.GetBucketCorsInput{ Bucket: aws.String(d.Id()), }) @@ -1044,7 +1051,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { } // Read the website configuration - wsResponse, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + wsResponse, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return conn.GetBucketWebsite(&s3.GetBucketWebsiteInput{ Bucket: aws.String(d.Id()), }) @@ -1082,7 +1089,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { // Read the versioning configuration - versioningResponse, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + versioningResponse, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return conn.GetBucketVersioning(&s3.GetBucketVersioningInput{ Bucket: aws.String(d.Id()), }) @@ -1109,7 +1116,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { // Read the acceleration status - accelerateResponse, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + accelerateResponse, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return conn.GetBucketAccelerateConfiguration(&s3.GetBucketAccelerateConfigurationInput{ Bucket: aws.String(d.Id()), }) @@ -1135,7 +1142,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { // Read the request payer configuration. - payerResponse, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + payerResponse, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return conn.GetBucketRequestPayment(&s3.GetBucketRequestPaymentInput{ Bucket: aws.String(d.Id()), }) @@ -1159,7 +1166,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { } // Read the logging configuration if configured outside this resource - loggingResponse, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + loggingResponse, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return conn.GetBucketLogging(&s3.GetBucketLoggingInput{ Bucket: aws.String(d.Id()), }) @@ -1188,7 +1195,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { // Read the lifecycle configuration - lifecycleResponse, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + lifecycleResponse, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return conn.GetBucketLifecycleConfiguration(&s3.GetBucketLifecycleConfigurationInput{ Bucket: aws.String(d.Id()), }) @@ -1217,7 +1224,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { // Read the bucket replication configuration if configured outside this resource - replicationResponse, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + replicationResponse, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return conn.GetBucketReplication(&s3.GetBucketReplicationInput{ Bucket: aws.String(d.Id()), }) @@ -1247,7 +1254,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { // Read the bucket server side encryption configuration - encryptionResponse, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + encryptionResponse, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return conn.GetBucketEncryption(&s3.GetBucketEncryptionInput{ Bucket: aws.String(d.Id()), }) @@ -1275,7 +1282,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { } // Object Lock configuration. - resp, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + resp, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return conn.GetObjectLockConfiguration(&s3.GetObjectLockConfigurationInput{ Bucket: aws.String(d.Id()), }) @@ -1312,7 +1319,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { } // Add the region as an attribute - discoveredRegion, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + discoveredRegion, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return s3manager.GetBucketRegionWithClient(context.Background(), conn, d.Id(), func(r *request.Request) { // By default, GetBucketRegion forces virtual host addressing, which // is not compatible with many non-AWS implementations. Instead, pass @@ -1386,7 +1393,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error { } // Retry due to S3 eventual consistency - tagsRaw, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + tagsRaw, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return BucketListTags(conn, d.Id()) }, s3.ErrCodeNoSuchBucket) @@ -1524,7 +1531,7 @@ func websiteEndpoint(client *conns.AWSClient, d *schema.ResourceData) (*S3Websit // Lookup the region for this bucket - locationResponse, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + locationResponse, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutRead), func() (interface{}, error) { return client.S3Conn.GetBucketLocation( &s3.GetBucketLocationInput{ Bucket: aws.String(bucket), @@ -1583,7 +1590,7 @@ func resourceBucketInternalAccelerationUpdate(conn *s3.S3, d *schema.ResourceDat }, } - _, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { return conn.PutBucketAccelerateConfiguration(input) }, s3.ErrCodeNoSuchBucket) @@ -1602,7 +1609,7 @@ func resourceBucketInternalACLUpdate(conn *s3.S3, d *schema.ResourceData) error ACL: aws.String(acl), } - _, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { return conn.PutBucketAcl(input) }, s3.ErrCodeNoSuchBucket) @@ -1614,7 +1621,7 @@ func resourceBucketInternalCorsUpdate(conn *s3.S3, d *schema.ResourceData) error if len(rawCors) == 0 { // Delete CORS - _, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { return conn.DeleteBucketCors(&s3.DeleteBucketCorsInput{ Bucket: aws.String(d.Id()), }) @@ -1668,7 +1675,7 @@ func resourceBucketInternalCorsUpdate(conn *s3.S3, d *schema.ResourceData) error }, } - _, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { return conn.PutBucketCors(input) }, s3.ErrCodeNoSuchBucket) @@ -1688,7 +1695,7 @@ func resourceBucketInternalGrantsUpdate(conn *s3.S3, d *schema.ResourceData) err return nil } - resp, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + resp, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { return conn.GetBucketAcl(&s3.GetBucketAclInput{ Bucket: aws.String(d.Id()), }) @@ -1712,7 +1719,7 @@ func resourceBucketInternalGrantsUpdate(conn *s3.S3, d *schema.ResourceData) err }, } - _, err = tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + _, err = tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { return conn.PutBucketAcl(input) }, s3.ErrCodeNoSuchBucket) @@ -1868,7 +1875,7 @@ func resourceBucketInternalLifecycleUpdate(conn *s3.S3, d *schema.ResourceData) }, } - _, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { return conn.PutBucketLifecycleConfiguration(input) }, s3.ErrCodeNoSuchBucket) @@ -1898,7 +1905,7 @@ func resourceBucketInternalLoggingUpdate(conn *s3.S3, d *schema.ResourceData) er BucketLoggingStatus: loggingStatus, } - _, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { return conn.PutBucketLogging(input) }, s3.ErrCodeNoSuchBucket) @@ -1912,7 +1919,7 @@ func resourceBucketInternalObjectLockConfigurationUpdate(conn *s3.S3, d *schema. ObjectLockConfiguration: expandObjectLockConfiguration(d.Get("object_lock_configuration").([]interface{})), } - _, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { return conn.PutObjectLockConfiguration(req) }, s3.ErrCodeNoSuchBucket) @@ -1927,7 +1934,7 @@ func resourceBucketInternalPolicyUpdate(conn *s3.S3, d *schema.ResourceData) err } if policy == "" { - _, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { return conn.DeleteBucketPolicy(&s3.DeleteBucketPolicyInput{ Bucket: aws.String(d.Id()), }) @@ -1945,7 +1952,7 @@ func resourceBucketInternalPolicyUpdate(conn *s3.S3, d *schema.ResourceData) err Policy: aws.String(policy), } - err = resource.Retry(1*time.Minute, func() *resource.RetryError { + err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { _, err := conn.PutBucketPolicy(params) if tfawserr.ErrCodeEquals(err, ErrCodeMalformedPolicy, s3.ErrCodeNoSuchBucket) { return resource.RetryableError(err) @@ -1999,7 +2006,7 @@ func resourceBucketInternalReplicationConfigurationUpdate(conn *s3.S3, d *schema ReplicationConfiguration: expandBucketReplicationConfiguration(replicationConfiguration), } - err := resource.Retry(1*time.Minute, func() *resource.RetryError { + err := resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { _, err := conn.PutBucketReplication(input) if tfawserr.ErrCodeEquals(err, s3.ErrCodeNoSuchBucket) || tfawserr.ErrMessageContains(err, ErrCodeInvalidRequest, "Versioning must be 'Enabled' on the bucket") { return resource.RetryableError(err) @@ -2027,7 +2034,7 @@ func resourceBucketInternalRequestPayerUpdate(conn *s3.S3, d *schema.ResourceDat }, } - _, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { return conn.PutBucketRequestPayment(input) }, s3.ErrCodeNoSuchBucket) @@ -2087,7 +2094,7 @@ func resourceBucketInternalServerSideEncryptionConfigurationUpdate(conn *s3.S3, } _, err := tfresource.RetryWhenAWSErrCodeEquals( - propagationTimeout, + d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { return conn.PutBucketEncryption(input) }, @@ -2098,13 +2105,13 @@ func resourceBucketInternalServerSideEncryptionConfigurationUpdate(conn *s3.S3, return err } -func resourceBucketInternalVersioningUpdate(conn *s3.S3, bucket string, versioningConfig *s3.VersioningConfiguration) error { +func resourceBucketInternalVersioningUpdate(conn *s3.S3, bucket string, versioningConfig *s3.VersioningConfiguration, timeout time.Duration) error { input := &s3.PutBucketVersioningInput{ Bucket: aws.String(bucket), VersioningConfiguration: versioningConfig, } - _, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(timeout, func() (interface{}, error) { return conn.PutBucketVersioning(input) }, s3.ErrCodeNoSuchBucket) @@ -2119,7 +2126,7 @@ func resourceBucketInternalWebsiteUpdate(conn *s3.S3, d *schema.ResourceData) er Bucket: aws.String(d.Id()), } - _, err := tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + _, err := tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { return conn.DeleteBucketWebsite(input) }, s3.ErrCodeNoSuchBucket) @@ -2143,7 +2150,7 @@ func resourceBucketInternalWebsiteUpdate(conn *s3.S3, d *schema.ResourceData) er WebsiteConfiguration: websiteConfig, } - _, err = tfresource.RetryWhenAWSErrCodeEquals(2*time.Minute, func() (interface{}, error) { + _, err = tfresource.RetryWhenAWSErrCodeEquals(d.Timeout(schema.TimeoutUpdate), func() (interface{}, error) { return conn.PutBucketWebsite(input) }, s3.ErrCodeNoSuchBucket) diff --git a/skaff/resource/websitedoc.tmpl b/skaff/resource/websitedoc.tmpl index 7c728ca7515..f36653b6a9e 100644 --- a/skaff/resource/websitedoc.tmpl +++ b/skaff/resource/websitedoc.tmpl @@ -38,11 +38,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_{{ .ServicePackage }}_{{ .ResourceSnake }}` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: -* `create` - (Optional, Default: `60m`) -* `update` - (Optional, Default: `180m`) -* `delete` - (Optional, Default: `90m`) +* `create` - (Default: `60m`) +* `update` - (Default: `180m`) +* `delete` - (Default: `90m`) ## Import diff --git a/website/docs/r/internet_gateway.html.markdown b/website/docs/r/internet_gateway.html.markdown index 4726471f09c..88793cb9e82 100644 --- a/website/docs/r/internet_gateway.html.markdown +++ b/website/docs/r/internet_gateway.html.markdown @@ -52,6 +52,14 @@ In addition to all arguments above, the following attributes are exported: * `owner_id` - The ID of the AWS account that owns the internet gateway. * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `create` - (Default `20m`) +- `update` - (Default `20m`) +- `delete` - (Default `20m`) + ## Import Internet Gateways can be imported using the `id`, e.g., diff --git a/website/docs/r/internet_gateway_attachment.html.markdown b/website/docs/r/internet_gateway_attachment.html.markdown index ade7ebbf823..821c59f1f1e 100644 --- a/website/docs/r/internet_gateway_attachment.html.markdown +++ b/website/docs/r/internet_gateway_attachment.html.markdown @@ -38,6 +38,13 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of the VPC and Internet Gateway separated by a colon. +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `create` - (Default `20m`) +- `update` - (Default `20m`) +- `delete` - (Default `20m`) ## Import diff --git a/website/docs/r/s3_bucket.html.markdown b/website/docs/r/s3_bucket.html.markdown index da5abeba627..78f4e9f9f76 100644 --- a/website/docs/r/s3_bucket.html.markdown +++ b/website/docs/r/s3_bucket.html.markdown @@ -724,6 +724,15 @@ In addition to all arguments above, the following attributes are exported: * `website_endpoint` - The website endpoint, if the bucket is configured with a website. If not, this will be an empty string. * `website_domain` - The domain of the website endpoint, if the bucket is configured with a website. If not, this will be an empty string. This is used to create Route 53 alias records. +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `create` - (Default `20m`) +- `read` - (Default `20m`) +- `update` - (Default `20m`) +- `delete` - (Default `60m`) + ## Import S3 bucket can be imported using the `bucket`, e.g., From 8082e132c9d53ed260f18510ee2b8a1fadd92587 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Aug 2022 19:33:05 -0400 Subject: [PATCH 04/10] docs: Add timeouts --- website/docs/d/ami.html.markdown | 6 ++++++ website/docs/d/ami_ids.html.markdown | 6 ++++++ website/docs/d/availability_zone.html.markdown | 6 ++++++ website/docs/d/availability_zones.html.markdown | 6 ++++++ website/docs/d/customer_gateway.html.markdown | 6 ++++++ website/docs/d/ebs_default_kms_key.html.markdown | 6 ++++++ website/docs/d/ebs_encryption_by_default.html.markdown | 6 ++++++ website/docs/d/ebs_snapshot.html.markdown | 6 ++++++ website/docs/d/ebs_snapshot_ids.html.markdown | 8 +++++++- website/docs/d/ebs_volume.html.markdown | 6 ++++++ website/docs/d/ebs_volumes.html.markdown | 6 ++++++ website/docs/d/ec2_client_vpn_endpoint.html.markdown | 6 ++++++ website/docs/d/ec2_coip_pool.html.markdown | 6 ++++++ website/docs/d/ec2_coip_pools.html.markdown | 6 ++++++ website/docs/d/ec2_host.html.markdown | 6 ++++++ website/docs/d/ec2_instance_type.html.markdown | 6 ++++++ website/docs/d/ec2_instance_type_offering.html.markdown | 6 ++++++ website/docs/d/ec2_instance_type_offerings.html.markdown | 6 ++++++ website/docs/d/ec2_instance_types.html.markdown | 6 ++++++ website/docs/d/ec2_local_gateway.html.markdown | 6 ++++++ .../docs/d/ec2_local_gateway_route_table.html.markdown | 6 ++++++ .../docs/d/ec2_local_gateway_route_tables.html.markdown | 6 ++++++ .../d/ec2_local_gateway_virtual_interface.html.markdown | 6 ++++++ ...c2_local_gateway_virtual_interface_group.html.markdown | 6 ++++++ ...2_local_gateway_virtual_interface_groups.html.markdown | 6 ++++++ website/docs/d/ec2_local_gateways.html.markdown | 6 ++++++ website/docs/d/ec2_managed_prefix_list.html.markdown | 6 ++++++ website/docs/d/ec2_serial_console_access.html.markdown | 6 ++++++ website/docs/d/ec2_spot_price.html.markdown | 6 ++++++ website/docs/d/ec2_transit_gateway.html.markdown | 6 ++++++ website/docs/d/ec2_transit_gateway_connect.html.markdown | 6 ++++++ .../docs/d/ec2_transit_gateway_connect_peer.html.markdown | 6 ++++++ ...c2_transit_gateway_dx_gateway_attachment.html.markdown | 6 ++++++ .../d/ec2_transit_gateway_multicast_domain.html.markdown | 6 ++++++ .../ec2_transit_gateway_peering_attachment.html.markdown | 6 ++++++ .../docs/d/ec2_transit_gateway_route_table.html.markdown | 6 ++++++ .../docs/d/ec2_transit_gateway_route_tables.html.markdown | 6 ++++++ .../d/ec2_transit_gateway_vpc_attachment.html.markdown | 6 ++++++ .../d/ec2_transit_gateway_vpc_attachments.html.markdown | 6 ++++++ .../d/ec2_transit_gateway_vpn_attachment.html.markdown | 6 ++++++ website/docs/d/eip.html.markdown | 6 ++++++ website/docs/d/eips.html.markdown | 6 ++++++ website/docs/d/instance.html.markdown | 6 ++++++ website/docs/d/instances.html.markdown | 5 +++++ website/docs/d/internet_gateway.html.markdown | 6 ++++++ website/docs/d/key_pair.html.markdown | 6 ++++++ website/docs/d/launch_template.html.markdown | 6 ++++++ website/docs/d/lb.html.markdown | 6 ++++++ website/docs/d/lb_listener.html.markdown | 6 ++++++ website/docs/d/lb_target_group.html.markdown | 6 ++++++ website/docs/d/nat_gateway.html.markdown | 6 ++++++ website/docs/d/nat_gateways.html.markdown | 6 ++++++ website/docs/d/network_acls.html.markdown | 6 ++++++ website/docs/d/network_interface.html.markdown | 6 ++++++ website/docs/d/network_interfaces.html.markdown | 6 ++++++ website/docs/d/prefix_list.html.markdown | 6 ++++++ website/docs/d/route.html.markdown | 6 ++++++ website/docs/d/route_table.html.markdown | 6 ++++++ website/docs/d/route_tables.html.markdown | 6 ++++++ website/docs/d/security_group.html.markdown | 6 ++++++ website/docs/d/security_groups.html.markdown | 6 ++++++ website/docs/d/subnet.html.markdown | 6 ++++++ website/docs/d/subnet_ids.html.markdown | 6 ++++++ website/docs/d/subnets.html.markdown | 6 ++++++ website/docs/d/vpc.html.markdown | 6 ++++++ website/docs/d/vpc_dhcp_options.html.markdown | 6 ++++++ website/docs/d/vpc_endpoint.html.markdown | 6 ++++++ website/docs/d/vpc_endpoint_service.html.markdown | 6 ++++++ website/docs/d/vpc_ipam_pool.html.markdown | 6 ++++++ website/docs/d/vpc_ipam_preview_next_cidr.html.markdown | 6 ++++++ website/docs/d/vpc_peering_connection.html.markdown | 6 ++++++ website/docs/d/vpc_peering_connections.html.markdown | 6 ++++++ website/docs/d/vpcs.html.markdown | 6 ++++++ website/docs/d/vpn_gateway.html.markdown | 6 ++++++ 74 files changed, 444 insertions(+), 1 deletion(-) diff --git a/website/docs/d/ami.html.markdown b/website/docs/d/ami.html.markdown index d8152252b8b..0cd3799a773 100644 --- a/website/docs/d/ami.html.markdown +++ b/website/docs/d/ami.html.markdown @@ -129,3 +129,9 @@ interpolation. * `ena_support` - Specifies whether enhanced networking with ENA is enabled. [1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-images.html + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ami_ids.html.markdown b/website/docs/d/ami_ids.html.markdown index 7098d4c8026..8867847d9bf 100644 --- a/website/docs/d/ami_ids.html.markdown +++ b/website/docs/d/ami_ids.html.markdown @@ -47,3 +47,9 @@ options to narrow down the list AWS returns. `ids` is set to the list of AMI IDs, sorted by creation time according to `sort_ascending`. [1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-images.html + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/availability_zone.html.markdown b/website/docs/d/availability_zone.html.markdown index cd5633dbbd0..572be1e336f 100644 --- a/website/docs/d/availability_zone.html.markdown +++ b/website/docs/d/availability_zone.html.markdown @@ -101,3 +101,9 @@ For Local and Wavelength Zones this is a longer string, for example `wl1-sfo-wlz * `parent_zone_name` - The name of the zone that handles some of the Local Zone or Wavelength Zone control plane operations, such as API calls. * `region` - The region where the selected availability zone resides. This is always the region selected on the provider, since this data source searches only within that region. * `zone_type` - The type of zone. Values are `availability-zone`, `local-zone`, and `wavelength-zone`. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/availability_zones.html.markdown b/website/docs/d/availability_zones.html.markdown index 002b45669d9..6e88d1a588e 100644 --- a/website/docs/d/availability_zones.html.markdown +++ b/website/docs/d/availability_zones.html.markdown @@ -98,3 +98,9 @@ In addition to all arguments above, the following attributes are exported: * `zone_ids` - A list of the Availability Zone IDs available to the account. Note that the indexes of Availability Zone names and IDs correspond. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/customer_gateway.html.markdown b/website/docs/d/customer_gateway.html.markdown index 98bd0c35919..e619dfa72c1 100644 --- a/website/docs/d/customer_gateway.html.markdown +++ b/website/docs/d/customer_gateway.html.markdown @@ -53,3 +53,9 @@ In addition to the arguments above, the following attributes are exported: * `ip_address` - The IP address of the gateway's Internet-routable external interface. * `tags` - Map of key-value pairs assigned to the gateway. * `type` - The type of customer gateway. The only type AWS supports at this time is "ipsec.1". + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ebs_default_kms_key.html.markdown b/website/docs/d/ebs_default_kms_key.html.markdown index 90ac70649bb..73f243b3123 100644 --- a/website/docs/d/ebs_default_kms_key.html.markdown +++ b/website/docs/d/ebs_default_kms_key.html.markdown @@ -29,3 +29,9 @@ The following attributes are exported: * `key_arn` - Amazon Resource Name (ARN) of the default KMS key uses to encrypt an EBS volume in this region when no key is specified in an API call that creates the volume and encryption by default is enabled. * `id` - Region of the default KMS Key. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ebs_encryption_by_default.html.markdown b/website/docs/d/ebs_encryption_by_default.html.markdown index c457ceee92d..e330cb01918 100644 --- a/website/docs/d/ebs_encryption_by_default.html.markdown +++ b/website/docs/d/ebs_encryption_by_default.html.markdown @@ -22,3 +22,9 @@ The following attributes are exported: * `enabled` - Whether or not default EBS encryption is enabled. Returns as `true` or `false`. * `id` - Region of default EBS encryption. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ebs_snapshot.html.markdown b/website/docs/d/ebs_snapshot.html.markdown index 44a691f983b..f0d0ba29d3f 100644 --- a/website/docs/d/ebs_snapshot.html.markdown +++ b/website/docs/d/ebs_snapshot.html.markdown @@ -66,4 +66,10 @@ In addition to all arguments above, the following attributes are exported: * `outpost_arn` - The ARN of the Outpost on which the snapshot is stored. * `tags` - A map of tags for the resource. +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) + [1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-snapshots.html diff --git a/website/docs/d/ebs_snapshot_ids.html.markdown b/website/docs/d/ebs_snapshot_ids.html.markdown index 8f89ce4b1ba..0de60a13160 100644 --- a/website/docs/d/ebs_snapshot_ids.html.markdown +++ b/website/docs/d/ebs_snapshot_ids.html.markdown @@ -46,4 +46,10 @@ several valid keys, for a full reference, check out * `id` - AWS Region. * `ids` - Set of EBS snapshot IDs, sorted by creation time in descending order. -[1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-snapshots.html +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) + +[1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-snapshots.html \ No newline at end of file diff --git a/website/docs/d/ebs_volume.html.markdown b/website/docs/d/ebs_volume.html.markdown index 641999a07fd..f1aa879d025 100644 --- a/website/docs/d/ebs_volume.html.markdown +++ b/website/docs/d/ebs_volume.html.markdown @@ -59,4 +59,10 @@ In addition to all arguments above, the following attributes are exported: * `tags` - A map of tags for the resource. * `throughput` - The throughput that the volume supports, in MiB/s. +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) + [1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-volumes.html diff --git a/website/docs/d/ebs_volumes.html.markdown b/website/docs/d/ebs_volumes.html.markdown index 8a4afa8df98..946d54e11d0 100644 --- a/website/docs/d/ebs_volumes.html.markdown +++ b/website/docs/d/ebs_volumes.html.markdown @@ -67,3 +67,9 @@ data "aws_ebs_volumes" "ten_or_twenty_gb_volumes" { * `id` - AWS Region. * `ids` - A set of all the EBS Volume IDs found. This data source will fail if no volumes match the provided criteria. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_client_vpn_endpoint.html.markdown b/website/docs/d/ec2_client_vpn_endpoint.html.markdown index d8673aa52f2..da9b1994b2f 100644 --- a/website/docs/d/ec2_client_vpn_endpoint.html.markdown +++ b/website/docs/d/ec2_client_vpn_endpoint.html.markdown @@ -69,3 +69,9 @@ In addition to all arguments above, the following attributes are exported: * `transport_protocol` - The transport protocol used by the Client VPN endpoint. * `vpc_id` - The ID of the VPC associated with the Client VPN endpoint. * `vpn_port` - The port number for the Client VPN endpoint. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_coip_pool.html.markdown b/website/docs/d/ec2_coip_pool.html.markdown index 409c630985a..6a4eed1f57b 100644 --- a/website/docs/d/ec2_coip_pool.html.markdown +++ b/website/docs/d/ec2_coip_pool.html.markdown @@ -59,3 +59,9 @@ In addition, the following attributes are exported: * `arn` - ARN of the COIP pool * `pool_cidrs` - Set of CIDR blocks in pool + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_coip_pools.html.markdown b/website/docs/d/ec2_coip_pools.html.markdown index 0c76779ee17..23dea571131 100644 --- a/website/docs/d/ec2_coip_pools.html.markdown +++ b/website/docs/d/ec2_coip_pools.html.markdown @@ -42,3 +42,9 @@ which take the following arguments: * `id` - AWS Region. * `pool_ids` - Set of COIP Pool Identifiers + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_host.html.markdown b/website/docs/d/ec2_host.html.markdown index 80fade1142c..7a2ccc0aad5 100644 --- a/website/docs/d/ec2_host.html.markdown +++ b/website/docs/d/ec2_host.html.markdown @@ -67,3 +67,9 @@ In addition to the attributes above, the following attributes are exported: * `owner_id` - The ID of the AWS account that owns the Dedicated Host. * `sockets` - The number of sockets on the Dedicated Host. * `total_vcpus` - The total number of vCPUs on the Dedicated Host. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_instance_type.html.markdown b/website/docs/d/ec2_instance_type.html.markdown index 8c74a9089ae..78853d3509b 100644 --- a/website/docs/d/ec2_instance_type.html.markdown +++ b/website/docs/d/ec2_instance_type.html.markdown @@ -91,3 +91,9 @@ In addition to the argument above, the following attributes are exported: * `total_instance_storage` - The total size of the instance disks, in GB. * `valid_cores` - List of the valid number of cores that can be configured for the instance type. * `valid_threads_per_core` - List of the valid number of threads per core that can be configured for the instance type. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_instance_type_offering.html.markdown b/website/docs/d/ec2_instance_type_offering.html.markdown index 0159ffdb12b..a880dfdb190 100644 --- a/website/docs/d/ec2_instance_type_offering.html.markdown +++ b/website/docs/d/ec2_instance_type_offering.html.markdown @@ -42,3 +42,9 @@ In addition to all arguments above, the following attributes are exported: * `id` - EC2 Instance Type. * `instance_type` - EC2 Instance Type. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_instance_type_offerings.html.markdown b/website/docs/d/ec2_instance_type_offerings.html.markdown index 752dd54cb51..27e900aa379 100644 --- a/website/docs/d/ec2_instance_type_offerings.html.markdown +++ b/website/docs/d/ec2_instance_type_offerings.html.markdown @@ -50,3 +50,9 @@ In addition to all arguments above, the following attributes are exported: * `location_types` - List of location types. Note that the indexes of Instance Type Offering instance types, locations and location types correspond. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_instance_types.html.markdown b/website/docs/d/ec2_instance_types.html.markdown index acc11cc7bfd..7f86bb97a43 100644 --- a/website/docs/d/ec2_instance_types.html.markdown +++ b/website/docs/d/ec2_instance_types.html.markdown @@ -53,3 +53,9 @@ In addition to all arguments above, the following attributes are exported: * `id` - AWS Region. * `instance_types` - List of EC2 Instance Types. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_local_gateway.html.markdown b/website/docs/d/ec2_local_gateway.html.markdown index 2381768c52a..4eeb51bfc2a 100644 --- a/website/docs/d/ec2_local_gateway.html.markdown +++ b/website/docs/d/ec2_local_gateway.html.markdown @@ -59,3 +59,9 @@ The following attributes are additionally exported: * `outpost_arn` - Amazon Resource Name (ARN) of Outpost * `owner_id` - AWS account identifier that owns the Local Gateway. * `state` - State of the local gateway. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_local_gateway_route_table.html.markdown b/website/docs/d/ec2_local_gateway_route_table.html.markdown index 800d9a5a2e1..6e1070395a9 100644 --- a/website/docs/d/ec2_local_gateway_route_table.html.markdown +++ b/website/docs/d/ec2_local_gateway_route_table.html.markdown @@ -50,3 +50,9 @@ which take the following arguments: * `values` - (Required) Set of values that are accepted for the given field. A local gateway route table will be selected if any one of the given values matches. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_local_gateway_route_tables.html.markdown b/website/docs/d/ec2_local_gateway_route_tables.html.markdown index ff19c88ca66..dc820edc174 100644 --- a/website/docs/d/ec2_local_gateway_route_tables.html.markdown +++ b/website/docs/d/ec2_local_gateway_route_tables.html.markdown @@ -42,3 +42,9 @@ which take the following arguments: * `id` - AWS Region. * `ids` - Set of Local Gateway Route Table identifiers + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_local_gateway_virtual_interface.html.markdown b/website/docs/d/ec2_local_gateway_virtual_interface.html.markdown index d68d487e474..e9edfc15bed 100644 --- a/website/docs/d/ec2_local_gateway_virtual_interface.html.markdown +++ b/website/docs/d/ec2_local_gateway_virtual_interface.html.markdown @@ -45,3 +45,9 @@ In addition to all arguments above, the following attributes are exported: * `peer_address` - Peer address. * `peer_bgp_asn` - Border Gateway Protocol (BGP) Autonomous System Number (ASN) of the peer. * `vlan` - Virtual Local Area Network. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_local_gateway_virtual_interface_group.html.markdown b/website/docs/d/ec2_local_gateway_virtual_interface_group.html.markdown index 559b0694a82..b0f95c1c900 100644 --- a/website/docs/d/ec2_local_gateway_virtual_interface_group.html.markdown +++ b/website/docs/d/ec2_local_gateway_virtual_interface_group.html.markdown @@ -39,3 +39,9 @@ The `filter` configuration block supports the following arguments: In addition to all arguments above, the following attributes are exported: * `local_gateway_virtual_interface_ids` - Set of EC2 Local Gateway Virtual Interface identifiers. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_local_gateway_virtual_interface_groups.html.markdown b/website/docs/d/ec2_local_gateway_virtual_interface_groups.html.markdown index f646668e724..af6c8f5e845 100644 --- a/website/docs/d/ec2_local_gateway_virtual_interface_groups.html.markdown +++ b/website/docs/d/ec2_local_gateway_virtual_interface_groups.html.markdown @@ -37,3 +37,9 @@ In addition to all arguments above, the following attributes are exported: * `id` - AWS Region. * `ids` - Set of EC2 Local Gateway Virtual Interface Group identifiers. * `local_gateway_virtual_interface_ids` - Set of EC2 Local Gateway Virtual Interface identifiers. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_local_gateways.html.markdown b/website/docs/d/ec2_local_gateways.html.markdown index 6e6c5ec870a..15bb4532c5e 100644 --- a/website/docs/d/ec2_local_gateways.html.markdown +++ b/website/docs/d/ec2_local_gateways.html.markdown @@ -46,3 +46,9 @@ which take the following arguments: * `id` - AWS Region. * `ids` - Set of all the Local Gateway identifiers + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_managed_prefix_list.html.markdown b/website/docs/d/ec2_managed_prefix_list.html.markdown index b538c43b3e7..e465bb7a194 100644 --- a/website/docs/d/ec2_managed_prefix_list.html.markdown +++ b/website/docs/d/ec2_managed_prefix_list.html.markdown @@ -63,3 +63,9 @@ In addition to all arguments above, the following attributes are exported: * `address_family` - The address family of the prefix list. Valid values are `IPv4` and `IPv6`. * `max_entries` - When then prefix list is managed, the maximum number of entries it supports, or null otherwise. * `tags` - A map of tags assigned to the resource. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_serial_console_access.html.markdown b/website/docs/d/ec2_serial_console_access.html.markdown index c4462bb9a16..2c2c7c12d7a 100644 --- a/website/docs/d/ec2_serial_console_access.html.markdown +++ b/website/docs/d/ec2_serial_console_access.html.markdown @@ -22,3 +22,9 @@ The following attributes are exported: * `enabled` - Whether or not serial console access is enabled. Returns as `true` or `false`. * `id` - Region of serial console access. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_spot_price.html.markdown b/website/docs/d/ec2_spot_price.html.markdown index a3b708270e1..2e878836582 100644 --- a/website/docs/d/ec2_spot_price.html.markdown +++ b/website/docs/d/ec2_spot_price.html.markdown @@ -44,3 +44,9 @@ In addition to all arguments above, the following attributes are exported: * `id` - AWS Region. * `spot_price` - The most recent Spot Price value for the given instance type and AZ. * `spot_price_timestamp` - The timestamp at which the Spot Price value was published. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway.html.markdown b/website/docs/d/ec2_transit_gateway.html.markdown index aec85c6fe2d..f142504d54f 100644 --- a/website/docs/d/ec2_transit_gateway.html.markdown +++ b/website/docs/d/ec2_transit_gateway.html.markdown @@ -62,3 +62,9 @@ In addition to all arguments above, the following attributes are exported: * `tags` - Key-value tags for the EC2 Transit Gateway * `transit_gateway_cidr_blocks` - The list of associated CIDR blocks * `vpn_ecmp_support` - Whether VPN Equal Cost Multipath Protocol support is enabled + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_connect.html.markdown b/website/docs/d/ec2_transit_gateway_connect.html.markdown index f66a286a644..e8048f57661 100644 --- a/website/docs/d/ec2_transit_gateway_connect.html.markdown +++ b/website/docs/d/ec2_transit_gateway_connect.html.markdown @@ -51,3 +51,9 @@ In addition to all arguments above, the following attributes are exported: * `tags` - Key-value tags for the EC2 Transit Gateway Connect * `transit_gateway_id` - EC2 Transit Gateway identifier * `transport_attachment_id` - The underlaying VPC attachment + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_connect_peer.html.markdown b/website/docs/d/ec2_transit_gateway_connect_peer.html.markdown index 800de8f40ed..18261364de2 100644 --- a/website/docs/d/ec2_transit_gateway_connect_peer.html.markdown +++ b/website/docs/d/ec2_transit_gateway_connect_peer.html.markdown @@ -54,3 +54,9 @@ In addition to all arguments above, the following attributes are exported: * `tags` - Key-value tags for the EC2 Transit Gateway Connect Peer * `transit_gateway_address` - The IP address assigned to Transit Gateway, which is used as tunnel endpoint. * `transit_gateway_attachment_id` - The Transit Gateway Connect + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown b/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown index 395f8fafaa4..d32dd06bfb4 100644 --- a/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown +++ b/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown @@ -43,3 +43,9 @@ In addition to all arguments above, the following attributes are exported: * `id` - EC2 Transit Gateway Attachment identifier * `tags` - Key-value tags for the EC2 Transit Gateway Attachment + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_multicast_domain.html.markdown b/website/docs/d/ec2_transit_gateway_multicast_domain.html.markdown index 5739d2355c3..4385ad5bf8c 100644 --- a/website/docs/d/ec2_transit_gateway_multicast_domain.html.markdown +++ b/website/docs/d/ec2_transit_gateway_multicast_domain.html.markdown @@ -68,3 +68,9 @@ In addition to all arguments above, the following attributes are exported: * `static_sources_support` - Whether to enable support for statically configuring multicast group sources for the EC2 Transit Gateway Multicast Domain. * `tags` - Key-value tags for the EC2 Transit Gateway Multicast Domain. * `transit_gateway_id` - EC2 Transit Gateway identifier. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown b/website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown index 1c239de42b8..9b762e466bb 100644 --- a/website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown +++ b/website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown @@ -56,3 +56,9 @@ In addition to all arguments above, the following attributes are exported: * `peer_region` - Identifier of the peer AWS region * `peer_transit_gateway_id` - Identifier of the peer EC2 Transit Gateway * `transit_gateway_id` - Identifier of the local EC2 Transit Gateway + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_route_table.html.markdown b/website/docs/d/ec2_transit_gateway_route_table.html.markdown index 558fee98a95..41ba58d0b99 100644 --- a/website/docs/d/ec2_transit_gateway_route_table.html.markdown +++ b/website/docs/d/ec2_transit_gateway_route_table.html.markdown @@ -58,3 +58,9 @@ In addition to all arguments above, the following attributes are exported: * `id` - EC2 Transit Gateway Route Table identifier * `transit_gateway_id` - EC2 Transit Gateway identifier * `tags` - Key-value tags for the EC2 Transit Gateway Route Table + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_route_tables.html.markdown b/website/docs/d/ec2_transit_gateway_route_tables.html.markdown index 842a72db8f3..3314762f5ab 100644 --- a/website/docs/d/ec2_transit_gateway_route_tables.html.markdown +++ b/website/docs/d/ec2_transit_gateway_route_tables.html.markdown @@ -46,3 +46,9 @@ In addition to all arguments above, the following attributes are exported: * `id` - AWS Region. * `ids` - Set of Transit Gateway Route Table identifiers. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_vpc_attachment.html.markdown b/website/docs/d/ec2_transit_gateway_vpc_attachment.html.markdown index b725700b0a4..9f28c712fc6 100644 --- a/website/docs/d/ec2_transit_gateway_vpc_attachment.html.markdown +++ b/website/docs/d/ec2_transit_gateway_vpc_attachment.html.markdown @@ -56,3 +56,9 @@ In addition to all arguments above, the following attributes are exported: * `tags` - Key-value tags for the EC2 Transit Gateway VPC Attachment * `vpc_id` - Identifier of EC2 VPC. * `vpc_owner_id` - Identifier of the AWS account that owns the EC2 VPC. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_vpc_attachments.html.markdown b/website/docs/d/ec2_transit_gateway_vpc_attachments.html.markdown index 9ca2a863f78..32be48593ab 100644 --- a/website/docs/d/ec2_transit_gateway_vpc_attachments.html.markdown +++ b/website/docs/d/ec2_transit_gateway_vpc_attachments.html.markdown @@ -47,3 +47,9 @@ In addition to all arguments above, the following attributes are exported: [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeTransitGatewayVpcAttachments.html [2]: https://www.terraform.io/docs/providers/aws/d/ec2_transit_gateway_vpc_attachment.html + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown b/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown index 14b6e2af5e0..3ac86f1c7dd 100644 --- a/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown +++ b/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown @@ -56,3 +56,9 @@ In addition to all arguments above, the following attributes are exported: * `id` - EC2 Transit Gateway VPN Attachment identifier * `tags` - Key-value tags for the EC2 Transit Gateway VPN Attachment + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/eip.html.markdown b/website/docs/d/eip.html.markdown index 7ae5669d764..9aa31bc1609 100644 --- a/website/docs/d/eip.html.markdown +++ b/website/docs/d/eip.html.markdown @@ -81,3 +81,9 @@ In addition to all arguments above, the following attributes are exported: * `tags` - Key-value map of tags associated with Elastic IP. ~> **Note:** The data source computes the `public_dns` and `private_dns` attributes according to the [VPC DNS Guide](https://docs.aws.amazon.com/vpc/latest/userguide/vpc-dns.html#vpc-dns-hostnames) as they are not available with the EC2 API. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/eips.html.markdown b/website/docs/d/eips.html.markdown index 7c6f47834f9..7a855057bfa 100644 --- a/website/docs/d/eips.html.markdown +++ b/website/docs/d/eips.html.markdown @@ -48,3 +48,9 @@ More complex filters can be expressed using one or more `filter` sub-blocks, whi * `id` - AWS Region. * `allocation_ids` - A list of all the allocation IDs for address for use with EC2-VPC. * `public_ips` - A list of all the Elastic IP addresses. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/instance.html.markdown b/website/docs/d/instance.html.markdown index d505588c160..6020b81da69 100644 --- a/website/docs/d/instance.html.markdown +++ b/website/docs/d/instance.html.markdown @@ -134,4 +134,10 @@ interpolation. * `maintenance_options` - The maintenance and recovery options for the instance. * `auto_recovery` - The automatic recovery behavior of the instance. +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) + [1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-instances.html diff --git a/website/docs/d/instances.html.markdown b/website/docs/d/instances.html.markdown index 73f66c94d48..85eb5f73172 100644 --- a/website/docs/d/instances.html.markdown +++ b/website/docs/d/instances.html.markdown @@ -61,5 +61,10 @@ several valid keys, for a full reference, check out * `private_ips` - Private IP addresses of instances found through the filter * `public_ips` - Public IP addresses of instances found through the filter +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) [1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-instances.html diff --git a/website/docs/d/internet_gateway.html.markdown b/website/docs/d/internet_gateway.html.markdown index b0e1c4a48aa..b30b910499a 100644 --- a/website/docs/d/internet_gateway.html.markdown +++ b/website/docs/d/internet_gateway.html.markdown @@ -60,3 +60,9 @@ Each attachment supports the following: * `owner_id` - The ID of the AWS account that owns the internet gateway. * `state` - The current state of the attachment between the gateway and the VPC. Present only if a VPC is attached * `vpc_id` - The ID of an attached VPC. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/key_pair.html.markdown b/website/docs/d/key_pair.html.markdown index 16a1c9f04a3..a804e64a6af 100644 --- a/website/docs/d/key_pair.html.markdown +++ b/website/docs/d/key_pair.html.markdown @@ -67,3 +67,9 @@ In addition to all arguments above, the following attributes are exported: * `key_type` - The type of key pair. * `public_key` - The public key material. * `tags` - Any tags assigned to the Key Pair. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/launch_template.html.markdown b/website/docs/d/launch_template.html.markdown index c0621e92a5e..818293d6124 100644 --- a/website/docs/d/launch_template.html.markdown +++ b/website/docs/d/launch_template.html.markdown @@ -52,3 +52,9 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of the launch template. This resource also exports a full set of attributes corresponding to the arguments of the [`aws_launch_template`](/docs/providers/aws/r/launch_template.html) resource. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/lb.html.markdown b/website/docs/d/lb.html.markdown index ebbf4ad5eb0..899d8a72a0e 100644 --- a/website/docs/d/lb.html.markdown +++ b/website/docs/d/lb.html.markdown @@ -49,3 +49,9 @@ The following arguments are supported: See the [LB Resource](/docs/providers/aws/r/lb.html) for details on the returned attributes - they are identical. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/lb_listener.html.markdown b/website/docs/d/lb_listener.html.markdown index 2c3b45784ac..14c406b5d9b 100644 --- a/website/docs/d/lb_listener.html.markdown +++ b/website/docs/d/lb_listener.html.markdown @@ -50,3 +50,9 @@ The following arguments are supported: ## Attributes Reference See the [LB Listener Resource](/docs/providers/aws/r/lb_listener.html) for details on the returned attributes - they are identical. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/lb_target_group.html.markdown b/website/docs/d/lb_target_group.html.markdown index 8f03901c668..45b3c199577 100644 --- a/website/docs/d/lb_target_group.html.markdown +++ b/website/docs/d/lb_target_group.html.markdown @@ -48,3 +48,9 @@ The following arguments are supported: See the [LB Target Group Resource](/docs/providers/aws/r/lb_target_group.html) for details on the returned attributes - they are identical. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/nat_gateway.html.markdown b/website/docs/d/nat_gateway.html.markdown index 9296980af6e..6583b45dfef 100644 --- a/website/docs/d/nat_gateway.html.markdown +++ b/website/docs/d/nat_gateway.html.markdown @@ -69,3 +69,9 @@ Each attachment supports the following: * `network_interface_id` - The Id of the ENI allocated to the selected Nat Gateway. * `private_ip` - The private Ip address of the selected Nat Gateway. * `public_ip` - The public Ip (EIP) address of the selected Nat Gateway. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/nat_gateways.html.markdown b/website/docs/d/nat_gateways.html.markdown index cd78e0fc9db..a35855940d5 100644 --- a/website/docs/d/nat_gateways.html.markdown +++ b/website/docs/d/nat_gateways.html.markdown @@ -49,3 +49,9 @@ which take the following arguments: * `id` - AWS Region. * `ids` - A list of all the NAT gateway ids found. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/network_acls.html.markdown b/website/docs/d/network_acls.html.markdown index 2ce2beb69bd..f326a50a565 100644 --- a/website/docs/d/network_acls.html.markdown +++ b/website/docs/d/network_acls.html.markdown @@ -71,3 +71,9 @@ which take the following arguments: * `id` - AWS Region. * `ids` - A list of all the network ACL ids found. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/network_interface.html.markdown b/website/docs/d/network_interface.html.markdown index 90a5b7a4652..01279409d47 100644 --- a/website/docs/d/network_interface.html.markdown +++ b/website/docs/d/network_interface.html.markdown @@ -66,3 +66,9 @@ Elastic Network Interfaces can be imported using the `id`, e.g., ``` $ terraform import aws_network_interface.test eni-12345 ``` + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/network_interfaces.html.markdown b/website/docs/d/network_interfaces.html.markdown index d5d224aaa7b..ee8693ebf2f 100644 --- a/website/docs/d/network_interfaces.html.markdown +++ b/website/docs/d/network_interfaces.html.markdown @@ -70,3 +70,9 @@ which take the following arguments: * `id` - AWS Region. * `ids` - A list of all the network interface ids found. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/prefix_list.html.markdown b/website/docs/d/prefix_list.html.markdown index e6f71b6b033..b008dec0307 100644 --- a/website/docs/d/prefix_list.html.markdown +++ b/website/docs/d/prefix_list.html.markdown @@ -81,3 +81,9 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of the selected prefix list. * `name` - The name of the selected prefix list. * `cidr_blocks` - The list of CIDR blocks for the AWS service associated with the prefix list. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/route.html.markdown b/website/docs/d/route.html.markdown index cbd049a328f..80293b265b1 100644 --- a/website/docs/d/route.html.markdown +++ b/website/docs/d/route.html.markdown @@ -60,3 +60,9 @@ The following arguments are optional: ## Attributes Reference All of the argument attributes are also exported as result attributes when there is data available. For example, the `vpc_peering_connection_id` field will be empty when the route is attached to a Network Interface. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/route_table.html.markdown b/website/docs/d/route_table.html.markdown index 7638af45160..19872d8bdf8 100644 --- a/website/docs/d/route_table.html.markdown +++ b/website/docs/d/route_table.html.markdown @@ -94,3 +94,9 @@ Associations are also exported with the following attributes: * `route_table_association_id` - Association ID. * `route_table_id` - Route Table ID. * `subnet_id` - Subnet ID. Only set when associated with a subnet. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/route_tables.html.markdown b/website/docs/d/route_tables.html.markdown index 97ce8b4252f..43d27c39545 100644 --- a/website/docs/d/route_tables.html.markdown +++ b/website/docs/d/route_tables.html.markdown @@ -56,3 +56,9 @@ which take the following arguments: * `id` - AWS Region. * `ids` - A list of all the route table ids found. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/security_group.html.markdown b/website/docs/d/security_group.html.markdown index 1fd9ffc2363..5b16b0e2fb8 100644 --- a/website/docs/d/security_group.html.markdown +++ b/website/docs/d/security_group.html.markdown @@ -72,3 +72,9 @@ The following fields are also exported: * `arn` - The computed ARN of the security group. ~> **Note:** The [default security group for a VPC](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_SecurityGroups.html#DefaultSecurityGroup) has the name `default`. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/security_groups.html.markdown b/website/docs/d/security_groups.html.markdown index df20f07f24e..d0f5a55d6aa 100644 --- a/website/docs/d/security_groups.html.markdown +++ b/website/docs/d/security_groups.html.markdown @@ -48,3 +48,9 @@ data "aws_security_groups" "test" { * `vpc_ids` - The VPC IDs of the matched security groups. The data source's tag or filter *will span VPCs* unless the `vpc-id` filter is also used. [1]: https://docs.aws.amazon.com/cli/latest/reference/ec2/describe-security-groups.html + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/subnet.html.markdown b/website/docs/d/subnet.html.markdown index 374bb7f4124..afdca00a969 100644 --- a/website/docs/d/subnet.html.markdown +++ b/website/docs/d/subnet.html.markdown @@ -92,3 +92,9 @@ In addition to the attributes above, the following attributes are exported: * `outpost_arn` - ARN of the Outpost. * `owner_id` - ID of the AWS account that owns the subnet. * `private_dns_hostname_type_on_launch` - The type of hostnames assigned to instances in the subnet at launch. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/subnet_ids.html.markdown b/website/docs/d/subnet_ids.html.markdown index 2bc7504611d..88a110b9c6d 100644 --- a/website/docs/d/subnet_ids.html.markdown +++ b/website/docs/d/subnet_ids.html.markdown @@ -85,3 +85,9 @@ data "aws_subnet_ids" "selected" { ## Attributes Reference * `ids` - A set of all the subnet ids found. This data source will fail if none are found. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/subnets.html.markdown b/website/docs/d/subnets.html.markdown index 25079cd9156..0985e4d0058 100644 --- a/website/docs/d/subnets.html.markdown +++ b/website/docs/d/subnets.html.markdown @@ -84,3 +84,9 @@ data "aws_subnets" "selected" { ## Attributes Reference * `ids` - A list of all the subnet ids found. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/vpc.html.markdown b/website/docs/d/vpc.html.markdown index c208bac8e00..53221d45f34 100644 --- a/website/docs/d/vpc.html.markdown +++ b/website/docs/d/vpc.html.markdown @@ -90,3 +90,9 @@ The following attribute is additionally exported: * `association_id` - The association ID for the the IPv4 CIDR block. * `cidr_block` - The CIDR block for the association. * `state` - The State of the association. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/vpc_dhcp_options.html.markdown b/website/docs/d/vpc_dhcp_options.html.markdown index 9580b7478c0..11cf0fc3315 100644 --- a/website/docs/d/vpc_dhcp_options.html.markdown +++ b/website/docs/d/vpc_dhcp_options.html.markdown @@ -60,3 +60,9 @@ For more information about filtering, see the [EC2 API documentation](https://do * `ntp_servers` - List of NTP servers. * `tags` - A map of tags assigned to the resource. * `owner_id` - The ID of the AWS account that owns the DHCP options set. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/vpc_endpoint.html.markdown b/website/docs/d/vpc_endpoint.html.markdown index 4947706b972..1ccde32149e 100644 --- a/website/docs/d/vpc_endpoint.html.markdown +++ b/website/docs/d/vpc_endpoint.html.markdown @@ -69,3 +69,9 @@ DNS blocks (for `dns_entry`) support the following attributes: * `dns_name` - The DNS name. * `hosted_zone_id` - The ID of the private hosted zone. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/vpc_endpoint_service.html.markdown b/website/docs/d/vpc_endpoint_service.html.markdown index 51fea7d274e..db8081c4b5b 100644 --- a/website/docs/d/vpc_endpoint_service.html.markdown +++ b/website/docs/d/vpc_endpoint_service.html.markdown @@ -88,3 +88,9 @@ In addition to all arguments above, the following attributes are exported: * `supported_ip_address_types` - The supported IP address types. * `tags` - A map of tags assigned to the resource. * `vpc_endpoint_policy_supported` - Whether or not the service supports endpoint policies - `true` or `false`. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/vpc_ipam_pool.html.markdown b/website/docs/d/vpc_ipam_pool.html.markdown index b393dee7e79..958a7c93bd5 100644 --- a/website/docs/d/vpc_ipam_pool.html.markdown +++ b/website/docs/d/vpc_ipam_pool.html.markdown @@ -73,3 +73,9 @@ The following attribute is additionally exported: * `locale` - Locale is the Region where your pool is available for allocations. You can only create pools with locales that match the operating Regions of the IPAM. You can only create VPCs from a pool whose locale matches the VPC's Region. * `source_ipam_pool_id` - The ID of the source IPAM pool. * `tags` - A map of tags to assigned to the resource. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown b/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown index e2ee949ce09..0aed608621c 100644 --- a/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown +++ b/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown @@ -50,3 +50,9 @@ In addition to all arguments above, the following attributes are exported: * `cidr` - The previewed CIDR from the pool. * `id` - The ID of the preview. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/vpc_peering_connection.html.markdown b/website/docs/d/vpc_peering_connection.html.markdown index 98f9900ff24..908b3b79c98 100644 --- a/website/docs/d/vpc_peering_connection.html.markdown +++ b/website/docs/d/vpc_peering_connection.html.markdown @@ -100,3 +100,9 @@ connection in the peer VPC over the VPC peering connection. #### CIDR block set Attributes Reference * `cidr_block` - A CIDR block associated to the VPC of the specific VPC Peering Connection. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/vpc_peering_connections.html.markdown b/website/docs/d/vpc_peering_connections.html.markdown index 203c7a5c7da..8422563394a 100644 --- a/website/docs/d/vpc_peering_connections.html.markdown +++ b/website/docs/d/vpc_peering_connections.html.markdown @@ -56,3 +56,9 @@ All of the argument attributes except `filter` are also exported as result attri * `id` - AWS Region. * `ids` - The IDs of the VPC Peering Connections. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/vpcs.html.markdown b/website/docs/d/vpcs.html.markdown index 0479bee0300..e1aee8f5480 100644 --- a/website/docs/d/vpcs.html.markdown +++ b/website/docs/d/vpcs.html.markdown @@ -72,3 +72,9 @@ which take the following arguments: * `id` - AWS Region. * `ids` - A list of all the VPC Ids found. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) diff --git a/website/docs/d/vpn_gateway.html.markdown b/website/docs/d/vpn_gateway.html.markdown index d1e704c32e8..1c9d3f66c52 100644 --- a/website/docs/d/vpn_gateway.html.markdown +++ b/website/docs/d/vpn_gateway.html.markdown @@ -58,3 +58,9 @@ which take the following arguments: ## Attributes Reference All of the argument attributes are also exported as result attributes. + +## Timeouts + +[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: + +- `read` - (Default `20m`) From a91e3a22e57ce2d41aea4e8fa673d34e2b2f2c10 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Aug 2022 19:38:50 -0400 Subject: [PATCH 05/10] docs: Linterest --- website/docs/d/ebs_snapshot_ids.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/d/ebs_snapshot_ids.html.markdown b/website/docs/d/ebs_snapshot_ids.html.markdown index 0de60a13160..489620c9e0b 100644 --- a/website/docs/d/ebs_snapshot_ids.html.markdown +++ b/website/docs/d/ebs_snapshot_ids.html.markdown @@ -52,4 +52,4 @@ several valid keys, for a full reference, check out - `read` - (Default `20m`) -[1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-snapshots.html \ No newline at end of file +[1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-snapshots.html From 2a1d42232d740165f35acea2ff82e325f7c4012a Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Aug 2022 19:43:33 -0400 Subject: [PATCH 06/10] vpc: Remove update timeout --- internal/service/ec2/vpc_internet_gateway_attachment.go | 1 - website/docs/r/internet_gateway_attachment.html.markdown | 1 - 2 files changed, 2 deletions(-) diff --git a/internal/service/ec2/vpc_internet_gateway_attachment.go b/internal/service/ec2/vpc_internet_gateway_attachment.go index b84adb02ebb..9fdb7734af7 100644 --- a/internal/service/ec2/vpc_internet_gateway_attachment.go +++ b/internal/service/ec2/vpc_internet_gateway_attachment.go @@ -20,7 +20,6 @@ func ResourceInternetGatewayAttachment() *schema.Resource { Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(20 * time.Minute), - Update: schema.DefaultTimeout(20 * time.Minute), Delete: schema.DefaultTimeout(20 * time.Minute), }, diff --git a/website/docs/r/internet_gateway_attachment.html.markdown b/website/docs/r/internet_gateway_attachment.html.markdown index 821c59f1f1e..01b2f433e5f 100644 --- a/website/docs/r/internet_gateway_attachment.html.markdown +++ b/website/docs/r/internet_gateway_attachment.html.markdown @@ -43,7 +43,6 @@ In addition to all arguments above, the following attributes are exported: [Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: - `create` - (Default `20m`) -- `update` - (Default `20m`) - `delete` - (Default `20m`) ## Import From ae85c2d714c2d2f9c81640914f772dff6d6c1164 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Aug 2022 19:59:06 -0400 Subject: [PATCH 07/10] s3: deadcode --- internal/service/s3/wait.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/s3/wait.go b/internal/service/s3/wait.go index 14e177c9921..64b09b9fa6c 100644 --- a/internal/service/s3/wait.go +++ b/internal/service/s3/wait.go @@ -10,7 +10,6 @@ import ( ) const ( - bucketCreatedTimeout = 2 * time.Minute bucketVersioningStableTimeout = 1 * time.Minute lifecycleConfigurationExtraRetryDelay = 5 * time.Second lifecycleConfigurationRulesPropagationTimeout = 3 * time.Minute From f28379c9586c7010132cbed70fd2812bf32be93d Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Aug 2022 20:07:19 -0400 Subject: [PATCH 08/10] ci: Fix unchecked checks --- .ci/.golangci2.yml | 1 + GNUmakefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/.golangci2.yml b/.ci/.golangci2.yml index 63cb622aebf..6becff47852 100644 --- a/.ci/.golangci2.yml +++ b/.ci/.golangci2.yml @@ -12,6 +12,7 @@ linters: - deadcode - errcheck - exportloopref + - gofmt - gomnd - gosimple - ineffassign diff --git a/GNUmakefile b/GNUmakefile index 7e9112dd8eb..68b3a81a98d 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -115,7 +115,7 @@ gh-workflows-lint: golangci-lint: @echo "==> Checking source code with golangci-lint..." - @golangci-lint -c .ci/.golangci.yml run ./$(PKG_NAME)/... + @golangci-lint -c .ci/.golangci2.yml run ./$(PKG_NAME)/... providerlint: @echo "==> Checking source code with providerlint..." From 6db7928308c67688ce9bee1ac7a3b64587674383 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Aug 2022 21:04:38 -0400 Subject: [PATCH 09/10] docs: Standardize timeout section --- skaff/resource/websitedoc.tmpl | 2 +- website/docs/d/ami.html.markdown | 6 +++--- website/docs/d/ami_ids.html.markdown | 2 +- .../docs/d/availability_zone.html.markdown | 2 +- .../docs/d/availability_zones.html.markdown | 2 +- website/docs/d/customer_gateway.html.markdown | 2 +- .../docs/d/ebs_default_kms_key.html.markdown | 2 +- .../d/ebs_encryption_by_default.html.markdown | 2 +- website/docs/d/ebs_snapshot.html.markdown | 2 +- website/docs/d/ebs_snapshot_ids.html.markdown | 2 +- website/docs/d/ebs_volume.html.markdown | 2 +- website/docs/d/ebs_volumes.html.markdown | 2 +- .../d/ec2_client_vpn_endpoint.html.markdown | 2 +- website/docs/d/ec2_coip_pool.html.markdown | 2 +- website/docs/d/ec2_coip_pools.html.markdown | 2 +- website/docs/d/ec2_host.html.markdown | 2 +- .../docs/d/ec2_instance_type.html.markdown | 2 +- .../ec2_instance_type_offering.html.markdown | 2 +- .../ec2_instance_type_offerings.html.markdown | 2 +- .../docs/d/ec2_instance_types.html.markdown | 2 +- .../docs/d/ec2_local_gateway.html.markdown | 2 +- ...c2_local_gateway_route_table.html.markdown | 2 +- ...2_local_gateway_route_tables.html.markdown | 2 +- ...al_gateway_virtual_interface.html.markdown | 2 +- ...eway_virtual_interface_group.html.markdown | 2 +- ...way_virtual_interface_groups.html.markdown | 2 +- .../docs/d/ec2_local_gateways.html.markdown | 2 +- .../d/ec2_managed_prefix_list.html.markdown | 2 +- .../d/ec2_serial_console_access.html.markdown | 2 +- website/docs/d/ec2_spot_price.html.markdown | 2 +- .../docs/d/ec2_transit_gateway.html.markdown | 2 +- .../ec2_transit_gateway_connect.html.markdown | 2 +- ...transit_gateway_connect_peer.html.markdown | 2 +- ...ateway_dx_gateway_attachment.html.markdown | 2 +- ...sit_gateway_multicast_domain.html.markdown | 2 +- ...t_gateway_peering_attachment.html.markdown | 2 +- ..._transit_gateway_route_table.html.markdown | 2 +- ...transit_gateway_route_tables.html.markdown | 2 +- ...ansit_gateway_vpc_attachment.html.markdown | 2 +- ...nsit_gateway_vpc_attachments.html.markdown | 2 +- ...ansit_gateway_vpn_attachment.html.markdown | 2 +- website/docs/d/eip.html.markdown | 2 +- website/docs/d/eips.html.markdown | 2 +- website/docs/d/instance.html.markdown | 2 +- website/docs/d/instances.html.markdown | 2 +- website/docs/d/internet_gateway.html.markdown | 2 +- website/docs/d/key_pair.html.markdown | 2 +- website/docs/d/launch_template.html.markdown | 2 +- website/docs/d/lb.html.markdown | 2 +- website/docs/d/lb_listener.html.markdown | 2 +- website/docs/d/lb_target_group.html.markdown | 2 +- website/docs/d/nat_gateway.html.markdown | 2 +- website/docs/d/nat_gateways.html.markdown | 2 +- website/docs/d/network_acls.html.markdown | 2 +- .../docs/d/network_interface.html.markdown | 10 +--------- .../docs/d/network_interfaces.html.markdown | 2 +- website/docs/d/prefix_list.html.markdown | 2 +- website/docs/d/route.html.markdown | 2 +- website/docs/d/route_table.html.markdown | 2 +- website/docs/d/route_tables.html.markdown | 2 +- website/docs/d/security_group.html.markdown | 2 +- website/docs/d/security_groups.html.markdown | 2 +- website/docs/d/subnet.html.markdown | 2 +- website/docs/d/subnet_ids.html.markdown | 2 +- website/docs/d/subnets.html.markdown | 2 +- website/docs/d/vpc.html.markdown | 2 +- website/docs/d/vpc_dhcp_options.html.markdown | 2 +- website/docs/d/vpc_endpoint.html.markdown | 2 +- .../docs/d/vpc_endpoint_service.html.markdown | 2 +- website/docs/d/vpc_ipam_pool.html.markdown | 2 +- .../vpc_ipam_preview_next_cidr.html.markdown | 2 +- .../d/vpc_peering_connection.html.markdown | 2 +- .../d/vpc_peering_connections.html.markdown | 2 +- website/docs/d/vpcs.html.markdown | 2 +- website/docs/d/vpn_gateway.html.markdown | 2 +- .../r/account_alternate_contact.html.markdown | 9 ++++----- .../acm_certificate_validation.html.markdown | 5 ++--- ...acmpca_certificate_authority.html.markdown | 5 ++--- website/docs/r/ami.html.markdown | 16 ++++++++-------- website/docs/r/ami_copy.html.markdown | 16 ++++++++-------- .../docs/r/ami_from_instance.html.markdown | 10 +++++----- .../r/apigatewayv2_domain_name.html.markdown | 6 +++--- .../docs/r/autoscaling_group.html.markdown | 6 ++---- website/docs/r/backup_framework.html.markdown | 16 ++++++++-------- .../docs/r/cloudformation_stack.html.markdown | 16 +++++++--------- .../r/cloudformation_stack_set.html.markdown | 4 ++-- ...formation_stack_set_instance.html.markdown | 8 ++++---- .../docs/r/cloudsearch_domain.html.markdown | 9 ++++----- ...domain_service_access_policy.html.markdown | 7 +++---- ...rganization_conformance_pack.html.markdown | 9 ++++----- ...fig_organization_custom_rule.html.markdown | 9 ++++----- ...ig_organization_managed_rule.html.markdown | 9 ++++----- website/docs/r/connect_instance.html.markdown | 8 ++++---- .../docs/r/connect_vocabulary.html.markdown | 8 ++++---- website/docs/r/datasync_agent.html.markdown | 4 ++-- website/docs/r/datasync_task.html.markdown | 4 ++-- website/docs/r/dax_cluster.html.markdown | 9 ++++----- .../docs/r/db_cluster_snapshot.html.markdown | 4 ++-- .../r/db_event_subscription.html.markdown | 9 ++++----- website/docs/r/db_instance.html.markdown | 19 ++++++++----------- ...nce_automated_backups_replication.markdown | 7 +++---- website/docs/r/db_option_group.html.markdown | 5 ++--- website/docs/r/db_proxy.html.markdown | 10 +++++----- ...b_proxy_default_target_group.html.markdown | 8 ++++---- .../docs/r/db_proxy_endpoint.html.markdown | 10 +++++----- website/docs/r/db_snapshot.html.markdown | 4 ++-- website/docs/r/db_snapshot_copy.html.markdown | 4 ++-- .../docs/r/default_route_table.html.markdown | 6 +++--- .../r/dms_event_subscription.html.markdown | 8 ++++---- .../r/dms_replication_instance.html.markdown | 9 ++++----- website/docs/r/docdb_cluster.html.markdown | 9 ++++----- .../r/docdb_cluster_instance.html.markdown | 9 ++++----- .../r/docdb_cluster_snapshot.html.markdown | 4 ++-- .../r/docdb_event_subscription.html.markdown | 9 ++++----- .../docs/r/docdb_global_cluster.html.markdown | 16 ++++++++-------- website/docs/r/dx_bgp_peer.html.markdown | 7 +++---- website/docs/r/dx_gateway.html.markdown | 7 +++---- .../r/dx_gateway_association.html.markdown | 9 ++++----- ...ed_private_virtual_interface.html.markdown | 9 ++++----- ...e_virtual_interface_accepter.html.markdown | 7 +++---- ...ted_public_virtual_interface.html.markdown | 7 +++---- ...c_virtual_interface_accepter.html.markdown | 7 +++---- ...ed_transit_virtual_interface.html.markdown | 9 ++++----- ...t_virtual_interface_accepter.html.markdown | 7 +++---- ...dx_private_virtual_interface.html.markdown | 9 ++++----- .../dx_public_virtual_interface.html.markdown | 7 +++---- ...dx_transit_virtual_interface.html.markdown | 9 ++++----- website/docs/r/dynamodb_table.html.markdown | 8 ++++---- website/docs/r/ebs_snapshot.html.markdown | 15 +++++++-------- .../docs/r/ebs_snapshot_copy.html.markdown | 15 +++++++-------- .../docs/r/ebs_snapshot_import.html.markdown | 9 ++++----- website/docs/r/ebs_volume.html.markdown | 8 ++++---- ...lient_vpn_authorization_rule.html.markdown | 6 +++--- ...ient_vpn_network_association.html.markdown | 6 +++--- .../docs/r/ec2_client_vpn_route.html.markdown | 6 +++--- website/docs/r/ec2_fleet.html.markdown | 8 ++++---- .../docs/r/ec2_transit_gateway.html.markdown | 8 ++++---- .../ec2_transit_gateway_connect.html.markdown | 8 ++++---- ...transit_gateway_connect_peer.html.markdown | 6 +++--- ...sit_gateway_multicast_domain.html.markdown | 6 +++--- ...multicast_domain_association.html.markdown | 6 +++--- website/docs/r/ecr_repository.html.markdown | 5 ++--- .../docs/r/ecrpublic_repository.html.markdown | 5 ++--- website/docs/r/ecs_service.html.markdown | 8 ++++---- ...fs_replication_configuration.html.markdown | 8 ++++---- website/docs/r/eip.html.markdown | 8 ++++---- website/docs/r/eks_cluster.html.markdown | 9 ++++----- .../docs/r/eks_fargate_profile.html.markdown | 6 +++--- ...eks_identity_provider_config.html.markdown | 6 +++--- website/docs/r/eks_node_group.html.markdown | 9 ++++----- ...lasticache_replication_group.html.markdown | 9 ++++----- .../docs/r/elasticsearch_domain.html.markdown | 8 ++++---- website/docs/r/fsx_backup.html.markdown | 7 +++---- ..._data_repository_association.html.markdown | 9 ++++----- .../r/fsx_lustre_file_system.html.markdown | 9 ++++----- .../r/fsx_ontap_file_system.html.markdown | 9 ++++----- ...ntap_storage_virtual_machine.html.markdown | 9 ++++----- website/docs/r/fsx_ontap_volume.html.markdown | 9 ++++----- .../r/fsx_openzfs_file_system.html.markdown | 9 ++++----- .../docs/r/fsx_openzfs_snapshot.html.markdown | 9 ++++----- .../docs/r/fsx_openzfs_volume.html.markdown | 9 ++++----- .../r/fsx_windows_file_system.html.markdown | 9 ++++----- website/docs/r/gamelift_fleet.html.markdown | 6 +++--- .../r/gamelift_game_server_group.markdown | 7 +++---- ...lobalaccelerator_accelerator.html.markdown | 7 +++---- ...alaccelerator_endpoint_group.html.markdown | 9 ++++----- .../globalaccelerator_listener.html.markdown | 9 ++++----- .../docs/r/glue_partition_index.html.markdown | 14 +++++++------- website/docs/r/glue_trigger.html.markdown | 7 +++---- .../r/guardduty_invite_accepter.html.markdown | 5 ++--- website/docs/r/guardduty_member.html.markdown | 16 +++++++--------- .../docs/r/imagebuilder_image.html.markdown | 4 ++-- website/docs/r/instance.html.markdown | 16 ++++++++-------- website/docs/r/internet_gateway.html.markdown | 2 +- .../internet_gateway_attachment.html.markdown | 2 +- .../docs/r/kendra_data_source.html.markdown | 8 ++++---- .../docs/r/kendra_experience.html.markdown | 8 ++++---- website/docs/r/kendra_faq.html.markdown | 6 +++--- website/docs/r/kendra_index.html.markdown | 10 +++++----- ...query_suggestions_block_list.html.markdown | 8 ++++---- website/docs/r/kendra_thesaurus.html.markdown | 8 ++++---- .../docs/r/keyspaces_keyspace.html.markdown | 6 +++--- website/docs/r/keyspaces_table.html.markdown | 8 ++++---- website/docs/r/kinesis_stream.html.markdown | 8 ++++---- .../docs/r/kinesis_video_stream.html.markdown | 8 ++++---- ...nesisanalyticsv2_application.html.markdown | 9 ++++----- ...yticsv2_application_snapshot.html.markdown | 7 +++---- website/docs/r/lambda_function.html.markdown | 4 ++-- ...ovisioned_concurrency_config.html.markdown | 6 +++--- website/docs/r/lb.html.markdown | 9 ++++----- website/docs/r/lex_bot.html.markdown | 10 +++++----- website/docs/r/lex_bot_alias.html.markdown | 16 ++++++++-------- website/docs/r/lex_intent.html.markdown | 17 ++++++++--------- website/docs/r/lex_slot_type.html.markdown | 10 +++++----- .../lightsail_container_service.html.markdown | 8 ++++---- ...r_service_deployment_version.html.markdown | 4 ++-- ...location_geofence_collection.html.markdown | 8 ++++---- .../r/location_route_calculator.html.markdown | 8 ++++---- website/docs/r/memorydb_cluster.html.markdown | 8 ++++---- .../docs/r/memorydb_snapshot.html.markdown | 6 +++--- website/docs/r/msk_cluster.html.markdown | 9 ++++----- .../docs/r/mskconnect_connector.html.markdown | 9 ++++----- .../r/mskconnect_custom_plugin.html.markdown | 7 +++---- website/docs/r/neptune_cluster.html.markdown | 9 ++++----- .../r/neptune_cluster_instance.html.markdown | 9 ++++----- .../r/neptune_cluster_snapshot.html.markdown | 4 ++-- .../neptune_event_subscription.html.markdown | 9 ++++----- .../docs/r/opensearch_domain.html.markdown | 8 ++++---- .../r/opensearch_domain_policy.html.markdown | 6 +++--- ...ensearch_domain_saml_options.html.markdown | 6 +++--- .../docs/r/opsworks_instance.html.markdown | 9 ++++----- website/docs/r/rds_cluster.html.markdown | 9 ++++----- .../docs/r/rds_cluster_instance.html.markdown | 9 ++++----- .../docs/r/rds_global_cluster.html.markdown | 9 ++++----- website/docs/r/redshift_cluster.html.markdown | 17 ++++++++--------- website/docs/r/route.html.markdown | 8 ++++---- .../r/route53_resolver_endpoint.html.markdown | 9 ++++----- ...e53domains_registered_domain.html.markdown | 7 +++---- ...oute53recoveryreadiness_cell.html.markdown | 13 ++++++------- ...eryreadiness_readiness_check.html.markdown | 5 ++--- ...veryreadiness_recovery_group.html.markdown | 13 ++++++------- ...coveryreadiness_resource_set.html.markdown | 5 ++--- website/docs/r/route_table.html.markdown | 8 ++++---- website/docs/r/s3_bucket.html.markdown | 2 +- ...ol_multi_region_access_point.html.markdown | 8 ++++---- ...i_region_access_point_policy.html.markdown | 14 +++++++------- website/docs/r/security_group.html.markdown | 7 +++---- .../docs/r/security_group_rule.html.markdown | 4 ++-- ..._budget_resource_association.html.markdown | 9 ++++----- .../r/servicecatalog_constraint.html.markdown | 11 +++++------ ...catalog_organizations_access.html.markdown | 5 ++--- .../r/servicecatalog_portfolio.html.markdown | 11 +++++------ ...rvicecatalog_portfolio_share.html.markdown | 11 +++++------ ...ncipal_portfolio_association.html.markdown | 9 ++++----- .../r/servicecatalog_product.html.markdown | 11 +++++------ ...roduct_portfolio_association.html.markdown | 9 ++++----- ...ecatalog_provisioned_product.html.markdown | 11 +++++------ ...atalog_provisioning_artifact.html.markdown | 11 +++++------ ...ervicecatalog_service_action.html.markdown | 11 +++++------ .../r/servicecatalog_tag_option.html.markdown | 11 +++++------ ..._option_resource_association.html.markdown | 9 ++++----- ...domain_identity_verification.html.markdown | 5 ++--- .../docs/r/spot_fleet_request.html.markdown | 14 +++++++------- .../r/spot_instance_request.html.markdown | 14 +++++++------- .../r/storagegateway_gateway.html.markdown | 4 ++-- ...toragegateway_nfs_file_share.html.markdown | 8 ++++---- ...toragegateway_smb_file_share.html.markdown | 8 ++++---- website/docs/r/subnet.html.markdown | 7 +++---- .../r/transcribe_language_model.html.markdown | 4 ++-- ...ranscribe_medical_vocabulary.html.markdown | 8 ++++---- .../r/transcribe_vocabulary.html.markdown | 8 ++++---- website/docs/r/vpc_endpoint.html.markdown | 11 +++++------ ..._endpoint_subnet_association.html.markdown | 15 +++++++-------- ..._ipv4_cidr_block_association.html.markdown | 15 +++++++-------- ..._ipv6_cidr_block_association.html.markdown | 7 +++---- .../r/vpc_peering_connection.html.markdown | 18 +++++++++--------- ...pn_gateway_route_propagation.html.markdown | 6 +++--- .../docs/r/workspaces_workspace.html.markdown | 17 ++++++++--------- 258 files changed, 807 insertions(+), 918 deletions(-) diff --git a/skaff/resource/websitedoc.tmpl b/skaff/resource/websitedoc.tmpl index f36653b6a9e..95ddec491bf 100644 --- a/skaff/resource/websitedoc.tmpl +++ b/skaff/resource/websitedoc.tmpl @@ -38,7 +38,7 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): * `create` - (Default: `60m`) * `update` - (Default: `180m`) diff --git a/website/docs/d/ami.html.markdown b/website/docs/d/ami.html.markdown index 0cd3799a773..0521f511ca5 100644 --- a/website/docs/d/ami.html.markdown +++ b/website/docs/d/ami.html.markdown @@ -128,10 +128,10 @@ interpolation. * `platform_details` - The platform details associated with the billing code of the AMI. * `ena_support` - Specifies whether enhanced networking with ENA is enabled. -[1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-images.html - ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) + +[1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-images.html diff --git a/website/docs/d/ami_ids.html.markdown b/website/docs/d/ami_ids.html.markdown index 8867847d9bf..a8d6e6383c4 100644 --- a/website/docs/d/ami_ids.html.markdown +++ b/website/docs/d/ami_ids.html.markdown @@ -50,6 +50,6 @@ options to narrow down the list AWS returns. ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/availability_zone.html.markdown b/website/docs/d/availability_zone.html.markdown index 572be1e336f..137ebfdaec1 100644 --- a/website/docs/d/availability_zone.html.markdown +++ b/website/docs/d/availability_zone.html.markdown @@ -104,6 +104,6 @@ For Local and Wavelength Zones this is a longer string, for example `wl1-sfo-wlz ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/availability_zones.html.markdown b/website/docs/d/availability_zones.html.markdown index 6e88d1a588e..c2c68c1dbf8 100644 --- a/website/docs/d/availability_zones.html.markdown +++ b/website/docs/d/availability_zones.html.markdown @@ -101,6 +101,6 @@ Note that the indexes of Availability Zone names and IDs correspond. ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/customer_gateway.html.markdown b/website/docs/d/customer_gateway.html.markdown index e619dfa72c1..957d7bc2828 100644 --- a/website/docs/d/customer_gateway.html.markdown +++ b/website/docs/d/customer_gateway.html.markdown @@ -56,6 +56,6 @@ In addition to the arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ebs_default_kms_key.html.markdown b/website/docs/d/ebs_default_kms_key.html.markdown index 73f243b3123..f286b832b79 100644 --- a/website/docs/d/ebs_default_kms_key.html.markdown +++ b/website/docs/d/ebs_default_kms_key.html.markdown @@ -32,6 +32,6 @@ The following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ebs_encryption_by_default.html.markdown b/website/docs/d/ebs_encryption_by_default.html.markdown index e330cb01918..d6b9ce9e305 100644 --- a/website/docs/d/ebs_encryption_by_default.html.markdown +++ b/website/docs/d/ebs_encryption_by_default.html.markdown @@ -25,6 +25,6 @@ The following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ebs_snapshot.html.markdown b/website/docs/d/ebs_snapshot.html.markdown index f0d0ba29d3f..32c0bc033e1 100644 --- a/website/docs/d/ebs_snapshot.html.markdown +++ b/website/docs/d/ebs_snapshot.html.markdown @@ -68,7 +68,7 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ebs_snapshot_ids.html.markdown b/website/docs/d/ebs_snapshot_ids.html.markdown index 489620c9e0b..208f8ed3d97 100644 --- a/website/docs/d/ebs_snapshot_ids.html.markdown +++ b/website/docs/d/ebs_snapshot_ids.html.markdown @@ -48,7 +48,7 @@ several valid keys, for a full reference, check out ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ebs_volume.html.markdown b/website/docs/d/ebs_volume.html.markdown index f1aa879d025..ea86a19cf77 100644 --- a/website/docs/d/ebs_volume.html.markdown +++ b/website/docs/d/ebs_volume.html.markdown @@ -61,7 +61,7 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ebs_volumes.html.markdown b/website/docs/d/ebs_volumes.html.markdown index 946d54e11d0..82a73d80fa5 100644 --- a/website/docs/d/ebs_volumes.html.markdown +++ b/website/docs/d/ebs_volumes.html.markdown @@ -70,6 +70,6 @@ data "aws_ebs_volumes" "ten_or_twenty_gb_volumes" { ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_client_vpn_endpoint.html.markdown b/website/docs/d/ec2_client_vpn_endpoint.html.markdown index da9b1994b2f..9f342fbd8c8 100644 --- a/website/docs/d/ec2_client_vpn_endpoint.html.markdown +++ b/website/docs/d/ec2_client_vpn_endpoint.html.markdown @@ -72,6 +72,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_coip_pool.html.markdown b/website/docs/d/ec2_coip_pool.html.markdown index 6a4eed1f57b..6a922ff6fc5 100644 --- a/website/docs/d/ec2_coip_pool.html.markdown +++ b/website/docs/d/ec2_coip_pool.html.markdown @@ -62,6 +62,6 @@ In addition, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_coip_pools.html.markdown b/website/docs/d/ec2_coip_pools.html.markdown index 23dea571131..7b2cb6fd17f 100644 --- a/website/docs/d/ec2_coip_pools.html.markdown +++ b/website/docs/d/ec2_coip_pools.html.markdown @@ -45,6 +45,6 @@ which take the following arguments: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_host.html.markdown b/website/docs/d/ec2_host.html.markdown index 7a2ccc0aad5..5ccabd28690 100644 --- a/website/docs/d/ec2_host.html.markdown +++ b/website/docs/d/ec2_host.html.markdown @@ -70,6 +70,6 @@ In addition to the attributes above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_instance_type.html.markdown b/website/docs/d/ec2_instance_type.html.markdown index 78853d3509b..a96f40ff01e 100644 --- a/website/docs/d/ec2_instance_type.html.markdown +++ b/website/docs/d/ec2_instance_type.html.markdown @@ -94,6 +94,6 @@ In addition to the argument above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_instance_type_offering.html.markdown b/website/docs/d/ec2_instance_type_offering.html.markdown index a880dfdb190..944b422c035 100644 --- a/website/docs/d/ec2_instance_type_offering.html.markdown +++ b/website/docs/d/ec2_instance_type_offering.html.markdown @@ -45,6 +45,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_instance_type_offerings.html.markdown b/website/docs/d/ec2_instance_type_offerings.html.markdown index 27e900aa379..cbabeb1245d 100644 --- a/website/docs/d/ec2_instance_type_offerings.html.markdown +++ b/website/docs/d/ec2_instance_type_offerings.html.markdown @@ -53,6 +53,6 @@ Note that the indexes of Instance Type Offering instance types, locations and lo ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_instance_types.html.markdown b/website/docs/d/ec2_instance_types.html.markdown index 7f86bb97a43..39314f8df8a 100644 --- a/website/docs/d/ec2_instance_types.html.markdown +++ b/website/docs/d/ec2_instance_types.html.markdown @@ -56,6 +56,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_local_gateway.html.markdown b/website/docs/d/ec2_local_gateway.html.markdown index 4eeb51bfc2a..cc249c9f04d 100644 --- a/website/docs/d/ec2_local_gateway.html.markdown +++ b/website/docs/d/ec2_local_gateway.html.markdown @@ -62,6 +62,6 @@ The following attributes are additionally exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_local_gateway_route_table.html.markdown b/website/docs/d/ec2_local_gateway_route_table.html.markdown index 6e1070395a9..9bf89656b8c 100644 --- a/website/docs/d/ec2_local_gateway_route_table.html.markdown +++ b/website/docs/d/ec2_local_gateway_route_table.html.markdown @@ -53,6 +53,6 @@ which take the following arguments: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_local_gateway_route_tables.html.markdown b/website/docs/d/ec2_local_gateway_route_tables.html.markdown index dc820edc174..6394cce91f3 100644 --- a/website/docs/d/ec2_local_gateway_route_tables.html.markdown +++ b/website/docs/d/ec2_local_gateway_route_tables.html.markdown @@ -45,6 +45,6 @@ which take the following arguments: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_local_gateway_virtual_interface.html.markdown b/website/docs/d/ec2_local_gateway_virtual_interface.html.markdown index e9edfc15bed..b8662139dd2 100644 --- a/website/docs/d/ec2_local_gateway_virtual_interface.html.markdown +++ b/website/docs/d/ec2_local_gateway_virtual_interface.html.markdown @@ -48,6 +48,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_local_gateway_virtual_interface_group.html.markdown b/website/docs/d/ec2_local_gateway_virtual_interface_group.html.markdown index b0f95c1c900..741d6bd850b 100644 --- a/website/docs/d/ec2_local_gateway_virtual_interface_group.html.markdown +++ b/website/docs/d/ec2_local_gateway_virtual_interface_group.html.markdown @@ -42,6 +42,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_local_gateway_virtual_interface_groups.html.markdown b/website/docs/d/ec2_local_gateway_virtual_interface_groups.html.markdown index af6c8f5e845..25ad5163523 100644 --- a/website/docs/d/ec2_local_gateway_virtual_interface_groups.html.markdown +++ b/website/docs/d/ec2_local_gateway_virtual_interface_groups.html.markdown @@ -40,6 +40,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_local_gateways.html.markdown b/website/docs/d/ec2_local_gateways.html.markdown index 15bb4532c5e..9c34424641d 100644 --- a/website/docs/d/ec2_local_gateways.html.markdown +++ b/website/docs/d/ec2_local_gateways.html.markdown @@ -49,6 +49,6 @@ which take the following arguments: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_managed_prefix_list.html.markdown b/website/docs/d/ec2_managed_prefix_list.html.markdown index e465bb7a194..1ce046c6c68 100644 --- a/website/docs/d/ec2_managed_prefix_list.html.markdown +++ b/website/docs/d/ec2_managed_prefix_list.html.markdown @@ -66,6 +66,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_serial_console_access.html.markdown b/website/docs/d/ec2_serial_console_access.html.markdown index 2c2c7c12d7a..2b8b6c887d5 100644 --- a/website/docs/d/ec2_serial_console_access.html.markdown +++ b/website/docs/d/ec2_serial_console_access.html.markdown @@ -25,6 +25,6 @@ The following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_spot_price.html.markdown b/website/docs/d/ec2_spot_price.html.markdown index 2e878836582..4247bb0e767 100644 --- a/website/docs/d/ec2_spot_price.html.markdown +++ b/website/docs/d/ec2_spot_price.html.markdown @@ -47,6 +47,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway.html.markdown b/website/docs/d/ec2_transit_gateway.html.markdown index f142504d54f..faf972c8f30 100644 --- a/website/docs/d/ec2_transit_gateway.html.markdown +++ b/website/docs/d/ec2_transit_gateway.html.markdown @@ -65,6 +65,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_connect.html.markdown b/website/docs/d/ec2_transit_gateway_connect.html.markdown index e8048f57661..000fd7daead 100644 --- a/website/docs/d/ec2_transit_gateway_connect.html.markdown +++ b/website/docs/d/ec2_transit_gateway_connect.html.markdown @@ -54,6 +54,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_connect_peer.html.markdown b/website/docs/d/ec2_transit_gateway_connect_peer.html.markdown index 18261364de2..8a9dada2af9 100644 --- a/website/docs/d/ec2_transit_gateway_connect_peer.html.markdown +++ b/website/docs/d/ec2_transit_gateway_connect_peer.html.markdown @@ -57,6 +57,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown b/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown index d32dd06bfb4..dc882506501 100644 --- a/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown +++ b/website/docs/d/ec2_transit_gateway_dx_gateway_attachment.html.markdown @@ -46,6 +46,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_multicast_domain.html.markdown b/website/docs/d/ec2_transit_gateway_multicast_domain.html.markdown index 4385ad5bf8c..94da3b8b1f1 100644 --- a/website/docs/d/ec2_transit_gateway_multicast_domain.html.markdown +++ b/website/docs/d/ec2_transit_gateway_multicast_domain.html.markdown @@ -71,6 +71,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown b/website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown index 9b762e466bb..0bf3b579eb0 100644 --- a/website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown +++ b/website/docs/d/ec2_transit_gateway_peering_attachment.html.markdown @@ -59,6 +59,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_route_table.html.markdown b/website/docs/d/ec2_transit_gateway_route_table.html.markdown index 41ba58d0b99..658fea5333e 100644 --- a/website/docs/d/ec2_transit_gateway_route_table.html.markdown +++ b/website/docs/d/ec2_transit_gateway_route_table.html.markdown @@ -61,6 +61,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_route_tables.html.markdown b/website/docs/d/ec2_transit_gateway_route_tables.html.markdown index 3314762f5ab..434cfb94f22 100644 --- a/website/docs/d/ec2_transit_gateway_route_tables.html.markdown +++ b/website/docs/d/ec2_transit_gateway_route_tables.html.markdown @@ -49,6 +49,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_vpc_attachment.html.markdown b/website/docs/d/ec2_transit_gateway_vpc_attachment.html.markdown index 9f28c712fc6..4dd460ded9c 100644 --- a/website/docs/d/ec2_transit_gateway_vpc_attachment.html.markdown +++ b/website/docs/d/ec2_transit_gateway_vpc_attachment.html.markdown @@ -59,6 +59,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_vpc_attachments.html.markdown b/website/docs/d/ec2_transit_gateway_vpc_attachments.html.markdown index 32be48593ab..a1d8c76ddf6 100644 --- a/website/docs/d/ec2_transit_gateway_vpc_attachments.html.markdown +++ b/website/docs/d/ec2_transit_gateway_vpc_attachments.html.markdown @@ -50,6 +50,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown b/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown index 3ac86f1c7dd..ac3c9b6ceb2 100644 --- a/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown +++ b/website/docs/d/ec2_transit_gateway_vpn_attachment.html.markdown @@ -59,6 +59,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/eip.html.markdown b/website/docs/d/eip.html.markdown index 9aa31bc1609..3f7b90e12ec 100644 --- a/website/docs/d/eip.html.markdown +++ b/website/docs/d/eip.html.markdown @@ -84,6 +84,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/eips.html.markdown b/website/docs/d/eips.html.markdown index 7a855057bfa..ac597152a18 100644 --- a/website/docs/d/eips.html.markdown +++ b/website/docs/d/eips.html.markdown @@ -51,6 +51,6 @@ More complex filters can be expressed using one or more `filter` sub-blocks, whi ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/instance.html.markdown b/website/docs/d/instance.html.markdown index 6020b81da69..dd86e6b8b0b 100644 --- a/website/docs/d/instance.html.markdown +++ b/website/docs/d/instance.html.markdown @@ -136,7 +136,7 @@ interpolation. ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/instances.html.markdown b/website/docs/d/instances.html.markdown index 85eb5f73172..a8ffb9e1f90 100644 --- a/website/docs/d/instances.html.markdown +++ b/website/docs/d/instances.html.markdown @@ -63,7 +63,7 @@ several valid keys, for a full reference, check out ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/internet_gateway.html.markdown b/website/docs/d/internet_gateway.html.markdown index b30b910499a..6019b0aa5de 100644 --- a/website/docs/d/internet_gateway.html.markdown +++ b/website/docs/d/internet_gateway.html.markdown @@ -63,6 +63,6 @@ Each attachment supports the following: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/key_pair.html.markdown b/website/docs/d/key_pair.html.markdown index a804e64a6af..ff325dbab31 100644 --- a/website/docs/d/key_pair.html.markdown +++ b/website/docs/d/key_pair.html.markdown @@ -70,6 +70,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/launch_template.html.markdown b/website/docs/d/launch_template.html.markdown index 818293d6124..6c708fd7311 100644 --- a/website/docs/d/launch_template.html.markdown +++ b/website/docs/d/launch_template.html.markdown @@ -55,6 +55,6 @@ This resource also exports a full set of attributes corresponding to the argumen ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/lb.html.markdown b/website/docs/d/lb.html.markdown index 899d8a72a0e..199438be215 100644 --- a/website/docs/d/lb.html.markdown +++ b/website/docs/d/lb.html.markdown @@ -52,6 +52,6 @@ returned attributes - they are identical. ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/lb_listener.html.markdown b/website/docs/d/lb_listener.html.markdown index 14c406b5d9b..6046682ac08 100644 --- a/website/docs/d/lb_listener.html.markdown +++ b/website/docs/d/lb_listener.html.markdown @@ -53,6 +53,6 @@ See the [LB Listener Resource](/docs/providers/aws/r/lb_listener.html) for detai ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/lb_target_group.html.markdown b/website/docs/d/lb_target_group.html.markdown index 45b3c199577..43a48eb3b87 100644 --- a/website/docs/d/lb_target_group.html.markdown +++ b/website/docs/d/lb_target_group.html.markdown @@ -51,6 +51,6 @@ on the returned attributes - they are identical. ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/nat_gateway.html.markdown b/website/docs/d/nat_gateway.html.markdown index 6583b45dfef..453e4b3af18 100644 --- a/website/docs/d/nat_gateway.html.markdown +++ b/website/docs/d/nat_gateway.html.markdown @@ -72,6 +72,6 @@ Each attachment supports the following: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/nat_gateways.html.markdown b/website/docs/d/nat_gateways.html.markdown index a35855940d5..8842f8e4d88 100644 --- a/website/docs/d/nat_gateways.html.markdown +++ b/website/docs/d/nat_gateways.html.markdown @@ -52,6 +52,6 @@ which take the following arguments: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/network_acls.html.markdown b/website/docs/d/network_acls.html.markdown index f326a50a565..57fee700b14 100644 --- a/website/docs/d/network_acls.html.markdown +++ b/website/docs/d/network_acls.html.markdown @@ -74,6 +74,6 @@ which take the following arguments: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/network_interface.html.markdown b/website/docs/d/network_interface.html.markdown index 01279409d47..8f31ee854a7 100644 --- a/website/docs/d/network_interface.html.markdown +++ b/website/docs/d/network_interface.html.markdown @@ -59,16 +59,8 @@ Additionally, the following attributes are exported: * `public_dns_name` - The public DNS name. * `public_ip` - The address of the Elastic IP address bound to the network interface. -## Import - -Elastic Network Interfaces can be imported using the `id`, e.g., - -``` -$ terraform import aws_network_interface.test eni-12345 -``` - ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/network_interfaces.html.markdown b/website/docs/d/network_interfaces.html.markdown index ee8693ebf2f..1956c541c9e 100644 --- a/website/docs/d/network_interfaces.html.markdown +++ b/website/docs/d/network_interfaces.html.markdown @@ -73,6 +73,6 @@ which take the following arguments: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/prefix_list.html.markdown b/website/docs/d/prefix_list.html.markdown index b008dec0307..0d3dff923ba 100644 --- a/website/docs/d/prefix_list.html.markdown +++ b/website/docs/d/prefix_list.html.markdown @@ -84,6 +84,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/route.html.markdown b/website/docs/d/route.html.markdown index 80293b265b1..91ad7214660 100644 --- a/website/docs/d/route.html.markdown +++ b/website/docs/d/route.html.markdown @@ -63,6 +63,6 @@ All of the argument attributes are also exported as result attributes when there ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/route_table.html.markdown b/website/docs/d/route_table.html.markdown index 19872d8bdf8..fe5710aafe9 100644 --- a/website/docs/d/route_table.html.markdown +++ b/website/docs/d/route_table.html.markdown @@ -97,6 +97,6 @@ Associations are also exported with the following attributes: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/route_tables.html.markdown b/website/docs/d/route_tables.html.markdown index 43d27c39545..f5f8a8487bc 100644 --- a/website/docs/d/route_tables.html.markdown +++ b/website/docs/d/route_tables.html.markdown @@ -59,6 +59,6 @@ which take the following arguments: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/security_group.html.markdown b/website/docs/d/security_group.html.markdown index 5b16b0e2fb8..8a3ca5e4691 100644 --- a/website/docs/d/security_group.html.markdown +++ b/website/docs/d/security_group.html.markdown @@ -75,6 +75,6 @@ The following fields are also exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/security_groups.html.markdown b/website/docs/d/security_groups.html.markdown index d0f5a55d6aa..a3b69cf0a1f 100644 --- a/website/docs/d/security_groups.html.markdown +++ b/website/docs/d/security_groups.html.markdown @@ -51,6 +51,6 @@ data "aws_security_groups" "test" { ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/subnet.html.markdown b/website/docs/d/subnet.html.markdown index afdca00a969..e03f5935148 100644 --- a/website/docs/d/subnet.html.markdown +++ b/website/docs/d/subnet.html.markdown @@ -95,6 +95,6 @@ In addition to the attributes above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/subnet_ids.html.markdown b/website/docs/d/subnet_ids.html.markdown index 88a110b9c6d..4c6dedca358 100644 --- a/website/docs/d/subnet_ids.html.markdown +++ b/website/docs/d/subnet_ids.html.markdown @@ -88,6 +88,6 @@ data "aws_subnet_ids" "selected" { ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/subnets.html.markdown b/website/docs/d/subnets.html.markdown index 0985e4d0058..6ddb389108a 100644 --- a/website/docs/d/subnets.html.markdown +++ b/website/docs/d/subnets.html.markdown @@ -87,6 +87,6 @@ data "aws_subnets" "selected" { ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/vpc.html.markdown b/website/docs/d/vpc.html.markdown index 53221d45f34..79eb00c632f 100644 --- a/website/docs/d/vpc.html.markdown +++ b/website/docs/d/vpc.html.markdown @@ -93,6 +93,6 @@ The following attribute is additionally exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/vpc_dhcp_options.html.markdown b/website/docs/d/vpc_dhcp_options.html.markdown index 11cf0fc3315..01dbe00aad2 100644 --- a/website/docs/d/vpc_dhcp_options.html.markdown +++ b/website/docs/d/vpc_dhcp_options.html.markdown @@ -63,6 +63,6 @@ For more information about filtering, see the [EC2 API documentation](https://do ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/vpc_endpoint.html.markdown b/website/docs/d/vpc_endpoint.html.markdown index 1ccde32149e..501afbfb801 100644 --- a/website/docs/d/vpc_endpoint.html.markdown +++ b/website/docs/d/vpc_endpoint.html.markdown @@ -72,6 +72,6 @@ DNS blocks (for `dns_entry`) support the following attributes: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/vpc_endpoint_service.html.markdown b/website/docs/d/vpc_endpoint_service.html.markdown index db8081c4b5b..d4ffeca7e89 100644 --- a/website/docs/d/vpc_endpoint_service.html.markdown +++ b/website/docs/d/vpc_endpoint_service.html.markdown @@ -91,6 +91,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/vpc_ipam_pool.html.markdown b/website/docs/d/vpc_ipam_pool.html.markdown index 958a7c93bd5..60c649d61d7 100644 --- a/website/docs/d/vpc_ipam_pool.html.markdown +++ b/website/docs/d/vpc_ipam_pool.html.markdown @@ -76,6 +76,6 @@ The following attribute is additionally exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown b/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown index 0aed608621c..f0e8887b1fc 100644 --- a/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown +++ b/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown @@ -53,6 +53,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/vpc_peering_connection.html.markdown b/website/docs/d/vpc_peering_connection.html.markdown index 908b3b79c98..298529340eb 100644 --- a/website/docs/d/vpc_peering_connection.html.markdown +++ b/website/docs/d/vpc_peering_connection.html.markdown @@ -103,6 +103,6 @@ connection in the peer VPC over the VPC peering connection. ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/vpc_peering_connections.html.markdown b/website/docs/d/vpc_peering_connections.html.markdown index 8422563394a..b3ffd1e45ef 100644 --- a/website/docs/d/vpc_peering_connections.html.markdown +++ b/website/docs/d/vpc_peering_connections.html.markdown @@ -59,6 +59,6 @@ All of the argument attributes except `filter` are also exported as result attri ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/vpcs.html.markdown b/website/docs/d/vpcs.html.markdown index e1aee8f5480..fd8e91186ae 100644 --- a/website/docs/d/vpcs.html.markdown +++ b/website/docs/d/vpcs.html.markdown @@ -75,6 +75,6 @@ which take the following arguments: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/d/vpn_gateway.html.markdown b/website/docs/d/vpn_gateway.html.markdown index 1c9d3f66c52..3f34181a945 100644 --- a/website/docs/d/vpn_gateway.html.markdown +++ b/website/docs/d/vpn_gateway.html.markdown @@ -61,6 +61,6 @@ All of the argument attributes are also exported as result attributes. ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `read` - (Default `20m`) diff --git a/website/docs/r/account_alternate_contact.html.markdown b/website/docs/r/account_alternate_contact.html.markdown index 252d105be54..cec2a994ffd 100644 --- a/website/docs/r/account_alternate_contact.html.markdown +++ b/website/docs/r/account_alternate_contact.html.markdown @@ -41,12 +41,11 @@ No additional attributes are exported. ## Timeouts -`aws_account_alternate_contact` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `5 minutes`) -- `update` - (Default `5 minutes`) -- `delete` - (Default `5 minutes`) +- `create` - (Default `5m`) +- `update` - (Default `5m`) +- `delete` - (Default `5m`) ## Import diff --git a/website/docs/r/acm_certificate_validation.html.markdown b/website/docs/r/acm_certificate_validation.html.markdown index d9602205d6b..fe6979c2265 100644 --- a/website/docs/r/acm_certificate_validation.html.markdown +++ b/website/docs/r/acm_certificate_validation.html.markdown @@ -141,7 +141,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`acm_certificate_validation` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `75m`) How long to wait for a certificate to be issued. +- `create` - (Default `75m`) diff --git a/website/docs/r/acmpca_certificate_authority.html.markdown b/website/docs/r/acmpca_certificate_authority.html.markdown index b26cc9406dd..d60ccdd69d7 100644 --- a/website/docs/r/acmpca_certificate_authority.html.markdown +++ b/website/docs/r/acmpca_certificate_authority.html.markdown @@ -158,10 +158,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_acmpca_certificate_authority` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `1m`) How long to wait for a certificate authority to be created. +* `create` - (Default `1m`) ## Import diff --git a/website/docs/r/ami.html.markdown b/website/docs/r/ami.html.markdown index bbdf02cc940..1ac95a06bb9 100644 --- a/website/docs/r/ami.html.markdown +++ b/website/docs/r/ami.html.markdown @@ -100,14 +100,6 @@ Nested `ephemeral_block_device` blocks have the following structure: * `virtual_name` - (Required) A name for the ephemeral device, of the form "ephemeralN" where *N* is a volume number starting from zero. -### Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: - -* `create` - (Defaults to 40 mins) Used when creating the AMI -* `update` - (Defaults to 40 mins) Used when updating the AMI -* `delete` - (Defaults to 90 mins) Used when deregistering the AMI - ## Attributes Reference In addition to all arguments above, the following attributes are exported: @@ -126,6 +118,14 @@ In addition to all arguments above, the following attributes are exported: * `public` - Indicates whether the image has public launch permissions. * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +* `create` - (Default `40m`) +* `update` - (Default `40m`) +* `delete` - (Default `90m`) + ## Import `aws_ami` can be imported using the ID of the AMI, e.g., diff --git a/website/docs/r/ami_copy.html.markdown b/website/docs/r/ami_copy.html.markdown index 432de1283b1..fbb385cf961 100644 --- a/website/docs/r/ami_copy.html.markdown +++ b/website/docs/r/ami_copy.html.markdown @@ -52,14 +52,6 @@ The following arguments are supported: This resource also exposes the full set of arguments from the [`aws_ami`](ami.html) resource. -### Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: - -* `create` - (Defaults to 40 mins) Used when creating the AMI -* `update` - (Defaults to 40 mins) Used when updating the AMI -* `delete` - (Defaults to 90 mins) Used when deregistering the AMI - ## Attributes Reference In addition to all arguments above, the following attributes are exported: @@ -70,3 +62,11 @@ In addition to all arguments above, the following attributes are exported: This resource also exports a full set of attributes corresponding to the arguments of the [`aws_ami`](/docs/providers/aws/r/ami.html) resource, allowing the properties of the created AMI to be used elsewhere in the configuration. + +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +* `create` - (Default `40m`) +* `update` - (Default `40m`) +* `delete` - (Default `90m`) diff --git a/website/docs/r/ami_from_instance.html.markdown b/website/docs/r/ami_from_instance.html.markdown index 1fcad85934e..729cf175bfd 100644 --- a/website/docs/r/ami_from_instance.html.markdown +++ b/website/docs/r/ami_from_instance.html.markdown @@ -47,13 +47,13 @@ The following arguments are supported: guarantees that no filesystem writes will be underway at the time of snapshot. * `tags` - (Optional) A map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. -### Timeouts +## Timeouts -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Defaults to 40 mins) Used when creating the AMI -* `update` - (Defaults to 40 mins) Used when updating the AMI -* `delete` - (Defaults to 90 mins) Used when deregistering the AMI +* `create` - (Default `40m`) +* `update` - (Default `40m`) +* `delete` - (Default `90m`) ## Attributes Reference diff --git a/website/docs/r/apigatewayv2_domain_name.html.markdown b/website/docs/r/apigatewayv2_domain_name.html.markdown index 380ccec0ba9..b164b8a06ff 100644 --- a/website/docs/r/apigatewayv2_domain_name.html.markdown +++ b/website/docs/r/apigatewayv2_domain_name.html.markdown @@ -90,10 +90,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_apigatewayv2_domain_name` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating the domain name -- `update` - (Default `60 minutes`) Used for updating the domain name +- `create` - (Default `10m`) +- `update` - (Default `60m`) ## Import diff --git a/website/docs/r/autoscaling_group.html.markdown b/website/docs/r/autoscaling_group.html.markdown index 2e486ecb94d..3183afffbeb 100644 --- a/website/docs/r/autoscaling_group.html.markdown +++ b/website/docs/r/autoscaling_group.html.markdown @@ -686,11 +686,9 @@ care to not duplicate these hooks in `aws_autoscaling_lifecycle_hook`. ## Timeouts -`autoscaling_group` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: - -- `delete` - (Default `10 minutes`) Used for destroying ASG. +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): +- `delete` - (Default `10m`) ## Waiting for Capacity diff --git a/website/docs/r/backup_framework.html.markdown b/website/docs/r/backup_framework.html.markdown index 3fafc9bcef1..704a34301c6 100644 --- a/website/docs/r/backup_framework.html.markdown +++ b/website/docs/r/backup_framework.html.markdown @@ -100,14 +100,6 @@ For **scope** the following attributes are supported: * `compliance_resource_types` - (Optional) Describes whether the control scope includes one or more types of resources, such as EFS or RDS. * `tags` - (Optional) The tag key-value pair applied to those AWS resources that you want to trigger an evaluation for a rule. A maximum of one key-value pair can be provided. -### Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: - -* `create` - (Defaults to 2 mins) Used when creating the framework -* `update` - (Defaults to 2 mins) Used when updating the framework -* `delete` - (Defaults to 2 mins) Used when deleting the framework - ## Attributes Reference In addition to all arguments above, the following attributes are exported: @@ -119,6 +111,14 @@ In addition to all arguments above, the following attributes are exported: * `status` - A framework consists of one or more controls. Each control governs a resource, such as backup plans, backup selections, backup vaults, or recovery points. You can also turn AWS Config recording on or off for each resource. For more information refer to the [AWS documentation for Framework Status](https://docs.aws.amazon.com/aws-backup/latest/devguide/API_DescribeFramework.html#Backup-DescribeFramework-response-FrameworkStatus) * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +* `create` - (Default `2m`) +* `update` - (Default `2m`) +* `delete` - (Default `2m`) + ## Import Backup Framework can be imported using the `id` which corresponds to the name of the Backup Framework, e.g., diff --git a/website/docs/r/cloudformation_stack.html.markdown b/website/docs/r/cloudformation_stack.html.markdown index b5c65d1319b..cd71dbf7ae9 100644 --- a/website/docs/r/cloudformation_stack.html.markdown +++ b/website/docs/r/cloudformation_stack.html.markdown @@ -76,6 +76,13 @@ In addition to all arguments above, the following attributes are exported: * `outputs` - A map of outputs from the stack. * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +- `create` - (Default `30m`) +- `update` - (Default `30m`) +- `delete` - (Default `30m`) ## Import @@ -84,12 +91,3 @@ Cloudformation Stacks can be imported using the `name`, e.g., ``` $ terraform import aws_cloudformation_stack.stack networking-stack ``` - -## Timeouts - -`aws_cloudformation_stack` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: - -- `create` - (Default `30 minutes`) Used for Creating Stacks -- `update` - (Default `30 minutes`) Used for Stack modifications -- `delete` - (Default `30 minutes`) Used for destroying stacks. diff --git a/website/docs/r/cloudformation_stack_set.html.markdown b/website/docs/r/cloudformation_stack_set.html.markdown index 5b37889385f..3d3ee2ef4c8 100644 --- a/website/docs/r/cloudformation_stack_set.html.markdown +++ b/website/docs/r/cloudformation_stack_set.html.markdown @@ -123,9 +123,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_cloudformation_stack_set` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `update` - (Default `30m`) How long to wait for a StackSet to be updated. +* `update` - (Default `30m`) ## Import diff --git a/website/docs/r/cloudformation_stack_set_instance.html.markdown b/website/docs/r/cloudformation_stack_set_instance.html.markdown index 15705ae3c51..235e76755ef 100644 --- a/website/docs/r/cloudformation_stack_set_instance.html.markdown +++ b/website/docs/r/cloudformation_stack_set_instance.html.markdown @@ -119,11 +119,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_cloudformation_stack_set_instance` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `30m`) How long to wait for a Stack to be created. -* `update` - (Default `30m`) How long to wait for a Stack to be updated. -* `delete` - (Default `30m`) How long to wait for a Stack to be deleted. +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/cloudsearch_domain.html.markdown b/website/docs/r/cloudsearch_domain.html.markdown index a4c57507db9..28d648a99a8 100644 --- a/website/docs/r/cloudsearch_domain.html.markdown +++ b/website/docs/r/cloudsearch_domain.html.markdown @@ -96,12 +96,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_cloudsearch_domain` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `30 minutes`) How long to wait for the CloudSearch domain to be created. -* `update` - (Default `30 minutes`) How long to wait for the CloudSearch domain to be updated. -* `delete` - (Default `20 minutes`) How long to wait for the CloudSearch domain to be deleted. +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `20m`) ## Import diff --git a/website/docs/r/cloudsearch_domain_service_access_policy.html.markdown b/website/docs/r/cloudsearch_domain_service_access_policy.html.markdown index 8aec902dbd6..bfa307fef55 100644 --- a/website/docs/r/cloudsearch_domain_service_access_policy.html.markdown +++ b/website/docs/r/cloudsearch_domain_service_access_policy.html.markdown @@ -53,11 +53,10 @@ No additional attributes are exported. ## Timeouts -`aws_cloudsearch_domain_service_access_policy` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `update` - (Default `20 minutes`) How long to wait for the CloudSearch domain service access policy to be created or updated. -* `delete` - (Default `20 minutes`) How long to wait for the CloudSearch domain service access policy to be deleted. +* `update` - (Default `20m`) +* `delete` - (Default `20m`) ## Import diff --git a/website/docs/r/config_organization_conformance_pack.html.markdown b/website/docs/r/config_organization_conformance_pack.html.markdown index a28a068c9ce..d691bab55f3 100644 --- a/website/docs/r/config_organization_conformance_pack.html.markdown +++ b/website/docs/r/config_organization_conformance_pack.html.markdown @@ -111,12 +111,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_config_organization_conformance_pack` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating conformance pack -- `update` - (Default `10 minutes`) Used for conformance pack modifications -- `delete` - (Default `20 minutes`) Used for destroying conformance pack +- `create` - (Default `10m`) +- `update` - (Default `10m`) +- `delete` - (Default `20m`) ## Import diff --git a/website/docs/r/config_organization_custom_rule.html.markdown b/website/docs/r/config_organization_custom_rule.html.markdown index 11133c08e48..9a6520c00dc 100644 --- a/website/docs/r/config_organization_custom_rule.html.markdown +++ b/website/docs/r/config_organization_custom_rule.html.markdown @@ -66,12 +66,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_config_organization_custom_rule` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `5m`) How long to wait for the rule to be created. -* `delete` - (Default `5m`) How long to wait for the rule to be deleted. -* `update` - (Default `5m`) How long to wait for the rule to be updated. +* `create` - (Default `5m`) +* `delete` - (Default `5m`) +* `update` - (Default `5m`) ## Import diff --git a/website/docs/r/config_organization_managed_rule.html.markdown b/website/docs/r/config_organization_managed_rule.html.markdown index fe0d9fda80a..5ef4448022b 100644 --- a/website/docs/r/config_organization_managed_rule.html.markdown +++ b/website/docs/r/config_organization_managed_rule.html.markdown @@ -53,12 +53,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_config_organization_managed_rule` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `5m`) How long to wait for the rule to be created. -* `delete` - (Default `5m`) How long to wait for the rule to be deleted. -* `update` - (Default `5m`) How long to wait for the rule to be updated. +* `create` - (Default `5m`) +* `delete` - (Default `5m`) +* `update` - (Default `5m`) ## Import diff --git a/website/docs/r/connect_instance.html.markdown b/website/docs/r/connect_instance.html.markdown index 84b2d78d652..64fe6c0f961 100644 --- a/website/docs/r/connect_instance.html.markdown +++ b/website/docs/r/connect_instance.html.markdown @@ -72,12 +72,12 @@ In addition to all arguments above, the following attributes are exported: * `service_role` - The service role of the instance. * `status` - The state of the instance. -### Timeouts +## Timeouts -`aws_connect_instance` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Defaults to 5 mins) Used when creating the instance. -* `delete` - (Defaults to 5 mins) Used when deleting the instance. +* `create` - (Default `5m`) +* `delete` - (Default `5m`) ## Import diff --git a/website/docs/r/connect_vocabulary.html.markdown b/website/docs/r/connect_vocabulary.html.markdown index a7e8b0de788..8e83a4558cc 100644 --- a/website/docs/r/connect_vocabulary.html.markdown +++ b/website/docs/r/connect_vocabulary.html.markdown @@ -36,12 +36,12 @@ The following arguments are supported: * `tags` - (Optional) Tags to apply to the vocabulary. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. -### Timeouts +## Timeouts -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Defaults to 5 mins) Used when creating the vocabulary. -* `delete` - (Defaults to 100 mins) Used when deleting the vocabulary. From the [documentation on adding custom vocabularies](https://docs.aws.amazon.com/connect/latest/adminguide/add-custom-vocabulary.html), deletes can take about 90 minutes. +* `create` - (Default `5m`) +* `delete` - (Default `100m`) ## Attributes Reference diff --git a/website/docs/r/datasync_agent.html.markdown b/website/docs/r/datasync_agent.html.markdown index 119975d4430..c4919845514 100644 --- a/website/docs/r/datasync_agent.html.markdown +++ b/website/docs/r/datasync_agent.html.markdown @@ -71,9 +71,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_datasync_agent` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `10m`) How long to wait for agent activation and connection to DataSync. +* `create` - (Default `10m`) ## Import diff --git a/website/docs/r/datasync_task.html.markdown b/website/docs/r/datasync_task.html.markdown index 500c055911b..bdc5794e53d 100644 --- a/website/docs/r/datasync_task.html.markdown +++ b/website/docs/r/datasync_task.html.markdown @@ -116,9 +116,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_datasync_task` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `5m`) How long to wait for DataSync Task availability. +* `create` - (Default `5m`) ## Import diff --git a/website/docs/r/dax_cluster.html.markdown b/website/docs/r/dax_cluster.html.markdown index c11a890b0f1..ce5f2de2ddb 100644 --- a/website/docs/r/dax_cluster.html.markdown +++ b/website/docs/r/dax_cluster.html.markdown @@ -95,12 +95,11 @@ consisting of a DNS name and a port number ## Timeouts -`aws_dax_cluster` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `45 minutes`) Used for creating a DAX cluster -- `update` - (Default `45 minutes`) Used for cluster modifications -- `delete` - (Default `90 minutes`) Used for destroying a DAX cluster +- `create` - (Default `45m`) +- `update` - (Default `45m`) +- `delete` - (Default `90m`) ## Import diff --git a/website/docs/r/db_cluster_snapshot.html.markdown b/website/docs/r/db_cluster_snapshot.html.markdown index 400fbb961aa..b492c3744e3 100644 --- a/website/docs/r/db_cluster_snapshot.html.markdown +++ b/website/docs/r/db_cluster_snapshot.html.markdown @@ -47,9 +47,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_db_cluster_snapshot` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `20m`) How long to wait for the snapshot to be available. +* `create` - (Default `20m`) ## Import diff --git a/website/docs/r/db_event_subscription.html.markdown b/website/docs/r/db_event_subscription.html.markdown index 5d0ad13bc75..acc2e1c29ff 100644 --- a/website/docs/r/db_event_subscription.html.markdown +++ b/website/docs/r/db_event_subscription.html.markdown @@ -75,12 +75,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_db_event_subscription` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `40m`) How long to wait for an RDS event notification subscription to be ready. -- `delete` - (Default `40m`) How long to wait for an RDS event notification subscription to be deleted. -- `update` - (Default `40m`) How long to wait for an RDS event notification subscription to be updated. +- `create` - (Default `40m`) +- `delete` - (Default `40m`) +- `update` - (Default `40m`) ## Import diff --git a/website/docs/r/db_instance.html.markdown b/website/docs/r/db_instance.html.markdown index 3c55281f05d..87f7c44a064 100644 --- a/website/docs/r/db_instance.html.markdown +++ b/website/docs/r/db_instance.html.markdown @@ -254,17 +254,6 @@ resource "aws_db_instance" "db" { This will not recreate the resource if the S3 object changes in some way. It's only used to initialize the database -### Timeouts - -`aws_db_instance` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: - -- `create` - (Default `40 minutes`) Used for Creating Instances, Replicas, and -restoring from Snapshots. -- `update` - (Default `80 minutes`) Used for Database modifications. -- `delete` - (Default `60 minutes`) Used for destroying databases. This includes -the time required to take snapshots. - [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.Replication.html [2]: @@ -307,6 +296,14 @@ On Oracle and Microsoft SQL instances the following is exported additionally: * `character_set_name` - The character set (collation) used on Oracle and Microsoft SQL instances. +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +- `create` - (Default `40m`) +- `update` - (Default `80m`) +- `delete` - (Default `60m`) + ## Import DB Instances can be imported using the `identifier`, e.g., diff --git a/website/docs/r/db_instance_automated_backups_replication.markdown b/website/docs/r/db_instance_automated_backups_replication.markdown index 3c7b913b527..ef762c55ff3 100644 --- a/website/docs/r/db_instance_automated_backups_replication.markdown +++ b/website/docs/r/db_instance_automated_backups_replication.markdown @@ -89,11 +89,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_db_instance_automated_backups_replication` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `75m`) How long to wait before RDS successfully starts replication of automated backups to a different AWS Region. -- `delete` - (Default `75m`) How long to wait before RDS stops automated backup replication for a DB instance. +- `create` - (Default `75m`) +- `delete` - (Default `75m`) ## Import diff --git a/website/docs/r/db_option_group.html.markdown b/website/docs/r/db_option_group.html.markdown index 2146158484a..f4f68d1cb2b 100644 --- a/website/docs/r/db_option_group.html.markdown +++ b/website/docs/r/db_option_group.html.markdown @@ -94,10 +94,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_db_option_group` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `delete` - (Default `15 minutes`) +- `delete` - (Default `15m`) ## Import diff --git a/website/docs/r/db_proxy.html.markdown b/website/docs/r/db_proxy.html.markdown index a015a20ee42..85b5ee8e797 100644 --- a/website/docs/r/db_proxy.html.markdown +++ b/website/docs/r/db_proxy.html.markdown @@ -69,13 +69,13 @@ In addition to all arguments above, the following attributes are exported: * `endpoint` - The endpoint that you can use to connect to the proxy. You include the endpoint value in the connection string for a database client application. * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). -### Timeouts +## Timeouts -`aws_db_proxy` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `30 minutes`) Used for creating DB proxies. -- `update` - (Default `30 minutes`) Used for modifying DB proxies. -- `delete` - (Default `60 minutes`) Used for destroying DB proxies. +- `create` - (Default `30m`) +- `update` - (Default `30m`) +- `delete` - (Default `60m`) ## Import diff --git a/website/docs/r/db_proxy_default_target_group.html.markdown b/website/docs/r/db_proxy_default_target_group.html.markdown index 8bb4921db4c..703da7ec135 100644 --- a/website/docs/r/db_proxy_default_target_group.html.markdown +++ b/website/docs/r/db_proxy_default_target_group.html.markdown @@ -74,12 +74,12 @@ In addition to all arguments above, the following attributes are exported: * `arn` - The Amazon Resource Name (ARN) representing the target group. * `name` - The name of the default target group. -### Timeouts +## Timeouts -`aws_db_proxy_default_target_group` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `30 minutes`) Timeout for modifying DB proxy target group on creation. -- `update` - (Default `30 minutes`) Timeout for modifying DB proxy target group on update. +- `create` - (Default `30m`) +- `update` - (Default `30m`) ## Import diff --git a/website/docs/r/db_proxy_endpoint.html.markdown b/website/docs/r/db_proxy_endpoint.html.markdown index 9de4fd97d84..10c3f39f998 100644 --- a/website/docs/r/db_proxy_endpoint.html.markdown +++ b/website/docs/r/db_proxy_endpoint.html.markdown @@ -42,13 +42,13 @@ In addition to all arguments above, the following attributes are exported: * `is_default` - Indicates whether this endpoint is the default endpoint for the associated DB proxy. * `vpc_id` - The VPC ID of the DB proxy endpoint. -### Timeouts +## Timeouts -`aws_db_proxy_endpoint` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `30 minutes`) Used for creating DB proxy endpoint. -- `update` - (Default `30 minutes`) Used for modifying DB proxy endpoint. -- `delete` - (Default `60 minutes`) Used for destroying DB proxy endpoint. +- `create` - (Default `30m`) +- `update` - (Default `30m`) +- `delete` - (Default `60m`) ## Import diff --git a/website/docs/r/db_snapshot.html.markdown b/website/docs/r/db_snapshot.html.markdown index 3e088e4f7c3..f69fa6e33d0 100644 --- a/website/docs/r/db_snapshot.html.markdown +++ b/website/docs/r/db_snapshot.html.markdown @@ -65,9 +65,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_db_snapshot` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `read` - (Default `20 minutes`) Length of time to wait for the snapshot to become available +- `read` - (Default `20m`) ## Import diff --git a/website/docs/r/db_snapshot_copy.html.markdown b/website/docs/r/db_snapshot_copy.html.markdown index c22ab17a9d7..d4eec128c58 100644 --- a/website/docs/r/db_snapshot_copy.html.markdown +++ b/website/docs/r/db_snapshot_copy.html.markdown @@ -76,9 +76,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_db_snapshot_copy` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `20 minutes`) Length of time to wait for the snapshot to become available +- `create` - (Default `20m`) ## Import diff --git a/website/docs/r/default_route_table.html.markdown b/website/docs/r/default_route_table.html.markdown index 53cf0c24fab..4039791199c 100644 --- a/website/docs/r/default_route_table.html.markdown +++ b/website/docs/r/default_route_table.html.markdown @@ -100,10 +100,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_default_route_table` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `2 minutes`) Used for route creation -- `update` - (Default `2 minutes`) Used for route creation +- `create` - (Default `2m`) +- `update` - (Default `2m`) ## Import diff --git a/website/docs/r/dms_event_subscription.html.markdown b/website/docs/r/dms_event_subscription.html.markdown index bcd062275db..dc4e0532cf6 100644 --- a/website/docs/r/dms_event_subscription.html.markdown +++ b/website/docs/r/dms_event_subscription.html.markdown @@ -48,11 +48,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_dms_event_subscription` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10m`) Used for creating event subscriptions. -- `update` - (Default `10m`) Used for event subscription modifications. -- `delete` - (Default `10m`) Used for destroying event descriptions. +- `create` - (Default `10m`) +- `update` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/dms_replication_instance.html.markdown b/website/docs/r/dms_replication_instance.html.markdown index e6e8f22bfb1..efc5adbcc0e 100644 --- a/website/docs/r/dms_replication_instance.html.markdown +++ b/website/docs/r/dms_replication_instance.html.markdown @@ -136,12 +136,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_dms_replication_instance` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `30 minutes`) Used for Creating Instances -- `update` - (Default `30 minutes`) Used for Database modifications -- `delete` - (Default `30 minutes`) Used for destroying databases. +- `create` - (Default `30m`) +- `update` - (Default `30m`) +- `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/docdb_cluster.html.markdown b/website/docs/r/docdb_cluster.html.markdown index 2ffb8e9de8d..bf9bda242f8 100644 --- a/website/docs/r/docdb_cluster.html.markdown +++ b/website/docs/r/docdb_cluster.html.markdown @@ -91,12 +91,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_docdb_cluster` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `120 minutes`) Used for Cluster creation -- `update` - (Default `120 minutes`) Used for Cluster modifications -- `delete` - (Default `120 minutes`) Used for destroying cluster. This includes +- `create` - (Default `120m`) +- `update` - (Default `120m`) +- `delete` - (Default `120m`) any cleanup task during the destroying process. ## Import diff --git a/website/docs/r/docdb_cluster_instance.html.markdown b/website/docs/r/docdb_cluster_instance.html.markdown index f751f8e5869..a59f226825b 100644 --- a/website/docs/r/docdb_cluster_instance.html.markdown +++ b/website/docs/r/docdb_cluster_instance.html.markdown @@ -94,13 +94,12 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_docdb_cluster_instance` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `90 minutes`) Used for Creating Instances, Replicas, and +- `create` - (Default `90m`) restoring from Snapshots -- `update` - (Default `90 minutes`) Used for Database modifications -- `delete` - (Default `90 minutes`) Used for destroying databases. This includes +- `update` - (Default `90m`) +- `delete` - (Default `90m`) the time required to take snapshots ## Import diff --git a/website/docs/r/docdb_cluster_snapshot.html.markdown b/website/docs/r/docdb_cluster_snapshot.html.markdown index cc6684bd34e..4f883e52253 100644 --- a/website/docs/r/docdb_cluster_snapshot.html.markdown +++ b/website/docs/r/docdb_cluster_snapshot.html.markdown @@ -43,9 +43,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_docdb_cluster_snapshot` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `20m`) How long to wait for the snapshot to be available. +* `create` - (Default `20m`) ## Import diff --git a/website/docs/r/docdb_event_subscription.html.markdown b/website/docs/r/docdb_event_subscription.html.markdown index 5f5d79731fc..1eae4ee73f1 100644 --- a/website/docs/r/docdb_event_subscription.html.markdown +++ b/website/docs/r/docdb_event_subscription.html.markdown @@ -59,12 +59,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_docdb_event_subscription` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `40m`) How long to wait for an DocDB event notification subscription to be ready. -- `delete` - (Default `40m`) How long to wait for an DocDB event notification subscription to be deleted. -- `update` - (Default `40m`) How long to wait for an DocDB event notification subscription to be updated. +- `create` - (Default `40m`) +- `delete` - (Default `40m`) +- `update` - (Default `40m`) ## Import diff --git a/website/docs/r/docdb_global_cluster.html.markdown b/website/docs/r/docdb_global_cluster.html.markdown index b34c7951b73..705ec9b8469 100644 --- a/website/docs/r/docdb_global_cluster.html.markdown +++ b/website/docs/r/docdb_global_cluster.html.markdown @@ -113,14 +113,6 @@ The following arguments are supported: * `source_db_cluster_identifier` - (Optional) Amazon Resource Name (ARN) to use as the primary DB Cluster of the Global Cluster on creation. Terraform cannot perform drift detection of this value. * `storage_encrypted` - (Optional, Forces new resources) Specifies whether the DB cluster is encrypted. The default is `false` unless `source_db_cluster_identifier` is specified and encrypted. Terraform will only perform drift detection if a configuration value is provided. -### Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: - -* `create` - (Defaults to 5 mins) Used when creating the Global Cluster -* `update` - (Defaults to 5 mins) Used when updating the Global Cluster members (time is per member) -* `delete` - (Defaults to 5 mins) Used when deleting the Global Cluster members (time is per member) - ## Attributes Reference In addition to all arguments above, the following attributes are exported: @@ -132,6 +124,14 @@ In addition to all arguments above, the following attributes are exported: * `global_cluster_resource_id` - AWS Region-unique, immutable identifier for the global database cluster. This identifier is found in AWS CloudTrail log entries whenever the AWS KMS key for the DB cluster is accessed. * `id` - DocDB Global Cluster. +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +* `create` - (Default `5m`) +* `update` - (Default `5m`) +* `delete` - (Default `5m`) + ## Import `aws_docdb_global_cluster` can be imported by using the Global Cluster identifier, e.g. diff --git a/website/docs/r/dx_bgp_peer.html.markdown b/website/docs/r/dx_bgp_peer.html.markdown index cb0c0add701..be8692ea37c 100644 --- a/website/docs/r/dx_bgp_peer.html.markdown +++ b/website/docs/r/dx_bgp_peer.html.markdown @@ -44,8 +44,7 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_dx_bgp_peer` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating BGP peer -- `delete` - (Default `10 minutes`) Used for destroying BGP peer +- `create` - (Default `10m`) +- `delete` - (Default `10m`) diff --git a/website/docs/r/dx_gateway.html.markdown b/website/docs/r/dx_gateway.html.markdown index 0e883eb4d79..b21bb82e0e6 100644 --- a/website/docs/r/dx_gateway.html.markdown +++ b/website/docs/r/dx_gateway.html.markdown @@ -35,11 +35,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_dx_gateway` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating the gateway -- `delete` - (Default `10 minutes`) Used for destroying the gateway +- `create` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/dx_gateway_association.html.markdown b/website/docs/r/dx_gateway_association.html.markdown index 35a3b7385b0..a8a44109c13 100644 --- a/website/docs/r/dx_gateway_association.html.markdown +++ b/website/docs/r/dx_gateway_association.html.markdown @@ -115,12 +115,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_dx_gateway_association` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `30 minutes`) Used for creating the association -- `update` - (Default `30 minutes`) Used for updating the association -- `delete` - (Default `30 minutes`) Used for destroying the association +- `create` - (Default `30m`) +- `update` - (Default `30m`) +- `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/dx_hosted_private_virtual_interface.html.markdown b/website/docs/r/dx_hosted_private_virtual_interface.html.markdown index 4e2c25611d2..5cfbf5f04c7 100644 --- a/website/docs/r/dx_hosted_private_virtual_interface.html.markdown +++ b/website/docs/r/dx_hosted_private_virtual_interface.html.markdown @@ -50,12 +50,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_dx_hosted_private_virtual_interface` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating virtual interface -- `update` - (Default `10 minutes`) Used for virtual interface modifications -- `delete` - (Default `10 minutes`) Used for destroying virtual interface +- `create` - (Default `10m`) +- `update` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/dx_hosted_private_virtual_interface_accepter.html.markdown b/website/docs/r/dx_hosted_private_virtual_interface_accepter.html.markdown index c22f40e4a3e..f60e5fa7ed4 100644 --- a/website/docs/r/dx_hosted_private_virtual_interface_accepter.html.markdown +++ b/website/docs/r/dx_hosted_private_virtual_interface_accepter.html.markdown @@ -86,11 +86,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_dx_hosted_private_virtual_interface_accepter` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating virtual interface -- `delete` - (Default `10 minutes`) Used for destroying virtual interface +- `create` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/dx_hosted_public_virtual_interface.html.markdown b/website/docs/r/dx_hosted_public_virtual_interface.html.markdown index ce4d6c38ee7..f20f86f8432 100644 --- a/website/docs/r/dx_hosted_public_virtual_interface.html.markdown +++ b/website/docs/r/dx_hosted_public_virtual_interface.html.markdown @@ -57,11 +57,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_dx_hosted_public_virtual_interface` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating virtual interface -- `delete` - (Default `10 minutes`) Used for destroying virtual interface +- `create` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/dx_hosted_public_virtual_interface_accepter.html.markdown b/website/docs/r/dx_hosted_public_virtual_interface_accepter.html.markdown index a98438264b3..9133bb0126a 100644 --- a/website/docs/r/dx_hosted_public_virtual_interface_accepter.html.markdown +++ b/website/docs/r/dx_hosted_public_virtual_interface_accepter.html.markdown @@ -84,11 +84,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_dx_hosted_public_virtual_interface_accepter` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating virtual interface -- `delete` - (Default `10 minutes`) Used for destroying virtual interface +- `create` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/dx_hosted_transit_virtual_interface.html.markdown b/website/docs/r/dx_hosted_transit_virtual_interface.html.markdown index 6ece272de93..ee08406c6a5 100644 --- a/website/docs/r/dx_hosted_transit_virtual_interface.html.markdown +++ b/website/docs/r/dx_hosted_transit_virtual_interface.html.markdown @@ -51,12 +51,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_dx_hosted_transit_virtual_interface` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating virtual interface -- `update` - (Default `10 minutes`) Used for virtual interface modifications -- `delete` - (Default `10 minutes`) Used for destroying virtual interface +- `create` - (Default `10m`) +- `update` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/dx_hosted_transit_virtual_interface_accepter.html.markdown b/website/docs/r/dx_hosted_transit_virtual_interface_accepter.html.markdown index dbbeb3fc16e..aa7afd62a65 100644 --- a/website/docs/r/dx_hosted_transit_virtual_interface_accepter.html.markdown +++ b/website/docs/r/dx_hosted_transit_virtual_interface_accepter.html.markdown @@ -82,11 +82,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_dx_hosted_transit_virtual_interface_accepter` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating virtual interface -- `delete` - (Default `10 minutes`) Used for destroying virtual interface +- `create` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/dx_private_virtual_interface.html.markdown b/website/docs/r/dx_private_virtual_interface.html.markdown index 02156bd1ceb..ea1279fdb93 100644 --- a/website/docs/r/dx_private_virtual_interface.html.markdown +++ b/website/docs/r/dx_private_virtual_interface.html.markdown @@ -53,12 +53,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_dx_private_virtual_interface` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating virtual interface -- `update` - (Default `10 minutes`) Used for virtual interface modifications -- `delete` - (Default `10 minutes`) Used for destroying virtual interface +- `create` - (Default `10m`) +- `update` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/dx_public_virtual_interface.html.markdown b/website/docs/r/dx_public_virtual_interface.html.markdown index 085c99d5ea9..0701bca18cf 100644 --- a/website/docs/r/dx_public_virtual_interface.html.markdown +++ b/website/docs/r/dx_public_virtual_interface.html.markdown @@ -57,11 +57,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_dx_public_virtual_interface` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating virtual interface -- `delete` - (Default `10 minutes`) Used for destroying virtual interface +- `create` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/dx_transit_virtual_interface.html.markdown b/website/docs/r/dx_transit_virtual_interface.html.markdown index 97e4d340280..82c011ad041 100644 --- a/website/docs/r/dx_transit_virtual_interface.html.markdown +++ b/website/docs/r/dx_transit_virtual_interface.html.markdown @@ -59,12 +59,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_dx_transit_virtual_interface` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating virtual interface -- `update` - (Default `10 minutes`) Used for virtual interface modifications -- `delete` - (Default `10 minutes`) Used for destroying virtual interface +- `create` - (Default `10m`) +- `update` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/dynamodb_table.html.markdown b/website/docs/r/dynamodb_table.html.markdown index 343644a4b58..4ed774f1413 100644 --- a/website/docs/r/dynamodb_table.html.markdown +++ b/website/docs/r/dynamodb_table.html.markdown @@ -246,11 +246,11 @@ In addition to all arguments above, the following attributes are exported: ~> **Note:** There are a variety of default timeouts set internally. If you set a shorter custom timeout than one of the defaults, the custom timeout will not be respected as the longer of the custom or internal default will be used. -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Defaults to 30 mins) Used when creating the table -* `update` - (Defaults to 60 mins) Used when updating the table configuration and reset for each individual Global Secondary Index and Replica update -* `delete` - (Defaults to 10 mins) Used when deleting the table +* `create` - (Default `30m`) +* `update` - (Default `60m`) +* `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/ebs_snapshot.html.markdown b/website/docs/r/ebs_snapshot.html.markdown index bec16c296e6..4ce6288bc18 100644 --- a/website/docs/r/ebs_snapshot.html.markdown +++ b/website/docs/r/ebs_snapshot.html.markdown @@ -43,14 +43,6 @@ The following arguments are supported: * `temporary_restore_days` - (Optional) Specifies the number of days for which to temporarily restore an archived snapshot. Required for temporary restores only. The snapshot will be automatically re-archived after this period. * `tags` - (Optional) A map of tags to assign to the snapshot. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. -### Timeouts - -`aws_ebs_snapshot` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: - -- `create` - (Default `10 minutes`) Used for creating the ebs snapshot -- `delete` - (Default `10 minutes`) Used for deleting the ebs snapshot - ## Attributes Reference In addition to all arguments above, the following attributes are exported: @@ -65,6 +57,13 @@ In addition to all arguments above, the following attributes are exported: * `data_encryption_key_id` - The data encryption key identifier for the snapshot. * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +- `create` - (Default `10m`) +- `delete` - (Default `10m`) + ## Import EBS Snapshot can be imported using the `id`, e.g., diff --git a/website/docs/r/ebs_snapshot_copy.html.markdown b/website/docs/r/ebs_snapshot_copy.html.markdown index c9cb2deb384..e53e6e9f9de 100644 --- a/website/docs/r/ebs_snapshot_copy.html.markdown +++ b/website/docs/r/ebs_snapshot_copy.html.markdown @@ -54,14 +54,6 @@ The following arguments are supported: * `temporary_restore_days` - (Optional) Specifies the number of days for which to temporarily restore an archived snapshot. Required for temporary restores only. The snapshot will be automatically re-archived after this period. * `tags` - A map of tags for the snapshot. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. -### Timeouts - -`aws_ebs_snapshot_copy` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: - -- `create` - (Default `10 minutes`) Used for creating the ebs snapshot copy -- `delete` - (Default `10 minutes`) Used for deleting the ebs snapshot copy - ## Attributes Reference In addition to all arguments above, the following attributes are exported: @@ -73,3 +65,10 @@ In addition to all arguments above, the following attributes are exported: * `volume_size` - The size of the drive in GiBs. * `data_encryption_key_id` - The data encryption key identifier for the snapshot. * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +- `create` - (Default `10m`) +- `delete` - (Default `10m`) diff --git a/website/docs/r/ebs_snapshot_import.html.markdown b/website/docs/r/ebs_snapshot_import.html.markdown index b6963558bad..21afb0d71d8 100644 --- a/website/docs/r/ebs_snapshot_import.html.markdown +++ b/website/docs/r/ebs_snapshot_import.html.markdown @@ -65,13 +65,12 @@ The following arguments are supported: * `s3_bucket` - The name of the Amazon S3 bucket where the disk image is located. * `s3_key` - The file name of the disk image. -### Timeouts +## Timeouts -`aws_ebs_snapshot_import` provides the following -[Timeouts](/docs/configuration/resources.html#timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `60 minutes`) Used for importing the EBS snapshot -- `delete` - (Default `10 minutes`) Used for deleting the EBS snapshot +- `create` - (Default `60m`) +- `delete` - (Default `10m`) ## Attributes Reference diff --git a/website/docs/r/ebs_volume.html.markdown b/website/docs/r/ebs_volume.html.markdown index 48f7d202d9f..ef1993e11f7 100644 --- a/website/docs/r/ebs_volume.html.markdown +++ b/website/docs/r/ebs_volume.html.markdown @@ -54,11 +54,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_ebs_volume` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `5 minutes`) Used for creating volumes. This includes the time required for the volume to become available -- `update` - (Default `5 minutes`) Used for `size`, `type`, or `iops` volume changes -- `delete` - (Default `5 minutes`) Used for destroying volumes +- `create` - (Default `5m`) +- `update` - (Default `5m`) +- `delete` - (Default `5m`) ## Import diff --git a/website/docs/r/ec2_client_vpn_authorization_rule.html.markdown b/website/docs/r/ec2_client_vpn_authorization_rule.html.markdown index faa5f5ce763..b1d170af225 100644 --- a/website/docs/r/ec2_client_vpn_authorization_rule.html.markdown +++ b/website/docs/r/ec2_client_vpn_authorization_rule.html.markdown @@ -37,10 +37,10 @@ No additional attributes are exported. ## Timeouts -`aws_ec2_client_vpn_authorization_rule` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for rule authorization -- `delete` - (Default `10 minutes`) Used for rule revocation +- `create` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/ec2_client_vpn_network_association.html.markdown b/website/docs/r/ec2_client_vpn_network_association.html.markdown index 2bac51e86b3..5d594f0d357 100644 --- a/website/docs/r/ec2_client_vpn_network_association.html.markdown +++ b/website/docs/r/ec2_client_vpn_network_association.html.markdown @@ -53,10 +53,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_ec2_client_vpn_network_association` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `30 minutes`) Used for network association -- `delete` - (Default `30 minutes`) Used for network disassociation +- `create` - (Default `30m`) +- `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/ec2_client_vpn_route.html.markdown b/website/docs/r/ec2_client_vpn_route.html.markdown index 936caa9491b..9e4da2120d6 100644 --- a/website/docs/r/ec2_client_vpn_route.html.markdown +++ b/website/docs/r/ec2_client_vpn_route.html.markdown @@ -60,10 +60,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_ec2_client_vpn_route` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `1 minute`) Used for route creation -- `delete` - (Default `1 minute`) Used for route deletion +- `create` - (Default `1m`) +- `delete` - (Default `1m`) ## Import diff --git a/website/docs/r/ec2_fleet.html.markdown b/website/docs/r/ec2_fleet.html.markdown index c9bc7a7a38e..f9d086d3acb 100644 --- a/website/docs/r/ec2_fleet.html.markdown +++ b/website/docs/r/ec2_fleet.html.markdown @@ -229,11 +229,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_ec2_fleet` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `10m`) How long to wait for a fleet to be active. -* `update` - (Default `10m`) How long to wait for a fleet to be modified. -* `delete` - (Default `10m`) How long to wait for a fleet to be deleted. If `terminate_instances` is `true`, how long to wait for instances to terminate. +* `create` - (Default `10m`) +* `update` - (Default `10m`) +* `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/ec2_transit_gateway.html.markdown b/website/docs/r/ec2_transit_gateway.html.markdown index d0ee6b20b06..7373c6ba286 100644 --- a/website/docs/r/ec2_transit_gateway.html.markdown +++ b/website/docs/r/ec2_transit_gateway.html.markdown @@ -46,11 +46,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_ec2_transit_gateway` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for EC2 Transit Gateway creation -- `update` - (Default `10 minutes`) Used for EC2 Transit Gateway updates -- `delete` - (Default `10 minutes`) Used for EC2 Transit Gateway deletion +- `create` - (Default `10m`) +- `update` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/ec2_transit_gateway_connect.html.markdown b/website/docs/r/ec2_transit_gateway_connect.html.markdown index 4696e80bb4f..33f73bebe22 100644 --- a/website/docs/r/ec2_transit_gateway_connect.html.markdown +++ b/website/docs/r/ec2_transit_gateway_connect.html.markdown @@ -45,11 +45,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_ec2_transit_gateway_connect` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for EC2 Transit Gateway Connect creation -- `update` - (Default `10 minutes`) Used for EC2 Transit Gateway Connect update -- `delete` - (Default `10 minutes`) Used for EC2 Transit Gateway Connect deletion +- `create` - (Default `10m`) +- `update` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/ec2_transit_gateway_connect_peer.html.markdown b/website/docs/r/ec2_transit_gateway_connect_peer.html.markdown index f8bcfc76da6..4f259c2307f 100644 --- a/website/docs/r/ec2_transit_gateway_connect_peer.html.markdown +++ b/website/docs/r/ec2_transit_gateway_connect_peer.html.markdown @@ -46,10 +46,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_ec2_transit_gateway_connect_peer` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for EC2 Transit Gateway Connect Peer creation -- `delete` - (Default `10 minutes`) Used for EC2 Transit Gateway Connect Peer deletion +- `create` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/ec2_transit_gateway_multicast_domain.html.markdown b/website/docs/r/ec2_transit_gateway_multicast_domain.html.markdown index abc15a6e6db..b2b7eee6176 100644 --- a/website/docs/r/ec2_transit_gateway_multicast_domain.html.markdown +++ b/website/docs/r/ec2_transit_gateway_multicast_domain.html.markdown @@ -164,10 +164,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_ec2_transit_gateway_multicast_domain` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for multicast domain creation -- `delete` - (Default `10 minutes`) Used for multicast domain deletion +- `create` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/ec2_transit_gateway_multicast_domain_association.html.markdown b/website/docs/r/ec2_transit_gateway_multicast_domain_association.html.markdown index 0a4dc717bcc..6c9fb2028e5 100644 --- a/website/docs/r/ec2_transit_gateway_multicast_domain_association.html.markdown +++ b/website/docs/r/ec2_transit_gateway_multicast_domain_association.html.markdown @@ -50,7 +50,7 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_ec2_transit_gateway_multicast_domain_association` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for multicast domain association creation -- `delete` - (Default `10 minutes`) Used for multicast domain association deletion +- `create` - (Default `10m`) +- `delete` - (Default `10m`) diff --git a/website/docs/r/ecr_repository.html.markdown b/website/docs/r/ecr_repository.html.markdown index cee10dbe775..4fb37ca77de 100644 --- a/website/docs/r/ecr_repository.html.markdown +++ b/website/docs/r/ecr_repository.html.markdown @@ -52,10 +52,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_ecr_repository` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `delete` - (Default `20 minutes`) How long to wait for a repository to be deleted. +- `delete` - (Default `20m`) ## Import diff --git a/website/docs/r/ecrpublic_repository.html.markdown b/website/docs/r/ecrpublic_repository.html.markdown index 7d7f07e80ac..8de45a009d3 100644 --- a/website/docs/r/ecrpublic_repository.html.markdown +++ b/website/docs/r/ecrpublic_repository.html.markdown @@ -69,10 +69,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_ecrpublic_repository` provides the following [Timeouts](/docs/configuration/resources.html#timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `delete` - (Default `20 minutes`) How long to wait for a repository to be deleted. +- `delete` - (Default `20m`) ## Import diff --git a/website/docs/r/ecs_service.html.markdown b/website/docs/r/ecs_service.html.markdown index 0e670fa099f..fa58d251eff 100644 --- a/website/docs/r/ecs_service.html.markdown +++ b/website/docs/r/ecs_service.html.markdown @@ -201,11 +201,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_ecs_service` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `20 minutes`) -- `update` - (Default `20 minutes`) -- `delete` - (Default `20 minutes`) +- `create` - (Default `20m`) +- `update` - (Default `20m`) +- `delete` - (Default `20m`) ## Import diff --git a/website/docs/r/efs_replication_configuration.html.markdown b/website/docs/r/efs_replication_configuration.html.markdown index 70a528795bf..5cf57be2404 100644 --- a/website/docs/r/efs_replication_configuration.html.markdown +++ b/website/docs/r/efs_replication_configuration.html.markdown @@ -68,12 +68,12 @@ In addition to all arguments above, the following attributes are exported: * `destination[0].file_system_id` - The fs ID of the replica. * `destination[0].status` - The status of the replication. -### Timeouts +## Timeouts -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `10 minutes`) Used when creating the replication configuration. -* `delete` - (Default `20 minutes`) Used when deleting the replication configuration. +* `create` - (Default `10m`) +* `delete` - (Default `20m`) ## Import diff --git a/website/docs/r/eip.html.markdown b/website/docs/r/eip.html.markdown index 5b03d1d065e..3f88f9c32c5 100644 --- a/website/docs/r/eip.html.markdown +++ b/website/docs/r/eip.html.markdown @@ -132,11 +132,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_eip` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `read` - (Default `15 minutes`) How long to wait querying for information about EIPs. -- `update` - (Default `5 minutes`) How long to wait for an EIP to be updated. -- `delete` - (Default `3 minutes`) How long to wait for an EIP to be deleted. +- `read` - (Default `15m`) +- `update` - (Default `5m`) +- `delete` - (Default `3m`) ## Import diff --git a/website/docs/r/eks_cluster.html.markdown b/website/docs/r/eks_cluster.html.markdown index ea19413f32a..5f3bf65ffb1 100644 --- a/website/docs/r/eks_cluster.html.markdown +++ b/website/docs/r/eks_cluster.html.markdown @@ -237,13 +237,12 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_eks_cluster` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `30 minutes`) How long to wait for the EKS Cluster to be created. -* `update` - (Default `60 minutes`) How long to wait for the EKS Cluster to be updated. +* `create` - (Default `30m`) +* `update` - (Default `60m`) Note that the `update` timeout is used separately for both `version` and `vpc_config` update timeouts. -* `delete` - (Default `15 minutes`) How long to wait for the EKS Cluster to be deleted. +* `delete` - (Default `15m`) ## Import diff --git a/website/docs/r/eks_fargate_profile.html.markdown b/website/docs/r/eks_fargate_profile.html.markdown index 13c8686ed03..c707a42d387 100644 --- a/website/docs/r/eks_fargate_profile.html.markdown +++ b/website/docs/r/eks_fargate_profile.html.markdown @@ -84,10 +84,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_eks_fargate_profile` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `10 minutes`) How long to wait for the EKS Fargate Profile to be created. -* `delete` - (Default `10 minutes`) How long to wait for the EKS Fargate Profile to be deleted. +* `create` - (Default `10m`) +* `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/eks_identity_provider_config.html.markdown b/website/docs/r/eks_identity_provider_config.html.markdown index d5792e74186..4fb79932e42 100644 --- a/website/docs/r/eks_identity_provider_config.html.markdown +++ b/website/docs/r/eks_identity_provider_config.html.markdown @@ -54,10 +54,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_eks_identity_provider_config` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `40 minutes`) How long to wait for the EKS Identity Provider Configuration to be associated. -* `delete` - (Default `40 minutes`) How long to wait for the EKS Identity Provider Configuration to be disassociated. +* `create` - (Default `40m`) +* `delete` - (Default `40m`) ## Import diff --git a/website/docs/r/eks_node_group.html.markdown b/website/docs/r/eks_node_group.html.markdown index 892b67f8ae2..7069782f41f 100644 --- a/website/docs/r/eks_node_group.html.markdown +++ b/website/docs/r/eks_node_group.html.markdown @@ -188,12 +188,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_eks_node_group` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `60 minutes`) How long to wait for the EKS Node Group to be created. -* `update` - (Default `60 minutes`) How long to wait for the EKS Node Group to be updated. Note that the `update` timeout is used separately for both configuration and version update operations. -* `delete` - (Default `60 minutes`) How long to wait for the EKS Node Group to be deleted. +* `create` - (Default `60m`) +* `update` - (Default `60m`) +* `delete` - (Default `60m`) ## Import diff --git a/website/docs/r/elasticache_replication_group.html.markdown b/website/docs/r/elasticache_replication_group.html.markdown index d44486cfd97..42f9a48a642 100644 --- a/website/docs/r/elasticache_replication_group.html.markdown +++ b/website/docs/r/elasticache_replication_group.html.markdown @@ -242,12 +242,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_elasticache_replication_group` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `60m`) How long to wait for a replication group to be created. -* `delete` - (Default `40m`) How long to wait for a replication group to be deleted. -* `update` - (Default `40m`) How long to wait for replication group settings to be updated. This is also separately used for adding/removing replicas and online resize operation completion, if necessary. +* `create` - (Default `60m`) +* `delete` - (Default `40m`) +* `update` - (Default `40m`) ## Import diff --git a/website/docs/r/elasticsearch_domain.html.markdown b/website/docs/r/elasticsearch_domain.html.markdown index 4e6acf216dc..17645487e41 100644 --- a/website/docs/r/elasticsearch_domain.html.markdown +++ b/website/docs/r/elasticsearch_domain.html.markdown @@ -346,11 +346,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_elasticsearch_domain` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Optional, Default: `60m`) How long to wait for creation. -* `update` - (Optional, Default: `60m`) How long to wait for updates. -* `delete` - (Optional, Default: `90m`) How long to wait for deletion. +* `create` - (Default: `60m`) +* `update` - (Default: `60m`) +* `delete` - (Default: `90m`) ## Import diff --git a/website/docs/r/fsx_backup.html.markdown b/website/docs/r/fsx_backup.html.markdown index f48b9bd5db4..67ab3174cc2 100644 --- a/website/docs/r/fsx_backup.html.markdown +++ b/website/docs/r/fsx_backup.html.markdown @@ -97,11 +97,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_fsx_backup` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `10m`) How long to wait for the backup to be created. -* `delete` - (Default `10m`) How long to wait for the backup to be deleted. +* `create` - (Default `10m`) +* `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/fsx_data_repository_association.html.markdown b/website/docs/r/fsx_data_repository_association.html.markdown index 1c3a994e210..d7acac8d14f 100644 --- a/website/docs/r/fsx_data_repository_association.html.markdown +++ b/website/docs/r/fsx_data_repository_association.html.markdown @@ -82,12 +82,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_fsx_data_repository_association` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `10m`) How long to wait for the file system to be created. -* `update` - (Default `10m`) How long to wait for the file system to be updated. -* `delete` - (Default `10m`) How long to wait for the file system to be deleted. +* `create` - (Default `10m`) +* `update` - (Default `10m`) +* `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/fsx_lustre_file_system.html.markdown b/website/docs/r/fsx_lustre_file_system.html.markdown index f45806f51cc..a97244a7da0 100644 --- a/website/docs/r/fsx_lustre_file_system.html.markdown +++ b/website/docs/r/fsx_lustre_file_system.html.markdown @@ -70,12 +70,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_fsx_lustre_file_system` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `30m`) How long to wait for the file system to be created. -* `update` - (Default `30m`) How long to wait for the file system to be updated. -* `delete` - (Default `30m`) How long to wait for the file system to be deleted. +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/fsx_ontap_file_system.html.markdown b/website/docs/r/fsx_ontap_file_system.html.markdown index daef450f2ca..87365125b35 100644 --- a/website/docs/r/fsx_ontap_file_system.html.markdown +++ b/website/docs/r/fsx_ontap_file_system.html.markdown @@ -74,12 +74,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_fsx_ontap_file_system` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `60m`) How long to wait for the file system to be created. -* `update` - (Default `60m`) How long to wait for the file system to be updated. -* `delete` - (Default `60m`) How long to wait for the file system to be deleted. +* `create` - (Default `60m`) +* `update` - (Default `60m`) +* `delete` - (Default `60m`) ## Import diff --git a/website/docs/r/fsx_ontap_storage_virtual_machine.html.markdown b/website/docs/r/fsx_ontap_storage_virtual_machine.html.markdown index 7e188f4c60f..babbdba80e7 100644 --- a/website/docs/r/fsx_ontap_storage_virtual_machine.html.markdown +++ b/website/docs/r/fsx_ontap_storage_virtual_machine.html.markdown @@ -97,12 +97,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_fsx_ontap_storage_virtual_machine` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `30m`) How long to wait for the storage virtual machine to be created. -* `delete` - (Default `30m`) How long to wait for the storage virtual machine to be deleted. -* `update` - (Default `30m`) How long to wait for the storage virtual machine to be updated. +* `create` - (Default `30m`) +* `delete` - (Default `30m`) +* `update` - (Default `30m`) ## Import diff --git a/website/docs/r/fsx_ontap_volume.html.markdown b/website/docs/r/fsx_ontap_volume.html.markdown index e0958a9a31e..ab2e5e828b8 100644 --- a/website/docs/r/fsx_ontap_volume.html.markdown +++ b/website/docs/r/fsx_ontap_volume.html.markdown @@ -79,12 +79,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_fsx_ontap_volume` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `30m`) How long to wait for the storage virtual machine to be created. -* `delete` - (Default `30m`) How long to wait for the storage virtual machine to be deleted. -* `update` - (Default `30m`) How long to wait for the storage virtual machine to be updated. +* `create` - (Default `30m`) +* `delete` - (Default `30m`) +* `update` - (Default `30m`) ## Import diff --git a/website/docs/r/fsx_openzfs_file_system.html.markdown b/website/docs/r/fsx_openzfs_file_system.html.markdown index 16e9e5bb314..a86e03cc307 100644 --- a/website/docs/r/fsx_openzfs_file_system.html.markdown +++ b/website/docs/r/fsx_openzfs_file_system.html.markdown @@ -87,12 +87,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_fsx_openzfs_file_system` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `60m`) How long to wait for the file system to be created. -* `update` - (Default `60m`) How long to wait for the file system to be updated. -* `delete` - (Default `60m`) How long to wait for the file system to be deleted. +* `create` - (Default `60m`) +* `update` - (Default `60m`) +* `delete` - (Default `60m`) ## Import diff --git a/website/docs/r/fsx_openzfs_snapshot.html.markdown b/website/docs/r/fsx_openzfs_snapshot.html.markdown index 136fed1c479..fec8914464f 100644 --- a/website/docs/r/fsx_openzfs_snapshot.html.markdown +++ b/website/docs/r/fsx_openzfs_snapshot.html.markdown @@ -70,12 +70,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_fsx_openzfs_snapshot` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `30m`) How long to wait for the backup to be created. -* `delete` - (Default `30m`) How long to wait for the backup to be deleted. -* `update` - (Default `30m`) How long to wait for the backup to be deleted. +* `create` - (Default `30m`) +* `delete` - (Default `30m`) +* `update` - (Default `30m`) ## Import diff --git a/website/docs/r/fsx_openzfs_volume.html.markdown b/website/docs/r/fsx_openzfs_volume.html.markdown index 6674624ca44..391c2fb1e92 100644 --- a/website/docs/r/fsx_openzfs_volume.html.markdown +++ b/website/docs/r/fsx_openzfs_volume.html.markdown @@ -62,12 +62,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_fsx_openzfs_file_system` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `30m`) How long to wait for the file system to be created. -* `update` - (Default `30m`) How long to wait for the file system to be updated. -* `delete` - (Default `30m`) How long to wait for the file system to be deleted. +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/fsx_windows_file_system.html.markdown b/website/docs/r/fsx_windows_file_system.html.markdown index 08e43dc2504..528ce6e359e 100644 --- a/website/docs/r/fsx_windows_file_system.html.markdown +++ b/website/docs/r/fsx_windows_file_system.html.markdown @@ -105,12 +105,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_fsx_windows_file_system` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `45m`) How long to wait for the file system to be created. -* `delete` - (Default `30m`) How long to wait for the file system to be deleted. -* `update` - (Default `45m`) How long to wait for the file system to be updated. +* `create` - (Default `45m`) +* `delete` - (Default `30m`) +* `update` - (Default `45m`) ## Import diff --git a/website/docs/r/gamelift_fleet.html.markdown b/website/docs/r/gamelift_fleet.html.markdown index efc0675c6bf..f5c7e9e9437 100644 --- a/website/docs/r/gamelift_fleet.html.markdown +++ b/website/docs/r/gamelift_fleet.html.markdown @@ -90,10 +90,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_gamelift_fleet` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `70m`) How long to wait for a fleet to be created. -* `delete` - (Default `20m`) How long to wait for a fleet to be deleted. +* `create` - (Default `70m`) +* `delete` - (Default `20m`) ## Import diff --git a/website/docs/r/gamelift_game_server_group.markdown b/website/docs/r/gamelift_game_server_group.markdown index 59075145355..69d3302ddcc 100644 --- a/website/docs/r/gamelift_game_server_group.markdown +++ b/website/docs/r/gamelift_game_server_group.markdown @@ -189,11 +189,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_gamelift_game_server_group` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `10 minutes`) How long to wait for the GameLift Game Server Group to be created. -* `delete` - (Default `30 minutes`) How long to wait for the GameLift Game Server Group to be deleted. +* `create` - (Default `10m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/globalaccelerator_accelerator.html.markdown b/website/docs/r/globalaccelerator_accelerator.html.markdown index 53ad332357a..71c65c96d85 100644 --- a/website/docs/r/globalaccelerator_accelerator.html.markdown +++ b/website/docs/r/globalaccelerator_accelerator.html.markdown @@ -63,11 +63,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_globalaccelerator_accelerator` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `30 minutes`) How long to wait for the Global Accelerator Accelerator to be created. -* `update` - (Default `30 minutes`) How long to wait for the Global Accelerator Accelerator to be updated. +* `create` - (Default `30m`) +* `update` - (Default `30m`) ## Import diff --git a/website/docs/r/globalaccelerator_endpoint_group.html.markdown b/website/docs/r/globalaccelerator_endpoint_group.html.markdown index e1f10161b70..cb451898ef3 100644 --- a/website/docs/r/globalaccelerator_endpoint_group.html.markdown +++ b/website/docs/r/globalaccelerator_endpoint_group.html.markdown @@ -60,12 +60,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_globalaccelerator_endpoint_group` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `30 minutes`) How long to wait for the Global Accelerator Endpoint Group to be created. -* `update` - (Default `30 minutes`) How long to wait for the Global Accelerator Endpoint Group to be updated. -* `delete` - (Default `30 minutes`) How long to wait for the Global Accelerator Endpoint Group to be deleted. +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/globalaccelerator_listener.html.markdown b/website/docs/r/globalaccelerator_listener.html.markdown index 82d59f5ea04..b39f2eabb94 100644 --- a/website/docs/r/globalaccelerator_listener.html.markdown +++ b/website/docs/r/globalaccelerator_listener.html.markdown @@ -59,12 +59,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_globalaccelerator_listener` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `30 minutes`) How long to wait for the Global Accelerator Listener to be created. -* `update` - (Default `30 minutes`) How long to wait for the Global Accelerator Listener to be updated. -* `delete` - (Default `30 minutes`) How long to wait for the Global Accelerator Listener to be deleted. +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/glue_partition_index.html.markdown b/website/docs/r/glue_partition_index.html.markdown index de594e0fbe2..d4eed2daa78 100644 --- a/website/docs/r/glue_partition_index.html.markdown +++ b/website/docs/r/glue_partition_index.html.markdown @@ -123,19 +123,19 @@ The following arguments are required: * `index_name` - (Required) Name of the partition index. * `keys` - (Required) Keys for the partition index. -### Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: - -* `create` - (Defaults to 10 mins) Used when creating the partition index. -* `delete` - (Defaults to 10 mins) Used when deleting the partition index. - ## Attributes Reference In addition to all arguments above, the following attributes are exported: * `id` - Catalog ID, Database name, table name, and index name. +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +* `create` - (Default `10m`) +* `delete` - (Default `10m`) + ## Import Glue Partition Indexes can be imported with their catalog ID (usually AWS account ID), database name, table name, and index name, e.g., diff --git a/website/docs/r/glue_trigger.html.markdown b/website/docs/r/glue_trigger.html.markdown index d7ceb16035c..ab3bbfc9376 100644 --- a/website/docs/r/glue_trigger.html.markdown +++ b/website/docs/r/glue_trigger.html.markdown @@ -162,11 +162,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_glue_trigger` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `5m`) How long to wait for a trigger to be created. -- `delete` - (Default `5m`) How long to wait for a trigger to be deleted. +- `create` - (Default `5m`) +- `delete` - (Default `5m`) ## Import diff --git a/website/docs/r/guardduty_invite_accepter.html.markdown b/website/docs/r/guardduty_invite_accepter.html.markdown index 8756c8e049e..148ac8f7952 100644 --- a/website/docs/r/guardduty_invite_accepter.html.markdown +++ b/website/docs/r/guardduty_invite_accepter.html.markdown @@ -61,10 +61,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_guardduty_invite_accepter` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `1m`) How long to wait for an invite to accept. +- `create` - (Default `1m`) ## Import diff --git a/website/docs/r/guardduty_member.html.markdown b/website/docs/r/guardduty_member.html.markdown index 7a13d15ae15..3de0fa67a85 100644 --- a/website/docs/r/guardduty_member.html.markdown +++ b/website/docs/r/guardduty_member.html.markdown @@ -43,15 +43,6 @@ The following arguments are supported: * `invitation_message` - (Optional) Message for invitation. * `disable_email_notification` - (Optional) Boolean whether an email notification is sent to the accounts. Defaults to `false`. -## Timeouts - -`aws_guardduty_member` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: - -- `create` - (Default `60s`) How long to wait for a verification to be done against inviting GuardDuty member account. -- `update` - (Default `60s`) How long to wait for a verification to be done against inviting GuardDuty member account. - - ## Attributes Reference In addition to all arguments above, the following attributes are exported: @@ -59,6 +50,13 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of the GuardDuty member * `relationship_status` - The status of the relationship between the member account and its primary account. More information can be found in [Amazon GuardDuty API Reference](https://docs.aws.amazon.com/guardduty/latest/ug/get-members.html). +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +- `create` - (Default `1m`) +- `update` - (Default `1m`) + ## Import GuardDuty members can be imported using the the primary GuardDuty detector ID and member AWS account ID, e.g., diff --git a/website/docs/r/imagebuilder_image.html.markdown b/website/docs/r/imagebuilder_image.html.markdown index c6ba78dd808..a1d7d6e44bd 100644 --- a/website/docs/r/imagebuilder_image.html.markdown +++ b/website/docs/r/imagebuilder_image.html.markdown @@ -62,9 +62,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_imagebuilder_image` provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `60m`) How long to wait for the image to be built, tested, and distributed. +* `create` - (Default `60m`) ## Import diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index e07ee0ffa6d..779835fe9aa 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -145,14 +145,6 @@ The following arguments are supported: * `vpc_security_group_ids` - (Optional, VPC only) A list of security group IDs to associate with. -### Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: - -* `create` - (Defaults to 10 mins) Used when launching the instance (until it reaches the initial `running` state) -* `update` - (Defaults to 10 mins) Used when stopping and starting the instance when necessary during update - e.g., when changing instance type -* `delete` - (Defaults to 20 mins) Used when terminating the instance - ### Capacity Reservation Specification ~> **NOTE:** You can specify only one argument at a time. If you specify both `capacity_reservation_preference` and `capacity_reservation_target`, the request fails. Modifying `capacity_reservation_preference` or `capacity_reservation_target` in this block requires the instance to be in `stopped` state. @@ -312,6 +304,14 @@ For `root_block_device`, in addition to the arguments above, the following attri * `volume_id` - ID of the volume. For example, the ID can be accessed like this, `aws_instance.web.root_block_device.0.volume_id`. * `device_name` - Device name, e.g., `/dev/sdh` or `xvdh`. +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +* `create` - (Default `10m`) +* `update` - (Default `10m`) +* `delete` - (Default `20m`) + ## Import Instances can be imported using the `id`, e.g., diff --git a/website/docs/r/internet_gateway.html.markdown b/website/docs/r/internet_gateway.html.markdown index 88793cb9e82..0afd22b7794 100644 --- a/website/docs/r/internet_gateway.html.markdown +++ b/website/docs/r/internet_gateway.html.markdown @@ -54,7 +54,7 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `create` - (Default `20m`) - `update` - (Default `20m`) diff --git a/website/docs/r/internet_gateway_attachment.html.markdown b/website/docs/r/internet_gateway_attachment.html.markdown index 01b2f433e5f..04aac344cf6 100644 --- a/website/docs/r/internet_gateway_attachment.html.markdown +++ b/website/docs/r/internet_gateway_attachment.html.markdown @@ -40,7 +40,7 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `create` - (Default `20m`) - `delete` - (Default `20m`) diff --git a/website/docs/r/kendra_data_source.html.markdown b/website/docs/r/kendra_data_source.html.markdown index fe416125833..1652183214e 100644 --- a/website/docs/r/kendra_data_source.html.markdown +++ b/website/docs/r/kendra_data_source.html.markdown @@ -499,11 +499,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_kendra_data_source` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Optional, Default: `30m`) -* `update` - (Optional, Default: `30m`) -* `delete` - (Optional, Default: `30m`) +* `create` - (Default: `30m`) +* `update` - (Default: `30m`) +* `delete` - (Default: `30m`) ## Import diff --git a/website/docs/r/kendra_experience.html.markdown b/website/docs/r/kendra_experience.html.markdown index 4d952ed2e07..c3f78192364 100644 --- a/website/docs/r/kendra_experience.html.markdown +++ b/website/docs/r/kendra_experience.html.markdown @@ -85,11 +85,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_kendra_experience` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Optional, Default: `30m`) -* `update` - (Optional, Default: `30m`) -* `delete` - (Optional, Default: `30m`) +* `create` - (Default: `30m`) +* `update` - (Default: `30m`) +* `delete` - (Default: `30m`) ## Import diff --git a/website/docs/r/kendra_faq.html.markdown b/website/docs/r/kendra_faq.html.markdown index 7760d361a98..ecc1c05d791 100644 --- a/website/docs/r/kendra_faq.html.markdown +++ b/website/docs/r/kendra_faq.html.markdown @@ -99,10 +99,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_kendra_faq` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Optional, Default: `30m`) -* `delete` - (Optional, Default: `30m`) +* `create` - (Default: `30m`) +* `delete` - (Default: `30m`) ## Import diff --git a/website/docs/r/kendra_index.html.markdown b/website/docs/r/kendra_index.html.markdown index 4782a1ca3e4..94a6dbe1ebe 100644 --- a/website/docs/r/kendra_index.html.markdown +++ b/website/docs/r/kendra_index.html.markdown @@ -120,13 +120,13 @@ A `jwt_token_type_configuration` block supports the following arguments: * `url` - (Optional) The signing key URL. Valid pattern is `^(https?|ftp|file):\/\/([^\s]*)` * `user_name_attribute_field` - (Optional) The user name attribute field. Minimum length of 1. Maximum length of 100. -### Timeouts +## Timeouts -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Defaults to 40 mins) Used when creating the index. -* `delete` - (Defaults to 40 mins) Used when deleting the index. -* `update` - (Defaults to 40 mins) Used when updating the index. +* `create` - (Default `40m`) +* `delete` - (Default `40m`) +* `update` - (Default `40m`) ## Attributes Reference diff --git a/website/docs/r/kendra_query_suggestions_block_list.html.markdown b/website/docs/r/kendra_query_suggestions_block_list.html.markdown index 0acf7c06eef..cda41603459 100644 --- a/website/docs/r/kendra_query_suggestions_block_list.html.markdown +++ b/website/docs/r/kendra_query_suggestions_block_list.html.markdown @@ -60,11 +60,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_kendra_query_suggestions_block_list` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Optional, Default: `30m`) -* `update` - (Optional, Default: `30m`) -* `delete` - (Optional, Default: `30m`) +* `create` - (Default: `30m`) +* `update` - (Default: `30m`) +* `delete` - (Default: `30m`) ## Import diff --git a/website/docs/r/kendra_thesaurus.html.markdown b/website/docs/r/kendra_thesaurus.html.markdown index 686d4a5f0b5..e0d91d2f89c 100644 --- a/website/docs/r/kendra_thesaurus.html.markdown +++ b/website/docs/r/kendra_thesaurus.html.markdown @@ -59,11 +59,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_kendra_thesaurus` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Optional, Default: `30m`) -* `update` - (Optional, Default: `30m`) -* `delete` - (Optional, Default: `30m`) +* `create` - (Default: `30m`) +* `update` - (Default: `30m`) +* `delete` - (Default: `30m`) ## Import diff --git a/website/docs/r/keyspaces_keyspace.html.markdown b/website/docs/r/keyspaces_keyspace.html.markdown index 8fc4e7bff11..86e4632ce8b 100644 --- a/website/docs/r/keyspaces_keyspace.html.markdown +++ b/website/docs/r/keyspaces_keyspace.html.markdown @@ -40,10 +40,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_keyspaces_keyspace` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `1 minute`) Used for keyspace creation -- `delete` - (Default `1 minute`) Used for keyspace deletion +- `create` - (Default `1m`) +- `delete` - (Default `1m`) ## Import diff --git a/website/docs/r/keyspaces_table.html.markdown b/website/docs/r/keyspaces_table.html.markdown index 831110915ee..6b4fe62add0 100644 --- a/website/docs/r/keyspaces_table.html.markdown +++ b/website/docs/r/keyspaces_table.html.markdown @@ -107,11 +107,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_keyspaces_table` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for table creation -- `update` - (Default `30 minutes`) Used for table modification -- `delete` - (Default `10 minutes`) Used for table deletion +- `create` - (Default `10m`) +- `update` - (Default `30m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/kinesis_stream.html.markdown b/website/docs/r/kinesis_stream.html.markdown index 69b47667271..53c3f6e0f68 100644 --- a/website/docs/r/kinesis_stream.html.markdown +++ b/website/docs/r/kinesis_stream.html.markdown @@ -67,11 +67,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_kinesis_stream` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `5 minutes`) Used for Creating a Kinesis Stream -- `update` - (Default `120 minutes`) Used for Updating a Kinesis Stream -- `delete` - (Default `120 minutes`) Used for Destroying a Kinesis Stream +- `create` - (Default `5m`) +- `update` - (Default `120m`) +- `delete` - (Default `120m`) ## Import diff --git a/website/docs/r/kinesis_video_stream.html.markdown b/website/docs/r/kinesis_video_stream.html.markdown index 9ca9c811c9d..85ae2168bee 100644 --- a/website/docs/r/kinesis_video_stream.html.markdown +++ b/website/docs/r/kinesis_video_stream.html.markdown @@ -51,11 +51,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_kinesis_video_stream` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `5 minutes`) Used for Creating a Kinesis Stream -- `update` - (Default `120 minutes`) Used for Updating a Kinesis Stream -- `delete` - (Default `120 minutes`) Used for Destroying a Kinesis Stream +- `create` - (Default `5m`) +- `update` - (Default `120m`) +- `delete` - (Default `120m`) ## Import diff --git a/website/docs/r/kinesisanalyticsv2_application.html.markdown b/website/docs/r/kinesisanalyticsv2_application.html.markdown index c649038f73c..2110044c75c 100644 --- a/website/docs/r/kinesisanalyticsv2_application.html.markdown +++ b/website/docs/r/kinesisanalyticsv2_application.html.markdown @@ -485,12 +485,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_kinesisanalyticsv2_application` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for Application creation -- `update` - (Default `10 minutes`) Used for Application modifications and snapshotting -- `delete` - (Default `10 minutes`) Used for Application deletion +- `create` - (Default `10m`) +- `update` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/kinesisanalyticsv2_application_snapshot.html.markdown b/website/docs/r/kinesisanalyticsv2_application_snapshot.html.markdown index e9a89176841..faed4083697 100644 --- a/website/docs/r/kinesisanalyticsv2_application_snapshot.html.markdown +++ b/website/docs/r/kinesisanalyticsv2_application_snapshot.html.markdown @@ -37,11 +37,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_kinesisanalyticsv2_application_snapshot` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for Snapshot creation -- `delete` - (Default `10 minutes`) Used for Snapshot destruction +- `create` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/lambda_function.html.markdown b/website/docs/r/lambda_function.html.markdown index 3f6e87838c1..f0d3d224beb 100644 --- a/website/docs/r/lambda_function.html.markdown +++ b/website/docs/r/lambda_function.html.markdown @@ -358,9 +358,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_lambda_function` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `10m`) How long to wait for slow uploads or EC2 throttling errors. +* `create` - (Default `10m`) ## Import diff --git a/website/docs/r/lambda_provisioned_concurrency_config.html.markdown b/website/docs/r/lambda_provisioned_concurrency_config.html.markdown index 08fbaae9bdb..cce4285960f 100644 --- a/website/docs/r/lambda_provisioned_concurrency_config.html.markdown +++ b/website/docs/r/lambda_provisioned_concurrency_config.html.markdown @@ -48,10 +48,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_lambda_provisioned_concurrency_config` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `15 minutes`) How long to wait for the Lambda Provisioned Concurrency Config to be ready on creation. -* `update` - (Default `15 minutes`) How long to wait for the Lambda Provisioned Concurrency Config to be ready on update. +* `create` - (Default `15m`) +* `update` - (Default `15m`) ## Import diff --git a/website/docs/r/lb.html.markdown b/website/docs/r/lb.html.markdown index 5e5c2530106..4c313c55be3 100644 --- a/website/docs/r/lb.html.markdown +++ b/website/docs/r/lb.html.markdown @@ -154,12 +154,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_lb` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for Creating LB -- `update` - (Default `10 minutes`) Used for LB modifications -- `delete` - (Default `10 minutes`) Used for destroying LB +- `create` - (Default `10m`) +- `update` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/lex_bot.html.markdown b/website/docs/r/lex_bot.html.markdown index 5a0ce9db0f5..d021ee2d740 100644 --- a/website/docs/r/lex_bot.html.markdown +++ b/website/docs/r/lex_bot.html.markdown @@ -110,13 +110,13 @@ are documented under [message](#message). slot values into the response card. For more information, see [Example: Using a Response Card](https://docs.aws.amazon.com/lex/latest/dg/ex-resp-card.html). -### Timeouts +## Timeouts -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Defaults to 5 mins) Used when creating the bot -* `update` - (Defaults to 5 mins) Used when updating the bot -* `delete` - (Defaults to 5 mins) Used when deleting the bot +* `create` - (Default `5m`) +* `update` - (Default `5m`) +* `delete` - (Default `5m`) ## Attributes Reference diff --git a/website/docs/r/lex_bot_alias.html.markdown b/website/docs/r/lex_bot_alias.html.markdown index d5641e69638..e703b0b89bb 100644 --- a/website/docs/r/lex_bot_alias.html.markdown +++ b/website/docs/r/lex_bot_alias.html.markdown @@ -49,14 +49,6 @@ The settings for conversation logs. * `resource_arn` - (Required) The Amazon Resource Name (ARN) of the CloudWatch Logs log group or S3 bucket where the logs are delivered. Must be less than or equal to 2048 characters in length. * `resource_prefix` - (Computed) The prefix of the S3 object key for `AUDIO` logs or the log stream name for `TEXT` logs. -### Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: - -* `create` - (Defaults to 1 mins) Used when creating the bot alias -* `update` - (Defaults to 1 mins) Used when updating the bot alias -* `delete` - (Defaults to 5 mins) Used when deleting the bot alias - ## Attributes Reference In addition to all arguments above, the following attributes are exported: @@ -66,6 +58,14 @@ In addition to all arguments above, the following attributes are exported: * `created_date` - The date that the bot alias was created. * `last_updated_date` - The date that the bot alias was updated. When you create a resource, the creation date and the last updated date are the same. +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +* `create` - (Default `1m`) +* `update` - (Default `1m`) +* `delete` - (Default `5m`) + ## Import Bot aliases can be imported using an ID with the format `bot_name:bot_alias_name`. diff --git a/website/docs/r/lex_intent.html.markdown b/website/docs/r/lex_intent.html.markdown index ec9f1259e3a..1c1cbe349e3 100644 --- a/website/docs/r/lex_intent.html.markdown +++ b/website/docs/r/lex_intent.html.markdown @@ -240,15 +240,6 @@ Attributes are documented under [message](#message). Must contain between 1 and slot values into the response card. For more information, see [Example: Using a Response Card](https://docs.aws.amazon.com/lex/latest/dg/ex-resp-card.html). Must be less than or equal to 50000 characters in length. -### Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: - -* `create` - (Defaults to 1 min) Used when creating the intent -* `update` - (Defaults to 1 min) Used when updating the intent -* `delete` - (Defaults to 5 mins) Used when deleting the intent - - ## Attributes Reference In addition to all arguments above, the following attributes are exported: @@ -260,6 +251,14 @@ included as an argument because the resource will add it automatically when upda * `last_updated_date` - The date when the $LATEST version of this intent was updated. * `version` - The version of the bot. +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +* `create` - (Default `1m`) +* `update` - (Default `1m`) +* `delete` - (Default `5m`) + ## Import Intents can be imported using their name. diff --git a/website/docs/r/lex_slot_type.html.markdown b/website/docs/r/lex_slot_type.html.markdown index cd78678f0db..19d208dceb4 100644 --- a/website/docs/r/lex_slot_type.html.markdown +++ b/website/docs/r/lex_slot_type.html.markdown @@ -70,13 +70,13 @@ pizza should have. The slot type could include the values: thick, thin, stuffed. * `synonyms` - (Optional) Additional values related to the slot type value. Each item must be less than or equal to 140 characters in length. * `value` - (Required) The value of the slot type. Must be less than or equal to 140 characters in length. -### Timeouts +## Timeouts -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Defaults to 1 min) Used when creating the slot type -* `update` - (Defaults to 1 min) Used when updating the slot type -* `delete` - (Defaults to 5 mins) Used when deleting the slot type +* `create` - (Default `1m`) +* `update` - (Default `1m`) +* `delete` - (Default `5m`) ## Attributes Reference diff --git a/website/docs/r/lightsail_container_service.html.markdown b/website/docs/r/lightsail_container_service.html.markdown index 4dac94058b0..dc1e04625d1 100644 --- a/website/docs/r/lightsail_container_service.html.markdown +++ b/website/docs/r/lightsail_container_service.html.markdown @@ -104,11 +104,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_lightsail_container_service` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Optional, Default: `30m`) -* `update` - (Optional, Default: `30m`) -* `delete` - (Optional, Default: `30m`) +* `create` - (Default: `30m`) +* `update` - (Default: `30m`) +* `delete` - (Default: `30m`) ## Import diff --git a/website/docs/r/lightsail_container_service_deployment_version.html.markdown b/website/docs/r/lightsail_container_service_deployment_version.html.markdown index cbedf8f2769..40035fe5e0e 100644 --- a/website/docs/r/lightsail_container_service_deployment_version.html.markdown +++ b/website/docs/r/lightsail_container_service_deployment_version.html.markdown @@ -101,9 +101,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_lightsail_container_service_deployment_version` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Optional, Default: `30m`) +* `create` - (Default: `30m`) ## Import diff --git a/website/docs/r/location_geofence_collection.html.markdown b/website/docs/r/location_geofence_collection.html.markdown index 03bd5419093..d24c11986d9 100644 --- a/website/docs/r/location_geofence_collection.html.markdown +++ b/website/docs/r/location_geofence_collection.html.markdown @@ -40,11 +40,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_location_geofence_collection` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Optional, Default: `30m`) -* `update` - (Optional, Default: `30m`) -* `delete` - (Optional, Default: `30m`) +* `create` - (Default: `30m`) +* `update` - (Default: `30m`) +* `delete` - (Default: `30m`) ## Import diff --git a/website/docs/r/location_route_calculator.html.markdown b/website/docs/r/location_route_calculator.html.markdown index 784d6c7b6e1..33c8bc2afb1 100644 --- a/website/docs/r/location_route_calculator.html.markdown +++ b/website/docs/r/location_route_calculator.html.markdown @@ -42,11 +42,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_location_route_calculator` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Optional, Default: `30m`) -* `update` - (Optional, Default: `30m`) -* `delete` - (Optional, Default: `30m`) +* `create` - (Default: `30m`) +* `update` - (Default: `30m`) +* `delete` - (Default: `30m`) ## Import diff --git a/website/docs/r/memorydb_cluster.html.markdown b/website/docs/r/memorydb_cluster.html.markdown index 39c3caef0c3..bda6030cf98 100644 --- a/website/docs/r/memorydb_cluster.html.markdown +++ b/website/docs/r/memorydb_cluster.html.markdown @@ -82,11 +82,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_memorydb_cluster` provides the following [timeout configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `120 minutes`) Used when creating a cluster. -- `update` - (Default `120 minutes`) Used when updating a cluster. -- `delete` - (Default `120 minutes`) Used when deleting a cluster. +- `create` - (Default `120m`) +- `update` - (Default `120m`) +- `delete` - (Default `120m`) ## Import diff --git a/website/docs/r/memorydb_snapshot.html.markdown b/website/docs/r/memorydb_snapshot.html.markdown index 7e232035bfb..c48e8be1671 100644 --- a/website/docs/r/memorydb_snapshot.html.markdown +++ b/website/docs/r/memorydb_snapshot.html.markdown @@ -56,10 +56,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_memorydb_snapshot` provides the following [timeout configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `120 minutes`) Used when taking the snapshot of a cluster. -- `delete` - (Default `120 minutes`) Used when deleting a snapshot. +- `create` - (Default `120m`) +- `delete` - (Default `120m`) ## Import diff --git a/website/docs/r/msk_cluster.html.markdown b/website/docs/r/msk_cluster.html.markdown index fecb2f96c47..636cef1514a 100644 --- a/website/docs/r/msk_cluster.html.markdown +++ b/website/docs/r/msk_cluster.html.markdown @@ -334,13 +334,12 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_msk_cluster` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `120 minutes`) How long to wait for the MSK Cluster to be created. -* `update` - (Default `120 minutes`) How long to wait for the MSK Cluster to be updated. +* `create` - (Default `120m`) +* `update` - (Default `120m`) Note that the `update` timeout is used separately for `ebs_volume_size`, `instance_type`, `number_of_broker_nodes`, `configuration_info`, `kafka_version` and monitoring and logging update timeouts. -* `delete` - (Default `120 minutes`) How long to wait for the MSK Cluster to be deleted. +* `delete` - (Default `120m`) ## Import diff --git a/website/docs/r/mskconnect_connector.html.markdown b/website/docs/r/mskconnect_connector.html.markdown index d30a2dce908..65146deda92 100644 --- a/website/docs/r/mskconnect_connector.html.markdown +++ b/website/docs/r/mskconnect_connector.html.markdown @@ -186,12 +186,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_mskconnect_connector` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `20 minutes`) How long to wait for the MSK Connect Connector to be created. -* `update` - (Default `20 minutes`) How long to wait for the MSK Connect Connector to be created. -* `delete` - (Default `10 minutes`) How long to wait for the MSK Connect Connector to be created. +* `create` - (Default `20m`) +* `update` - (Default `20m`) +* `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/mskconnect_custom_plugin.html.markdown b/website/docs/r/mskconnect_custom_plugin.html.markdown index ddee0fd95dd..1cbe5233882 100644 --- a/website/docs/r/mskconnect_custom_plugin.html.markdown +++ b/website/docs/r/mskconnect_custom_plugin.html.markdown @@ -69,11 +69,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_mskconnect_custom_plugin` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `10 minutes`) How long to wait for the MSK Connect Custom Plugin to be created. -* `delete` - (Default `10 minutes`) How long to wait for the MSK Connect Custom Plugin to be created. +* `create` - (Default `10m`) +* `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/neptune_cluster.html.markdown b/website/docs/r/neptune_cluster.html.markdown index 17b46a2a74f..544899fee22 100644 --- a/website/docs/r/neptune_cluster.html.markdown +++ b/website/docs/r/neptune_cluster.html.markdown @@ -82,12 +82,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_neptune_cluster` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `120 minutes`) Used for Cluster creation -- `update` - (Default `120 minutes`) Used for Cluster modifications -- `delete` - (Default `120 minutes`) Used for destroying cluster. This includes any cleanup task during the destroying process. +- `create` - (Default `120m`) +- `update` - (Default `120m`) +- `delete` - (Default `120m`) ## Import diff --git a/website/docs/r/neptune_cluster_instance.html.markdown b/website/docs/r/neptune_cluster_instance.html.markdown index 28b2fc21e1e..d224568f475 100644 --- a/website/docs/r/neptune_cluster_instance.html.markdown +++ b/website/docs/r/neptune_cluster_instance.html.markdown @@ -80,12 +80,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_neptune_cluster_instance` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `90 minutes`) How long to wait for creating instances to become available. -- `update` - (Default `90 minutes`) How long to wait for updating instances to complete updates. -- `delete` - (Default `90 minutes`) How long to wait for deleting instances to become fully deleted. +- `create` - (Default `90m`) +- `update` - (Default `90m`) +- `delete` - (Default `90m`) ## Import diff --git a/website/docs/r/neptune_cluster_snapshot.html.markdown b/website/docs/r/neptune_cluster_snapshot.html.markdown index 1fd1097827b..f9b40a4ff3f 100644 --- a/website/docs/r/neptune_cluster_snapshot.html.markdown +++ b/website/docs/r/neptune_cluster_snapshot.html.markdown @@ -45,9 +45,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_neptune_cluster_snapshot` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `20m`) How long to wait for the snapshot to be available. +* `create` - (Default `20m`) ## Import diff --git a/website/docs/r/neptune_event_subscription.html.markdown b/website/docs/r/neptune_event_subscription.html.markdown index 72119e6a369..9a9b57c5965 100644 --- a/website/docs/r/neptune_event_subscription.html.markdown +++ b/website/docs/r/neptune_event_subscription.html.markdown @@ -84,12 +84,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_neptune_event_subscription` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `40m`) How long to wait for creating event subscription to become available. -- `delete` - (Default `40m`) How long to wait for deleting event subscription to become fully deleted. -- `update` - (Default `40m`) How long to wait for updating event subscription to complete updates. +- `create` - (Default `40m`) +- `delete` - (Default `40m`) +- `update` - (Default `40m`) ## Import diff --git a/website/docs/r/opensearch_domain.html.markdown b/website/docs/r/opensearch_domain.html.markdown index 168a758fbbd..6d7a9be9bd6 100644 --- a/website/docs/r/opensearch_domain.html.markdown +++ b/website/docs/r/opensearch_domain.html.markdown @@ -363,11 +363,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_opensearch_domain` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Optional, Default: `60m`) How long to wait for creation. -* `update` - (Optional, Default: `180m`) How long to wait for updates. -* `delete` - (Optional, Default: `90m`) How long to wait for deletion. +* `create` - (Default: `60m`) +* `update` - (Default: `180m`) +* `delete` - (Default: `90m`) ## Import diff --git a/website/docs/r/opensearch_domain_policy.html.markdown b/website/docs/r/opensearch_domain_policy.html.markdown index bd3d60bc413..752360ba342 100644 --- a/website/docs/r/opensearch_domain_policy.html.markdown +++ b/website/docs/r/opensearch_domain_policy.html.markdown @@ -53,7 +53,7 @@ No additional attributes are exported. ## Timeouts -`aws_opensearch_domain_policy` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `update` - (Optional, Default: `180m`) How long to wait for updates. -* `delete` - (Optional, Default: `90m`) How long to wait for deletion. +* `update` - (Default: `180m`) +* `delete` - (Default: `90m`) diff --git a/website/docs/r/opensearch_domain_saml_options.html.markdown b/website/docs/r/opensearch_domain_saml_options.html.markdown index 80125e55d6a..637490154a5 100644 --- a/website/docs/r/opensearch_domain_saml_options.html.markdown +++ b/website/docs/r/opensearch_domain_saml_options.html.markdown @@ -79,10 +79,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_opensearch_domain_saml_options` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `update` - (Optional, Default: `180m`) How long to wait for updates. -* `delete` - (Optional, Default: `90m`) How long to wait for deletion. +* `update` - (Default: `180m`) +* `delete` - (Default: `90m`) ## Import diff --git a/website/docs/r/opsworks_instance.html.markdown b/website/docs/r/opsworks_instance.html.markdown index 1c23ed909f5..c8961c8a85c 100644 --- a/website/docs/r/opsworks_instance.html.markdown +++ b/website/docs/r/opsworks_instance.html.markdown @@ -131,12 +131,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_opsworks_instance` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used when the instance is created. It should cover the time needed for the instance to start successfully. -- `delete` - (Default `10 minutes`) Used when the instance is deleted. It should cover the time needed for the instance to stop successfully. -- `update` - (Default `10 minutes`) Used when the instance is changed. It should cover the time needed to either start or stop the instance. +- `create` - (Default `10m`) +- `delete` - (Default `10m`) +- `update` - (Default `10m`) ## Import diff --git a/website/docs/r/rds_cluster.html.markdown b/website/docs/r/rds_cluster.html.markdown index ad6429a8121..78d34fe5053 100644 --- a/website/docs/r/rds_cluster.html.markdown +++ b/website/docs/r/rds_cluster.html.markdown @@ -333,12 +333,11 @@ load-balanced across replicas ## Timeouts -`aws_rds_cluster` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `120 minutes`) Used for Cluster creation -- `update` - (Default `120 minutes`) Used for Cluster modifications -- `delete` - (Default `120 minutes`) Used for destroying cluster. This includes +- `create` - (Default `120m`) +- `update` - (Default `120m`) +- `delete` - (Default `120m`) any cleanup task during the destroying process. ## Import diff --git a/website/docs/r/rds_cluster_instance.html.markdown b/website/docs/r/rds_cluster_instance.html.markdown index 92e8474b017..eb742e4abd3 100644 --- a/website/docs/r/rds_cluster_instance.html.markdown +++ b/website/docs/r/rds_cluster_instance.html.markdown @@ -116,13 +116,12 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_rds_cluster_instance` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `90 minutes`) Used for Creating Instances, Replicas, and +- `create` - (Default `90m`) restoring from Snapshots -- `update` - (Default `90 minutes`) Used for Database modifications -- `delete` - (Default `90 minutes`) Used for destroying databases. This includes +- `update` - (Default `90m`) +- `delete` - (Default `90m`) the time required to take snapshots ## Import diff --git a/website/docs/r/rds_global_cluster.html.markdown b/website/docs/r/rds_global_cluster.html.markdown index dac0bbd608c..d52c6c36ed2 100644 --- a/website/docs/r/rds_global_cluster.html.markdown +++ b/website/docs/r/rds_global_cluster.html.markdown @@ -226,12 +226,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_rds_global_cluster` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `30 minutes`) -- `update` - (Default `90 minutes`) -- `delete` - (Default `30 minutes`) +- `create` - (Default `30m`) +- `update` - (Default `90m`) +- `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/redshift_cluster.html.markdown b/website/docs/r/redshift_cluster.html.markdown index 01b7778b9b5..3d4cadfaa01 100644 --- a/website/docs/r/redshift_cluster.html.markdown +++ b/website/docs/r/redshift_cluster.html.markdown @@ -81,15 +81,6 @@ The following arguments are supported: * `snapshot_copy` - (Optional) Configuration of automatic copy of snapshots from one region to another. Documented below. * `tags` - (Optional) A map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. -### Timeouts - -`aws_redshift_cluster` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: - -- `create` - (Default `75 minutes`) Used for creating Clusters. -- `update` - (Default `75 minutes`) Used for updating Clusters. -- `delete` - (Default `40 minutes`) Used for destroying Clusters. - ### Nested Blocks #### `logging` @@ -140,6 +131,14 @@ Cluster nodes (for `cluster_nodes`) support the following attributes: * `private_ip_address` - The private IP address of a node within a cluster * `public_ip_address` - The public IP address of a node within a cluster +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +- `create` - (Default `75m`) +- `update` - (Default `75m`) +- `delete` - (Default `40m`) + ## Import Redshift Clusters can be imported using the `cluster_identifier`, e.g., diff --git a/website/docs/r/route.html.markdown b/website/docs/r/route.html.markdown index 259cd8136c3..38cc42a6ffa 100644 --- a/website/docs/r/route.html.markdown +++ b/website/docs/r/route.html.markdown @@ -85,11 +85,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_route` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `5 minutes`) Used for route creation -- `update` - (Default `2 minutes`) Used for route creation -- `delete` - (Default `5 minutes`) Used for route deletion +- `create` - (Default `5m`) +- `update` - (Default `2m`) +- `delete` - (Default `5m`) ## Import diff --git a/website/docs/r/route53_resolver_endpoint.html.markdown b/website/docs/r/route53_resolver_endpoint.html.markdown index 6b7365362f6..cca708cbbd0 100644 --- a/website/docs/r/route53_resolver_endpoint.html.markdown +++ b/website/docs/r/route53_resolver_endpoint.html.markdown @@ -66,12 +66,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_route53_resolver_endpoint` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating Route 53 Resolver endpoint -- `update` - (Default `10 minutes`) Used for updating Route 53 Resolver endpoint -- `delete` - (Default `10 minutes`) Used for destroying Route 53 Resolver endpoint +- `create` - (Default `10m`) +- `update` - (Default `10m`) +- `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/route53domains_registered_domain.html.markdown b/website/docs/r/route53domains_registered_domain.html.markdown index 3d00782d1a5..1b86d5bad45 100644 --- a/website/docs/r/route53domains_registered_domain.html.markdown +++ b/website/docs/r/route53domains_registered_domain.html.markdown @@ -93,8 +93,7 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_route53domains_registered_domain` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `30 minutes`) Used for Domain creation -- `update` - (Default `30 minutes`) Used for Domain update +- `create` - (Default `30m`) +- `update` - (Default `30m`) diff --git a/website/docs/r/route53recoveryreadiness_cell.html.markdown b/website/docs/r/route53recoveryreadiness_cell.html.markdown index 1ab1ca8b00d..73812315310 100644 --- a/website/docs/r/route53recoveryreadiness_cell.html.markdown +++ b/website/docs/r/route53recoveryreadiness_cell.html.markdown @@ -37,6 +37,12 @@ In addition to all arguments above, the following attributes are exported: * `parent_readiness_scopes` - List of readiness scopes (recovery groups or cells) that contain this cell. * `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +- `delete` - (Default `5m`) + ## Import Route53 Recovery Readiness cells can be imported via the cell name, e.g., @@ -44,10 +50,3 @@ Route53 Recovery Readiness cells can be imported via the cell name, e.g., ``` $ terraform import aws_route53recoveryreadiness_cell.us-west-2-failover-cell us-west-2-failover-cell ``` - -## Timeouts - -`aws_route53recoveryreadiness_cell` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: - -- `delete` - (Default `5m`) Used when deleting the Cell diff --git a/website/docs/r/route53recoveryreadiness_readiness_check.html.markdown b/website/docs/r/route53recoveryreadiness_readiness_check.html.markdown index 5bb75adeef3..affdc7547c5 100644 --- a/website/docs/r/route53recoveryreadiness_readiness_check.html.markdown +++ b/website/docs/r/route53recoveryreadiness_readiness_check.html.markdown @@ -47,7 +47,6 @@ $ terraform import aws_route53recoveryreadiness_readiness_check.my-cw-alarm-chec ## Timeouts -`aws_route53recoveryreadiness_readiness_check` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `delete` - (Default `5m`) Used when deleting the Readiness Check +- `delete` - (Default `5m`) diff --git a/website/docs/r/route53recoveryreadiness_recovery_group.html.markdown b/website/docs/r/route53recoveryreadiness_recovery_group.html.markdown index 786036d30b8..3f8d3247599 100644 --- a/website/docs/r/route53recoveryreadiness_recovery_group.html.markdown +++ b/website/docs/r/route53recoveryreadiness_recovery_group.html.markdown @@ -36,6 +36,12 @@ In addition to all arguments above, the following attributes are exported: * `arn` - ARN of the recovery group * `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +- `delete` - (Default `5m`) + ## Import Route53 Recovery Readiness recovery groups can be imported via the recovery group name, e.g., @@ -43,10 +49,3 @@ Route53 Recovery Readiness recovery groups can be imported via the recovery grou ``` $ terraform import aws_route53recoveryreadiness_recovery_group.my-high-availability-app my-high-availability-app ``` - -## Timeouts - -`aws_route53recoveryreadiness_recovery_group` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: - -- `delete` - (Default `5m`) Used when deleting the Recovery Group diff --git a/website/docs/r/route53recoveryreadiness_resource_set.html.markdown b/website/docs/r/route53recoveryreadiness_resource_set.html.markdown index 0168244b215..a1f76e252fe 100644 --- a/website/docs/r/route53recoveryreadiness_resource_set.html.markdown +++ b/website/docs/r/route53recoveryreadiness_resource_set.html.markdown @@ -81,7 +81,6 @@ $ terraform import aws_route53recoveryreadiness_resource_set.my-cw-alarm-set ## Timeouts -`aws_route53recoveryreadiness_resource_set` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `delete` - (Default `5m`) Used when deleting the Resource Set +- `delete` - (Default `5m`) diff --git a/website/docs/r/route_table.html.markdown b/website/docs/r/route_table.html.markdown index c571632bfdf..337ee6dc6a2 100644 --- a/website/docs/r/route_table.html.markdown +++ b/website/docs/r/route_table.html.markdown @@ -115,11 +115,11 @@ attribute once the route resource is created. ## Timeouts -`aws_route_table` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `5 minutes`) Used for route creation -- `update` - (Default `2 minutes`) Used for route creation -- `delete` - (Default `5 minutes`) Used for route deletion +- `create` - (Default `5m`) +- `update` - (Default `2m`) +- `delete` - (Default `5m`) ## Import diff --git a/website/docs/r/s3_bucket.html.markdown b/website/docs/r/s3_bucket.html.markdown index 78f4e9f9f76..04ec6df1a8f 100644 --- a/website/docs/r/s3_bucket.html.markdown +++ b/website/docs/r/s3_bucket.html.markdown @@ -726,7 +726,7 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -[Timeout](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): - `create` - (Default `20m`) - `read` - (Default `20m`) diff --git a/website/docs/r/s3control_multi_region_access_point.html.markdown b/website/docs/r/s3control_multi_region_access_point.html.markdown index 1b19ee3edbc..475afa0bf81 100644 --- a/website/docs/r/s3control_multi_region_access_point.html.markdown +++ b/website/docs/r/s3control_multi_region_access_point.html.markdown @@ -59,12 +59,12 @@ The following arguments are supported: * `account_id` - (Optional) The AWS account ID for the owner of the buckets for which you want to create a Multi-Region Access Point. Defaults to automatically determined account ID of the Terraform AWS provider. * `details` - (Required) A configuration block containing details about the Multi-Region Access Point. See [Details Configuration Block](#details-configuration) below for more details -### Timeouts +## Timeouts -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `60 minutes`) Used when creating the Multi-Region Access Point. -* `delete` - (Default `15 minutes`) Used when deleting the Multi-Region Access Point. +* `create` - (Default `60m`) +* `delete` - (Default `15m`) ### Details Configuration diff --git a/website/docs/r/s3control_multi_region_access_point_policy.html.markdown b/website/docs/r/s3control_multi_region_access_point_policy.html.markdown index eb26b78148a..32f6215afc9 100644 --- a/website/docs/r/s3control_multi_region_access_point_policy.html.markdown +++ b/website/docs/r/s3control_multi_region_access_point_policy.html.markdown @@ -60,13 +60,6 @@ The following arguments are supported: * `account_id` - (Optional) The AWS account ID for the owner of the Multi-Region Access Point. Defaults to automatically determined account ID of the Terraform AWS provider. * `details` - (Required) A configuration block containing details about the policy for the Multi-Region Access Point. See [Details Configuration Block](#details-configuration) below for more details -### Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: - -* `create` - (Default `15 minutes`) Used when creating the Multi-Region Access Point Policy. -* `update` - (Default `15 minutes`) Used when updating the Multi-Region Access Point Policy. - ### Details Configuration The `details` block supports the following: @@ -84,6 +77,13 @@ In addition to all arguments above, the following attributes are exported: * `id` - The AWS account ID and access point name separated by a colon (`:`). * `proposed` - The proposed policy for the Multi-Region Access Point. +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +* `create` - (Default `15m`) +* `update` - (Default `15m`) + ## Import Multi-Region Access Point Policies can be imported using the `account_id` and `name` of the Multi-Region Access Point separated by a colon (`:`), e.g. diff --git a/website/docs/r/security_group.html.markdown b/website/docs/r/security_group.html.markdown index 2762912245d..5bc26ce4c71 100644 --- a/website/docs/r/security_group.html.markdown +++ b/website/docs/r/security_group.html.markdown @@ -176,11 +176,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_security_group` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10m`) How long to wait for a security group to be created. -- `delete` - (Default `15m`) How long to retry on `DependencyViolation` errors during security group deletion from lingering ENIs left by certain AWS services such as Elastic Load Balancing. NOTE: Lambda ENIs can take up to 45 minutes to delete, which is not affected by changing this customizable timeout (in version 2.31.0 and later of the Terraform AWS Provider) unless it is increased above 45 minutes. +- `create` - (Default `10m`) +- `delete` - (Default `15m`) ## Import diff --git a/website/docs/r/security_group_rule.html.markdown b/website/docs/r/security_group_rule.html.markdown index 65dc65b4d18..7ed9184c922 100644 --- a/website/docs/r/security_group_rule.html.markdown +++ b/website/docs/r/security_group_rule.html.markdown @@ -116,9 +116,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_security_group_rule` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `5 minutes`) Used for security group rule creation +- `create` - (Default `5m`) ## Import diff --git a/website/docs/r/servicecatalog_budget_resource_association.html.markdown b/website/docs/r/servicecatalog_budget_resource_association.html.markdown index db9345b34ff..550c929dec1 100644 --- a/website/docs/r/servicecatalog_budget_resource_association.html.markdown +++ b/website/docs/r/servicecatalog_budget_resource_association.html.markdown @@ -38,12 +38,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_servicecatalog_budget_resource_association` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `3 minutes`) -- `read` - (Default `10 minutes`) -- `delete` - (Default `3 minutes`) +- `create` - (Default `3m`) +- `read` - (Default `10m`) +- `delete` - (Default `3m`) ## Import diff --git a/website/docs/r/servicecatalog_constraint.html.markdown b/website/docs/r/servicecatalog_constraint.html.markdown index 2b82360a04c..2ac19226b8d 100644 --- a/website/docs/r/servicecatalog_constraint.html.markdown +++ b/website/docs/r/servicecatalog_constraint.html.markdown @@ -86,13 +86,12 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_servicecatalog_constraint` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `3 minutes`) -- `read` - (Default `10 minutes`) -- `update` - (Default `3 minutes`) -- `delete` - (Default `3 minutes`) +- `create` - (Default `3m`) +- `read` - (Default `10m`) +- `update` - (Default `3m`) +- `delete` - (Default `3m`) ## Import diff --git a/website/docs/r/servicecatalog_organizations_access.html.markdown b/website/docs/r/servicecatalog_organizations_access.html.markdown index d39848c50b1..0f93e6e0be4 100644 --- a/website/docs/r/servicecatalog_organizations_access.html.markdown +++ b/website/docs/r/servicecatalog_organizations_access.html.markdown @@ -36,7 +36,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_servicecatalog_organizations_access` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `read` - (Default `10 minutes`) +- `read` - (Default `10m`) diff --git a/website/docs/r/servicecatalog_portfolio.html.markdown b/website/docs/r/servicecatalog_portfolio.html.markdown index 9809101640c..28e1840aefe 100644 --- a/website/docs/r/servicecatalog_portfolio.html.markdown +++ b/website/docs/r/servicecatalog_portfolio.html.markdown @@ -38,13 +38,12 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_servicecatalog_portfolio` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `30 minutes`) -- `read` - (Default `10 minutes`) -- `update` - (Default `30 minutes`) -- `delete` - (Default `30 minutes`) +- `create` - (Default `30m`) +- `read` - (Default `10m`) +- `update` - (Default `30m`) +- `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/servicecatalog_portfolio_share.html.markdown b/website/docs/r/servicecatalog_portfolio_share.html.markdown index 1e26ddaa929..80066f0e86c 100644 --- a/website/docs/r/servicecatalog_portfolio_share.html.markdown +++ b/website/docs/r/servicecatalog_portfolio_share.html.markdown @@ -52,13 +52,12 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_servicecatalog_portfolio_share` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `3 minutes`) -- `read` - (Default `10 minutes`) -- `update` - (Default `3 minutes`) -- `delete` - (Default `3 minutes`) +- `create` - (Default `3m`) +- `read` - (Default `10m`) +- `update` - (Default `3m`) +- `delete` - (Default `3m`) ## Import diff --git a/website/docs/r/servicecatalog_principal_portfolio_association.html.markdown b/website/docs/r/servicecatalog_principal_portfolio_association.html.markdown index afeb145b3d9..dac2cd2018e 100644 --- a/website/docs/r/servicecatalog_principal_portfolio_association.html.markdown +++ b/website/docs/r/servicecatalog_principal_portfolio_association.html.markdown @@ -41,12 +41,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_servicecatalog_principal_portfolio_association` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `3 minutes`) -- `read` - (Default `10 minutes`) -- `delete` - (Default `3 minutes`) +- `create` - (Default `3m`) +- `read` - (Default `10m`) +- `delete` - (Default `3m`) ## Import diff --git a/website/docs/r/servicecatalog_product.html.markdown b/website/docs/r/servicecatalog_product.html.markdown index 9b9a56cb81e..0c210b3562d 100644 --- a/website/docs/r/servicecatalog_product.html.markdown +++ b/website/docs/r/servicecatalog_product.html.markdown @@ -77,13 +77,12 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_servicecatalog_product` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `5 minutes`) -- `read` - (Default `10 minutes`) -- `update` - (Default `5 minutes`) -- `delete` - (Default `5 minutes`) +- `create` - (Default `5m`) +- `read` - (Default `10m`) +- `update` - (Default `5m`) +- `delete` - (Default `5m`) ## Import diff --git a/website/docs/r/servicecatalog_product_portfolio_association.html.markdown b/website/docs/r/servicecatalog_product_portfolio_association.html.markdown index 77d29e14cd9..b0329b70d03 100644 --- a/website/docs/r/servicecatalog_product_portfolio_association.html.markdown +++ b/website/docs/r/servicecatalog_product_portfolio_association.html.markdown @@ -39,12 +39,11 @@ In addition to all arguments above, the following attributes are exported: * `id` - Identifier of the association. -`aws_servicecatalog_product_portfolio_association` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `3 minutes`) -- `read` - (Default `10 minutes`) -- `delete` - (Default `3 minutes`) +- `create` - (Default `3m`) +- `read` - (Default `10m`) +- `delete` - (Default `3m`) ## Import diff --git a/website/docs/r/servicecatalog_provisioned_product.html.markdown b/website/docs/r/servicecatalog_provisioned_product.html.markdown index bb4e6069784..40583c24427 100644 --- a/website/docs/r/servicecatalog_provisioned_product.html.markdown +++ b/website/docs/r/servicecatalog_provisioned_product.html.markdown @@ -116,13 +116,12 @@ valid results. Wait for an `AVAILABLE` status before performing operations. ## Timeouts -`aws_servicecatalog_provisioned_product` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `30 minutes`) -- `read` - (Default `10 minutes`) -- `update` - (Default `30 minutes`) -- `delete` - (Default `30 minutes`) +- `create` - (Default `30m`) +- `read` - (Default `10m`) +- `update` - (Default `30m`) +- `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/servicecatalog_provisioning_artifact.html.markdown b/website/docs/r/servicecatalog_provisioning_artifact.html.markdown index 3c14a2c7c4a..de6139596fe 100644 --- a/website/docs/r/servicecatalog_provisioning_artifact.html.markdown +++ b/website/docs/r/servicecatalog_provisioning_artifact.html.markdown @@ -57,13 +57,12 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_servicecatalog_provisioning_artifact` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `3 minutes`) -- `read` - (Default `10 minutes`) -- `update` - (Default `3 minutes`) -- `delete` - (Default `3 minutes`) +- `create` - (Default `3m`) +- `read` - (Default `10m`) +- `update` - (Default `3m`) +- `delete` - (Default `3m`) ## Import diff --git a/website/docs/r/servicecatalog_service_action.html.markdown b/website/docs/r/servicecatalog_service_action.html.markdown index c9c8ebdfdbe..5a1c7e91843 100644 --- a/website/docs/r/servicecatalog_service_action.html.markdown +++ b/website/docs/r/servicecatalog_service_action.html.markdown @@ -55,13 +55,12 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_servicecatalog_service_action` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `3 minutes`) -- `read` - (Default `10 minutes`) -- `update` - (Default `3 minutes`) -- `delete` - (Default `3 minutes`) +- `create` - (Default `3m`) +- `read` - (Default `10m`) +- `update` - (Default `3m`) +- `delete` - (Default `3m`) ## Import diff --git a/website/docs/r/servicecatalog_tag_option.html.markdown b/website/docs/r/servicecatalog_tag_option.html.markdown index 0dc39447933..724d0de3b3e 100644 --- a/website/docs/r/servicecatalog_tag_option.html.markdown +++ b/website/docs/r/servicecatalog_tag_option.html.markdown @@ -41,13 +41,12 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_servicecatalog_tag_option` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `3 minutes`) -- `read` - (Default `10 minutes`) -- `update` - (Default `3 minutes`) -- `delete` - (Default `3 minutes`) +- `create` - (Default `3m`) +- `read` - (Default `10m`) +- `update` - (Default `3m`) +- `delete` - (Default `3m`) ## Import diff --git a/website/docs/r/servicecatalog_tag_option_resource_association.html.markdown b/website/docs/r/servicecatalog_tag_option_resource_association.html.markdown index 1eb14c76e39..68ec7d4e80f 100644 --- a/website/docs/r/servicecatalog_tag_option_resource_association.html.markdown +++ b/website/docs/r/servicecatalog_tag_option_resource_association.html.markdown @@ -42,12 +42,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_servicecatalog_tag_option_resource_association` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `3 minutes`) -- `read` - (Default `10 minutes`) -- `delete` - (Default `3 minutes`) +- `create` - (Default `3m`) +- `read` - (Default `10m`) +- `delete` - (Default `3m`) ## Import diff --git a/website/docs/r/ses_domain_identity_verification.html.markdown b/website/docs/r/ses_domain_identity_verification.html.markdown index 503b04f92e8..2fa60b82782 100644 --- a/website/docs/r/ses_domain_identity_verification.html.markdown +++ b/website/docs/r/ses_domain_identity_verification.html.markdown @@ -53,7 +53,6 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`acm_ses_domain_identity_verification` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `45m`) How long to wait for a domain identity to be verified. +- `create` - (Default `45m`) diff --git a/website/docs/r/spot_fleet_request.html.markdown b/website/docs/r/spot_fleet_request.html.markdown index 89fd1c757e5..f66c619601f 100644 --- a/website/docs/r/spot_fleet_request.html.markdown +++ b/website/docs/r/spot_fleet_request.html.markdown @@ -382,13 +382,6 @@ This configuration block supports the following: * `min` - (Optional) Minimum. * `max` - (Optional) Maximum. -### Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: - -* `create` - (Defaults to 10 mins) Used when requesting the spot instance (only valid if `wait_for_fulfillment = true`) -* `delete` - (Defaults to 15 mins) Used when destroying the spot instance - ## Attributes Reference In addition to all arguments above, the following attributes are exported: @@ -397,6 +390,13 @@ In addition to all arguments above, the following attributes are exported: * `spot_request_state` - The state of the Spot fleet request. * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +* `create` - (Default `10m`) +* `delete` - (Default `15m`) + ## Import Spot Fleet Requests can be imported using `id`, e.g., diff --git a/website/docs/r/spot_instance_request.html.markdown b/website/docs/r/spot_instance_request.html.markdown index f5c2f0f9b29..8783c0e315a 100644 --- a/website/docs/r/spot_instance_request.html.markdown +++ b/website/docs/r/spot_instance_request.html.markdown @@ -68,13 +68,6 @@ Spot Instance Requests support all the same arguments as * `valid_from` - (Optional) The start date and time of the request, in UTC [RFC3339](https://tools.ietf.org/html/rfc3339#section-5.8) format(for example, YYYY-MM-DDTHH:MM:SSZ). The default is to start fulfilling the request immediately. * `tags` - (Optional) A map of tags to assign to the Spot Instance Request. These tags are not automatically applied to the launched Instance. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. -### Timeouts - -The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) for certain actions: - -* `create` - (Defaults to 10 mins) Used when requesting the spot instance (only valid if `wait_for_fulfillment = true`) -* `delete` - (Defaults to 20 mins) Used when terminating all instances launched via the given spot instance request - ## Attributes Reference In addition to all arguments above, the following attributes are exported: @@ -100,3 +93,10 @@ should only be used for informational purposes, not for resource dependencies: for your VPC * `private_ip` - The private IP address assigned to the instance * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +* `create` - (Default `10m`) +* `delete` - (Default `20m`) diff --git a/website/docs/r/storagegateway_gateway.html.markdown b/website/docs/r/storagegateway_gateway.html.markdown index 2e0ef44643d..b6341c1fa89 100644 --- a/website/docs/r/storagegateway_gateway.html.markdown +++ b/website/docs/r/storagegateway_gateway.html.markdown @@ -165,9 +165,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_storagegateway_gateway` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `10m`) How long to wait for gateway activation and connection to Storage Gateway. +* `create` - (Default `10m`) ## Import diff --git a/website/docs/r/storagegateway_nfs_file_share.html.markdown b/website/docs/r/storagegateway_nfs_file_share.html.markdown index c866c949b0b..9512b4eb166 100644 --- a/website/docs/r/storagegateway_nfs_file_share.html.markdown +++ b/website/docs/r/storagegateway_nfs_file_share.html.markdown @@ -74,11 +74,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_storagegateway_nfs_file_share` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `10m`) How long to wait for file share creation. -* `update` - (Default `10m`) How long to wait for file share updates. -* `delete` - (Default `10m`) How long to wait for file share deletion. +* `create` - (Default `10m`) +* `update` - (Default `10m`) +* `delete` - (Default `10m`) ## Import diff --git a/website/docs/r/storagegateway_smb_file_share.html.markdown b/website/docs/r/storagegateway_smb_file_share.html.markdown index 65a31dac294..0b1273b416b 100644 --- a/website/docs/r/storagegateway_smb_file_share.html.markdown +++ b/website/docs/r/storagegateway_smb_file_share.html.markdown @@ -87,11 +87,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_storagegateway_smb_file_share` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default `10m`) How long to wait for file share creation. -* `update` - (Default `10m`) How long to wait for file share updates. -* `delete` - (Default `15m`) How long to wait for file share deletion. +* `create` - (Default `10m`) +* `update` - (Default `10m`) +* `delete` - (Default `15m`) ## Import diff --git a/website/docs/r/subnet.html.markdown b/website/docs/r/subnet.html.markdown index fe6d6df1f42..c37770828c3 100644 --- a/website/docs/r/subnet.html.markdown +++ b/website/docs/r/subnet.html.markdown @@ -82,11 +82,10 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_subnet` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) -configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10m`) How long to wait for a subnet to be created. -- `delete` - (Default `20m`) How long to retry on `DependencyViolation` errors during subnet deletion from lingering ENIs left by certain AWS services such as Elastic Load Balancing. NOTE: Lambda ENIs can take up to 45 minutes to delete, which is not affected by changing this customizable timeout (in version 2.31.0 and later of the Terraform AWS Provider) unless it is increased above 45 minutes. +- `create` - (Default `10m`) +- `delete` - (Default `20m`) ## Import diff --git a/website/docs/r/transcribe_language_model.html.markdown b/website/docs/r/transcribe_language_model.html.markdown index 664350bfcf0..2a2e96a17d9 100644 --- a/website/docs/r/transcribe_language_model.html.markdown +++ b/website/docs/r/transcribe_language_model.html.markdown @@ -109,9 +109,9 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_transcribe_language_model` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Optional, Default: `600m`) +* `create` - (Default: `600m`) ## Import diff --git a/website/docs/r/transcribe_medical_vocabulary.html.markdown b/website/docs/r/transcribe_medical_vocabulary.html.markdown index 867ab80175a..a3f101103a2 100644 --- a/website/docs/r/transcribe_medical_vocabulary.html.markdown +++ b/website/docs/r/transcribe_medical_vocabulary.html.markdown @@ -64,11 +64,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_transcribe_medicalvocabulary` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Optional, Default: `30m`) -* `update` - (Optional, Default: `30m`) -* `delete` - (Optional, Default: `30m`) +* `create` - (Default: `30m`) +* `update` - (Default: `30m`) +* `delete` - (Default: `30m`) ## Import diff --git a/website/docs/r/transcribe_vocabulary.html.markdown b/website/docs/r/transcribe_vocabulary.html.markdown index bb6e71f7331..5baf7740059 100644 --- a/website/docs/r/transcribe_vocabulary.html.markdown +++ b/website/docs/r/transcribe_vocabulary.html.markdown @@ -66,11 +66,11 @@ In addition to all arguments above, the following attributes are exported: ## Timeouts -`aws_transcribe_vocabulary` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Optional, Default: `30m`) -* `update` - (Optional, Default: `30m`) -* `delete` - (Optional, Default: `30m`) +* `create` - (Default: `30m`) +* `update` - (Default: `30m`) +* `delete` - (Default: `30m`) ## Import diff --git a/website/docs/r/vpc_endpoint.html.markdown b/website/docs/r/vpc_endpoint.html.markdown index 22ffa927382..a77a90f3386 100644 --- a/website/docs/r/vpc_endpoint.html.markdown +++ b/website/docs/r/vpc_endpoint.html.markdown @@ -133,14 +133,13 @@ If no security groups are specified, the VPC's [default security group](https:// * `dns_record_ip_type` - (Optional) The DNS records created for the endpoint. Valid values are `ipv4`, `dualstack`, `service-defined`, and `ipv6`. -### Timeouts +## Timeouts -`aws_vpc_endpoint` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating a VPC endpoint -- `update` - (Default `10 minutes`) Used for VPC endpoint modifications -- `delete` - (Default `10 minutes`) Used for destroying VPC endpoints +- `create` - (Default `10m`) +- `update` - (Default `10m`) +- `delete` - (Default `10m`) ## Attributes Reference diff --git a/website/docs/r/vpc_endpoint_subnet_association.html.markdown b/website/docs/r/vpc_endpoint_subnet_association.html.markdown index cdcf479e170..9ff83cf120e 100644 --- a/website/docs/r/vpc_endpoint_subnet_association.html.markdown +++ b/website/docs/r/vpc_endpoint_subnet_association.html.markdown @@ -34,20 +34,19 @@ The following arguments are supported: * `vpc_endpoint_id` - (Required) The ID of the VPC endpoint with which the subnet will be associated. * `subnet_id` - (Required) The ID of the subnet to be associated with the VPC endpoint. -### Timeouts - -`aws_vpc_endpoint_subnet_association` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: - -- `create` - (Default `10 minutes`) Used for creating the association -- `delete` - (Default `10 minutes`) Used for destroying the association - ## Attributes Reference In addition to all arguments above, the following attributes are exported: * `id` - The ID of the association. +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +- `create` - (Default `10m`) +- `delete` - (Default `10m`) + ## Import VPC Endpoint Subnet Associations can be imported using `vpc_endpoint_id` together with `subnet_id`, diff --git a/website/docs/r/vpc_ipv4_cidr_block_association.html.markdown b/website/docs/r/vpc_ipv4_cidr_block_association.html.markdown index 1f5338b52a3..d4be14344dc 100644 --- a/website/docs/r/vpc_ipv4_cidr_block_association.html.markdown +++ b/website/docs/r/vpc_ipv4_cidr_block_association.html.markdown @@ -35,20 +35,19 @@ The following arguments are supported: * `ipv4_netmask_length` - (Optional) The netmask length of the IPv4 CIDR you want to allocate to this VPC. Requires specifying a `ipv4_ipam_pool_id`. * `vpc_id` - (Required) The ID of the VPC to make the association with. -## Timeouts - -`aws_vpc_ipv4_cidr_block_association` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: - -- `create` - (Default `10 minutes`) Used for creating the association -- `delete` - (Default `10 minutes`) Used for destroying the association - ## Attributes Reference In addition to all arguments above, the following attributes are exported: * `id` - The ID of the VPC CIDR association +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +- `create` - (Default `10m`) +- `delete` - (Default `10m`) + ## Import `aws_vpc_ipv4_cidr_block_association` can be imported by using the VPC CIDR Association ID, e.g., diff --git a/website/docs/r/vpc_ipv6_cidr_block_association.html.markdown b/website/docs/r/vpc_ipv6_cidr_block_association.html.markdown index 407ad16976e..52992b273ff 100644 --- a/website/docs/r/vpc_ipv6_cidr_block_association.html.markdown +++ b/website/docs/r/vpc_ipv6_cidr_block_association.html.markdown @@ -36,11 +36,10 @@ The following arguments are supported: ## Timeouts -`aws_vpc_ipv6_cidr_block_association` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `10 minutes`) Used for creating the association -- `delete` - (Default `10 minutes`) Used for destroying the association +- `create` - (Default `10m`) +- `delete` - (Default `10m`) ## Attributes Reference diff --git a/website/docs/r/vpc_peering_connection.html.markdown b/website/docs/r/vpc_peering_connection.html.markdown index 56060763737..21006d2e840 100644 --- a/website/docs/r/vpc_peering_connection.html.markdown +++ b/website/docs/r/vpc_peering_connection.html.markdown @@ -131,15 +131,6 @@ to the remote VPC. instance in a peer VPC. This enables an outbound communication from the local VPC to the remote ClassicLink connection. -### Timeouts - -`aws_vpc_peering_connection` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: - -- `create` - (Default `1 minute`) Used for creating a peering connection -- `update` - (Default `1 minute`) Used for peering connection modifications -- `delete` - (Default `1 minute`) Used for destroying peering connections - ## Attributes Reference In addition to all arguments above, the following attributes are exported: @@ -154,6 +145,15 @@ If both VPCs are not in the same AWS account and region do not enable the `auto_ The accepter can manage its side of the connection using the `aws_vpc_peering_connection_accepter` resource or accept the connection manually using the AWS Management Console, AWS CLI, through SDKs, etc. + +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +- `create` - (Default `1m`) +- `update` - (Default `1m`) +- `delete` - (Default `1m`) + ## Import VPC Peering resources can be imported using the `vpc peering id`, e.g., diff --git a/website/docs/r/vpn_gateway_route_propagation.html.markdown b/website/docs/r/vpn_gateway_route_propagation.html.markdown index b44d0518a40..11995d6a999 100644 --- a/website/docs/r/vpn_gateway_route_propagation.html.markdown +++ b/website/docs/r/vpn_gateway_route_propagation.html.markdown @@ -36,7 +36,7 @@ No additional attributes are exported. ## Timeouts -`aws_vpn_gateway_route_propagation` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -- `create` - (Default `2 minutes`) Used for propagation creation -- `delete` - (Default `2 minutes`) Used for propagation deletion +- `create` - (Default `2m`) +- `delete` - (Default `2m`) diff --git a/website/docs/r/workspaces_workspace.html.markdown b/website/docs/r/workspaces_workspace.html.markdown index 7c4324be918..40d4c2b2b01 100644 --- a/website/docs/r/workspaces_workspace.html.markdown +++ b/website/docs/r/workspaces_workspace.html.markdown @@ -63,15 +63,6 @@ The following arguments are supported: * `running_mode_auto_stop_timeout_in_minutes` – (Optional) The time after a user logs off when WorkSpaces are automatically stopped. Configured in 60-minute intervals. * `user_volume_size_gib` – (Optional) The size of the user storage. -### Timeouts - -`aws_workspaces_workspace` provides the following -[Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: - -- `create` - (Default `30 minutes`) Used for WorkSpace creation. -- `update` - (Default `10 minutes`) Used for WorkSpace updating. -- `delete` - (Default `10 minutes`) Used for WorkSpace termination. - ## Attributes Reference In addition to all arguments above, the following attributes are exported: @@ -82,6 +73,14 @@ In addition to all arguments above, the following attributes are exported: * `state` - The operational state of the WorkSpace. * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). +## Timeouts + +[Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): + +- `create` - (Default `30m`) +- `update` - (Default `10m`) +- `delete` - (Default `10m`) + ## Import Workspaces can be imported using their ID, e.g., From 83c23b8d0771dbaed1320edb7f35f6b05301033b Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Aug 2022 21:08:04 -0400 Subject: [PATCH 10/10] docs: Standardize timeout section --- skaff/resource/websitedoc.tmpl | 6 +++--- website/docs/r/elastic_beanstalk_environment.html.markdown | 2 +- website/docs/r/elasticsearch_domain.html.markdown | 6 +++--- website/docs/r/kendra_data_source.html.markdown | 6 +++--- website/docs/r/kendra_experience.html.markdown | 6 +++--- website/docs/r/kendra_faq.html.markdown | 4 ++-- .../r/kendra_query_suggestions_block_list.html.markdown | 6 +++--- website/docs/r/kendra_thesaurus.html.markdown | 6 +++--- website/docs/r/lightsail_container_service.html.markdown | 6 +++--- ...tsail_container_service_deployment_version.html.markdown | 2 +- website/docs/r/location_geofence_collection.html.markdown | 6 +++--- website/docs/r/location_route_calculator.html.markdown | 6 +++--- website/docs/r/opensearch_domain.html.markdown | 6 +++--- website/docs/r/opensearch_domain_policy.html.markdown | 4 ++-- website/docs/r/opensearch_domain_saml_options.html.markdown | 4 ++-- website/docs/r/transcribe_language_model.html.markdown | 2 +- website/docs/r/transcribe_medical_vocabulary.html.markdown | 6 +++--- website/docs/r/transcribe_vocabulary.html.markdown | 6 +++--- 18 files changed, 45 insertions(+), 45 deletions(-) diff --git a/skaff/resource/websitedoc.tmpl b/skaff/resource/websitedoc.tmpl index 95ddec491bf..38f0d8953ef 100644 --- a/skaff/resource/websitedoc.tmpl +++ b/skaff/resource/websitedoc.tmpl @@ -40,9 +40,9 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `60m`) -* `update` - (Default: `180m`) -* `delete` - (Default: `90m`) +* `create` - (Default `60m`) +* `update` - (Default `180m`) +* `delete` - (Default `90m`) ## Import diff --git a/website/docs/r/elastic_beanstalk_environment.html.markdown b/website/docs/r/elastic_beanstalk_environment.html.markdown index 951cda58e01..ba9e7e091bf 100644 --- a/website/docs/r/elastic_beanstalk_environment.html.markdown +++ b/website/docs/r/elastic_beanstalk_environment.html.markdown @@ -52,7 +52,7 @@ off of. Example stacks can be found in the [Amazon API documentation][1] template to use in deployment * `platform_arn` – (Optional) The [ARN][2] of the Elastic Beanstalk [Platform][3] to use in deployment -* `wait_for_ready_timeout` - (Default: `20m`) The maximum +* `wait_for_ready_timeout` - (Default `20m`) The maximum [duration](https://golang.org/pkg/time/#ParseDuration) that Terraform should wait for an Elastic Beanstalk Environment to be in a ready state before timing out. diff --git a/website/docs/r/elasticsearch_domain.html.markdown b/website/docs/r/elasticsearch_domain.html.markdown index 17645487e41..f0c436eca5b 100644 --- a/website/docs/r/elasticsearch_domain.html.markdown +++ b/website/docs/r/elasticsearch_domain.html.markdown @@ -348,9 +348,9 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `60m`) -* `update` - (Default: `60m`) -* `delete` - (Default: `90m`) +* `create` - (Default `60m`) +* `update` - (Default `60m`) +* `delete` - (Default `90m`) ## Import diff --git a/website/docs/r/kendra_data_source.html.markdown b/website/docs/r/kendra_data_source.html.markdown index 1652183214e..869520cc93b 100644 --- a/website/docs/r/kendra_data_source.html.markdown +++ b/website/docs/r/kendra_data_source.html.markdown @@ -501,9 +501,9 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `30m`) -* `update` - (Default: `30m`) -* `delete` - (Default: `30m`) +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/kendra_experience.html.markdown b/website/docs/r/kendra_experience.html.markdown index c3f78192364..535ef4396da 100644 --- a/website/docs/r/kendra_experience.html.markdown +++ b/website/docs/r/kendra_experience.html.markdown @@ -87,9 +87,9 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `30m`) -* `update` - (Default: `30m`) -* `delete` - (Default: `30m`) +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/kendra_faq.html.markdown b/website/docs/r/kendra_faq.html.markdown index ecc1c05d791..2810730b13f 100644 --- a/website/docs/r/kendra_faq.html.markdown +++ b/website/docs/r/kendra_faq.html.markdown @@ -101,8 +101,8 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `30m`) -* `delete` - (Default: `30m`) +* `create` - (Default `30m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/kendra_query_suggestions_block_list.html.markdown b/website/docs/r/kendra_query_suggestions_block_list.html.markdown index cda41603459..9217be5ca77 100644 --- a/website/docs/r/kendra_query_suggestions_block_list.html.markdown +++ b/website/docs/r/kendra_query_suggestions_block_list.html.markdown @@ -62,9 +62,9 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `30m`) -* `update` - (Default: `30m`) -* `delete` - (Default: `30m`) +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/kendra_thesaurus.html.markdown b/website/docs/r/kendra_thesaurus.html.markdown index e0d91d2f89c..db67f2f2000 100644 --- a/website/docs/r/kendra_thesaurus.html.markdown +++ b/website/docs/r/kendra_thesaurus.html.markdown @@ -61,9 +61,9 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `30m`) -* `update` - (Default: `30m`) -* `delete` - (Default: `30m`) +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/lightsail_container_service.html.markdown b/website/docs/r/lightsail_container_service.html.markdown index dc1e04625d1..2e1164ec3ab 100644 --- a/website/docs/r/lightsail_container_service.html.markdown +++ b/website/docs/r/lightsail_container_service.html.markdown @@ -106,9 +106,9 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `30m`) -* `update` - (Default: `30m`) -* `delete` - (Default: `30m`) +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/lightsail_container_service_deployment_version.html.markdown b/website/docs/r/lightsail_container_service_deployment_version.html.markdown index 40035fe5e0e..162ecc9ea5f 100644 --- a/website/docs/r/lightsail_container_service_deployment_version.html.markdown +++ b/website/docs/r/lightsail_container_service_deployment_version.html.markdown @@ -103,7 +103,7 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `30m`) +* `create` - (Default `30m`) ## Import diff --git a/website/docs/r/location_geofence_collection.html.markdown b/website/docs/r/location_geofence_collection.html.markdown index d24c11986d9..17aedfae70f 100644 --- a/website/docs/r/location_geofence_collection.html.markdown +++ b/website/docs/r/location_geofence_collection.html.markdown @@ -42,9 +42,9 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `30m`) -* `update` - (Default: `30m`) -* `delete` - (Default: `30m`) +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/location_route_calculator.html.markdown b/website/docs/r/location_route_calculator.html.markdown index 33c8bc2afb1..b761df78538 100644 --- a/website/docs/r/location_route_calculator.html.markdown +++ b/website/docs/r/location_route_calculator.html.markdown @@ -44,9 +44,9 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `30m`) -* `update` - (Default: `30m`) -* `delete` - (Default: `30m`) +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/opensearch_domain.html.markdown b/website/docs/r/opensearch_domain.html.markdown index 6d7a9be9bd6..e667723a8ae 100644 --- a/website/docs/r/opensearch_domain.html.markdown +++ b/website/docs/r/opensearch_domain.html.markdown @@ -365,9 +365,9 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `60m`) -* `update` - (Default: `180m`) -* `delete` - (Default: `90m`) +* `create` - (Default `60m`) +* `update` - (Default `180m`) +* `delete` - (Default `90m`) ## Import diff --git a/website/docs/r/opensearch_domain_policy.html.markdown b/website/docs/r/opensearch_domain_policy.html.markdown index 752360ba342..cd5016228b1 100644 --- a/website/docs/r/opensearch_domain_policy.html.markdown +++ b/website/docs/r/opensearch_domain_policy.html.markdown @@ -55,5 +55,5 @@ No additional attributes are exported. [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `update` - (Default: `180m`) -* `delete` - (Default: `90m`) +* `update` - (Default `180m`) +* `delete` - (Default `90m`) diff --git a/website/docs/r/opensearch_domain_saml_options.html.markdown b/website/docs/r/opensearch_domain_saml_options.html.markdown index 637490154a5..96ec7e17e3c 100644 --- a/website/docs/r/opensearch_domain_saml_options.html.markdown +++ b/website/docs/r/opensearch_domain_saml_options.html.markdown @@ -81,8 +81,8 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `update` - (Default: `180m`) -* `delete` - (Default: `90m`) +* `update` - (Default `180m`) +* `delete` - (Default `90m`) ## Import diff --git a/website/docs/r/transcribe_language_model.html.markdown b/website/docs/r/transcribe_language_model.html.markdown index 2a2e96a17d9..ff5dd49a34a 100644 --- a/website/docs/r/transcribe_language_model.html.markdown +++ b/website/docs/r/transcribe_language_model.html.markdown @@ -111,7 +111,7 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `600m`) +* `create` - (Default `600m`) ## Import diff --git a/website/docs/r/transcribe_medical_vocabulary.html.markdown b/website/docs/r/transcribe_medical_vocabulary.html.markdown index a3f101103a2..3bfa5ae052f 100644 --- a/website/docs/r/transcribe_medical_vocabulary.html.markdown +++ b/website/docs/r/transcribe_medical_vocabulary.html.markdown @@ -66,9 +66,9 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `30m`) -* `update` - (Default: `30m`) -* `delete` - (Default: `30m`) +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import diff --git a/website/docs/r/transcribe_vocabulary.html.markdown b/website/docs/r/transcribe_vocabulary.html.markdown index 5baf7740059..10ca2b383bb 100644 --- a/website/docs/r/transcribe_vocabulary.html.markdown +++ b/website/docs/r/transcribe_vocabulary.html.markdown @@ -68,9 +68,9 @@ In addition to all arguments above, the following attributes are exported: [Configuration options](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts): -* `create` - (Default: `30m`) -* `update` - (Default: `30m`) -* `delete` - (Default: `30m`) +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import