r/aws_connect_contact_flow - add new resource

.changelog/16854.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_connect_contact_flow
+```
+
+```release-note:new-data-source
+aws_connect_contact_flow
+```

aws/data_source_aws_connect_contact_flow.go

@@ -0,0 +1,144 @@
+package aws
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/connect"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags"
+	tfconnect "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/connect"
+)
+
+func dataSourceAwsConnectContactFlow() *schema.Resource {
+	return &schema.Resource{
+		ReadContext: dataSourceAwsConnectContactFlowRead,
+		Schema: map[string]*schema.Schema{
+			"arn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"contact_flow_id": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ExactlyOneOf: []string{"contact_flow_id", "name"},
+			},
+			"content": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"description": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"instance_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"name": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ExactlyOneOf: []string{"name", "contact_flow_id"},
+			},
+			"tags": tagsSchemaComputed(),
+			"type": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+		},
+	}
+}
+
+func dataSourceAwsConnectContactFlowRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	conn := meta.(*AWSClient).connectconn
+	ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig
+
+	instanceID := d.Get("instance_id").(string)
+
+	input := &connect.DescribeContactFlowInput{
+		InstanceId: aws.String(instanceID),
+	}
+
+	if v, ok := d.GetOk("contact_flow_id"); ok {
+		input.ContactFlowId = aws.String(v.(string))
+	} else if v, ok := d.GetOk("name"); ok {
+		name := v.(string)
+		contactFlowSummary, err := dataSourceAwsConnectGetConnectContactFlowSummaryByName(ctx, conn, instanceID, name)
+
+		if err != nil {
+			return diag.FromErr(fmt.Errorf("error finding Connect Contact Flow Summary by name (%s): %w", name, err))
+		}
+
+		if contactFlowSummary == nil {
+			return diag.FromErr(fmt.Errorf("error finding Connect Contact Flow Summary by name (%s): not found", name))
+		}
+
+		input.ContactFlowId = contactFlowSummary.Id
+	}
+
+	resp, err := conn.DescribeContactFlow(input)
+
+	if err != nil {
+		return diag.FromErr(fmt.Errorf("error getting Connect Contact Flow: %w", err))
+	}
+
+	if resp == nil || resp.ContactFlow == nil {
+		return diag.FromErr(fmt.Errorf("error getting Connect Contact Flow: empty response"))
+	}
+
+	contactFlow := resp.ContactFlow
+
+	d.Set("arn", contactFlow.Arn)
+	d.Set("instance_id", instanceID)
+	d.Set("contact_flow_id", contactFlow.Id)
+	d.Set("name", contactFlow.Name)
+	d.Set("description", contactFlow.Description)
+	d.Set("content", contactFlow.Content)
+	d.Set("type", contactFlow.Type)
+
+	if err := d.Set("tags", keyvaluetags.ConnectKeyValueTags(contactFlow.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil {
+		return diag.FromErr(fmt.Errorf("error setting tags: %s", err))
+	}
+
+	d.SetId(fmt.Sprintf("%s:%s", instanceID, aws.StringValue(contactFlow.Id)))
+
+	return nil
+}
+
+func dataSourceAwsConnectGetConnectContactFlowSummaryByName(ctx context.Context, conn *connect.Connect, instanceID, name string) (*connect.ContactFlowSummary, error) {
+	var result *connect.ContactFlowSummary
+
+	input := &connect.ListContactFlowsInput{
+		InstanceId: aws.String(instanceID),
+		MaxResults: aws.Int64(tfconnect.ListContactFlowsMaxResults),
+	}
+
+	err := conn.ListContactFlowsPagesWithContext(ctx, input, func(page *connect.ListContactFlowsOutput, lastPage bool) bool {
+		if page == nil {
+			return !lastPage
+		}
+
+		for _, cf := range page.ContactFlowSummaryList {
+			if cf == nil {
+				continue
+			}
+
+			if aws.StringValue(cf.Name) == name {
+				result = cf
+				return false
+			}
+		}
+
+		return !lastPage
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}

aws/data_source_aws_connect_contact_flow_test.go

@@ -0,0 +1,109 @@
+package aws
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/aws/aws-sdk-go/service/connect"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccAwsConnectContactFlowDataSource_ContactFlowId(t *testing.T) {
+	rName := acctest.RandomWithPrefix("resource-test-terraform")
+	resourceName := "aws_connect_contact_flow.test"
+	datasourceName := "data.aws_connect_contact_flow.test"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:   func() { testAccPreCheck(t) },
+		ErrorCheck: testAccErrorCheck(t, connect.EndpointsID),
+		Providers:  testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAwsConnectContactFlowDataSourceConfig_ContactFlowId(rName, resourceName),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrPair(datasourceName, "id", resourceName, "id"),
+					resource.TestCheckResourceAttrPair(datasourceName, "arn", resourceName, "arn"),
+					resource.TestCheckResourceAttrPair(datasourceName, "contact_flow_id", resourceName, "contact_flow_id"),
+					resource.TestCheckResourceAttrPair(datasourceName, "instance_id", resourceName, "instance_id"),
+					resource.TestCheckResourceAttrPair(datasourceName, "name", resourceName, "name"),
+					resource.TestCheckResourceAttrPair(datasourceName, "description", resourceName, "description"),
+					resource.TestCheckResourceAttrPair(datasourceName, "content", resourceName, "content"),
+					resource.TestCheckResourceAttrPair(datasourceName, "type", resourceName, "type"),
+					resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"),
+				),
+			},
+		},
+	})
+}
+
+func TestAccAwsConnectContactFlowDataSource_Name(t *testing.T) {
+	rName := acctest.RandomWithPrefix("resource-test-terraform")
+	rName2 := acctest.RandomWithPrefix("resource-test-terraform")
+	resourceName := "aws_connect_contact_flow.test"
+	datasourceName := "data.aws_connect_contact_flow.test"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:   func() { testAccPreCheck(t) },
+		ErrorCheck: testAccErrorCheck(t, connect.EndpointsID),
+		Providers:  testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAwsConnectContactFlowDataSourceConfig_Name(rName, rName2),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrPair(datasourceName, "id", resourceName, "id"),
+					resource.TestCheckResourceAttrPair(datasourceName, "arn", resourceName, "arn"),
+					resource.TestCheckResourceAttrPair(datasourceName, "contact_flow_id", resourceName, "contact_flow_id"),
+					resource.TestCheckResourceAttrPair(datasourceName, "instance_id", resourceName, "instance_id"),
+					resource.TestCheckResourceAttrPair(datasourceName, "name", resourceName, "name"),
+					resource.TestCheckResourceAttrPair(datasourceName, "description", resourceName, "description"),
+					resource.TestCheckResourceAttrPair(datasourceName, "content", resourceName, "content"),
+					resource.TestCheckResourceAttrPair(datasourceName, "type", resourceName, "type"),
+					resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"),
+				),
+			},
+		},
+	})
+}
+
+func testAccAwsConnectContactFlowDataSourceBaseConfig(rName, rName2 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
+}
+
+resource "aws_connect_contact_flow" "test" {
+  instance_id = aws_connect_instance.test.id
+  name        = %[2]q
+  description = "Test Contact Flow Description"
+  type        = "CONTACT_FLOW"
+  content     = file("./testdata/service/connect/connect_contact_flow.json")
+  tags = {
+    "Name"        = "Test Contact Flow",
+    "Application" = "Terraform",
+    "Method"      = "Create"
+  }
+}
+	`, rName, rName2)
+}
+
+func testAccAwsConnectContactFlowDataSourceConfig_ContactFlowId(rName, rName2 string) string {
+	return fmt.Sprintf(testAccAwsConnectContactFlowDataSourceBaseConfig(rName, rName2) + `
+data "aws_connect_contact_flow" "test" {
+  instance_id     = aws_connect_instance.test.id
+  contact_flow_id = aws_connect_contact_flow.test.contact_flow_id
+}
+`)
+}
+
+func testAccAwsConnectContactFlowDataSourceConfig_Name(rName, rName2 string) string {
+	return fmt.Sprintf(testAccAwsConnectContactFlowDataSourceBaseConfig(rName, rName2) + `
+data "aws_connect_contact_flow" "test" {
+  instance_id = aws_connect_instance.test.id
+  name        = aws_connect_contact_flow.test.name
+}
+`)
+}

aws/internal/keyvaluetags/generators/servicetags/main.go

@@ -123,6 +123,7 @@ var mapServiceNames = []string{
 	"codestarnotifications",
 	"cognitoidentity",
 	"cognitoidentityprovider",
+	"connect",
 	"dataexchange",
 	"dlm",
 	"eks",

aws/internal/keyvaluetags/generators/updatetags/main.go

@@ -49,6 +49,7 @@ var serviceNames = []string{
 	"cognitoidentity",
 	"cognitoidentityprovider",
 	"configservice",
+	"connect",
 	"databasemigrationservice",
 	"dataexchange",
 	"datapipeline",

aws/internal/keyvaluetags/service_generation_customizations.go

@@ -37,6 +37,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/cognitoidentity"
 	"github.com/aws/aws-sdk-go/service/cognitoidentityprovider"
 	"github.com/aws/aws-sdk-go/service/configservice"
+	"github.com/aws/aws-sdk-go/service/connect"
 	"github.com/aws/aws-sdk-go/service/databasemigrationservice"
 	"github.com/aws/aws-sdk-go/service/dataexchange"
 	"github.com/aws/aws-sdk-go/service/datapipeline"
@@ -198,6 +199,8 @@ func ServiceClientType(serviceName string) string {
 		funcType = reflect.TypeOf(cognitoidentityprovider.New)
 	case "configservice":
 		funcType = reflect.TypeOf(configservice.New)
+	case "connect":
+		funcType = reflect.TypeOf(connect.New)
 	case "databasemigrationservice":
 		funcType = reflect.TypeOf(databasemigrationservice.New)
 	case "dataexchange":

aws/internal/service/connect/enum.go

@@ -6,6 +6,8 @@ const InstanceStatusStatusNotFound = "ResourceNotFoundException"
 
 const (
 	ListInstancesMaxResults = 10
+	// MaxResults Valid Range: Minimum value of 1. Maximum value of 1000
+	ListContactFlowsMaxResults = 60
 )
 
 func InstanceAttributeMapping() map[string]string {

aws/internal/service/connect/waiter/waiter.go

@@ -13,6 +13,9 @@ const (
 	// ConnectInstanceCreateTimeout Timeout for connect instance creation
 	ConnectInstanceCreatedTimeout = 5 * time.Minute
 	ConnectInstanceDeletedTimeout = 5 * time.Minute
+
+	ConnectContactFlowCreateTimeout = 5 * time.Minute
+	ConnectContactFlowUpdateTimeout = 5 * time.Minute
 )
 
 func InstanceCreated(ctx context.Context, conn *connect.Connect, instanceId string) (*connect.DescribeInstanceOutput, error) {

aws/provider.go

@@ -229,6 +229,7 @@ func Provider() *schema.Provider {
 			"aws_cognito_user_pools":                         dataSourceAwsCognitoUserPools(),
 			"aws_codecommit_repository":                      dataSourceAwsCodeCommitRepository(),
 			"aws_codestarconnections_connection":             dataSourceAwsCodeStarConnectionsConnection(),
+			"aws_connect_contact_flow":                       dataSourceAwsConnectContactFlow(),
 			"aws_connect_instance":                           dataSourceAwsConnectInstance(),
 			"aws_cur_report_definition":                      dataSourceAwsCurReportDefinition(),
 			"aws_default_tags":                               dataSourceAwsDefaultTags(),
@@ -645,6 +646,7 @@ func Provider() *schema.Provider {
 			"aws_codestarconnections_connection":                      resourceAwsCodeStarConnectionsConnection(),
 			"aws_codestarconnections_host":                            resourceAwsCodeStarConnectionsHost(),
 			"aws_codestarnotifications_notification_rule":             resourceAwsCodeStarNotificationsNotificationRule(),
+			"aws_connect_contact_flow":                                resourceAwsConnectContactFlow(),
 			"aws_connect_instance":                                    resourceAwsConnectInstance(),
 			"aws_cur_report_definition":                               resourceAwsCurReportDefinition(),
 			"aws_customer_gateway":                                    resourceAwsCustomerGateway(),