From 0783fd09cdfa9201dae19db722eb7151c932ba7d Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 17 Oct 2024 10:07:54 -0700 Subject: [PATCH] Fixes `tflint` `terraform_unused_declarations` in `ec2` --- .../ec2/testdata/Subnet/data.tags/main_gen.tf | 6 ------ .../testdata/Subnet/data.tags_defaults/main_gen.tf | 6 ------ .../testdata/Subnet/data.tags_ignore/main_gen.tf | 6 ------ internal/service/ec2/vpc_subnet_data_source.go | 1 + .../ec2/vpc_subnet_data_source_tags_gen_test.go | 13 ------------- 5 files changed, 1 insertion(+), 31 deletions(-) diff --git a/internal/service/ec2/testdata/Subnet/data.tags/main_gen.tf b/internal/service/ec2/testdata/Subnet/data.tags/main_gen.tf index 2482fd7fe921..92fa1d163c05 100644 --- a/internal/service/ec2/testdata/Subnet/data.tags/main_gen.tf +++ b/internal/service/ec2/testdata/Subnet/data.tags/main_gen.tf @@ -17,12 +17,6 @@ resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" } -variable "rName" { - description = "Name for resource" - type = string - nullable = false -} - variable "resource_tags" { description = "Tags to set on resource. To specify no tags, set to `null`" # Not setting a default, so that this must explicitly be set to `null` to specify no tags diff --git a/internal/service/ec2/testdata/Subnet/data.tags_defaults/main_gen.tf b/internal/service/ec2/testdata/Subnet/data.tags_defaults/main_gen.tf index 4789f0c902c3..20015f966bb0 100644 --- a/internal/service/ec2/testdata/Subnet/data.tags_defaults/main_gen.tf +++ b/internal/service/ec2/testdata/Subnet/data.tags_defaults/main_gen.tf @@ -23,12 +23,6 @@ resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" } -variable "rName" { - description = "Name for resource" - type = string - nullable = false -} - variable "resource_tags" { description = "Tags to set on resource. To specify no tags, set to `null`" # Not setting a default, so that this must explicitly be set to `null` to specify no tags diff --git a/internal/service/ec2/testdata/Subnet/data.tags_ignore/main_gen.tf b/internal/service/ec2/testdata/Subnet/data.tags_ignore/main_gen.tf index cced61d5a0b2..1bef78df232f 100644 --- a/internal/service/ec2/testdata/Subnet/data.tags_ignore/main_gen.tf +++ b/internal/service/ec2/testdata/Subnet/data.tags_ignore/main_gen.tf @@ -26,12 +26,6 @@ resource "aws_vpc" "test" { cidr_block = "10.1.0.0/16" } -variable "rName" { - description = "Name for resource" - type = string - nullable = false -} - variable "resource_tags" { description = "Tags to set on resource. To specify no tags, set to `null`" # Not setting a default, so that this must explicitly be set to `null` to specify no tags diff --git a/internal/service/ec2/vpc_subnet_data_source.go b/internal/service/ec2/vpc_subnet_data_source.go index 64502d5fcb43..c64bfa2b3c55 100644 --- a/internal/service/ec2/vpc_subnet_data_source.go +++ b/internal/service/ec2/vpc_subnet_data_source.go @@ -21,6 +21,7 @@ import ( // @SDKDataSource("aws_subnet") // @Tags(identifierAttribute="id") +// @Testing(generator=false) func dataSourceSubnet() *schema.Resource { return &schema.Resource{ ReadWithoutTimeout: dataSourceSubnetRead, diff --git a/internal/service/ec2/vpc_subnet_data_source_tags_gen_test.go b/internal/service/ec2/vpc_subnet_data_source_tags_gen_test.go index 6c05747ffd4a..efecb544e9f1 100644 --- a/internal/service/ec2/vpc_subnet_data_source_tags_gen_test.go +++ b/internal/service/ec2/vpc_subnet_data_source_tags_gen_test.go @@ -6,7 +6,6 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/config" - sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/knownvalue" "github.com/hashicorp/terraform-plugin-testing/statecheck" @@ -18,7 +17,6 @@ import ( func TestAccVPCSubnetDataSource_tags(t *testing.T) { ctx := acctest.Context(t) dataSourceName := "data.aws_subnet.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, @@ -28,7 +26,6 @@ func TestAccVPCSubnetDataSource_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Subnet/data.tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), @@ -46,7 +43,6 @@ func TestAccVPCSubnetDataSource_tags(t *testing.T) { func TestAccVPCSubnetDataSource_tags_NullMap(t *testing.T) { ctx := acctest.Context(t) dataSourceName := "data.aws_subnet.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, @@ -56,7 +52,6 @@ func TestAccVPCSubnetDataSource_tags_NullMap(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Subnet/data.tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ConfigStateChecks: []statecheck.StateCheck{ @@ -70,7 +65,6 @@ func TestAccVPCSubnetDataSource_tags_NullMap(t *testing.T) { func TestAccVPCSubnetDataSource_tags_EmptyMap(t *testing.T) { ctx := acctest.Context(t) dataSourceName := "data.aws_subnet.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, @@ -80,7 +74,6 @@ func TestAccVPCSubnetDataSource_tags_EmptyMap(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Subnet/data.tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{}), }, ConfigStateChecks: []statecheck.StateCheck{ @@ -94,7 +87,6 @@ func TestAccVPCSubnetDataSource_tags_EmptyMap(t *testing.T) { func TestAccVPCSubnetDataSource_tags_DefaultTags_nonOverlapping(t *testing.T) { ctx := acctest.Context(t) dataSourceName := "data.aws_subnet.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, @@ -104,7 +96,6 @@ func TestAccVPCSubnetDataSource_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Subnet/data.tags_defaults/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), @@ -126,7 +117,6 @@ func TestAccVPCSubnetDataSource_tags_DefaultTags_nonOverlapping(t *testing.T) { func TestAccVPCSubnetDataSource_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) { ctx := acctest.Context(t) dataSourceName := "data.aws_subnet.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, @@ -136,7 +126,6 @@ func TestAccVPCSubnetDataSource_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Subnet/data.tags_ignore/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), @@ -164,7 +153,6 @@ func TestAccVPCSubnetDataSource_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) func TestAccVPCSubnetDataSource_tags_IgnoreTags_Overlap_ResourceTag(t *testing.T) { ctx := acctest.Context(t) dataSourceName := "data.aws_subnet.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, @@ -174,7 +162,6 @@ func TestAccVPCSubnetDataSource_tags_IgnoreTags_Overlap_ResourceTag(t *testing.T ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Subnet/data.tags_ignore/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }),