diff --git a/.github/workflows/test_terraform.yml b/.github/workflows/test_terraform.yml deleted file mode 100644 index 194c6d598..000000000 --- a/.github/workflows/test_terraform.yml +++ /dev/null @@ -1,48 +0,0 @@ -on: [workflow_dispatch] -name: TestTerraform -jobs: - prepare_list: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - id: set-matrix - run: echo "matrix=$(python tests/terraformtests/get_tf_services.py --names)" >> $GITHUB_OUTPUT - outputs: - matrix: ${{ steps.set-matrix.outputs.matrix }} - test_service: - needs: prepare_list - if: "!contains(github.event.pull_request.labels.*.name, 'java')" - strategy: - fail-fast: false - matrix: - service: ${{ fromJson(needs.prepare_list.outputs.matrix) }} - go-version: [1.21.x] - os: [ubuntu-latest] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v4 - with: - submodules: 'true' - - uses: actions/setup-go@v5 - with: - go-version: ${{ matrix.go-version }} - cache-dependency-path: tests/terraformtests/terraform-provider-aws/go.sum - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: "3.8" - - name: Start MotoServer - run: | - pip install PyYAML build - python -m build - docker run --rm -t --name motoserver -e TEST_SERVER_MODE=true -e MOTO_PORT=4566 -e AWS_SECRET_ACCESS_KEY=server_secret -e AWS_ACCESS_KEY_ID=server_key -v `pwd`:/moto -p 4566:4566 -v /var/run/docker.sock:/var/run/docker.sock python:3.9-slim /moto/scripts/ci_moto_server.sh & - MOTO_PORT=4566 python scripts/ci_wait_for_server.py - - name: Get list of tests for this service - id: get-list - run: echo "testlist=$(python tests/terraformtests/get_tf_tests.py '${{ matrix.service }}')" >> $GITHUB_OUTPUT - - name: Get original AWS service name - id: get-service-name - run: echo "servicename=$(python -c "print('${{ matrix.service }}'[:'${{ matrix.service }}'.index('|') if '|' in '${{ matrix.service }}' else len('${{ matrix.service }}')])")" >> $GITHUB_OUTPUT - - name: Execute tests - run: | - make terraformtests SERVICE_NAME=${{ steps.get-service-name.outputs.servicename }} TEST_NAMES=${{ steps.get-list.outputs.testlist }} diff --git a/.gitmodules b/.gitmodules index 037925161..e69de29bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "tests/terraformtests/terraform-provider-aws"] - path = tests/terraformtests/terraform-provider-aws - url = https://github.com/hashicorp/terraform-provider-aws/ diff --git a/tests/terraformtests/README.md b/tests/terraformtests/README.md deleted file mode 100644 index 9b36f6e27..000000000 --- a/tests/terraformtests/README.md +++ /dev/null @@ -1,35 +0,0 @@ -Documentation on how to run Terraform Tests can be found here: - -http://docs.getmoto.org/en/latest/docs/contributing/development_tips/tests.html#terraform-tests - -To get started you need to have [Go](https://go.dev/doc/install) installed. - -One time setup: - -```bash -go mod init moto -``` - -To see a list of available tests: - -```bash -cd tests/terraformtests/terraform-provider-aws -git submodule init -git submodule update -go test ./internal/service/elb/ -v -list TestAcc -``` - -To run a specific test: - -```bash -moto_server -p 4566 -make terraformtests SERVICE_NAME=elb TEST_NAMES=NewTestName -``` - -To see the list of tests that currently pass: - -```bash -python tests/terraformtests/get_tf_services.py -python tests/terraformtests/get_tf_tests.py ec2 -``` - diff --git a/tests/terraformtests/__init__.py b/tests/terraformtests/__init__.py deleted file mode 100644 index 54b6b0db1..000000000 --- a/tests/terraformtests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -name = "terraformtests" diff --git a/tests/terraformtests/bin/run_go_test b/tests/terraformtests/bin/run_go_test deleted file mode 100755 index 6593ecb21..000000000 --- a/tests/terraformtests/bin/run_go_test +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -pwd=$PWD - -( -cd terraform-provider-aws || exit -echo "Patching the terraform-provider-aws directory..." -echo "Patches may fail if the patch was already applied, or if the patch is outdated" -PATCH="etc/0001-Patch-Hardcode-endpoints-to-local-server.patch" -(git apply $pwd/etc/0001-Patch-Hardcode-endpoints-to-local-server.patch > /dev/null 2>&1 && echo "Patched endpoints") || echo "!! Not able to patch endpoints" -#(git apply $pwd/etc/0002-EC2-reduce-wait-times.patch > /dev/null 2>&1 && echo "Patched EC2") || echo "!! Not able to EC2" -(git apply $pwd/etc/0003-Patch-IAM-wait-times.patch > /dev/null 2>&1 && echo "Patched IAM") || echo "!! Not able to patch IAM" -(git apply $pwd/etc/0005-Route53-Reduce-wait-times.patch > /dev/null 2>&1 && echo "Patched Route53") || echo "!! Not able to patch Route53" -(git apply $pwd/etc/0006-CF-Reduce-wait-times.patch > /dev/null 2>&1 && echo "Patched CF") || echo "!! Not able to patch CF" -(git apply $pwd/etc/0007-Comprehend-Reduce-wait-times.patch > /dev/null 2>&1 && echo "Patched Comprehend") || echo "!! Not able to patch Comprehend" -(git apply $pwd/etc/0008-Patch-RDS-improvements.patch > /dev/null 2>&1 && echo "Patched RDS") || echo "!! Not able to patch RDS" -) - -( -cd terraform-provider-aws || exit -echo "Running tests $2 for service $1..." -TF_ACC=1 \ - AWS_ACCESS_KEY_ID=test AWS_SECRET_ACCESS_KEY=test \ - AWS_ALTERNATE_ACCESS_KEY_ID=test AWS_ALTERNATE_SECRET_ACCESS_KEY=test \ - AWS_THIRD_SECRET_ACCESS_KEY=test AWS_THIRD_ACCESS_KEY_ID=test \ - go test ./internal/service/$1/ -v -timeout 60m -run $2 -) diff --git a/tests/terraformtests/etc/0001-Patch-Hardcode-endpoints-to-local-server.patch b/tests/terraformtests/etc/0001-Patch-Hardcode-endpoints-to-local-server.patch deleted file mode 100644 index c6182f232..000000000 --- a/tests/terraformtests/etc/0001-Patch-Hardcode-endpoints-to-local-server.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 83f8df495c5fc187d925a7dd61f93d1fdc4f405b Mon Sep 17 00:00:00 2001 -From: Bert Blommers -Date: Sun, 13 Aug 2023 21:16:30 +0000 -Subject: [PATCH] Patch endpoints to localhost:4566 - ---- - internal/conns/config.go | 14 ++++++++++++++ - internal/provider/provider.go | 4 ++-- - 2 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/internal/conns/config.go b/internal/conns/config.go -index 72c9cabde0..1f2e0d00e9 100644 ---- a/internal/conns/config.go -+++ b/internal/conns/config.go -@@ -55,10 +55,24 @@ type Config struct { - UseFIPSEndpoint bool - } - -+// XXX: added by bblommers -+func GetLocalEndpoints() map[string]string { -+ const localEndpoint = "http://localhost:4566" -+ var localEndpoints = map[string]string{} -+ for _, name := range names.Aliases() { -+ localEndpoints[name] = localEndpoint -+ } -+ return localEndpoints -+} -+ - // ConfigureProvider configures the provided provider Meta (instance data). - func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWSClient, diag.Diagnostics) { - var diags diag.Diagnostics - -+ // XXX: added by bblommers -+ // insert custom endpoints -+ c.Endpoints = GetLocalEndpoints() -+ - awsbaseConfig := awsbase.Config{ - AccessKey: c.AccessKey, - APNInfo: StdUserAgentProducts(c.TerraformVersion), -diff --git a/internal/provider/provider.go b/internal/provider/provider.go -index 88c6ea9538..cfe78c5549 100644 ---- a/internal/provider/provider.go -+++ b/internal/provider/provider.go -@@ -452,13 +452,13 @@ func configure(ctx context.Context, provider *schema.Provider, d *schema.Resourc - CustomCABundle: d.Get("custom_ca_bundle").(string), - EC2MetadataServiceEndpoint: d.Get("ec2_metadata_service_endpoint").(string), - EC2MetadataServiceEndpointMode: d.Get("ec2_metadata_service_endpoint_mode").(string), -- Endpoints: make(map[string]string), -+ Endpoints: conns.GetLocalEndpoints(), // XXX: added by bblommers - HTTPProxy: d.Get("http_proxy").(string), - Insecure: d.Get("insecure").(bool), - MaxRetries: 25, // Set default here, not in schema (muxing with v6 provider). - Profile: d.Get("profile").(string), - Region: d.Get("region").(string), -- S3UsePathStyle: d.Get("s3_use_path_style").(bool), -+ S3UsePathStyle: true, - SecretKey: d.Get("secret_key").(string), - SkipCredsValidation: d.Get("skip_credentials_validation").(bool), - SkipRegionValidation: d.Get("skip_region_validation").(bool), --- -2.25.1 diff --git a/tests/terraformtests/etc/0002-EC2-reduce-wait-times.patch b/tests/terraformtests/etc/0002-EC2-reduce-wait-times.patch deleted file mode 100644 index 48f157828..000000000 --- a/tests/terraformtests/etc/0002-EC2-reduce-wait-times.patch +++ /dev/null @@ -1,1160 +0,0 @@ -From 7074c7dbf89a9aa796fbdc4a5132fca6b4bf5598 Mon Sep 17 00:00:00 2001 -From: Bert Blommers -Date: Sun, 19 Jun 2022 19:37:57 +0000 -Subject: [PATCH] EC2: Reduce wait times - ---- - internal/service/ec2/create_tags_gen.go | 2 +- - internal/service/ec2/ebs_snapshot.go | 4 +- - internal/service/ec2/ebs_snapshot_copy.go | 4 +- - .../ebs_snapshot_create_volume_permission.go | 4 +- - internal/service/ec2/ebs_snapshot_import.go | 4 +- - internal/service/ec2/ebs_volume.go | 6 +- - internal/service/ec2/ebs_volume_attachment.go | 4 +- - internal/service/ec2/ec2_ami.go | 4 +- - internal/service/ec2/ec2_eip.go | 8 +- - internal/service/ec2/ec2_fleet.go | 6 +- - internal/service/ec2/ec2_instance.go | 6 +- - .../service/ec2/ec2_spot_fleet_request.go | 6 +- - .../ec2/ec2_spot_fleet_request_test.go | 2 +- - .../service/ec2/ec2_spot_instance_request.go | 4 +- - .../service/ec2/generate/createtags/main.go | 2 +- - internal/service/ec2/ipam_.go | 4 +- - internal/service/ec2/ipam_pool.go | 6 +- - internal/service/ec2/ipam_pool_cidr.go | 4 +- - internal/service/ec2/ipam_scope.go | 4 +- - .../ec2/outposts_local_gateway_route.go | 2 +- - internal/service/ec2/transitgateway_.go | 28 ++-- - .../service/ec2/transitgateway_connect.go | 6 +- - .../ec2/transitgateway_connect_peer.go | 4 +- - .../ec2/transitgateway_multicast_domain.go | 4 +- - ...sitgateway_multicast_domain_association.go | 4 +- - .../service/ec2/vpc_default_route_table.go | 4 +- - internal/service/ec2/vpc_default_subnet.go | 4 +- - internal/service/ec2/vpc_endpoint.go | 6 +- - internal/service/ec2/vpc_endpoint_policy.go | 4 +- - internal/service/ec2/vpc_endpoint_service.go | 4 +- - .../ec2/vpc_endpoint_subnet_association.go | 8 +- - .../ec2/vpc_ipv4_cidr_block_association.go | 4 +- - .../ec2/vpc_ipv6_cidr_block_association.go | 4 +- - .../service/ec2/vpc_peering_connection.go | 6 +- - .../ec2/vpc_peering_connection_accepter.go | 4 +- - internal/service/ec2/vpc_route.go | 6 +- - internal/service/ec2/vpc_route_table.go | 6 +- - internal/service/ec2/vpc_security_group.go | 6 +- - internal/service/ec2/vpc_subnet.go | 4 +- - .../ec2/vpnsite_gateway_route_propagation.go | 4 +- - internal/service/ec2/wait.go | 128 +++++++++--------- - 41 files changed, 167 insertions(+), 167 deletions(-) - -diff --git a/internal/service/ec2/create_tags_gen.go b/internal/service/ec2/create_tags_gen.go -index dede4649b4..c6d8d8db4e 100644 ---- a/internal/service/ec2/create_tags_gen.go -+++ b/internal/service/ec2/create_tags_gen.go -@@ -14,7 +14,7 @@ import ( - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - ) - --const EventualConsistencyTimeout = 5 * time.Minute -+const EventualConsistencyTimeout = 5 * time.Second - - // CreateTags creates ec2 service tags for new resources. - // The identifier is typically the Amazon Resource Name (ARN), although -diff --git a/internal/service/ec2/ebs_snapshot.go b/internal/service/ec2/ebs_snapshot.go -index 38ecbd73ea..576203732e 100644 ---- a/internal/service/ec2/ebs_snapshot.go -+++ b/internal/service/ec2/ebs_snapshot.go -@@ -31,8 +31,8 @@ func ResourceEBSSnapshot() *schema.Resource { - CustomizeDiff: verify.SetTagsDiff, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(10 * time.Minute), -+ Create: schema.DefaultTimeout(1 * time.Minute), -+ Delete: schema.DefaultTimeout(1 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ -diff --git a/internal/service/ec2/ebs_snapshot_copy.go b/internal/service/ec2/ebs_snapshot_copy.go -index a1fccab1b9..0894e9f87b 100644 ---- a/internal/service/ec2/ebs_snapshot_copy.go -+++ b/internal/service/ec2/ebs_snapshot_copy.go -@@ -24,8 +24,8 @@ func ResourceEBSSnapshotCopy() *schema.Resource { - CustomizeDiff: verify.SetTagsDiff, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(10 * time.Minute), -+ Create: schema.DefaultTimeout(1 * time.Minute), -+ Delete: schema.DefaultTimeout(1 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ -diff --git a/internal/service/ec2/ebs_snapshot_create_volume_permission.go b/internal/service/ec2/ebs_snapshot_create_volume_permission.go -index f5e205f7b7..ffd26a66b5 100644 ---- a/internal/service/ec2/ebs_snapshot_create_volume_permission.go -+++ b/internal/service/ec2/ebs_snapshot_create_volume_permission.go -@@ -24,8 +24,8 @@ func ResourceSnapshotCreateVolumePermission() *schema.Resource { - CustomizeDiff: resourceSnapshotCreateVolumePermissionCustomizeDiff, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(20 * time.Minute), -- Delete: schema.DefaultTimeout(5 * time.Minute), -+ Create: schema.DefaultTimeout(2 * time.Minute), -+ Delete: schema.DefaultTimeout(1 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ -diff --git a/internal/service/ec2/ebs_snapshot_import.go b/internal/service/ec2/ebs_snapshot_import.go -index e2f487a7bc..eca3c7be12 100644 ---- a/internal/service/ec2/ebs_snapshot_import.go -+++ b/internal/service/ec2/ebs_snapshot_import.go -@@ -27,8 +27,8 @@ func ResourceEBSSnapshotImport() *schema.Resource { - CustomizeDiff: verify.SetTagsDiff, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(60 * time.Minute), -- Delete: schema.DefaultTimeout(10 * time.Minute), -+ Create: schema.DefaultTimeout(6 * time.Minute), -+ Delete: schema.DefaultTimeout(1 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ -diff --git a/internal/service/ec2/ebs_volume.go b/internal/service/ec2/ebs_volume.go -index 4fbdfb3ba7..e284717ee6 100644 ---- a/internal/service/ec2/ebs_volume.go -+++ b/internal/service/ec2/ebs_volume.go -@@ -31,9 +31,9 @@ func ResourceEBSVolume() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(5 * time.Minute), -- Update: schema.DefaultTimeout(5 * time.Minute), -- Delete: schema.DefaultTimeout(5 * time.Minute), -+ Create: schema.DefaultTimeout(1 * time.Minute), -+ Update: schema.DefaultTimeout(1 * time.Minute), -+ Delete: schema.DefaultTimeout(1 * time.Minute), - }, - - CustomizeDiff: customdiff.Sequence( -diff --git a/internal/service/ec2/ebs_volume_attachment.go b/internal/service/ec2/ebs_volume_attachment.go -index 410c3b5107..0b31e4e618 100644 ---- a/internal/service/ec2/ebs_volume_attachment.go -+++ b/internal/service/ec2/ebs_volume_attachment.go -@@ -43,8 +43,8 @@ func ResourceVolumeAttachment() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(5 * time.Minute), -- Delete: schema.DefaultTimeout(5 * time.Minute), -+ Create: schema.DefaultTimeout(1 * time.Minute), -+ Delete: schema.DefaultTimeout(1 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ -diff --git a/internal/service/ec2/ec2_ami.go b/internal/service/ec2/ec2_ami.go -index f2d401ce3d..ef399c8ce6 100644 ---- a/internal/service/ec2/ec2_ami.go -+++ b/internal/service/ec2/ec2_ami.go -@@ -22,8 +22,8 @@ import ( - ) - - const ( -- amiRetryTimeout = 40 * time.Minute -- amiDeleteTimeout = 90 * time.Minute -+ amiRetryTimeout = 4 * time.Minute -+ amiDeleteTimeout = 9 * time.Minute - amiRetryDelay = 5 * time.Second - amiRetryMinTimeout = 3 * time.Second - ) -diff --git a/internal/service/ec2/ec2_eip.go b/internal/service/ec2/ec2_eip.go -index aac7e3119c..300c97092e 100644 ---- a/internal/service/ec2/ec2_eip.go -+++ b/internal/service/ec2/ec2_eip.go -@@ -21,7 +21,7 @@ import ( - - const ( - // Maximum amount of time to wait for EIP association with EC2-Classic instances -- addressAssociationClassicTimeout = 2 * time.Minute -+ addressAssociationClassicTimeout = 1 * time.Minute - ) - - func ResourceEIP() *schema.Resource { -@@ -37,9 +37,9 @@ func ResourceEIP() *schema.Resource { - CustomizeDiff: verify.SetTagsDiff, - - Timeouts: &schema.ResourceTimeout{ -- Read: schema.DefaultTimeout(15 * time.Minute), -- Update: schema.DefaultTimeout(5 * time.Minute), -- Delete: schema.DefaultTimeout(3 * time.Minute), -+ Read: schema.DefaultTimeout(3 * time.Minute), -+ Update: schema.DefaultTimeout(2 * time.Minute), -+ Delete: schema.DefaultTimeout(1 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ -diff --git a/internal/service/ec2/ec2_fleet.go b/internal/service/ec2/ec2_fleet.go -index b4c4e161d3..c7cc4b394d 100644 ---- a/internal/service/ec2/ec2_fleet.go -+++ b/internal/service/ec2/ec2_fleet.go -@@ -33,9 +33,9 @@ func ResourceFleet() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(10 * time.Minute), -- Update: schema.DefaultTimeout(10 * time.Minute), -+ Create: schema.DefaultTimeout(1 * time.Minute), -+ Delete: schema.DefaultTimeout(1 * time.Minute), -+ Update: schema.DefaultTimeout(1 * time.Minute), - }, - - CustomizeDiff: customdiff.All( -diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go -index 268e49d0ef..097d80dcb2 100644 ---- a/internal/service/ec2/ec2_instance.go -+++ b/internal/service/ec2/ec2_instance.go -@@ -45,9 +45,9 @@ func ResourceInstance() *schema.Resource { - MigrateState: InstanceMigrateState, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Update: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(20 * time.Minute), -+ Create: schema.DefaultTimeout(1 * time.Minute), -+ Update: schema.DefaultTimeout(1 * time.Minute), -+ Delete: schema.DefaultTimeout(2 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ -diff --git a/internal/service/ec2/ec2_spot_fleet_request.go b/internal/service/ec2/ec2_spot_fleet_request.go -index d47742a790..5db732e457 100644 ---- a/internal/service/ec2/ec2_spot_fleet_request.go -+++ b/internal/service/ec2/ec2_spot_fleet_request.go -@@ -38,9 +38,9 @@ func ResourceSpotFleetRequest() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Update: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(15 * time.Minute), -+ Create: schema.DefaultTimeout(1 * time.Minute), -+ Update: schema.DefaultTimeout(1 * time.Minute), -+ Delete: schema.DefaultTimeout(2 * time.Minute), - }, - - SchemaVersion: 1, -diff --git a/internal/service/ec2/ec2_spot_fleet_request_test.go b/internal/service/ec2/ec2_spot_fleet_request_test.go -index c3ae2845ce..6852b2df3b 100644 ---- a/internal/service/ec2/ec2_spot_fleet_request_test.go -+++ b/internal/service/ec2/ec2_spot_fleet_request_test.go -@@ -1141,7 +1141,7 @@ func TestAccEC2SpotFleetRequest_withWeightedCapacity(t *testing.T) { - // See https://github.com/hashicorp/terraform/pull/8938 - return func(s *terraform.State) error { - log.Print("[DEBUG] Test: Sleep to allow EC2 to actually begin fulfilling TestAccEC2SpotFleetRequest_withWeightedCapacity request") -- time.Sleep(1 * time.Minute) -+ time.Sleep(1 * time.Second) - return nil - } - } -diff --git a/internal/service/ec2/ec2_spot_instance_request.go b/internal/service/ec2/ec2_spot_instance_request.go -index 1cee62f547..2798d62577 100644 ---- a/internal/service/ec2/ec2_spot_instance_request.go -+++ b/internal/service/ec2/ec2_spot_instance_request.go -@@ -31,8 +31,8 @@ func ResourceSpotInstanceRequest() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(20 * time.Minute), -+ Create: schema.DefaultTimeout(1 * time.Minute), -+ Delete: schema.DefaultTimeout(2 * time.Minute), - }, - - Schema: func() map[string]*schema.Schema { -diff --git a/internal/service/ec2/generate/createtags/main.go b/internal/service/ec2/generate/createtags/main.go -index d42232fc09..8f7f983957 100644 ---- a/internal/service/ec2/generate/createtags/main.go -+++ b/internal/service/ec2/generate/createtags/main.go -@@ -133,7 +133,7 @@ import ( - tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - ) - --const EventualConsistencyTimeout = 5 * time.Minute -+const EventualConsistencyTimeout = 5 * time.Second - - // CreateTags creates {{ .ServicePackage }} service tags for new resources. - // The identifier is typically the Amazon Resource Name (ARN), although -diff --git a/internal/service/ec2/ipam_.go b/internal/service/ec2/ipam_.go -index 5bcdcbcefa..7e61d28cb0 100644 ---- a/internal/service/ec2/ipam_.go -+++ b/internal/service/ec2/ipam_.go -@@ -72,9 +72,9 @@ func ResourceIPAM() *schema.Resource { - - const ( - invalidIPAMIDNotFound = "InvalidIpamId.NotFound" -- ipamCreateTimeout = 3 * time.Minute -+ ipamCreateTimeout = 1 * time.Minute - ipamCreateDelay = 5 * time.Second -- IPAMDeleteTimeout = 3 * time.Minute -+ IPAMDeleteTimeout = 1 * time.Minute - ipamDeleteDelay = 5 * time.Second - ) - -diff --git a/internal/service/ec2/ipam_pool.go b/internal/service/ec2/ipam_pool.go -index 74b54d6c32..d7f4c2b8a1 100644 ---- a/internal/service/ec2/ipam_pool.go -+++ b/internal/service/ec2/ipam_pool.go -@@ -114,10 +114,10 @@ func ResourceIPAMPool() *schema.Resource { - } - - const ( -- ipamPoolCreateTimeout = 3 * time.Minute -+ ipamPoolCreateTimeout = 1 * time.Minute - InvalidIPAMPoolIDNotFound = "InvalidIpamPoolId.NotFound" -- ipamPoolUpdateTimeout = 3 * time.Minute -- IPAMPoolDeleteTimeout = 3 * time.Minute -+ ipamPoolUpdateTimeout = 1 * time.Minute -+ IPAMPoolDeleteTimeout = 1 * time.Minute - ipamPoolAvailableDelay = 5 * time.Second - ipamPoolDeleteDelay = 5 * time.Second - ) -diff --git a/internal/service/ec2/ipam_pool_cidr.go b/internal/service/ec2/ipam_pool_cidr.go -index bd23ef9ee0..18a38fafa6 100644 ---- a/internal/service/ec2/ipam_pool_cidr.go -+++ b/internal/service/ec2/ipam_pool_cidr.go -@@ -65,9 +65,9 @@ func ResourceIPAMPoolCIDR() *schema.Resource { - } - - const ( -- ipamPoolCIDRCreateTimeout = 10 * time.Minute -+ ipamPoolCIDRCreateTimeout = 10 * time.Second - // allocations releases are eventually consistent with a max time of 20m -- ipamPoolCIDRDeleteTimeout = 32 * time.Minute -+ ipamPoolCIDRDeleteTimeout = 32 * time.Second - ipamPoolCIDRAvailableDelay = 5 * time.Second - ipamPoolCIDRDeleteDelay = 5 * time.Second - ) -diff --git a/internal/service/ec2/ipam_scope.go b/internal/service/ec2/ipam_scope.go -index c8121239c4..5f75fdee82 100644 ---- a/internal/service/ec2/ipam_scope.go -+++ b/internal/service/ec2/ipam_scope.go -@@ -64,9 +64,9 @@ func ResourceIPAMScope() *schema.Resource { - } - - const ( -- ipamScopeCreateTimeout = 3 * time.Minute -+ ipamScopeCreateTimeout = 1 * time.Minute - ipamScopeCreateDeley = 5 * time.Second -- IPAMScopeDeleteTimeout = 3 * time.Minute -+ IPAMScopeDeleteTimeout = 1 * time.Minute - ipamScopeDeleteDelay = 5 * time.Second - - invalidIPAMScopeIDNotFound = "InvalidIpamScopeId.NotFound" -diff --git a/internal/service/ec2/outposts_local_gateway_route.go b/internal/service/ec2/outposts_local_gateway_route.go -index b85beed092..dadbd1c35d 100644 ---- a/internal/service/ec2/outposts_local_gateway_route.go -+++ b/internal/service/ec2/outposts_local_gateway_route.go -@@ -17,7 +17,7 @@ import ( - ) - - const ( -- localGatewayRouteEventualConsistencyTimeout = 1 * time.Minute -+ localGatewayRouteEventualConsistencyTimeout = 1 * time.Second - ) - - func ResourceLocalGatewayRoute() *schema.Resource { -diff --git a/internal/service/ec2/transitgateway_.go b/internal/service/ec2/transitgateway_.go -index 7393846669..c00d5eebd1 100644 ---- a/internal/service/ec2/transitgateway_.go -+++ b/internal/service/ec2/transitgateway_.go -@@ -33,9 +33,9 @@ func ResourceTransitGateway() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Update: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(10 * time.Minute), -+ Create: schema.DefaultTimeout(10 * time.Second), -+ Update: schema.DefaultTimeout(10 * time.Second), -+ Delete: schema.DefaultTimeout(10 * time.Second), - }, - - CustomizeDiff: customdiff.Sequence( -@@ -753,7 +753,7 @@ func waitForTransitGatewayPeeringAttachmentAcceptance(conn *ec2.EC2, transitGate - }, - Target: []string{ec2.TransitGatewayAttachmentStateAvailable}, - Refresh: transitGatewayPeeringAttachmentRefreshFunc(conn, transitGatewayAttachmentID), -- Timeout: 10 * time.Minute, -+ Timeout: 10 * time.Second, - } - - log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Peering Attachment (%s) availability", transitGatewayAttachmentID) -@@ -774,7 +774,7 @@ func waitForTransitGatewayPeeringAttachmentCreation(conn *ec2.EC2, transitGatewa - ec2.TransitGatewayAttachmentStatePendingAcceptance, - }, - Refresh: transitGatewayPeeringAttachmentRefreshFunc(conn, transitGatewayAttachmentID), -- Timeout: 10 * time.Minute, -+ Timeout: 10 * time.Second, - } - - log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Peering Attachment (%s) availability", transitGatewayAttachmentID) -@@ -793,7 +793,7 @@ func WaitForTransitGatewayPeeringAttachmentDeletion(conn *ec2.EC2, transitGatewa - }, - Target: []string{ec2.TransitGatewayAttachmentStateDeleted}, - Refresh: transitGatewayPeeringAttachmentRefreshFunc(conn, transitGatewayAttachmentID), -- Timeout: 10 * time.Minute, -+ Timeout: 10 * time.Second, - } - - log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Peering Attachment (%s) deletion", transitGatewayAttachmentID) -@@ -811,7 +811,7 @@ func waitForTransitGatewayRouteTableAssociationCreation(conn *ec2.EC2, transitGa - Pending: []string{ec2.TransitGatewayAssociationStateAssociating}, - Target: []string{ec2.TransitGatewayAssociationStateAssociated}, - Refresh: transitGatewayRouteTableAssociationRefreshFunc(conn, transitGatewayRouteTableID, transitGatewayAttachmentID), -- Timeout: 5 * time.Minute, -+ Timeout: 5 * time.Second, - } - - log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Route Table (%s) association: %s", transitGatewayRouteTableID, transitGatewayAttachmentID) -@@ -828,7 +828,7 @@ func waitForTransitGatewayRouteTableAssociationDeletion(conn *ec2.EC2, transitGa - }, - Target: []string{""}, - Refresh: transitGatewayRouteTableAssociationRefreshFunc(conn, transitGatewayRouteTableID, transitGatewayAttachmentID), -- Timeout: 5 * time.Minute, -+ Timeout: 5 * time.Second, - NotFoundChecks: 1, - } - -@@ -847,7 +847,7 @@ func waitForTransitGatewayRouteTableCreation(conn *ec2.EC2, transitGatewayRouteT - Pending: []string{ec2.TransitGatewayRouteTableStatePending}, - Target: []string{ec2.TransitGatewayRouteTableStateAvailable}, - Refresh: transitGatewayRouteTableRefreshFunc(conn, transitGatewayRouteTableID), -- Timeout: 10 * time.Minute, -+ Timeout: 10 * time.Second, - } - - log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Route Table (%s) availability", transitGatewayRouteTableID) -@@ -864,7 +864,7 @@ func waitForTransitGatewayRouteTableDeletion(conn *ec2.EC2, transitGatewayRouteT - }, - Target: []string{ec2.TransitGatewayRouteTableStateDeleted}, - Refresh: transitGatewayRouteTableRefreshFunc(conn, transitGatewayRouteTableID), -- Timeout: 10 * time.Minute, -+ Timeout: 10 * time.Second, - NotFoundChecks: 1, - } - -@@ -886,7 +886,7 @@ func waitForTransitGatewayVPCAttachmentAcceptance(conn *ec2.EC2, transitGatewayA - }, - Target: []string{ec2.TransitGatewayAttachmentStateAvailable}, - Refresh: transitGatewayAttachmentRefreshFunc(conn, transitGatewayAttachmentID), -- Timeout: 10 * time.Minute, -+ Timeout: 10 * time.Second, - } - - log.Printf("[DEBUG] Waiting for EC2 Transit Gateway VPC Attachment (%s) availability", transitGatewayAttachmentID) -@@ -903,7 +903,7 @@ func waitForTransitGatewayAttachmentCreation(conn *ec2.EC2, transitGatewayAttach - ec2.TransitGatewayAttachmentStateAvailable, - }, - Refresh: transitGatewayAttachmentRefreshFunc(conn, transitGatewayAttachmentID), -- Timeout: 10 * time.Minute, -+ Timeout: 10 * time.Second, - } - - log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Attachment (%s) availability", transitGatewayAttachmentID) -@@ -920,7 +920,7 @@ func WaitForTransitGatewayAttachmentDeletion(conn *ec2.EC2, transitGatewayAttach - }, - Target: []string{ec2.TransitGatewayAttachmentStateDeleted}, - Refresh: transitGatewayAttachmentRefreshFunc(conn, transitGatewayAttachmentID), -- Timeout: 10 * time.Minute, -+ Timeout: 10 * time.Second, - NotFoundChecks: 1, - } - -@@ -939,7 +939,7 @@ func waitForTransitGatewayAttachmentUpdate(conn *ec2.EC2, transitGatewayAttachme - Pending: []string{ec2.TransitGatewayAttachmentStateModifying}, - Target: []string{ec2.TransitGatewayAttachmentStateAvailable}, - Refresh: transitGatewayAttachmentRefreshFunc(conn, transitGatewayAttachmentID), -- Timeout: 10 * time.Minute, -+ Timeout: 10 * time.Second, - } - - log.Printf("[DEBUG] Waiting for EC2 Transit Gateway Attachment (%s) availability", transitGatewayAttachmentID) -diff --git a/internal/service/ec2/transitgateway_connect.go b/internal/service/ec2/transitgateway_connect.go -index 87697fd0dc..1d27d0eadb 100644 ---- a/internal/service/ec2/transitgateway_connect.go -+++ b/internal/service/ec2/transitgateway_connect.go -@@ -29,9 +29,9 @@ func ResourceTransitGatewayConnect() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Update: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(10 * time.Minute), -+ Create: schema.DefaultTimeout(10 * time.Second), -+ Update: schema.DefaultTimeout(10 * time.Second), -+ Delete: schema.DefaultTimeout(10 * time.Second), - }, - - CustomizeDiff: verify.SetTagsDiff, -diff --git a/internal/service/ec2/transitgateway_connect_peer.go b/internal/service/ec2/transitgateway_connect_peer.go -index 2e1e95dd3a..286d15d29d 100644 ---- a/internal/service/ec2/transitgateway_connect_peer.go -+++ b/internal/service/ec2/transitgateway_connect_peer.go -@@ -34,8 +34,8 @@ func ResourceTransitGatewayConnectPeer() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(10 * time.Minute), -+ Create: schema.DefaultTimeout(10 * time.Second), -+ Delete: schema.DefaultTimeout(10 * time.Second), - }, - - CustomizeDiff: verify.SetTagsDiff, -diff --git a/internal/service/ec2/transitgateway_multicast_domain.go b/internal/service/ec2/transitgateway_multicast_domain.go -index 5f4118c36e..11c7798f05 100644 ---- a/internal/service/ec2/transitgateway_multicast_domain.go -+++ b/internal/service/ec2/transitgateway_multicast_domain.go -@@ -31,8 +31,8 @@ func ResourceTransitGatewayMulticastDomain() *schema.Resource { - CustomizeDiff: verify.SetTagsDiff, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(10 * time.Minute), -+ Create: schema.DefaultTimeout(10 * time.Second), -+ Delete: schema.DefaultTimeout(10 * time.Second), - }, - - Schema: map[string]*schema.Schema{ -diff --git a/internal/service/ec2/transitgateway_multicast_domain_association.go b/internal/service/ec2/transitgateway_multicast_domain_association.go -index ab9595b81d..fca49cea03 100644 ---- a/internal/service/ec2/transitgateway_multicast_domain_association.go -+++ b/internal/service/ec2/transitgateway_multicast_domain_association.go -@@ -23,8 +23,8 @@ func ResourceTransitGatewayMulticastDomainAssociation() *schema.Resource { - DeleteWithoutTimeout: resourceTransitGatewayMulticastDomainAssociationDelete, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(10 * time.Minute), -+ Create: schema.DefaultTimeout(10 * time.Second), -+ Delete: schema.DefaultTimeout(10 * time.Second), - }, - - Schema: map[string]*schema.Schema{ -diff --git a/internal/service/ec2/vpc_default_route_table.go b/internal/service/ec2/vpc_default_route_table.go -index 01e170d231..10bc05b4b6 100644 ---- a/internal/service/ec2/vpc_default_route_table.go -+++ b/internal/service/ec2/vpc_default_route_table.go -@@ -27,8 +27,8 @@ func ResourceDefaultRouteTable() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(2 * time.Minute), -- Update: schema.DefaultTimeout(2 * time.Minute), -+ Create: schema.DefaultTimeout(20 * time.Second), -+ Update: schema.DefaultTimeout(20 * time.Second), - }, - - // -diff --git a/internal/service/ec2/vpc_default_subnet.go b/internal/service/ec2/vpc_default_subnet.go -index 9a0a8151e2..8bcd1eb537 100644 ---- a/internal/service/ec2/vpc_default_subnet.go -+++ b/internal/service/ec2/vpc_default_subnet.go -@@ -30,8 +30,8 @@ func ResourceDefaultSubnet() *schema.Resource { - CustomizeDiff: verify.SetTagsDiff, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(20 * time.Minute), -+ Create: schema.DefaultTimeout(20 * time.Second), -+ Delete: schema.DefaultTimeout(20 * time.Second), - }, - - SchemaVersion: 1, -diff --git a/internal/service/ec2/vpc_endpoint.go b/internal/service/ec2/vpc_endpoint.go -index bc03d302e0..76ae4c7554 100644 ---- a/internal/service/ec2/vpc_endpoint.go -+++ b/internal/service/ec2/vpc_endpoint.go -@@ -22,7 +22,7 @@ import ( - - const ( - // Maximum amount of time to wait for VPC Endpoint creation -- VPCEndpointCreationTimeout = 10 * time.Minute -+ VPCEndpointCreationTimeout = 20 * time.Second - ) - - func ResourceVPCEndpoint() *schema.Resource { -@@ -147,8 +147,8 @@ func ResourceVPCEndpoint() *schema.Resource { - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(VPCEndpointCreationTimeout), -- Update: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(10 * time.Minute), -+ Update: schema.DefaultTimeout(20 * time.Second), -+ Delete: schema.DefaultTimeout(20 * time.Second), - }, - - CustomizeDiff: verify.SetTagsDiff, -diff --git a/internal/service/ec2/vpc_endpoint_policy.go b/internal/service/ec2/vpc_endpoint_policy.go -index 98ba994861..f653423ae1 100644 ---- a/internal/service/ec2/vpc_endpoint_policy.go -+++ b/internal/service/ec2/vpc_endpoint_policy.go -@@ -45,8 +45,8 @@ func ResourceVPCEndpointPolicy() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(10 * time.Minute), -+ Create: schema.DefaultTimeout(20 * time.Second), -+ Delete: schema.DefaultTimeout(20 * time.Second), - }, - } - } -diff --git a/internal/service/ec2/vpc_endpoint_service.go b/internal/service/ec2/vpc_endpoint_service.go -index 5e38bebaca..cf4e397598 100644 ---- a/internal/service/ec2/vpc_endpoint_service.go -+++ b/internal/service/ec2/vpc_endpoint_service.go -@@ -415,7 +415,7 @@ func vpcEndpointServiceWaitUntilAvailable(d *schema.ResourceData, conn *ec2.EC2) - Pending: []string{ec2.ServiceStatePending}, - Target: []string{ec2.ServiceStateAvailable}, - Refresh: vpcEndpointServiceStateRefresh(conn, d.Id()), -- Timeout: 10 * time.Minute, -+ Timeout: 30 * time.Second, - Delay: 5 * time.Second, - MinTimeout: 5 * time.Second, - } -@@ -431,7 +431,7 @@ func waitForVPCEndpointServiceDeletion(conn *ec2.EC2, serviceID string) error { - Pending: []string{ec2.ServiceStateAvailable, ec2.ServiceStateDeleting}, - Target: []string{ec2.ServiceStateDeleted}, - Refresh: vpcEndpointServiceStateRefresh(conn, serviceID), -- Timeout: 10 * time.Minute, -+ Timeout: 30 * time.Second, - Delay: 5 * time.Second, - MinTimeout: 5 * time.Second, - } -diff --git a/internal/service/ec2/vpc_endpoint_subnet_association.go b/internal/service/ec2/vpc_endpoint_subnet_association.go -index 793eea6ef2..b9b5b062d1 100644 ---- a/internal/service/ec2/vpc_endpoint_subnet_association.go -+++ b/internal/service/ec2/vpc_endpoint_subnet_association.go -@@ -38,8 +38,8 @@ func ResourceVPCEndpointSubnetAssociation() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(10 * time.Minute), -+ Create: schema.DefaultTimeout(10 * time.Second), -+ Delete: schema.DefaultTimeout(10 * time.Second), - }, - } - } -@@ -66,8 +66,8 @@ func resourceVPCEndpointSubnetAssociationCreate(d *schema.ResourceData, meta int - defer conns.GlobalMutexKV.Unlock(mk) - - c := &resource.StateChangeConf{ -- Delay: 1 * time.Minute, -- Timeout: 3 * time.Minute, -+ Delay: 1 * time.Second, -+ Timeout: 1 * time.Minute, - Target: []string{"ok"}, - Refresh: func() (interface{}, string, error) { - output, err := conn.ModifyVpcEndpoint(input) -diff --git a/internal/service/ec2/vpc_ipv4_cidr_block_association.go b/internal/service/ec2/vpc_ipv4_cidr_block_association.go -index c3ba8fe16a..a7d6bb9f98 100644 ---- a/internal/service/ec2/vpc_ipv4_cidr_block_association.go -+++ b/internal/service/ec2/vpc_ipv4_cidr_block_association.go -@@ -64,8 +64,8 @@ func ResourceVPCIPv4CIDRBlockAssociation() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(10 * time.Minute), -+ Create: schema.DefaultTimeout(10 * time.Second), -+ Delete: schema.DefaultTimeout(10 * time.Second), - }, - } - } -diff --git a/internal/service/ec2/vpc_ipv6_cidr_block_association.go b/internal/service/ec2/vpc_ipv6_cidr_block_association.go -index 9894a5703a..0c5cd51ab8 100644 ---- a/internal/service/ec2/vpc_ipv6_cidr_block_association.go -+++ b/internal/service/ec2/vpc_ipv6_cidr_block_association.go -@@ -71,8 +71,8 @@ func ResourceVPCIPv6CIDRBlockAssociation() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(10 * time.Minute), -+ Create: schema.DefaultTimeout(10 * time.Second), -+ Delete: schema.DefaultTimeout(10 * time.Second), - }, - } - } -diff --git a/internal/service/ec2/vpc_peering_connection.go b/internal/service/ec2/vpc_peering_connection.go -index 7ed8ec448c..d74eef1bc9 100644 ---- a/internal/service/ec2/vpc_peering_connection.go -+++ b/internal/service/ec2/vpc_peering_connection.go -@@ -28,9 +28,9 @@ func ResourceVPCPeeringConnection() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(1 * time.Minute), -- Update: schema.DefaultTimeout(1 * time.Minute), -- Delete: schema.DefaultTimeout(1 * time.Minute), -+ Create: schema.DefaultTimeout(10 * time.Second), -+ Update: schema.DefaultTimeout(10 * time.Second), -+ Delete: schema.DefaultTimeout(10 * time.Second), - }, - - // Keep in sync with aws_vpc_peering_connection_accepter's schema. -diff --git a/internal/service/ec2/vpc_peering_connection_accepter.go b/internal/service/ec2/vpc_peering_connection_accepter.go -index 5fb1bcb194..2b00ab82d0 100644 ---- a/internal/service/ec2/vpc_peering_connection_accepter.go -+++ b/internal/service/ec2/vpc_peering_connection_accepter.go -@@ -21,8 +21,8 @@ func ResourceVPCPeeringConnectionAccepter() *schema.Resource { - Delete: resourceVPCPeeringAccepterDelete, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(1 * time.Minute), -- Update: schema.DefaultTimeout(1 * time.Minute), -+ Create: schema.DefaultTimeout(10 * time.Second), -+ Update: schema.DefaultTimeout(10 * time.Second), - }, - - Importer: &schema.ResourceImporter{ -diff --git a/internal/service/ec2/vpc_route.go b/internal/service/ec2/vpc_route.go -index b81c585ac3..5b5eebd83b 100644 ---- a/internal/service/ec2/vpc_route.go -+++ b/internal/service/ec2/vpc_route.go -@@ -46,9 +46,9 @@ func ResourceRoute() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(5 * time.Minute), -- Update: schema.DefaultTimeout(2 * time.Minute), -- Delete: schema.DefaultTimeout(5 * time.Minute), -+ Create: schema.DefaultTimeout(5 * time.Second), -+ Update: schema.DefaultTimeout(5 * time.Second), -+ Delete: schema.DefaultTimeout(5 * time.Second), - }, - - Schema: map[string]*schema.Schema{ -diff --git a/internal/service/ec2/vpc_route_table.go b/internal/service/ec2/vpc_route_table.go -index 5a7b5d36ac..e228b3da4a 100644 ---- a/internal/service/ec2/vpc_route_table.go -+++ b/internal/service/ec2/vpc_route_table.go -@@ -50,9 +50,9 @@ func ResourceRouteTable() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(5 * time.Minute), -- Update: schema.DefaultTimeout(2 * time.Minute), -- Delete: schema.DefaultTimeout(5 * time.Minute), -+ Create: schema.DefaultTimeout(5 * time.Second), -+ Update: schema.DefaultTimeout(5 * time.Second), -+ Delete: schema.DefaultTimeout(5 * time.Second), - }, - - Schema: map[string]*schema.Schema{ -diff --git a/internal/service/ec2/vpc_security_group.go b/internal/service/ec2/vpc_security_group.go -index e7e5114b1c..58dbe14d47 100644 ---- a/internal/service/ec2/vpc_security_group.go -+++ b/internal/service/ec2/vpc_security_group.go -@@ -36,8 +36,8 @@ func ResourceSecurityGroup() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(15 * time.Minute), -+ Create: schema.DefaultTimeout(10 * time.Second), -+ Delete: schema.DefaultTimeout(15 * time.Second), - }, - - SchemaVersion: 1, -@@ -1347,7 +1347,7 @@ func sgProtocolIntegers() map[string]int { - // which would prevent SGs attached to such ENIs from being destroyed - func deleteLingeringLambdaENIs(conn *ec2.EC2, filterName, resourceId string, timeout time.Duration) error { - // AWS Lambda service team confirms P99 deletion time of ~35 minutes. Buffer for safety. -- if minimumTimeout := 45 * time.Minute; timeout < minimumTimeout { -+ if minimumTimeout := 45 * time.Second; timeout < minimumTimeout { - timeout = minimumTimeout - } - -diff --git a/internal/service/ec2/vpc_subnet.go b/internal/service/ec2/vpc_subnet.go -index e52c0c58eb..9a43020008 100644 ---- a/internal/service/ec2/vpc_subnet.go -+++ b/internal/service/ec2/vpc_subnet.go -@@ -30,8 +30,8 @@ func ResourceSubnet() *schema.Resource { - CustomizeDiff: verify.SetTagsDiff, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(10 * time.Minute), -- Delete: schema.DefaultTimeout(20 * time.Minute), -+ Create: schema.DefaultTimeout(20 * time.Second), -+ Delete: schema.DefaultTimeout(20 * time.Second), - }, - - SchemaVersion: 1, -diff --git a/internal/service/ec2/vpnsite_gateway_route_propagation.go b/internal/service/ec2/vpnsite_gateway_route_propagation.go -index 498d05323f..2b20d8eb42 100644 ---- a/internal/service/ec2/vpnsite_gateway_route_propagation.go -+++ b/internal/service/ec2/vpnsite_gateway_route_propagation.go -@@ -18,8 +18,8 @@ func ResourceVPNGatewayRoutePropagation() *schema.Resource { - Delete: resourceVPNGatewayRoutePropagationDisable, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(2 * time.Minute), -- Delete: schema.DefaultTimeout(2 * time.Minute), -+ Create: schema.DefaultTimeout(2 * time.Second), -+ Delete: schema.DefaultTimeout(2 * time.Second), - }, - - Schema: map[string]*schema.Schema{ -diff --git a/internal/service/ec2/wait.go b/internal/service/ec2/wait.go -index 5ad62e86c0..68209e7fb8 100644 ---- a/internal/service/ec2/wait.go -+++ b/internal/service/ec2/wait.go -@@ -14,13 +14,13 @@ import ( - ) - - const ( -- InstanceReadyTimeout = 10 * time.Minute -- InstanceStartTimeout = 10 * time.Minute -- InstanceStopTimeout = 10 * time.Minute -+ InstanceReadyTimeout = 10 * time.Second -+ InstanceStartTimeout = 10 * time.Second -+ InstanceStopTimeout = 10 * time.Second - - // General timeout for EC2 resource creations to propagate. - // See https://docs.aws.amazon.com/AWSEC2/latest/APIReference/query-api-troubleshooting.html#eventual-consistency. -- propagationTimeout = 2 * time.Minute -+ propagationTimeout = 2 * time.Second - - RouteNotFoundChecks = 1000 // Should exceed any reasonable custom timeout value. - RouteTableNotFoundChecks = 1000 // Should exceed any reasonable custom timeout value. -@@ -30,7 +30,7 @@ const ( - ) - - const ( -- AvailabilityZoneGroupOptInStatusTimeout = 10 * time.Minute -+ AvailabilityZoneGroupOptInStatusTimeout = 10 * time.Second - ) - - func WaitAvailabilityZoneGroupOptedIn(conn *ec2.EC2, name string) (*ec2.AvailabilityZone, error) { -@@ -68,8 +68,8 @@ func WaitAvailabilityZoneGroupNotOptedIn(conn *ec2.EC2, name string) (*ec2.Avail - } - - const ( -- CapacityReservationActiveTimeout = 2 * time.Minute -- CapacityReservationDeletedTimeout = 2 * time.Minute -+ CapacityReservationActiveTimeout = 2 * time.Second -+ CapacityReservationDeletedTimeout = 2 * time.Second - ) - - func WaitCapacityReservationActive(conn *ec2.EC2, id string) (*ec2.CapacityReservation, error) { -@@ -107,9 +107,9 @@ func WaitCapacityReservationDeleted(conn *ec2.EC2, id string) (*ec2.CapacityRese - } - - const ( -- CarrierGatewayAvailableTimeout = 5 * time.Minute -+ CarrierGatewayAvailableTimeout = 5 * time.Second - -- CarrierGatewayDeletedTimeout = 5 * time.Minute -+ CarrierGatewayDeletedTimeout = 5 * time.Second - ) - - func WaitCarrierGatewayAvailable(conn *ec2.EC2, carrierGatewayID string) (*ec2.CarrierGateway, error) { -@@ -148,10 +148,10 @@ func WaitCarrierGatewayDeleted(conn *ec2.EC2, carrierGatewayID string) (*ec2.Car - - const ( - // Maximum amount of time to wait for a LocalGatewayRouteTableVpcAssociation to return Associated -- LocalGatewayRouteTableVPCAssociationAssociatedTimeout = 5 * time.Minute -+ LocalGatewayRouteTableVPCAssociationAssociatedTimeout = 5 * time.Second - - // Maximum amount of time to wait for a LocalGatewayRouteTableVpcAssociation to return Disassociated -- LocalGatewayRouteTableVPCAssociationDisassociatedTimeout = 5 * time.Minute -+ LocalGatewayRouteTableVPCAssociationDisassociatedTimeout = 5 * time.Second - ) - - // WaitLocalGatewayRouteTableVPCAssociationAssociated waits for a LocalGatewayRouteTableVpcAssociation to return Associated -@@ -191,8 +191,8 @@ func WaitLocalGatewayRouteTableVPCAssociationDisassociated(conn *ec2.EC2, localG - } - - const ( -- ClientVPNEndpointDeletedTimeout = 5 * time.Minute -- ClientVPNEndpointAttributeUpdatedTimeout = 5 * time.Minute -+ ClientVPNEndpointDeletedTimeout = 5 * time.Second -+ ClientVPNEndpointAttributeUpdatedTimeout = 5 * time.Second - ) - - func WaitClientVPNEndpointDeleted(conn *ec2.EC2, id string) (*ec2.ClientVpnEndpoint, error) { -@@ -234,8 +234,8 @@ func WaitClientVPNEndpointClientConnectResponseOptionsUpdated(conn *ec2.EC2, id - } - - const ( -- ClientVPNAuthorizationRuleCreatedTimeout = 10 * time.Minute -- ClientVPNAuthorizationRuleDeletedTimeout = 10 * time.Minute -+ ClientVPNAuthorizationRuleCreatedTimeout = 10 * time.Second -+ ClientVPNAuthorizationRuleDeletedTimeout = 10 * time.Second - ) - - func WaitClientVPNAuthorizationRuleCreated(conn *ec2.EC2, endpointID, targetNetworkCIDR, accessGroupID string, timeout time.Duration) (*ec2.AuthorizationRule, error) { -@@ -277,10 +277,10 @@ func WaitClientVPNAuthorizationRuleDeleted(conn *ec2.EC2, endpointID, targetNetw - } - - const ( -- ClientVPNNetworkAssociationCreatedTimeout = 30 * time.Minute -- ClientVPNNetworkAssociationCreatedDelay = 4 * time.Minute -- ClientVPNNetworkAssociationDeletedTimeout = 30 * time.Minute -- ClientVPNNetworkAssociationDeletedDelay = 4 * time.Minute -+ ClientVPNNetworkAssociationCreatedTimeout = 30 * time.Second -+ ClientVPNNetworkAssociationCreatedDelay = 4 * time.Second -+ ClientVPNNetworkAssociationDeletedTimeout = 30 * time.Second -+ ClientVPNNetworkAssociationDeletedDelay = 4 * time.Second - ClientVPNNetworkAssociationStatusPollInterval = 10 * time.Second - ) - -@@ -327,8 +327,8 @@ func WaitClientVPNNetworkAssociationDeleted(conn *ec2.EC2, associationID, endpoi - } - - const ( -- ClientVPNRouteCreatedTimeout = 1 * time.Minute -- ClientVPNRouteDeletedTimeout = 1 * time.Minute -+ ClientVPNRouteCreatedTimeout = 1 * time.Second -+ ClientVPNRouteDeletedTimeout = 1 * time.Second - ) - - func WaitClientVPNRouteCreated(conn *ec2.EC2, endpointID, targetSubnetID, destinationCIDR string, timeout time.Duration) (*ec2.ClientVpnRoute, error) { -@@ -649,7 +649,7 @@ func WaitInstanceRootBlockDeviceDeleteOnTerminationUpdated(conn *ec2.EC2, id str - return nil, err - } - --const ManagedPrefixListEntryCreateTimeout = 5 * time.Minute -+const ManagedPrefixListEntryCreateTimeout = 5 * time.Second - - func WaitRouteDeleted(conn *ec2.EC2, routeFinder RouteFinder, routeTableID, destination string, timeout time.Duration) (*ec2.Route, error) { - stateConf := &resource.StateChangeConf{ -@@ -689,11 +689,11 @@ func WaitRouteReady(conn *ec2.EC2, routeFinder RouteFinder, routeTableID, destin - } - - const ( -- RouteTableAssociationPropagationTimeout = 5 * time.Minute -+ RouteTableAssociationPropagationTimeout = 5 * time.Second - -- RouteTableAssociationCreatedTimeout = 5 * time.Minute -- RouteTableAssociationUpdatedTimeout = 5 * time.Minute -- RouteTableAssociationDeletedTimeout = 5 * time.Minute -+ RouteTableAssociationCreatedTimeout = 5 * time.Second -+ RouteTableAssociationUpdatedTimeout = 5 * time.Second -+ RouteTableAssociationDeletedTimeout = 5 * time.Second - ) - - func WaitRouteTableReady(conn *ec2.EC2, id string, timeout time.Duration) (*ec2.RouteTable, error) { -@@ -815,10 +815,10 @@ func WaitSecurityGroupCreated(conn *ec2.EC2, id string, timeout time.Duration) ( - } - - const ( -- SubnetPropagationTimeout = 2 * time.Minute -- SubnetAttributePropagationTimeout = 5 * time.Minute -- SubnetIPv6CIDRBlockAssociationCreatedTimeout = 3 * time.Minute -- SubnetIPv6CIDRBlockAssociationDeletedTimeout = 3 * time.Minute -+ SubnetPropagationTimeout = 10 * time.Second -+ SubnetAttributePropagationTimeout = 10 * time.Second -+ SubnetIPv6CIDRBlockAssociationCreatedTimeout = 3 * time.Second -+ SubnetIPv6CIDRBlockAssociationDeletedTimeout = 3 * time.Second - ) - - func WaitSubnetAvailable(conn *ec2.EC2, id string, timeout time.Duration) (*ec2.Subnet, error) { -@@ -1007,7 +1007,7 @@ func WaitSubnetPrivateDNSHostnameTypeOnLaunchUpdated(conn *ec2.EC2, subnetID str - } - - const ( -- TransitGatewayIncorrectStateTimeout = 5 * time.Minute -+ TransitGatewayIncorrectStateTimeout = 5 * time.Second - ) - - func WaitTransitGatewayCreated(conn *ec2.EC2, id string, timeout time.Duration) (*ec2.TransitGateway, error) { -@@ -1200,7 +1200,7 @@ func WaitTransitGatewayMulticastDomainAssociationDeleted(conn *ec2.EC2, multicas - } - - const ( -- TransitGatewayPrefixListReferenceTimeout = 5 * time.Minute -+ TransitGatewayPrefixListReferenceTimeout = 5 * time.Second - ) - - func WaitTransitGatewayPrefixListReferenceStateCreated(conn *ec2.EC2, transitGatewayRouteTableID string, prefixListID string) (*ec2.TransitGatewayPrefixListReference, error) { -@@ -1255,8 +1255,8 @@ func WaitTransitGatewayPrefixListReferenceStateUpdated(conn *ec2.EC2, transitGat - } - - const ( -- TransitGatewayRouteCreatedTimeout = 2 * time.Minute -- TransitGatewayRouteDeletedTimeout = 2 * time.Minute -+ TransitGatewayRouteCreatedTimeout = 2 * time.Second -+ TransitGatewayRouteDeletedTimeout = 2 * time.Second - ) - - func WaitTransitGatewayRouteCreated(conn *ec2.EC2, transitGatewayRouteTableID, destination string) (*ec2.TransitGatewayRoute, error) { -@@ -1294,7 +1294,7 @@ func WaitTransitGatewayRouteDeleted(conn *ec2.EC2, transitGatewayRouteTableID, d - } - - const ( -- TransitGatewayRouteTablePropagationTimeout = 5 * time.Minute -+ TransitGatewayRouteTablePropagationTimeout = 5 * time.Second - ) - - func WaitTransitGatewayRouteTablePropagationStateEnabled(conn *ec2.EC2, transitGatewayRouteTableID string, transitGatewayAttachmentID string) (*ec2.TransitGatewayRouteTablePropagation, error) { -@@ -1455,9 +1455,9 @@ func WaitVolumeModificationComplete(conn *ec2.EC2, id string, timeout time.Durat - } - - const ( -- vpcAttributePropagationTimeout = 5 * time.Minute -- vpcCreatedTimeout = 10 * time.Minute -- vpcDeletedTimeout = 5 * time.Minute -+ vpcAttributePropagationTimeout = 1 * time.Minute -+ vpcCreatedTimeout = 1 * time.Minute -+ vpcDeletedTimeout = 1 * time.Minute - ) - - func WaitVPCCreated(conn *ec2.EC2, id string) (*ec2.Vpc, error) { -@@ -1542,8 +1542,8 @@ func WaitVPCCIDRBlockAssociationDeleted(conn *ec2.EC2, id string, timeout time.D - } - - const ( -- vpcIPv6CIDRBlockAssociationCreatedTimeout = 10 * time.Minute -- vpcIPv6CIDRBlockAssociationDeletedTimeout = 5 * time.Minute -+ vpcIPv6CIDRBlockAssociationCreatedTimeout = 15 * time.Second -+ vpcIPv6CIDRBlockAssociationDeletedTimeout = 15 * time.Second - ) - - func WaitVPCIPv6CIDRBlockAssociationCreated(conn *ec2.EC2, id string, timeout time.Duration) (*ec2.VpcCidrBlockState, error) { -@@ -1593,7 +1593,7 @@ func WaitVPCIPv6CIDRBlockAssociationDeleted(conn *ec2.EC2, id string, timeout ti - } - - const ( -- VPCPeeringConnectionOptionsPropagationTimeout = 3 * time.Minute -+ VPCPeeringConnectionOptionsPropagationTimeout = 3 * time.Second - ) - - func WaitVPCPeeringConnectionActive(conn *ec2.EC2, id string, timeout time.Duration) (*ec2.VpcPeeringConnection, error) { -@@ -1639,10 +1639,10 @@ func WaitVPCPeeringConnectionDeleted(conn *ec2.EC2, id string, timeout time.Dura - } - - const ( -- VPNGatewayDeletedTimeout = 5 * time.Minute -+ VPNGatewayDeletedTimeout = 5 * time.Second - -- VPNGatewayVPCAttachmentAttachedTimeout = 15 * time.Minute -- VPNGatewayVPCAttachmentDetachedTimeout = 30 * time.Minute -+ VPNGatewayVPCAttachmentAttachedTimeout = 15 * time.Second -+ VPNGatewayVPCAttachmentDetachedTimeout = 30 * time.Second - ) - - func WaitVPNGatewayVPCAttachmentAttached(conn *ec2.EC2, vpnGatewayID, vpcID string) (*ec2.VpcAttachment, error) { -@@ -1680,8 +1680,8 @@ func WaitVPNGatewayVPCAttachmentDetached(conn *ec2.EC2, vpnGatewayID, vpcID stri - } - - const ( -- customerGatewayCreatedTimeout = 10 * time.Minute -- customerGatewayDeletedTimeout = 5 * time.Minute -+ customerGatewayCreatedTimeout = 10 * time.Second -+ customerGatewayDeletedTimeout = 5 * time.Second - ) - - func WaitCustomerGatewayCreated(conn *ec2.EC2, id string) (*ec2.CustomerGateway, error) { -@@ -1721,8 +1721,8 @@ func WaitCustomerGatewayDeleted(conn *ec2.EC2, id string) (*ec2.CustomerGateway, - } - - const ( -- natGatewayCreatedTimeout = 10 * time.Minute -- natGatewayDeletedTimeout = 30 * time.Minute -+ natGatewayCreatedTimeout = 10 * time.Second -+ natGatewayDeletedTimeout = 30 * time.Second - ) - - func WaitNATGatewayCreated(conn *ec2.EC2, id string) (*ec2.NatGateway, error) { -@@ -1770,9 +1770,9 @@ func WaitNATGatewayDeleted(conn *ec2.EC2, id string) (*ec2.NatGateway, error) { - } - - const ( -- vpnConnectionCreatedTimeout = 40 * time.Minute -- vpnConnectionDeletedTimeout = 30 * time.Minute -- vpnConnectionUpdatedTimeout = 30 * time.Minute -+ vpnConnectionCreatedTimeout = 4 * time.Second -+ vpnConnectionDeletedTimeout = 3 * time.Second -+ vpnConnectionUpdatedTimeout = 3 * time.Second - ) - - func WaitVPNConnectionCreated(conn *ec2.EC2, id string) (*ec2.VpnConnection, error) { -@@ -1872,9 +1872,9 @@ func WaitVPNConnectionRouteDeleted(conn *ec2.EC2, vpnConnectionID, cidrBlock str - } - - const ( -- HostCreatedTimeout = 10 * time.Minute -- HostUpdatedTimeout = 10 * time.Minute -- HostDeletedTimeout = 20 * time.Minute -+ HostCreatedTimeout = 10 * time.Second -+ HostUpdatedTimeout = 10 * time.Second -+ HostDeletedTimeout = 20 * time.Second - ) - - func WaitHostCreated(conn *ec2.EC2, id string) (*ec2.Host, error) { -@@ -1929,13 +1929,13 @@ func WaitHostDeleted(conn *ec2.EC2, id string) (*ec2.Host, error) { - } - - const ( -- dhcpOptionSetDeletedTimeout = 3 * time.Minute -+ dhcpOptionSetDeletedTimeout = 3 * time.Second - ) - - const ( -- internetGatewayAttachedTimeout = 4 * time.Minute -- internetGatewayDeletedTimeout = 10 * time.Minute -- internetGatewayDetachedTimeout = 15 * time.Minute -+ internetGatewayAttachedTimeout = 4 * time.Second -+ internetGatewayDeletedTimeout = 10 * time.Second -+ internetGatewayDetachedTimeout = 15 * time.Second - ) - - func WaitInternetGatewayAttached(conn *ec2.EC2, internetGatewayID, vpcID string, timeout time.Duration) (*ec2.InternetGatewayAttachment, error) { -@@ -1974,7 +1974,7 @@ func WaitInternetGatewayDetached(conn *ec2.EC2, internetGatewayID, vpcID string, - } - - const ( -- ManagedPrefixListTimeout = 15 * time.Minute -+ ManagedPrefixListTimeout = 15 * time.Second - ) - - func WaitManagedPrefixListCreated(conn *ec2.EC2, id string) (*ec2.ManagedPrefixList, error) { -@@ -2041,8 +2041,8 @@ func WaitManagedPrefixListDeleted(conn *ec2.EC2, id string) (*ec2.ManagedPrefixL - } - - const ( -- networkInterfaceAttachedTimeout = 5 * time.Minute -- NetworkInterfaceDetachedTimeout = 10 * time.Minute -+ networkInterfaceAttachedTimeout = 5 * time.Second -+ NetworkInterfaceDetachedTimeout = 10 * time.Second - ) - - func WaitNetworkInterfaceAttached(conn *ec2.EC2, id string, timeout time.Duration) (*ec2.NetworkInterfaceAttachment, error) { -@@ -2121,8 +2121,8 @@ func WaitNetworkInterfaceDetached(conn *ec2.EC2, id string, timeout time.Duratio - } - - const ( -- PlacementGroupCreatedTimeout = 5 * time.Minute -- PlacementGroupDeletedTimeout = 5 * time.Minute -+ PlacementGroupCreatedTimeout = 5 * time.Second -+ PlacementGroupDeletedTimeout = 5 * time.Second - ) - - func WaitPlacementGroupCreated(conn *ec2.EC2, name string) (*ec2.PlacementGroup, error) { -@@ -2355,7 +2355,7 @@ func waitVPCEndpointConnectionAccepted(conn *ec2.EC2, serviceID, vpcEndpointID s - } - - const ( -- ebsSnapshotArchivedTimeout = 60 * time.Minute -+ ebsSnapshotArchivedTimeout = 60 * time.Second - ) - - func waitEBSSnapshotTierArchive(conn *ec2.EC2, id string, timeout time.Duration) (*ec2.SnapshotTierStatus, error) { //nolint:unparam --- -2.25.1 - diff --git a/tests/terraformtests/etc/0003-Patch-IAM-wait-times.patch b/tests/terraformtests/etc/0003-Patch-IAM-wait-times.patch deleted file mode 100644 index 2fc64226b..000000000 --- a/tests/terraformtests/etc/0003-Patch-IAM-wait-times.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 84af701010212ceccccba66422191dfcf1e7445b Mon Sep 17 00:00:00 2001 -From: Bert Blommers -Date: Sun, 13 Aug 2023 21:35:11 +0000 -Subject: [PATCH] Patch IAM timings - ---- - internal/service/iam/wait.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/internal/service/iam/wait.go b/internal/service/iam/wait.go -index 3d1c542aa2..e2e5069b63 100644 ---- a/internal/service/iam/wait.go -+++ b/internal/service/iam/wait.go -@@ -20,7 +20,7 @@ const ( - // as this will negatively impact user experience when configurations - // have incorrect references or permissions. - // Reference: https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_eventual-consistency -- propagationTimeout = 2 * time.Minute -+ propagationTimeout = 2 * time.Second - - RoleStatusARNIsUniqueID = "uniqueid" - RoleStatusARNIsARN = "arn" --- -2.25.1 - diff --git a/tests/terraformtests/etc/0005-Route53-Reduce-wait-times.patch b/tests/terraformtests/etc/0005-Route53-Reduce-wait-times.patch deleted file mode 100644 index 9d9e870ff..000000000 --- a/tests/terraformtests/etc/0005-Route53-Reduce-wait-times.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 094b3837cd19df89d266038a91592126723cf833 Mon Sep 17 00:00:00 2001 -From: Bert Blommers -Date: Sun, 13 Aug 2023 21:40:43 +0000 -Subject: [PATCH] Patch: Route53 timings - ---- - internal/service/route53/record.go | 10 +++++----- - internal/service/route53/wait.go | 14 +++++++------- - internal/service/route53/zone.go | 20 ++++++++++---------- - 3 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/internal/service/route53/record.go b/internal/service/route53/record.go -index 4f2eb6d5ef..c4ba38824f 100644 ---- a/internal/service/route53/record.go -+++ b/internal/service/route53/record.go -@@ -25,8 +25,8 @@ import ( - ) - - const ( -- recordSetSyncMinDelay = 10 -- recordSetSyncMaxDelay = 30 -+ recordSetSyncMinDelay = 1 -+ recordSetSyncMaxDelay = 3 - ) - - // @SDKResource("aws_route53_record") -@@ -749,7 +749,7 @@ func FindResourceRecordSetByFourPartKey(ctx context.Context, conn *route53.Route - } - - func ChangeResourceRecordSets(ctx context.Context, conn *route53.Route53, input *route53.ChangeResourceRecordSetsInput) (*route53.ChangeInfo, error) { -- outputRaw, err := tfresource.RetryWhenAWSErrCodeEquals(ctx, 1*time.Minute, func() (interface{}, error) { -+ outputRaw, err := tfresource.RetryWhenAWSErrCodeEquals(ctx, 10*time.Second, func() (interface{}, error) { - return conn.ChangeResourceRecordSetsWithContext(ctx, input) - }, route53.ErrCodeNoSuchHostedZone) - -@@ -766,8 +766,8 @@ func WaitForRecordSetToSync(ctx context.Context, conn *route53.Route53, requestI - Target: []string{route53.ChangeStatusInsync}, - Delay: time.Duration(rand.Int63n(recordSetSyncMaxDelay-recordSetSyncMinDelay)+recordSetSyncMinDelay) * time.Second, - MinTimeout: 5 * time.Second, -- PollInterval: 20 * time.Second, -- Timeout: 30 * time.Minute, -+ PollInterval: 2 * time.Second, -+ Timeout: 3 * time.Minute, - Refresh: func() (result interface{}, state string, err error) { - changeRequest := &route53.GetChangeInput{ - Id: aws.String(requestId), -diff --git a/internal/service/route53/wait.go b/internal/service/route53/wait.go -index d8f577b269..2fc26bf570 100644 ---- a/internal/service/route53/wait.go -+++ b/internal/service/route53/wait.go -@@ -16,17 +16,17 @@ import ( - ) - - const ( -- changeTimeout = 30 * time.Minute -+ changeTimeout = 3 * time.Minute - changeMinTimeout = 5 * time.Second -- changePollInterval = 15 * time.Second -- changeMinDelay = 10 -- changeMaxDelay = 30 -+ changePollInterval = 1 * time.Second -+ changeMinDelay = 1 -+ changeMaxDelay = 3 - -- hostedZoneDNSSECStatusTimeout = 5 * time.Minute -+ hostedZoneDNSSECStatusTimeout = 1 * time.Minute - -- keySigningKeyStatusTimeout = 5 * time.Minute -+ keySigningKeyStatusTimeout = 1 * time.Minute - -- trafficPolicyInstanceOperationTimeout = 4 * time.Minute -+ trafficPolicyInstanceOperationTimeout = 1 * time.Minute - ) - - func waitChangeInfoStatusInsync(ctx context.Context, conn *route53.Route53, changeID string) (*route53.ChangeInfo, error) { //nolint:unparam -diff --git a/internal/service/route53/zone.go b/internal/service/route53/zone.go -index dc080c4916..493d5a41aa 100644 ---- a/internal/service/route53/zone.go -+++ b/internal/service/route53/zone.go -@@ -32,10 +32,10 @@ import ( - ) - - const ( -- zoneChangeSyncMinDelay = 10 -- zoneChangeSyncMaxDelay = 30 -- zoneChangeSyncMinPollInterval = 15 -- zoneChangeSyncMaxPollInterval = 30 -+ zoneChangeSyncMinDelay = 1 -+ zoneChangeSyncMaxDelay = 3 -+ zoneChangeSyncMinPollInterval = 2 -+ zoneChangeSyncMaxPollInterval = 3 - ) - - // @SDKResource("aws_route53_zone", name="Hosted Zone") -@@ -424,7 +424,7 @@ func dnsSECStatus(ctx context.Context, conn *route53.Route53, hostedZoneID strin - } - - var output *route53.GetDNSSECOutput -- err := tfresource.Retry(ctx, 3*time.Minute, func() *retry.RetryError { -+ err := tfresource.Retry(ctx, 3*time.Second, func() *retry.RetryError { - var err error - - output, err = conn.GetDNSSECWithContext(ctx, input) -@@ -439,7 +439,7 @@ func dnsSECStatus(ctx context.Context, conn *route53.Route53, hostedZoneID strin - } - - return nil -- }, tfresource.WithDelayRand(1*time.Minute), tfresource.WithPollInterval(30*time.Second)) -+ }, tfresource.WithDelayRand(5*time.Second), tfresource.WithPollInterval(3*time.Second)) - - if tfresource.TimedOut(err) { - output, err = conn.GetDNSSECWithContext(ctx, input) -@@ -480,7 +480,7 @@ func disableDNSSECForHostedZone(ctx context.Context, conn *route53.Route53, host - } - - var output *route53.DisableHostedZoneDNSSECOutput -- err = tfresource.Retry(ctx, 5*time.Minute, func() *retry.RetryError { -+ err = tfresource.Retry(ctx, 5*time.Second, func() *retry.RetryError { - var err error - - output, err = conn.DisableHostedZoneDNSSECWithContext(ctx, input) -@@ -495,7 +495,7 @@ func disableDNSSECForHostedZone(ctx context.Context, conn *route53.Route53, host - } - - return nil -- }, tfresource.WithDelayRand(1*time.Minute), tfresource.WithPollInterval(20*time.Second)) -+ }, tfresource.WithDelayRand(1*time.Second), tfresource.WithPollInterval(20*time.Second)) - - if tfresource.TimedOut(err) { - output, err = conn.DisableHostedZoneDNSSECWithContext(ctx, input) -@@ -687,9 +687,9 @@ func waitForChangeSynchronization(ctx context.Context, conn *route53.Route53, ch - Pending: []string{route53.ChangeStatusPending}, - Target: []string{route53.ChangeStatusInsync}, - Delay: time.Duration(rand.Int63n(zoneChangeSyncMaxDelay-zoneChangeSyncMinDelay)+zoneChangeSyncMinDelay) * time.Second, -- MinTimeout: 5 * time.Second, -+ MinTimeout: 1 * time.Second, - PollInterval: time.Duration(rand.Int63n(zoneChangeSyncMaxPollInterval-zoneChangeSyncMinPollInterval)+zoneChangeSyncMinPollInterval) * time.Second, -- Timeout: 15 * time.Minute, -+ Timeout: 1 * time.Minute, - Refresh: func() (result interface{}, state string, err error) { - input := &route53.GetChangeInput{ - Id: aws.String(changeID), --- -2.25.1 - diff --git a/tests/terraformtests/etc/0006-CF-Reduce-wait-times.patch b/tests/terraformtests/etc/0006-CF-Reduce-wait-times.patch deleted file mode 100644 index 8b8aacc4b..000000000 --- a/tests/terraformtests/etc/0006-CF-Reduce-wait-times.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c2981f42629c1dcb3756c13f243c8c52391f3677 Mon Sep 17 00:00:00 2001 -From: Bert Blommers -Date: Sun, 13 Aug 2023 21:43:26 +0000 -Subject: [PATCH] Patch: CloudFront timings - ---- - internal/service/cloudfront/distribution.go | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/internal/service/cloudfront/distribution.go b/internal/service/cloudfront/distribution.go -index 4870ca0f6d..8190b12231 100644 ---- a/internal/service/cloudfront/distribution.go -+++ b/internal/service/cloudfront/distribution.go -@@ -1120,9 +1120,9 @@ func DistributionWaitUntilDeployed(ctx context.Context, id string, meta interfac - Pending: []string{"InProgress"}, - Target: []string{"Deployed"}, - Refresh: resourceWebDistributionStateRefreshFunc(ctx, id, meta), -- Timeout: 90 * time.Minute, -- MinTimeout: 15 * time.Second, -- Delay: 1 * time.Minute, -+ Timeout: 90 * time.Second, -+ MinTimeout: 2 * time.Second, -+ Delay: 2 * time.Second, - } - - _, err := stateConf.WaitForStateContext(ctx) --- -2.25.1 - diff --git a/tests/terraformtests/etc/0007-Comprehend-Reduce-wait-times.patch b/tests/terraformtests/etc/0007-Comprehend-Reduce-wait-times.patch deleted file mode 100644 index b74c4b867..000000000 --- a/tests/terraformtests/etc/0007-Comprehend-Reduce-wait-times.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 44aeb35bb1747acd7fcae1b53186a37eee61c93d Mon Sep 17 00:00:00 2001 -From: Bert Blommers -Date: Sun, 13 Aug 2023 20:53:38 +0000 -Subject: [PATCH] Patch: Comprehend timings - ---- - internal/service/comprehend/common_model.go | 2 +- - internal/service/comprehend/consts.go | 14 +++++++------- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/internal/service/comprehend/common_model.go b/internal/service/comprehend/common_model.go -index b9af8e5f4c..bda7b84d90 100644 ---- a/internal/service/comprehend/common_model.go -+++ b/internal/service/comprehend/common_model.go -@@ -60,7 +60,7 @@ func waitNetworkInterfaceCreated(ctx context.Context, conn *ec2.EC2, initialENII - Pending: []string{}, - Target: []string{ec2.NetworkInterfaceStatusInUse}, - Refresh: statusNetworkInterfaces(ctx, conn, initialENIIds, securityGroups, subnets), -- Delay: 4 * time.Minute, -+ Delay: 4 * time.Second, - MinTimeout: 10 * time.Second, - Timeout: timeout, - } -diff --git a/internal/service/comprehend/consts.go b/internal/service/comprehend/consts.go -index e57884a12d..8fc23d7018 100644 ---- a/internal/service/comprehend/consts.go -+++ b/internal/service/comprehend/consts.go -@@ -4,15 +4,15 @@ import ( - "time" - ) - --const iamPropagationTimeout = 2 * time.Minute -+const iamPropagationTimeout = 2 * time.Second - - // Avoid service throttling --const entityRegcognizerCreatedDelay = 10 * time.Minute -+const entityRegcognizerCreatedDelay = 10 * time.Second - const entityRegcognizerStoppedDelay = 0 --const entityRegcognizerDeletedDelay = 5 * time.Minute --const entityRegcognizerPollInterval = 1 * time.Minute -+const entityRegcognizerDeletedDelay = 5 * time.Second -+const entityRegcognizerPollInterval = 1 * time.Second - --const documentClassifierCreatedDelay = 15 * time.Minute -+const documentClassifierCreatedDelay = 15 * time.Second - const documentClassifierStoppedDelay = 0 --const documentClassifierDeletedDelay = 5 * time.Minute --const documentClassifierPollInterval = 1 * time.Minute -+const documentClassifierDeletedDelay = 5 * time.Second -+const documentClassifierPollInterval = 1 * time.Second --- -2.25.1 \ No newline at end of file diff --git a/tests/terraformtests/etc/0008-Patch-RDS-improvements.patch b/tests/terraformtests/etc/0008-Patch-RDS-improvements.patch deleted file mode 100644 index a1b9fdad6..000000000 --- a/tests/terraformtests/etc/0008-Patch-RDS-improvements.patch +++ /dev/null @@ -1,152 +0,0 @@ -From ef15713b2e04a87966d2ddb8822d703c632c9551 Mon Sep 17 00:00:00 2001 -From: Bert Blommers -Date: Sun, 13 Aug 2023 21:48:20 +0000 -Subject: [PATCH] Patch: RDS timings - ---- - internal/service/rds/cluster.go | 16 ++++++++-------- - internal/service/rds/consts.go | 2 +- - internal/service/rds/instance.go | 24 ++++++++++++------------ - 3 files changed, 21 insertions(+), 21 deletions(-) - -diff --git a/internal/service/rds/cluster.go b/internal/service/rds/cluster.go -index 5b71483600..e18e024e47 100644 ---- a/internal/service/rds/cluster.go -+++ b/internal/service/rds/cluster.go -@@ -34,7 +34,7 @@ import ( - const ( - clusterScalingConfiguration_DefaultMinCapacity = 1 - clusterScalingConfiguration_DefaultMaxCapacity = 16 -- clusterTimeoutDelete = 2 * time.Minute -+ clusterTimeoutDelete = 5 * time.Second - ) - - // @SDKResource("aws_rds_cluster", name="Cluster") -@@ -1365,7 +1365,7 @@ func resourceClusterUpdate(ctx context.Context, d *schema.ResourceData, meta int - } - } - -- _, err := tfresource.RetryWhen(ctx, 5*time.Minute, -+ _, err := tfresource.RetryWhen(ctx, 1*time.Minute, - func() (interface{}, error) { - return conn.ModifyDBClusterWithContext(ctx, input) - }, -@@ -1694,8 +1694,8 @@ func waitDBClusterCreated(ctx context.Context, conn *rds.RDS, id string, timeout - Target: []string{ClusterStatusAvailable}, - Refresh: statusDBCluster(ctx, conn, id), - Timeout: timeout, -- MinTimeout: 10 * time.Second, -- Delay: 30 * time.Second, -+ MinTimeout: 1 * time.Second, -+ Delay: 3 * time.Second, - } - - outputRaw, err := stateConf.WaitForStateContext(ctx) -@@ -1721,8 +1721,8 @@ func waitDBClusterUpdated(ctx context.Context, conn *rds.RDS, id string, timeout - Target: []string{ClusterStatusAvailable}, - Refresh: statusDBCluster(ctx, conn, id), - Timeout: timeout, -- MinTimeout: 10 * time.Second, -- Delay: 30 * time.Second, -+ MinTimeout: 1 * time.Second, -+ Delay: 3 * time.Second, - } - - outputRaw, err := stateConf.WaitForStateContext(ctx) -@@ -1745,8 +1745,8 @@ func waitDBClusterDeleted(ctx context.Context, conn *rds.RDS, id string, timeout - Target: []string{}, - Refresh: statusDBCluster(ctx, conn, id), - Timeout: timeout, -- MinTimeout: 10 * time.Second, -- Delay: 30 * time.Second, -+ MinTimeout: 1 * time.Second, -+ Delay: 3 * time.Second, - } - - outputRaw, err := stateConf.WaitForStateContext(ctx) -diff --git a/internal/service/rds/consts.go b/internal/service/rds/consts.go -index 6bc2ab6194..937ba77468 100644 ---- a/internal/service/rds/consts.go -+++ b/internal/service/rds/consts.go -@@ -239,7 +239,7 @@ func backupTarget_Values() []string { - } - - const ( -- propagationTimeout = 2 * time.Minute -+ propagationTimeout = 2 * time.Second - ) - - const ( -diff --git a/internal/service/rds/instance.go b/internal/service/rds/instance.go -index eafddc13b0..86809379d9 100644 ---- a/internal/service/rds/instance.go -+++ b/internal/service/rds/instance.go -@@ -77,9 +77,9 @@ func ResourceInstance() *schema.Resource { - }, - - Timeouts: &schema.ResourceTimeout{ -- Create: schema.DefaultTimeout(40 * time.Minute), -- Update: schema.DefaultTimeout(80 * time.Minute), -- Delete: schema.DefaultTimeout(60 * time.Minute), -+ Create: schema.DefaultTimeout(40 * time.Second), -+ Update: schema.DefaultTimeout(80 * time.Second), -+ Delete: schema.DefaultTimeout(60 * time.Second), - }, - - Schema: map[string]*schema.Schema{ -@@ -1917,7 +1917,7 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, meta in - DBInstanceIdentifier: aws.String(sourceARN.Identifier), - SkipFinalSnapshot: true, - } -- _, err = tfresource.RetryWhen(ctx, 5*time.Minute, -+ _, err = tfresource.RetryWhen(ctx, 1*time.Minute, - func() (any, error) { - return conn.DeleteDBInstance(ctx, deleteInput) - }, -@@ -2520,8 +2520,8 @@ func statusDBInstanceSDKv2(ctx context.Context, conn *rds_sdkv2.Client, id strin - - func waitDBInstanceAvailableSDKv1(ctx context.Context, conn *rds.RDS, id string, timeout time.Duration, optFns ...tfresource.OptionsFunc) (*rds.DBInstance, error) { - options := tfresource.Options{ -- PollInterval: 10 * time.Second, -- Delay: 1 * time.Minute, -+ PollInterval: 5 * time.Second, -+ Delay: 3 * time.Second, - ContinuousTargetOccurence: 3, - } - for _, fn := range optFns { -@@ -2563,8 +2563,8 @@ func waitDBInstanceAvailableSDKv1(ctx context.Context, conn *rds.RDS, id string, - - func waitDBInstanceAvailableSDKv2(ctx context.Context, conn *rds_sdkv2.Client, id string, timeout time.Duration, optFns ...tfresource.OptionsFunc) (*rds.DBInstance, error) { //nolint:unparam - options := tfresource.Options{ -- PollInterval: 10 * time.Second, -- Delay: 1 * time.Minute, -+ PollInterval: 2 * time.Second, -+ Delay: 5 * time.Second, - ContinuousTargetOccurence: 3, - } - for _, fn := range optFns { -@@ -2606,8 +2606,8 @@ func waitDBInstanceAvailableSDKv2(ctx context.Context, conn *rds_sdkv2.Client, i - - func waitDBInstanceDeleted(ctx context.Context, conn *rds.RDS, id string, timeout time.Duration, optFns ...tfresource.OptionsFunc) (*rds.DBInstance, error) { //nolint:unparam - options := tfresource.Options{ -- PollInterval: 10 * time.Second, -- Delay: 1 * time.Minute, -+ PollInterval: 2 * time.Second, -+ Delay: 5 * time.Second, - ContinuousTargetOccurence: 3, - } - for _, fn := range optFns { -@@ -2694,8 +2694,8 @@ func statusBlueGreenDeployment(ctx context.Context, conn *rds_sdkv2.Client, id s - - func waitBlueGreenDeploymentAvailable(ctx context.Context, conn *rds_sdkv2.Client, id string, timeout time.Duration, optFns ...tfresource.OptionsFunc) (*types.BlueGreenDeployment, error) { - options := tfresource.Options{ -- PollInterval: 10 * time.Second, -- Delay: 1 * time.Minute, -+ PollInterval: 2 * time.Second, -+ Delay: 5 * time.Second, - } - for _, fn := range optFns { - fn(&options) --- -2.25.1 - diff --git a/tests/terraformtests/etc/README.md b/tests/terraformtests/etc/README.md deleted file mode 100644 index 1485701e9..000000000 --- a/tests/terraformtests/etc/README.md +++ /dev/null @@ -1,36 +0,0 @@ -### What is the purpose of this folder? - -This folder contains git-patches for the Terraform repository. When running Terraform-tests against Moto, these patches will be applied automatically. - -See http://docs.getmoto.org/en/latest/docs/contributing/development_tips/tests.html#terraform-tests on how to run the tests. - -#### What kind of patches are there? - - Patches that set the endpoint to localhost, to ensure the tests are run against Moto - - Patches that reduce the wait time for resources. AWS may take a few minutes before an EC2 instance is spun up, Moto does this immediately - so it's not necessary for Terraform to wait until resources are ready - - etc - -#### How do I create a new patch? - - - Checkout the repository, and open a terminal in the root-directory - - Go into the Terraform-directory: - ```commandline - cd tests/terraformtests/terraform-provider-aws - ``` - - Ensure the right Terraform-branch is selected, and is clean: - ```commandline - git checkout main - git checkout . - ``` - - Create a new branch: - ```commandline - git checkout -b patch-my-changes - ``` - - Make the required changes. - - Commit your changes - - Create a patch: - ```commandline - git format-patch main - ``` - - Move the created patch-file into this folder - - Update `tests/terraformtests/bin/run_go_test` with the new patch-file - diff --git a/tests/terraformtests/get_tf_services.py b/tests/terraformtests/get_tf_services.py deleted file mode 100644 index 6e2df048a..000000000 --- a/tests/terraformtests/get_tf_services.py +++ /dev/null @@ -1,5 +0,0 @@ -import yaml - -with open("tests/terraformtests/terraform-tests.success.txt") as f: - dct = yaml.load(f, Loader=yaml.FullLoader) - print(list(dct.keys())) diff --git a/tests/terraformtests/get_tf_tests.py b/tests/terraformtests/get_tf_tests.py deleted file mode 100644 index 3caaac72f..000000000 --- a/tests/terraformtests/get_tf_tests.py +++ /dev/null @@ -1,20 +0,0 @@ -import sys - -import yaml - - -def print_test_names(service): - with open("tests/terraformtests/terraform-tests.success.txt") as f: - dct = yaml.load(f, Loader=yaml.FullLoader) - tests = dct.get(service) - if len(tests) == 1: - print(tests[0]) - else: - print('"(' + "|".join(tests) + ')"') - - -if __name__ == "__main__": - if len(sys.argv) != 2: - print("") - else: - print_test_names(service=sys.argv[1]) diff --git a/tests/terraformtests/terraform-provider-aws b/tests/terraformtests/terraform-provider-aws deleted file mode 160000 index 96ac19e4c..000000000 --- a/tests/terraformtests/terraform-provider-aws +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 96ac19e4c1feb5edee5f30aba29be233109e8717 diff --git a/tests/terraformtests/terraform-tests.failures.txt b/tests/terraformtests/terraform-tests.failures.txt deleted file mode 100644 index 9bd6b2873..000000000 --- a/tests/terraformtests/terraform-tests.failures.txt +++ /dev/null @@ -1,64 +0,0 @@ -# The Tests in this file worked against an older version of Terraform -# Either they do not work anymore, or have not been verified to work yet - -TestAccAppsyncApiKey -TestAccAppsyncGraphqlApi -TestAccAutoscalingPolicy -TestAccBatchJobQueue -TestAccCloudTrail -TestAccEventsRule -TestAccCloudWatchEventTarget_ssmDocument -TestAccCloudWatchMetricAlarm -TestAccEC2DefaultSecurityGroup -TestAccEC2DefaultVPCAndSubnet -TestAccMetaDefaultTagsDataSource -TestAccEc2ManagedPrefixList -TestAccEC2Tag -TestAccEc2TransitGateway -TestAccEC2TransitGatewayDataSource -TestAccEc2TransitGatewayPeeringAttachment -TestAccEc2TransitGatewayPeeringAttachmentDataSource -TestAccEc2TransitGatewayRoute -TestAccEc2TransitGatewayRouteTable -TestAccEc2TransitGatewayRouteTableDataSource -TestAccEc2TransitGatewayRouteTablePropagation -TestAccEc2TransitGatewayVpcAttachmentAccepter -TestAccEc2TransitGatewayVpcAttachment_ApplianceModeSupport -TestAccEc2TransitGatewayVpcAttachment_basic -TestAccEc2TransitGatewayVpcAttachmentDataSource -TestAccEc2TransitGatewayVpcAttachment_disappears -TestAccEc2TransitGatewayVpcAttachment_DnsSupport -TestAccEc2TransitGatewayVpcAttachment_SharedTransitGateway -TestAccEc2TransitGatewayVpnAttachmentDataSource -TestAccEc2TransitGatewayDxGatewayAttachmentDataSource -TestAccEc2TransitGatewayPeeringAttachmentAccepter -TestAccEc2TransitGatewayRouteTableAssociation -TestAccEc2TransitGatewayVpcAttachment -TestAccEC2EgressOnlyInternetGateway -TestAccEFSMountTarget -TestAccEksClusterDataSource -TestAccIAMRole -TestAccIotThing -TestAccIPRanges -TestAccELBPolicy -TestAccPartition -TestAccPinpointApp -TestAccPinpointEventStream -TestAccProvider -TestAccSsmParameterDataSource -TestAccDataSourceLambdaLayerVersion -TestAccDataSourceLambdaInvocation -TestAccDataSourceNetworkInterface_ - -TestAccELBListenerPolicy_update -TestAccServiceDiscoveryService_private -TestAccIAMGroup_path -TestAccLambdaFunctionURL_Cors -TestAccVPCNATGateway_privateIP -TestAccVPCSecurityGroupRule_multiDescription - -TestAccELBV2TargetGroup_ProtocolVersion_basic -TestAccELBV2TargetGroup_ForceNew_port -TestAccELBV2TargetGroup_ForceNew_protocol -# TF expects a wrong error message, which is not in-line with what AWS returns -TestAccEFSFileSystemDataSource_nonExistent_fileSystemID diff --git a/tests/terraformtests/terraform-tests.success.txt b/tests/terraformtests/terraform-tests.success.txt deleted file mode 100644 index b94d6afa9..000000000 --- a/tests/terraformtests/terraform-tests.success.txt +++ /dev/null @@ -1,619 +0,0 @@ -acm: - - TestAccACMCertificateDataSource -acmpca: - - TestAccACMPCACertificateAuthority_ - - TestAccACMPCACertificateAuthorityDataSource - - TestAccACMPCACertificateAuthorityCertificate - - TestAccACMPCACertificateDataSource -amp: - - TestAccAMPWorkspace - - TestAccAMPRuleGroupNamespace -apigateway: - - TestAccAPIGatewayAPIKeyDataSource_basic - - TestAccAPIGatewayAPIKey_disappears - - TestAccAPIGatewayAPIKey_enabled - - TestAccAPIGatewayAPIKey_value - - TestAccAPIGatewayGatewayResponse - - TestAccAPIGatewayRestAPI_apiKeySource - - TestAccAPIGatewayRestAPI_basic - - TestAccAPIGatewayRestAPI_description - - TestAccAPIGatewayRestAPI_disappears - - TestAccAPIGatewayRestAPI_Endpoint_private - - TestAccAPIGatewayStage_basic - - TestAccAPIGatewayStage_Disappears_restAPI - - TestAccAPIGatewayStage_disappears - - TestAccAPIGatewayStage_Disappears_referencingDeployment - - TestAccAPIGatewayStage_tags - - TestAccAPIGatewayStage_accessLogSettings -apigatewayv2: - - TestAccAPIGatewayV2Authorizer - - TestAccAPIGatewayV2IntegrationResponse - - TestAccAPIGatewayV2Model - - TestAccAPIGatewayV2Route - - TestAccAPIGatewayV2Stage_basicHTTP - - TestAccAPIGatewayV2Stage_basicWebSocket - - TestAccAPIGatewayV2Stage_disappears - - TestAccAPIGatewayV2VPCLink -appconfig: - - TestAccAppConfigConfigurationProfileDataSource_basic - - TestAccAppConfigConfigurationProfile_ - - TestAccAppConfigConfigurationProfilesDataSource_basic - - TestAccAppConfigApplication_ - - TestAccAppConfigHostedConfigurationVersion_ -autoscaling: - - TestAccAutoScalingAttachment - - TestAccAutoScalingGroupDataSource - - TestAccAutoScalingGroupTag - - TestAccAutoScalingGroup_basic - - TestAccAutoScalingGroup_disappears - - TestAccAutoScalingGroup_nameGenerated - - TestAccAutoScalingGroup_namePrefix - - TestAccAutoScalingGroup_enablingMetrics - - TestAccAutoScalingGroup_suspendingProcesses - - TestAccAutoScalingGroup_mixedInstancesPolicy - - TestAccAutoScalingGroup_MixedInstancesPolicy_capacityRebalance - - TestAccAutoScalingLaunchConfigurationDataSource - - TestAccAutoScalingLaunchConfiguration_AssociatePublicIPAddress - - TestAccAutoScalingLaunchConfiguration_EBS_noDevice - - TestAccAutoScalingLaunchConfiguration_userData - - TestAccAutoScalingLaunchConfiguration_metadataOptions - - TestAccAutoScalingLaunchConfiguration_with - - TestAccAutoScalingLaunchConfiguration_encryptedEBSBlockDevice - - TestAccAutoScalingLaunchConfiguration_encryptedRootBlockDevice -batch: - - TestAccBatchJobDefinition - - TestAccBatchJobQueue_ - - TestAccBatchJobQueueDataSource_ - - TestAccBatchSchedulingPolicy -ce: - - TestAccCECostCategory -cloudformation: - - TestAccCloudFormationExportDataSource - - TestAccCloudFormationStackDataSource_DataSource - - TestAccCloudFormationStackSet_basic - - TestAccCloudFormationStackSet_templateBody - - TestAccCloudFormationStackSet_templateURL - - TestAccCloudFormationStackSet_description - - TestAccCloudFormationStackSet_operationPreferences - - TestAccCloudFormationStackSet_name - - TestAccCloudFormationStackSet_executionRoleName - - TestAccCloudFormationStackSet_disappears - - TestAccCloudFormationStack_basic - - TestAccCloudFormationStack_disappears - - TestAccCloudFormationStack_onFailure - - TestAccCloudFormationStack_yaml - - TestAccCloudFormationStack_withTransform - - TestAccCloudFormationStack_WithURLWithParams_withYAML - - TestAccCloudFormationStack_WithURL_withParams -cloudfront: - - TestAccCloudFrontDistributionDataSource_basic - - TestAccCloudFrontDistribution_isIPV6Enabled - - TestAccCloudFrontOriginAccessControl_ -cloudtrail: - - TestAccCloudTrailServiceAccount -cloudwatch: - - TestAccCloudWatchDashboard - - TestAccCloudWatchLogsDestination - - TestAccCloudWatchLogsDestinationPolicy - - TestAccCloudWatchLogsGroupDataSource -cognitoidp: - - TestAccCognitoIDPIdentityProvider - - TestAccCognitoIDPUserGroup_ - - TestAccCognitoIDPUserInGroup - - TestAccCognitoIDPUserPoolClientDataSource - - TestAccCognitoIDPUserPoolClient_basic - - TestAccCognitoIDPUserPoolClient_enableRevocation - - TestAccCognitoIDPUserPoolClient_refreshTokenValidity - - TestAccCognitoIDPUserPoolClient_accessTokenValidity - - TestAccCognitoIDPUserPoolClient_idTokenValidity - - TestAccCognitoIDPUserPoolClient_name - - TestAccCognitoIDPUserPoolClient_allFields - - TestAccCognitoIDPUserPool_ - - TestAccCognitoIDPUser_ - - TestAccCognitoIDPUserPoolClients -comprehend: - - TestAccComprehendEntityRecognizer_basic - - TestAccComprehendEntityRecognizer_disappears - - TestAccComprehendEntityRecognizer_version - - TestAccComprehendEntityRecognizer_documents - - TestAccComprehendEntityRecognizer_annotations - - TestAccComprehendEntityRecognizer_tags - - TestAccComprehendEntityRecognizer_DefaultTags - - TestAccComprehendEntityRecognizer_KMSKeys -dax: - - TestAccDAXCluster_basic - - TestAccDAXCluster_Encryption_enabled -dynamodb: - - TestAccDynamoDBTableItem -ec2: - - TestAccEC2AvailabilityZonesDataSource_ - - TestAccEC2CarrierGateway_ - - TestAccEC2HostDataSource_ - - TestAccEC2Host_basic - - TestAccEC2Host_disappears - - TestAccEC2Host_instanceFamily - - TestAccEC2Host_tags - - TestAccEC2InstanceTypeOfferingDataSource_ - - TestAccEC2InstanceTypeOfferingsDataSource_ - - TestAccEC2RouteTableAssociation_ - - TestAccEC2SpotInstanceRequest_disappears - - TestAccEC2SpotInstanceRequest_interruptUpdate - - TestAccEC2VPCEndpointService_ - - TestAccEC2VPCPeeringConnectionAccepter_ - - TestAccEC2VPCsDataSource - - TestAccEC2VPNGateway_ - - TestAccEC2VPNGatewayAttachment_ - - TestAccVPCEgressOnlyInternetGateway_ - - TestAccVPCInternetGateway - - TestAccVPCNATGateway_basic - - TestAccVPCNATGateway_disappears - - TestAccVPCNATGateway_ConnectivityType_private - - TestAccVPCNATGateway_tags - - TestAccVPCSecurityGroupDataSource_basic - - TestAccVPCSecurityGroupRule_Ingress - - TestAccVPCSecurityGroupRule_egress - - TestAccVPCSecurityGroupRule_selfReference - - TestAccVPCSecurityGroupRule_expectInvalid - - TestAccVPCSecurityGroupRule_PartialMatching - - TestAccVPCSecurityGroupRule_issue5310 - - TestAccVPCSecurityGroupRule_race - - TestAccVPCSecurityGroupRule_selfSource - - TestAccVPCSecurityGroupRule_prefixList - - TestAccVPCSecurityGroupRule_ingressDescription - - TestAccVPCSecurityGroupRule_egressDescription - - TestAccVPCSecurityGroupRule_IngressDescription_updates - - TestAccVPCSecurityGroupRule_EgressDescription_updates - - TestAccVPCSecurityGroupRule_Description - - TestAccVPCSecurityGroupRule_MultipleRuleSearching_allProtocolCrash - - TestAccVPCSecurityGroupRule_protocolChange - - TestAccVPCSecurityGroup_allowAll - - TestAccVPCSecurityGroup_basic - - TestAccVPCSecurityGroup_change - - TestAccVPCSecurityGroup_cidrAndGroups - - TestAccVPCSecurityGroup_defaultEgressVPC - - TestAccVPCSecurityGroup_disappears - - TestAccVPCSecurityGroup_driftComplex - - TestAccVPCSecurityGroup_egressMode - - TestAccVPCSecurityGroup_egressWithPrefixList - - TestAccVPCSecurityGroup_failWithDiffMismatch - - TestAccVPCSecurityGroup_ingressMode - - TestAccVPCSecurityGroup_ingressWithCIDRAndSGsVPC - - TestAccVPCSecurityGroup_ingressWithPrefixList - - TestAccVPCSecurityGroup_invalidCIDRBlock - - TestAccVPCSecurityGroup_ipRangeAndSecurityGroupWithSameRules - - TestAccVPCSecurityGroup_ipRangesWithSameRules - - TestAccVPCSecurityGroup_ipv4AndIPv6Egress - - TestAccVPCSecurityGroup_ipv6 - - TestAccVPCSecurityGroup_multiIngress - - TestAccVPCSecurityGroup_nameGenerated - - TestAccVPCSecurityGroup_namePrefix - - TestAccVPCSecurityGroup_namePrefixTerraform - - TestAccVPCSecurityGroup_nameTerraformPrefix - - TestAccVPCSecurityGroup_noVPC - - TestAccVPCSecurityGroup_ruleDescription - - TestAccVPCSecurityGroup_ruleGathering - - TestAccVPCSecurityGroup_self - - TestAccVPCSecurityGroup_sourceSecurityGroup - - TestAccVPCSecurityGroup_tags - - TestAccVPCSecurityGroup_vpc - - TestAccVPCSecurityGroups -ecr: - - TestAccECRLifecyclePolicy - - TestAccECRRegistryPolicy - - TestAccECRReplicationConfiguration - - TestAccECRRepository - - TestAccECRRepositoryDataSource - - TestAccECRRepositoryPolicy -ecs: - - TestAccECSCapacityProvider_basic - - TestAccECSCapacityProvider_disappears - - TestAccECSCapacityProvider_tags - - TestAccECSCluster_ - - TestAccECSClusterCapacityProviders_basic - - TestAccECSClusterCapacityProviders_defaults - - TestAccECSClusterCapacityProviders_disappears - - TestAccECSClusterCapacityProviders_Update - - TestAccECSService_clusterName - - TestAccECSService_deploymentCircuitBreaker - - TestAccECSService_alb - - TestAccECSService_multipleTargetGroups - - TestAccECSService_DeploymentValues - - TestAccECSService_iamRole - - TestAccECSService_ServiceRegistries_container - - TestAccECSService_renamedCluster - - TestAccECSService_familyAndRevision - - TestAccECSService_replicaSchedulingStrategy - - TestAccECSService_DaemonSchedulingStrategy - - TestAccECSService_PlacementStrategy_missing - - TestAccECSService_disappears - - TestAccECSTaskSet_ - - TestAccECSTaskDefinition_Docker - - TestAccECSTaskDefinition_EFSVolume - - TestAccECSTaskDefinition_Fargate - - TestAccECSTaskDefinition_ipcMode - - TestAccECSTaskDefinition_constraint - - TestAccECSTaskDefinition_tags - - TestAccECSTaskDefinition_pidMode - - TestAccECSTaskDefinition_executionRole - - TestAccECSTaskDefinition_service - - TestAccECSTaskDefinition_disappears - - TestAccECSTaskDefinition_taskRoleARN - - TestAccECSTaskDefinition_inferenceAccelerator - - TestAccECSTaskDefinition_proxy - - TestAccECSTaskDefinition_changeVolumesForcesNewResource - - TestAccECSTaskDefinition_invalidContainerDefinition - - TestAccECSTaskDefinition_arrays - - TestAccECSTaskDefinition_scratchVolume - - TestAccECSTaskDefinition_runtimePlatform - - TestAccECSTaskDefinition_basic - - TestAccECSTaskDefinition_networkMode -efs: - - TestAccEFSAccessPoint_ - - TestAccEFSAccessPointDataSource - - TestAccEFSFileSystemDataSource_availabilityZone - - TestAccEFSFileSystemDataSource_id - - TestAccEFSFileSystemDataSource_name - - TestAccEFSFileSystemDataSource_tags -elasticbeanstalk: - - TestAccElasticBeanstalkHostedZoneDataSource - - TestAccElasticBeanstalkSolutionStackDataSource -elb: - - TestAccELBAttachment - - TestAccELBBackendServerPolicy - - TestAccELBHostedZoneIDDataSource - - TestAccELBListenerPolicy_basic - - TestAccELBListenerPolicy_disappears - - TestAccELBServiceAccountDataSource - - TestAccELBSSLNegotiationPolicy -elbv2: - - TestAccELBV2ListenerCertificate - - TestAccELBV2TargetGroup_backwardsCompatibility - - TestAccELBV2TargetGroup_ProtocolVersion_grpcHealthCheck - - TestAccELBV2TargetGroup_ProtocolVersion_grpcUpdate - - TestAccELBV2TargetGroup_ipAddressType - - TestAccELBV2TargetGroup_tls - - TestAccELBV2TargetGroup_HealthCheck_tcpHTTPS - - TestAccELBV2TargetGroup_attrsOnCreate - - TestAccELBV2TargetGroup_basic - - TestAccELBV2TargetGroup_udp - - TestAccELBV2TargetGroup_ForceNew_name - - TestAccELBV2TargetGroup_ForceNew_vpc - - TestAccELBV2TargetGroup_Defaults_application - - TestAccELBV2TargetGroup_Defaults_network - - TestAccELBV2TargetGroup_HealthCheck_enable - - TestAccELBV2TargetGroup_Name_generated - - TestAccELBV2TargetGroup_Name_prefix - - TestAccELBV2TargetGroup_NetworkLB_tcpHealthCheckUpdated - - TestAccELBV2TargetGroup_networkLB_TargetGroupWithConnectionTermination - - TestAccELBV2TargetGroup_NetworkLB_targetGroupWithProxy - - TestAccELBV2TargetGroup_preserveClientIPValid - - TestAccELBV2TargetGroup_Geneve_basic - - TestAccELBV2TargetGroup_Geneve_notSticky - - TestAccELBV2TargetGroup_Geneve_Sticky - - TestAccELBV2TargetGroup_Geneve_targetFailover - - TestAccELBV2TargetGroup_Stickiness_defaultALB - - TestAccELBV2TargetGroup_Stickiness_defaultNLB - - TestAccELBV2TargetGroup_Stickiness_invalidALB - - TestAccELBV2TargetGroup_Stickiness_invalidNLB - - TestAccELBV2TargetGroup_Stickiness_validALB - - TestAccELBV2TargetGroup_Stickiness_validNLB - - TestAccELBV2TargetGroup_tags - - TestAccELBV2TargetGroup_Stickiness_updateAppEnabled - - TestAccELBV2TargetGroup_HealthCheck_update - - TestAccELBV2TargetGroup_Stickiness_updateEnabled - - TestAccELBV2TargetGroup_HealthCheck_without - - TestAccELBV2TargetGroup_ALBAlias_basic - - TestAccELBV2TargetGroup_ALBAlias_changeNameForceNew - - TestAccELBV2TargetGroup_ALBAlias_changePortForceNew - - TestAccELBV2TargetGroup_ALBAlias_changeProtocolForceNew - - TestAccELBV2TargetGroup_ALBAlias_changeVPCForceNew - - TestAccELBV2TargetGroup_ALBAlias_generatedName - - TestAccELBV2TargetGroup_ALBAlias_lambda - - TestAccELBV2TargetGroup_ALBAlias_lambdaMultiValueHeadersEnabled - - TestAccELBV2TargetGroup_ALBAlias_missingPortProtocolVPC - - TestAccELBV2TargetGroup_ALBAlias_namePrefix - - TestAccELBV2TargetGroup_ALBAlias_setAndUpdateSlowStart - - TestAccELBV2TargetGroup_ALBAlias_tags - - TestAccELBV2TargetGroup_ALBAlias_updateHealthCheck - - TestAccELBV2TargetGroup_ALBAlias_updateLoadBalancingAlgorithmType - - TestAccELBV2TargetGroup_ALBAlias_updateLoadBalancingCrossZoneEnabled - - TestAccELBV2TargetGroup_ALBAlias_updateStickinessEnabled - - TestAccELBV2TargetGroup_Name_noDuplicates -events: - - TestAccEventsAPIDestination - - TestAccEventsArchive - - TestAccEventsBus - - TestAccEventsBusPolicy - - TestAccEventsConnection - - TestAccEventsConnectionDataSource - - TestAccEventsPermission - - TestAccEventsRule - - TestAccEventsTarget_basic - - TestAccEventsTarget_batch - - TestAccEventsTarget_disappears - - TestAccEventsTarget_eventBusName - - TestAccEventsTarget_ecs - - TestAccEventsTarget_eventBusARN - - TestAccEventsTarget_full - - TestAccEventsTarget_generatedTargetID - - TestAccEventsTarget_inputTransformer - - TestAccEventsTarget_kinesis - - TestAccEventsTarget_ssmDocument -firehose: - - TestAccFirehoseDeliveryStreamDataSource_basic - - TestAccFirehoseDeliveryStream_basic - - TestAccFirehoseDeliveryStream_missingProcessing - - TestAccFirehoseDeliveryStream_HTTPEndpoint_retryDuration - - TestAccFirehoseDeliveryStream_ExtendedS3_ - - TestAccFirehoseDeliveryStream_extendedS3DynamicPartitioningUpdate - - TestAccFirehoseDeliveryStream_extendedS3DynamicPartitioning - - TestAccFirehoseDeliveryStream_extendedS3KMSKeyARN - - TestAccFirehoseDeliveryStream_ExtendedS3Processing_empty - - TestAccFirehoseDeliveryStream_extendedS3Updates - - TestAccFirehoseDeliveryStream_s3 - - TestAccFirehoseDeliveryStream_HTTP - - TestAccFirehoseDeliveryStream_http - - TestAccFirehoseDeliveryStream_splunk - - TestAccFirehoseDeliveryStream_Splunk -glue: - - TestAccGlueSchema_ -guardduty: - - TestAccGuardDuty_serial/Detector/basic - - TestAccGuardDuty_serial/Filter/basic -iam: - - TestAccIAMAccessKey_ - - TestAccIAMAccountAlias_ - - TestAccIAMGroup_basic - - TestAccIAMGroup_disappears - - TestAccIAMGroup_nameChange - - TestAccIAMInstanceProfileDataSource_ - - TestAccIAMGroupPolicy_ - - TestAccIAMOpenIDConnectProvider_ - - TestAccIAMOpenidConnectProviderDataSource_ - - TestAccIAMPolicy_ - - TestAccIAMPolicyDataSource_ - - TestAccIAMPolicyDocumentDataSource_ - - TestAccIAMRoleDataSource_ - - TestAccIAMRolePolicy_ - - TestAccIAMRolePolicyAttachment_ - - TestAccIAMSessionContextDataSource_ - - TestAccIAMServiceLinkedRole - - TestAccIAMUserDataSource_ - - TestAccIAMUserPolicy_ - - TestAccIAMUserPolicyAttachment_ - - TestAccIAMUserSSHKey_ - - TestAccIAMUserSSHKeyDataSource_ -iot: - - TestAccIoTEndpointDataSource -kinesis: - - TestAccKinesisStreamConsumerDataSource_ - - TestAccKinesisStreamConsumer_ - - TestAccKinesisStreamDataSource_ - - TestAccKinesisStream_ -kms: - - TestAccKMSAlias - - TestAccKMSGrant_arn - - TestAccKMSGrant_asymmetricKey - - TestAccKMSGrant_basic - - TestAccKMSGrant_bare - - TestAccKMSGrant_withConstraints - - TestAccKMSGrant_withRetiringPrincipal - - TestAccKMSKey_Policy_basic - - TestAccKMSKey_Policy_iamRole - - TestAccKMSKey_Policy_iamRoleOrder - - TestAccKMSKey_Policy_iamServiceLinkedRole - - TestAccKMSSecretDataSource - - TestAccKMSSecretsDataSource -lakeformation: - - TestAccLakeFormationResource -lambda: - - TestAccLambdaAlias_ - - TestAccLambdaLayerVersion_basic - - TestAccLambdaLayerVersion_compatibleArchitectures - - TestAccLambdaLayerVersion_compatibleRuntimes - - TestAccLambdaLayerVersion_licenseInfo - - TestAccLambdaLayerVersion_s3 - - TestAccLambdaLayerVersion_update - - TestAccLambdaFunctionURL_Alias - - TestAccLambdaFunctionURL_basic - - TestAccLambdaFunctionURL_TwoURLs -logs: - - TestAccLogsDestination_ - - TestAccLogsGroupDataSource_basic - - TestAccLogsGroupsDataSource_basic - - TestAccLogsGroup_basic - - TestAccLogsGroup_tags - - TestAccLogsStream -meta: - - TestAccMetaBillingServiceAccountDataSource -mq: - - TestAccMQBrokerDataSource - - TestAccMQBroker_ -neptune: - - TestAccNeptuneCluster_basic - - TestAccNeptuneCluster_namePrefix - - TestAccNeptuneCluster_serverlessConfiguration - - TestAccNeptuneCluster_encrypted - - TestAccNeptuneCluster_backupsUpdate - - TestAccNeptuneCluster_kmsKey - - TestAccNeptuneCluster_tags - - TestAccNeptuneCluster_disappears - - TestAccNeptuneGlobalCluster_basic -opensearch: - - TestAccOpenSearchDomain_basic - - TestAccOpenSearchDomain_LogPublishingOptions_searchSlowLogs - - TestAccOpenSearchDomain_AdvancedSecurityOptions - - TestAccOpenSearchDomain_autoTuneOptions - - TestAccOpenSearchDomain_v23 - - TestAccOpenSearchDomain_Cluster_ - - TestAccOpenSearchDomain_disappears - - TestAccOpenSearchDomain_VolumeType - - TestAccOpenSearchDomain_VPC_ - - TestAccOpenSearchDomain_Encryption_ - - TestAccOpenSearchDomain_LogPublishingOptions_ - - TestAccOpenSearchDomain_Policy_ - - TestAccOpenSearchDomain_requireHTTPS - - TestAccOpenSearchDomain_tags - - TestAccOpenSearchDomain_customEndpoint -quicksight: - - TestAccQuickSightUser - - TestAccQuickSightGroup_ -rds: - - TestAccRDSCluster_basic - - TestAccRDSCluster_disappears - - TestAccRDSCluster_EnabledCloudWatchLogsExports_ - - TestAccRDSCluster_enableHTTPEndpoint - - TestAccRDSCluster_engineMode - - TestAccRDSCluster_EngineMode - - TestAccRDSCluster_GlobalClusterIdentifierEngineMode_ - - TestAccRDSCluster_identifier - - TestAccRDSCluster_tags - - TestAccRDSGlobalCluster_basic - - TestAccRDSGlobalCluster_storageEncrypted -redshift: - - TestAccRedshiftServiceAccountDataSource -route53|1: - - TestAccRoute53Record_basic - - TestAccRoute53Record_underscored - - TestAccRoute53Record_disappears - - TestAccRoute53Record_Disappears_multipleRecords - - TestAccRoute53Record_Basic_fqdn - - TestAccRoute53Record_Basic_trailingPeriodAndZoneID - - TestAccRoute53Record_txtSupport - - TestAccRoute53Record_spfSupport - - TestAccRoute53Record_caaSupport - - TestAccRoute53Record_dsSupport - - TestAccRoute53Record_generatesSuffix - - TestAccRoute53Record_wildcard - - TestAccRoute53Record_failover - - TestAccRoute53Record_Weighted_basic - - TestAccRoute53Record_WeightedToSimple_basic - - TestAccRoute53Record_Alias_s3 - - TestAccRoute53Record_Geolocation_basic - - TestAccRoute53Record_HealthCheckID_setIdentifierChange - - TestAccRoute53Record_HealthCheckID_typeChange - - TestAccRoute53Record_Latency_basic - - TestAccRoute53Record_typeChange - - TestAccRoute53Record_nameChange - - TestAccRoute53Record_setIdentifierChange - - TestAccRoute53Record_empty - - TestAccRoute53Record_longTXTrecord - - TestAccRoute53Record_Allow_doNotOverwrite - - TestAccRoute53Record_Allow_overwrite -route53|2: - - TestAccRoute53Zone_ - - TestAccRoute53ZoneAssociation_basic - - TestAccRoute53ZoneAssociation_disappears - - TestAccRoute53ZoneAssociation_Disappears - - TestAccRoute53ZoneAssociation_crossRegion - - TestAccRoute53ZoneDataSource_id - - TestAccRoute53ZoneDataSource_name - - TestAccRoute53ZoneDataSource_tags - - TestAccRoute53ZoneDataSource_vpc - - TestAccRoute53HealthCheck_basic - - TestAccRoute53HealthCheck_tags - - TestAccRoute53HealthCheck_withSearchString - - TestAccRoute53HealthCheck_withChildHealthChecks - - TestAccRoute53HealthCheck_withHealthCheckRegions - - TestAccRoute53HealthCheck_ip - - TestAccRoute53HealthCheck_ipv6 - - TestAccRoute53HealthCheck_withSNI - - TestAccRoute53HealthCheck_disabled - - TestAccRoute53HealthCheck_disappears - - TestAccRoute53ResolverEndpoint -s3: - - TestAccS3Bucket_Basic_forceDestroyWithEmptyPrefixes - - TestAccS3Bucket_Basic_namePrefix - - TestAccS3Bucket_Basic_keyEnabled - - TestAccS3Bucket_Basic_forceDestroyWithObjectLockEnabled - - TestAccS3Bucket_Basic_generatedName - - TestAccS3Bucket_Basic_acceleration - - TestAccS3Bucket_Basic_forceDestroy - - TestAccS3Bucket_Basic_emptyString - - TestAccS3BucketPolicy - - TestAccS3BucketPublicAccessBlock - - TestAccS3BucketVersioning_basic - - TestAccS3BucketVersioning_disappears - - TestAccS3BucketVersioning_update - - TestAccS3BucketVersioning_Status_ - - TestAccS3ObjectCopy - - TestAccS3Object_noNameNoKey - - TestAccS3Object_sse - - TestAccS3Object_kms - - TestAccS3Object_empty - - TestAccS3Object_source - - TestAccS3Object_content - - TestAccS3Object_etagEncryption - - TestAccS3Object_contentBase64 - - TestAccS3Object_sourceHashTrigger - - TestAccS3Object_withContentCharacteristics - - TestAccS3Object_nonVersioned - - TestAccS3Object_acl - - TestAccS3Object_metadata - - TestAccS3Object_tags - - TestAccS3ObjectDataSource_kmsEncrypted - - TestAccS3ObjectDataSource_readableBody - - TestAccS3ObjectDataSource_bucketKeyEnabled - - TestAccS3ObjectDataSource_allParams - - TestAccS3ObjectDataSource_object - - TestAccS3ObjectDataSource_leadingSlash - - TestAccS3ObjectDataSource_multipleSlashes - - TestAccS3ObjectDataSource_singleSlashAsKey - - TestAccS3ObjectsDataSource_all - - TestAccS3ObjectsDataSource_prefixes - - TestAccS3ObjectsDataSource_maxKeys - - TestAccS3ObjectsDataSource_startAfter - - TestAccS3ObjectsDataSource_fetchOwner -sagemaker: - - TestAccSageMakerPrebuiltECRImageDataSource -scheduler: - - TestAccSchedulerSchedule_ - - TestAccSchedulerScheduleGroup_ -secretsmanager: - - TestAccSecretsManagerSecretDataSource_basic - - TestAccSecretsManagerSecretPolicy_ - - TestAccSecretsManagerSecret_RecoveryWindowInDays_recreate - - TestAccSecretsManagerSecret_tags - - TestAccSecretsManagerSecret_kmsKeyID - - TestAccSecretsManagerSecret_withNamePrefix - - TestAccSecretsManagerSecret_rotationRules -servicediscovery: - - TestAccServiceDiscoveryDNSNamespaceDataSource - - TestAccServiceDiscoveryHTTPNamespace - - TestAccServiceDiscoveryPrivateDNSNamespace - - TestAccServiceDiscoveryPublicDNSNamespace - - TestAccServiceDiscoveryService_disappears - - TestAccServiceDiscoveryService_http - - TestAccServiceDiscoveryService_tags - - TestAccServiceDiscoveryService_private_http - - TestAccServiceDiscoveryService_public -signer: - - TestAccSignerSigningProfileDataSource_basic - - TestAccSignerSigningProfile_basic - - TestAccSignerSigningProfile_generateNameWithNamePrefix - - TestAccSignerSigningProfile_generateName - - TestAccSignerSigningProfile_tags - - TestAccSignerSigningProfile_signatureValidityPeriod -sns: - - TestAccSNSTopicPolicy - - TestAccSNSTopicDataSource - - TestAccSNSSMSPreferences -ssm: - - TestAccSSMDocumentDataSource_basic - - TestAccSSMDocument_ -sts: - - TestAccSTSCallerIdentityDataSource -sqs: - - TestAccSQSQueueDataSource - - TestAccSQSQueuePolicy - - TestAccSQSQueue_FIFOQueue_ -timestreamwrite: - - TestAccTimestreamWriteDatabase - - TestAccTimestreamWriteTable -wafv2: - - TestAccWAFV2WebACL_basic - - TestAccWAFV2WebACL_disappears - - TestAccWAFV2WebACL_minimal - - TestAccWAFV2WebACL_tags - - TestAccWAFV2WebACL_Update_rule - - TestAccWAFV2WebACL_RuleLabels diff --git a/tests/terraformtests/test-fixtures/lambda_func.js b/tests/terraformtests/test-fixtures/lambda_func.js deleted file mode 100644 index 556182a5c..000000000 --- a/tests/terraformtests/test-fixtures/lambda_func.js +++ /dev/null @@ -1,9 +0,0 @@ -var http = require('http') - -exports.handler = function(event, context) { - http.get("http://requestb.in/10m32wg1", function(res) { - console.log("success", res.statusCode, res.body) - }).on('error', function(e) { - console.log("error", e) - }) -} diff --git a/tests/terraformtests/test-fixtures/lambda_func_modified.js b/tests/terraformtests/test-fixtures/lambda_func_modified.js deleted file mode 100644 index 9842040bb..000000000 --- a/tests/terraformtests/test-fixtures/lambda_func_modified.js +++ /dev/null @@ -1,9 +0,0 @@ -var http = require('http') - -exports.handler = function(event, context) { - http.get("http://requestb.in/MODIFIED", function(res) { - console.log("success", res.statusCode, res.body) - }).on('error', function(e) { - console.log("error", e) - }) -} diff --git a/tests/terraformtests/test-fixtures/lambda_invocation.js b/tests/terraformtests/test-fixtures/lambda_invocation.js deleted file mode 100644 index abc0191f9..000000000 --- a/tests/terraformtests/test-fixtures/lambda_invocation.js +++ /dev/null @@ -1,6 +0,0 @@ -exports.handler = async (event) => { - if (process.env.TEST_DATA) { - event.key3 = process.env.TEST_DATA; - } - return event; -} diff --git a/tests/terraformtests/test-fixtures/lambda_invocation.zip b/tests/terraformtests/test-fixtures/lambda_invocation.zip deleted file mode 100644 index b2bc4cde4..000000000 Binary files a/tests/terraformtests/test-fixtures/lambda_invocation.zip and /dev/null differ diff --git a/tests/terraformtests/test-fixtures/lambdapinpoint.zip b/tests/terraformtests/test-fixtures/lambdapinpoint.zip deleted file mode 100644 index 259ef4e54..000000000 Binary files a/tests/terraformtests/test-fixtures/lambdapinpoint.zip and /dev/null differ diff --git a/tests/terraformtests/test-fixtures/lambdatest.zip b/tests/terraformtests/test-fixtures/lambdatest.zip deleted file mode 100644 index 5c636e955..000000000 Binary files a/tests/terraformtests/test-fixtures/lambdatest.zip and /dev/null differ diff --git a/tests/terraformtests/test-fixtures/lambdatest_modified.zip b/tests/terraformtests/test-fixtures/lambdatest_modified.zip deleted file mode 100644 index 336bdd72e..000000000 Binary files a/tests/terraformtests/test-fixtures/lambdatest_modified.zip and /dev/null differ