Fix overlapping names

hashicorp · Sep 22, 2021 · 2e321d8 · 2e321d8
1 parent 8c195d0
commit 2e321d8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/aws/data_source_aws_iam_group_test.go b/aws/data_source_aws_iam_group_test.go
@@ -18,7 +18,7 @@ func TestAccAWSDataSourceIAMGroup_basic(t *testing.T) {
 		Providers:  testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAwsIAMGroupConfig(groupName),
+				Config: testAccAwsIAMGroupDataSourceConfig(groupName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.aws_iam_group.test", "group_id"),
 					resource.TestCheckResourceAttr("data.aws_iam_group.test", "path", "/"),
@@ -42,7 +42,7 @@ func TestAccAWSDataSourceIAMGroup_users(t *testing.T) {
 		Providers:  testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAwsIAMGroupConfigWithUser(groupName, userName, groupMemberShipName, userCount),
+				Config: testAccAwsIAMGroupDataSourceConfigWithUser(groupName, userName, groupMemberShipName, userCount),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.aws_iam_group.test", "group_id"),
 					resource.TestCheckResourceAttr("data.aws_iam_group.test", "path", "/"),
@@ -59,7 +59,7 @@ func TestAccAWSDataSourceIAMGroup_users(t *testing.T) {
 	})
 }
 
-func testAccAwsIAMGroupConfig(name string) string {
+func testAccAwsIAMGroupDataSourceConfig(name string) string {
 	return fmt.Sprintf(`
 resource "aws_iam_group" "group" {
   name = "%s"
@@ -72,7 +72,7 @@ data "aws_iam_group" "test" {
 `, name)
 }
 
-func testAccAwsIAMGroupConfigWithUser(groupName, userName, membershipName string, userCount int) string {
+func testAccAwsIAMGroupDataSourceConfigWithUser(groupName, userName, membershipName string, userCount int) string {
 	return fmt.Sprintf(`
 resource "aws_iam_group" "group" {
   name = "%s"

diff --git a/aws/data_source_aws_iam_role_test.go b/aws/data_source_aws_iam_role_test.go
@@ -20,7 +20,7 @@ func TestAccAWSDataSourceIAMRole_basic(t *testing.T) {
 		Providers:  testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAwsIAMRoleConfig(roleName),
+				Config: testAccAwsIAMRoleDataSourceConfig(roleName),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrPair(dataSourceName, "arn", resourceName, "arn"),
 					resource.TestCheckResourceAttrPair(dataSourceName, "assume_role_policy", resourceName, "assume_role_policy"),
@@ -48,7 +48,7 @@ func TestAccAWSDataSourceIAMRole_tags(t *testing.T) {
 		Providers:  testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAwsIAMRoleConfig_tags(roleName),
+				Config: testAccAwsIAMRoleDataSourceConfig_tags(roleName),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrPair(dataSourceName, "arn", resourceName, "arn"),
 					resource.TestCheckResourceAttrPair(dataSourceName, "assume_role_policy", resourceName, "assume_role_policy"),
@@ -67,7 +67,7 @@ func TestAccAWSDataSourceIAMRole_tags(t *testing.T) {
 	})
 }
 
-func testAccAwsIAMRoleConfig(roleName string) string {
+func testAccAwsIAMRoleDataSourceConfig(roleName string) string {
 	return fmt.Sprintf(`
 resource "aws_iam_role" "test" {
   name = %[1]q
@@ -97,7 +97,7 @@ data "aws_iam_role" "test" {
 `, roleName)
 }
 
-func testAccAwsIAMRoleConfig_tags(roleName string) string {
+func testAccAwsIAMRoleDataSourceConfig_tags(roleName string) string {
 	return fmt.Sprintf(`
 resource "aws_iam_role" "test" {
   name = %q

diff --git a/aws/resource_aws_codestarconnections_host_test.go b/aws/resource_aws_codestarconnections_host_test.go
@@ -148,7 +148,7 @@ func testAccCheckAWSCodeStarConnectionsHostDestroy(s *terraform.State) error {
 	return nil
 }
 
-func testAccAWSCodeStarConnectionsHostVpcConfig(rName string) string {
+func testAccAWSCodeStarConnectionsHostVpcBaseConfig(rName string) string {
 	return fmt.Sprintf(`
 data "aws_availability_zones" "available" {
   state = "available"
@@ -209,7 +209,9 @@ resource "aws_codestarconnections_host" "test" {
 }
 
 func testAccAWSCodeStarConnectionsHostConfigVpcConfig(rName string) string {
-	return testAccAWSCodeStarConnectionsHostVpcConfig(rName) + fmt.Sprintf(`
+	return composeConfig(
+		testAccAWSCodeStarConnectionsHostVpcBaseConfig(rName),
+		fmt.Sprintf(`
 resource "aws_codestarconnections_host" "test" {
   name              = %[1]q
   provider_endpoint = "https://test.com"
@@ -221,5 +223,5 @@ resource "aws_codestarconnections_host" "test" {
     vpc_id             = aws_vpc.test.id
   }
 }
-`, rName)
+`, rName))
 }
diff --git a/aws/resource_aws_sqs_queue_policy_test.go b/aws/resource_aws_sqs_queue_policy_test.go
@@ -22,7 +22,7 @@ func TestAccAWSSQSQueuePolicy_basic(t *testing.T) {
 		CheckDestroy: testAccCheckAWSSQSQueueDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAWSSQSPolicyConfig(rName),
+				Config: testAccAWSSQSQueuePolicyConfig(rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSSQSQueueExists(queueResourceName, &queueAttributes),
 					resource.TestCheckResourceAttrSet(resourceName, "policy"),
@@ -34,7 +34,7 @@ func TestAccAWSSQSQueuePolicy_basic(t *testing.T) {
 				ImportStateVerify: true,
 			},
 			{
-				Config:   testAccAWSSQSPolicyConfig(rName),
+				Config:   testAccAWSSQSQueuePolicyConfig(rName),
 				PlanOnly: true,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrPair(resourceName, "policy", queueResourceName, "policy"),
@@ -57,7 +57,7 @@ func TestAccAWSSQSQueuePolicy_disappears(t *testing.T) {
 		CheckDestroy: testAccCheckAWSSQSQueueDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAWSSQSPolicyConfig(rName),
+				Config: testAccAWSSQSQueuePolicyConfig(rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSSQSQueueExists(queueResourceName, &queueAttributes),
 					testAccCheckResourceDisappears(testAccProvider, resourceAwsSqsQueuePolicy(), resourceName),
@@ -80,7 +80,7 @@ func TestAccAWSSQSQueuePolicy_disappears_queue(t *testing.T) {
 		CheckDestroy: testAccCheckAWSSQSQueueDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAWSSQSPolicyConfig(rName),
+				Config: testAccAWSSQSQueuePolicyConfig(rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSSQSQueueExists(queueResourceName, &queueAttributes),
 					testAccCheckResourceDisappears(testAccProvider, resourceAwsSqsQueue(), queueResourceName),
@@ -104,7 +104,7 @@ func TestAccAWSSQSQueuePolicy_Update(t *testing.T) {
 		CheckDestroy: testAccCheckAWSSQSQueueDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAWSSQSPolicyConfig(rName),
+				Config: testAccAWSSQSQueuePolicyConfig(rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSSQSQueueExists(queueResourceName, &queueAttributes),
 					resource.TestCheckResourceAttrSet(resourceName, "policy"),
@@ -125,7 +125,7 @@ func TestAccAWSSQSQueuePolicy_Update(t *testing.T) {
 	})
 }
 
-func testAccAWSSQSPolicyConfig(rName string) string {
+func testAccAWSSQSQueuePolicyConfig(rName string) string {
 	return fmt.Sprintf(`
 resource "aws_sqs_queue" "test" {
   name = %[1]q