Merge pull request #26786 from hashicorp/td-ec2-classic-retirement-phase3

EC2-Classic retirement phase 3: Remove acceptance test configurations

Author: ewbankkit

internal/acctest/ec2_classic.go

@@ -342,41 +342,6 @@ func TestAccAutoScalingLaunchConfiguration_withSpotPrice(t *testing.T) {
 	})
 }
 
-func TestAccAutoScalingLaunchConfiguration_withVPCClassicLink(t *testing.T) {
-	var vpc ec2.Vpc
-	var group ec2.SecurityGroup
-	var conf autoscaling.LaunchConfiguration
-	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
-	resourceName := "aws_launch_configuration.test"
-	vpcResourceName := "aws_vpc.test"
-	sgResourceName := "aws_security_group.test"
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:                 func() { acctest.PreCheck(t); acctest.PreCheckEC2Classic(t) },
-		ErrorCheck:               acctest.ErrorCheck(t, autoscaling.EndpointsID),
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
-		CheckDestroy:             testAccCheckLaunchConfigurationDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccLaunchConfigurationConfig_vpcClassicLink(rName),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckLaunchConfigurationExists(resourceName, &conf),
-					acctest.CheckVPCExists(vpcResourceName, &vpc),
-					testAccCheckSecurityGroupExists(sgResourceName, &group),
-					resource.TestCheckResourceAttrPair(resourceName, "vpc_classic_link_id", vpcResourceName, "id"),
-					resource.TestCheckResourceAttr(resourceName, "vpc_classic_link_security_groups.#", "1"),
-					resource.TestCheckTypeSetElemAttrPair(resourceName, "vpc_classic_link_security_groups.*", sgResourceName, "id"),
-				),
-			},
-			{
-				ResourceName:      resourceName,
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
 func TestAccAutoScalingLaunchConfiguration_withIAMProfile(t *testing.T) {
 	var conf autoscaling.LaunchConfiguration
 	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
@@ -873,31 +838,6 @@ func testAccCheckInstanceHasPublicIPAddress(group *autoscaling.Group, idx int, e
 	}
 }
 
-func testAccCheckSecurityGroupExists(n string, v *ec2.SecurityGroup) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		rs, ok := s.RootModule().Resources[n]
-		if !ok {
-			return fmt.Errorf("Not found: %s", n)
-		}
-
-		if rs.Primary.ID == "" {
-			return fmt.Errorf("No EC2 Security Group ID is set")
-		}
-
-		conn := acctest.Provider.Meta().(*conns.AWSClient).EC2Conn
-
-		output, err := tfec2.FindSecurityGroupByID(conn, rs.Primary.ID)
-
-		if err != nil {
-			return err
-		}
-
-		*v = *output
-
-		return nil
-	}
-}
-
 func testAccLaunchConfigurationConfig_basic(rName string) string {
 	return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(`
 resource "aws_launch_configuration" "test" {
@@ -1056,37 +996,6 @@ resource "aws_launch_configuration" "test" {
 `, rName))
 }
 
-func testAccLaunchConfigurationConfig_vpcClassicLink(rName string) string {
-	return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(`
-resource "aws_vpc" "test" {
-  cidr_block         = "10.0.0.0/16"
-  enable_classiclink = true
-
-  tags = {
-    Name = %[1]q
-  }
-}
-
-resource "aws_security_group" "test" {
-  name   = %[1]q
-  vpc_id = aws_vpc.test.id
-
-  tags = {
-    Name = %[1]q
-  }
-}
-
-resource "aws_launch_configuration" "test" {
-  name          = %[1]q
-  image_id      = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
-  instance_type = "t2.micro"
-
-  vpc_classic_link_id              = aws_vpc.test.id
-  vpc_classic_link_security_groups = [aws_security_group.test.id]
-}
-`, rName))
-}
-
 func testAccLaunchConfigurationConfig_iamProfile(rName string) string {
 	return acctest.ConfigCompose(acctest.ConfigLatestAmazonLinuxHVMEBSAMI(), fmt.Sprintf(`
 resource "aws_iam_role" "test" {

internal/service/autoscaling/launch_configuration_test.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/aws/aws-sdk-go/aws/endpoints"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -146,43 +145,6 @@ func TestAccEC2EIPAssociation_spotInstance(t *testing.T) {
 	})
 }
 
-func TestAccEC2EIPAssociation_classic(t *testing.T) {
-	var a ec2.Address
-	resourceName := "aws_eip_association.test"
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck: func() {
-			acctest.PreCheck(t)
-			acctest.PreCheckEC2Classic(t)
-			// Force to us-east-1 so that testAccCheckEIPAssociationExists/testAccCheckEIPAssociationDestroy work correctly.
-			acctest.PreCheckRegion(t, endpoints.UsEast1RegionID)
-		},
-		ErrorCheck:   acctest.ErrorCheck(t, ec2.EndpointsID),
-		CheckDestroy: testAccCheckEIPAssociationDestroy,
-		Steps: []resource.TestStep{
-			// Create the EC2-Classic Instance and ENI with the last version that supports that.
-			{
-				ExternalProviders: map[string]resource.ExternalProvider{
-					"aws": {
-						Source:            "hashicorp/aws",
-						VersionConstraint: "4.28.0",
-					},
-				},
-				Config: testAccEIPAssociationConfig_classicNoAssociation(),
-			},
-			{
-				ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
-				Config:                   testAccEIPAssociationConfig_classicWithAssociation(),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckEIPAssociationExists(resourceName, &a),
-					resource.TestCheckResourceAttr(resourceName, "allocation_id", ""),
-					resource.TestCheckResourceAttrSet(resourceName, "public_ip"),
-				),
-			},
-		},
-	})
-}
-
 func testAccCheckEIPAssociationExists(n string, v *ec2.Address) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -421,26 +383,3 @@ resource "aws_eip_association" "test" {
 }
 `, rName, publicKey))
 }
-
-func testAccEIPAssociationConfig_classicNoAssociation() string {
-	return acctest.ConfigCompose(
-		testAccLatestAmazonLinuxPVEBSAMIConfig(),
-		acctest.AvailableEC2InstanceTypeForRegion("t1.micro", "m3.medium", "m3.large", "c3.large", "r3.large"),
-		`
-resource "aws_instance" "test" {
-  ami           = data.aws_ami.amzn-ami-minimal-pv-ebs.id
-  instance_type = data.aws_ec2_instance_type_offering.available.instance_type
-}
-
-resource "aws_eip" "test" {}
-`)
-}
-
-func testAccEIPAssociationConfig_classicWithAssociation() string {
-	return acctest.ConfigCompose(testAccEIPAssociationConfig_classicNoAssociation(), `
-resource "aws_eip_association" "test" {
-  public_ip   = aws_eip.test.id
-  instance_id = aws_instance.test.id
-}
-`)
-}

internal/service/ec2/ec2_eip_association_test.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/aws/aws-sdk-go/aws/endpoints"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -622,44 +621,6 @@ func TestAccEC2EIP_BYOIPAddress_customWithPublicIPv4Pool(t *testing.T) {
 	})
 }
 
-func TestAccEC2EIP_Instance_ec2Classic(t *testing.T) {
-	resourceName := "aws_eip.test"
-	var conf ec2.Address
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck: func() {
-			acctest.PreCheck(t)
-			acctest.PreCheckEC2Classic(t)
-			// Force to us-east-1 so that testAccCheckEIPExists/testAccCheckEIPDestroy work correctly.
-			acctest.PreCheckRegion(t, endpoints.UsEast1RegionID)
-		},
-		ErrorCheck:   acctest.ErrorCheck(t, ec2.EndpointsID),
-		CheckDestroy: testAccCheckEIPDestroy,
-		Steps: []resource.TestStep{
-			// Create the EC2-Classic Instance and ENI with the last version that supports that.
-			{
-				ExternalProviders: map[string]resource.ExternalProvider{
-					"aws": {
-						Source:            "hashicorp/aws",
-						VersionConstraint: "4.28.0",
-					},
-				},
-				Config: testAccEIPConfig_instanceClassic(),
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(resourceName, "domain", ec2.DomainTypeStandard),
-				),
-			},
-			{
-				ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
-				Config:                   testAccEIPConfig_instanceClassic(),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckEIPExists(resourceName, &conf),
-				),
-			},
-		},
-	})
-}
-
 func testAccCheckEIPExists(n string, v *ec2.Address) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -1235,19 +1196,3 @@ resource "aws_eip" "test" {
 }
 `, rName, address, poolName)
 }
-
-func testAccEIPConfig_instanceClassic() string {
-	return acctest.ConfigCompose(
-		testAccLatestAmazonLinuxPVEBSAMIConfig(),
-		acctest.AvailableEC2InstanceTypeForRegion("t1.micro", "m3.medium", "m3.large", "c3.large", "r3.large"),
-		`
-resource "aws_instance" "test" {
-  ami           = data.aws_ami.amzn-ami-minimal-pv-ebs.id
-  instance_type = data.aws_ec2_instance_type_offering.available.instance_type
-}
-
-resource "aws_eip" "test" {
-  instance = aws_instance.test.id
-}
-`)
-}