Combining AccTests to save resources. Fixed Formatting.

aws/data_source_aws_connect_instance.go

@@ -165,8 +165,7 @@ func dataSourceAwsConnectGetAllConnectInstanceSummaries(ctx context.Context, con
 
 	for {
 		input := &connect.ListInstancesInput{
-			// MaxResults Valid Range: Minimum value of 1. Maximum value of 60
-			MaxResults: aws.Int64(int64(60)),
+			MaxResults: aws.Int64(int64(tfconnect.ListInstancesMaxResults)),
 		}
 		if nextToken != "" {
 			input.NextToken = aws.String(nextToken)

aws/data_source_aws_connect_instance_test.go

@@ -93,7 +93,7 @@ data "aws_connect_instance" "test" {
 func testAccAwsConnectInstanceDataSourceConfigBasic(rName string) string {
 	return fmt.Sprintf(`
 resource "aws_connect_instance" "test" {
-  instance_alias = %[1]q
+  instance_alias           = %[1]q
   identity_management_type = "CONNECT_MANAGED"
   inbound_calls_enabled    = true
   outbound_calls_enabled   = true
@@ -108,7 +108,7 @@ data "aws_connect_instance" "test" {
 func testAccAwsConnectInstanceDataSourceConfigAlias(rName string) string {
 	return fmt.Sprintf(`
 resource "aws_connect_instance" "test" {
-  instance_alias = %[1]q
+  instance_alias           = %[1]q
   identity_management_type = "CONNECT_MANAGED"
   inbound_calls_enabled    = true
   outbound_calls_enabled   = true

aws/internal/service/connect/enum.go

@@ -4,6 +4,10 @@ import "github.com/aws/aws-sdk-go/service/connect"
 
 const InstanceStatusStatusNotFound = "ResourceNotFoundException"
 
+const (
+	ListInstancesMaxResults = 10
+)
+
 func InstanceAttributeMapping() map[string]string {
 	return map[string]string{
 		connect.InstanceAttributeTypeAutoResolveBestVoices: "auto_resolve_best_voices_enabled",

aws/resource_aws_connect_instance_test.go

@@ -99,11 +99,27 @@ func TestAccAwsConnectInstance_basic(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			{
+				Config: testAccAwsConnectInstanceConfigBasicFlipped(rName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsConnectInstanceExists(resourceName, &v),
+					testAccMatchResourceAttrRegionalARN(resourceName, "arn", "connect", regexp.MustCompile(`instance/.+`)),
+					resource.TestCheckResourceAttr(resourceName, "auto_resolve_best_voices_enabled", "false"),
+					resource.TestCheckResourceAttr(resourceName, "contact_flow_logs_enabled", "true"),
+					resource.TestCheckResourceAttr(resourceName, "contact_lens_enabled", "false"),
+					resource.TestCheckResourceAttrSet(resourceName, "created_time"),
+					resource.TestCheckResourceAttr(resourceName, "early_media_enabled", "false"),
+					resource.TestCheckResourceAttr(resourceName, "inbound_calls_enabled", "false"),
+					resource.TestMatchResourceAttr(resourceName, "instance_alias", regexp.MustCompile(rName)),
+					resource.TestCheckResourceAttr(resourceName, "outbound_calls_enabled", "false"),
+					resource.TestCheckResourceAttr(resourceName, "status", connect.InstanceStatusActive),
+				),
+			},
 		},
 	})
 }
 
-func TestAccAwsConnectInstance_custom(t *testing.T) {
+func TestAccAwsConnectInstance_directory(t *testing.T) {
 	var v connect.DescribeInstanceOutput
 	rName := acctest.RandomWithPrefix("resource-test-terraform")
 	resourceName := "aws_connect_instance.test"
@@ -115,51 +131,24 @@ func TestAccAwsConnectInstance_custom(t *testing.T) {
 		CheckDestroy: testAccCheckAwsConnectInstanceDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAwsConnectInstanceConfigCustom(rName),
+				Config: testAccAwsConnectInstanceConfigDirectory(rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAwsConnectInstanceExists(resourceName, &v),
-					testAccMatchResourceAttrRegionalARN(resourceName, "arn", "connect", regexp.MustCompile(`instance/.+`)),
-					resource.TestCheckResourceAttrSet(resourceName, "created_time"),
-					resource.TestCheckResourceAttr(resourceName, "identity_management_type", connect.DirectoryTypeConnectManaged),
-					resource.TestMatchResourceAttr(resourceName, "instance_alias", regexp.MustCompile(rName)),
-					resource.TestCheckResourceAttr(resourceName, "inbound_calls_enabled", "false"),
-					resource.TestCheckResourceAttr(resourceName, "outbound_calls_enabled", "false"),
-					resource.TestCheckResourceAttr(resourceName, "contact_flow_logs_enabled", "true"),
-					resource.TestCheckResourceAttr(resourceName, "contact_lens_enabled", "false"),
-					resource.TestCheckResourceAttr(resourceName, "auto_resolve_best_voices_enabled", "false"),
-					resource.TestCheckResourceAttr(resourceName, "early_media_enabled", "false"),
+					resource.TestCheckResourceAttr(resourceName, "identity_management_type", connect.DirectoryTypeExistingDirectory),
 					resource.TestCheckResourceAttr(resourceName, "status", connect.InstanceStatusActive),
-					testAccMatchResourceAttrGlobalARN(resourceName, "service_role", "iam", regexp.MustCompile(`role/aws-service-role/connect.amazonaws.com/.+`)),
 				),
 			},
 			{
-				ResourceName:      resourceName,
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-			{
-				Config: testAccAwsConnectInstanceConfigBasic(rName),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckAwsConnectInstanceExists(resourceName, &v),
-					testAccMatchResourceAttrRegionalARN(resourceName, "arn", "connect", regexp.MustCompile(`instance/.+`)),
-					resource.TestCheckResourceAttr(resourceName, "auto_resolve_best_voices_enabled", "true"), //verified default result from ListInstanceAttributes()
-					resource.TestCheckResourceAttr(resourceName, "contact_flow_logs_enabled", "false"),       //verified default result from ListInstanceAttributes()
-					resource.TestCheckResourceAttr(resourceName, "contact_lens_enabled", "true"),             //verified default result from ListInstanceAttributes()
-					resource.TestCheckResourceAttrSet(resourceName, "created_time"),
-					resource.TestCheckResourceAttr(resourceName, "early_media_enabled", "true"), //verified default result from ListInstanceAttributes()
-					resource.TestCheckResourceAttr(resourceName, "identity_management_type", connect.DirectoryTypeConnectManaged),
-					resource.TestCheckResourceAttr(resourceName, "inbound_calls_enabled", "true"),
-					resource.TestMatchResourceAttr(resourceName, "instance_alias", regexp.MustCompile(rName)),
-					resource.TestCheckResourceAttr(resourceName, "outbound_calls_enabled", "true"),
-					testAccMatchResourceAttrGlobalARN(resourceName, "service_role", "iam", regexp.MustCompile(`role/aws-service-role/connect.amazonaws.com/.+`)),
-					resource.TestCheckResourceAttr(resourceName, "status", connect.InstanceStatusActive),
-				),
+				ResourceName:            resourceName,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"directory_id"},
 			},
 		},
 	})
 }
 
-func TestAccAwsConnectInstance_directory(t *testing.T) {
+func TestAccAwsConnectInstance_saml(t *testing.T) {
 	var v connect.DescribeInstanceOutput
 	rName := acctest.RandomWithPrefix("resource-test-terraform")
 	resourceName := "aws_connect_instance.test"
@@ -171,17 +160,16 @@ func TestAccAwsConnectInstance_directory(t *testing.T) {
 		CheckDestroy: testAccCheckAwsConnectInstanceDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAwsConnectInstanceConfigDirectory(rName),
+				Config: testAccAwsConnectInstanceConfigSAML(rName),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(resourceName, "identity_management_type", connect.DirectoryTypeExistingDirectory),
+					resource.TestCheckResourceAttr(resourceName, "identity_management_type", connect.DirectoryTypeSaml),
 					testAccCheckAwsConnectInstanceExists(resourceName, &v),
 				),
 			},
 			{
-				ResourceName:            resourceName,
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"directory_id"},
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 		},
 	})
@@ -218,32 +206,6 @@ func testAccCheckAwsConnectInstanceExists(resourceName string, instance *connect
 	}
 }
 
-func TestAccAwsConnectInstance_saml(t *testing.T) {
-	var v connect.DescribeInstanceOutput
-	rName := acctest.RandomWithPrefix("resource-test-terraform")
-	resourceName := "aws_connect_instance.test"
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		ErrorCheck:   testAccErrorCheck(t, connect.EndpointsID),
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckAwsConnectInstanceDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccAwsConnectInstanceConfigSAML(rName),
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(resourceName, "identity_management_type", connect.DirectoryTypeSaml),
-					testAccCheckAwsConnectInstanceExists(resourceName, &v),
-				),
-			},
-			{
-				ResourceName:      resourceName,
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
 func testAccCheckAwsConnectInstanceDestroy(s *terraform.State) error {
 	for _, rs := range s.RootModule().Resources {
 		if rs.Type != "aws_connect_instance" {
@@ -281,7 +243,7 @@ resource "aws_connect_instance" "test" {
 `, rName)
 }
 
-func testAccAwsConnectInstanceConfigCustom(rName string) string {
+func testAccAwsConnectInstanceConfigBasicFlipped(rName string) string {
 	return fmt.Sprintf(`
 resource "aws_connect_instance" "test" {
   identity_management_type         = "CONNECT_MANAGED"
@@ -290,42 +252,7 @@ resource "aws_connect_instance" "test" {
   outbound_calls_enabled           = false
   auto_resolve_best_voices_enabled = false
   contact_flow_logs_enabled        = true
-  contact_lens_enabled             = false
-  early_media_enabled       	   = false
-}
-`, rName)
-}
-
-func testAccAwsConnectInstanceConfigInboundEnabledOutboundDisabled(rName string) string {
-	return fmt.Sprintf(`
-resource "aws_connect_instance" "test" {
-  identity_management_type = "CONNECT_MANAGED"
-  inbound_calls_enabled    = true
-  instance_alias           = %[1]q
-  outbound_calls_enabled   = false
-}
-`, rName)
-}
-
-func testAccAwsConnectInstanceConfigInboundDisabledOutboundEnabled(rName string) string {
-	return fmt.Sprintf(`
-resource "aws_connect_instance" "test" {
-  identity_management_type = "CONNECT_MANAGED"
-  inbound_calls_enabled    = false
-  instance_alias           = %[1]q
-  outbound_calls_enabled   = true
-}
-`, rName)
-}
-
-func testAccAwsConnectInstanceConfigAttributeEarlyMedia(rName string) string {
-	return fmt.Sprintf(`
-resource "aws_connect_instance" "test" {
-  identity_management_type = "CONNECT_MANAGED"
-  inbound_calls_enabled    = true
-  instance_alias           = %[1]q
-  outbound_calls_enabled   = true
-  early_media_enabled      = true
+  early_media_enabled              = false
 }
 `, rName)
 }
@@ -383,8 +310,6 @@ resource "aws_connect_instance" "test" {
   instance_alias           = %[1]q
   inbound_calls_enabled    = true
   outbound_calls_enabled   = true
-
-  depends_on = [aws_directory_service_directory.test]
 }
 `, rName)
 }

website/docs/r/connect_instance.html.markdown

@@ -13,8 +13,8 @@ Provides an Amazon Connect instance resource. For more information see
 
 ## Example Usage
 
-```hcl
-resource "aws_connect_instance" "foo" {
+```terraform
+resource "aws_connect_instance" "test" {
   identity_management_type = "CONNECT_MANAGED"
   instance_alias           = "resource-test-terraform-connect"
   inbound_calls_enabled    = true