Feature: AWSConnectContactFlow Resource

aws/data_source_aws_connect_contact_flow.go

@@ -0,0 +1,146 @@
+package aws
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"log"
+
+	"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"
+)
+
+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,
+			},
+			"instance_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"description": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"content": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"type": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"tags": tagsSchema(),
+		},
+	}
+}
+
+func dataSourceAwsConnectContactFlowRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	conn := meta.(*AWSClient).connectconn
+	ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig
+
+	var matchedInstance *connect.ContactFlow
+
+	contactFlowID, contactFlowIDOk := d.GetOk("contact_flow_id")
+	instanceID, instanceIDOk := d.GetOk("instance_id")
+	name, nameOk := d.GetOk("name")
+
+	if !instanceIDOk && (!contactFlowIDOk || !nameOk) {
+		return diag.FromErr(errors.New("error instance_id and contact_flow_id or name of must be assigned"))
+	}
+	if contactFlowIDOk {
+		resp, err := conn.DescribeContactFlow(&connect.DescribeContactFlowInput{
+			ContactFlowId: aws.String(contactFlowID.(string)),
+			InstanceId:    aws.String(instanceID.(string)),
+		})
+		if err != nil {
+			return diag.FromErr(fmt.Errorf("error getting Connect Contact Flow by contact_flow_id (%s): %s", contactFlowID, err))
+		}
+		matchedInstance = resp.ContactFlow
+	} else if nameOk {
+		connectFlowSummaryList, err := dataSourceAwsConnectGetAllConnectContactFlowSummaries(ctx, conn, instanceID.(string))
+		if err != nil {
+			return diag.FromErr(fmt.Errorf("error listing Connect Contact Flows: %s", err))
+		}
+
+		for _, connectFlowSummary := range connectFlowSummaryList {
+			log.Printf("[DEBUG] Connect Contact flow summary: %s", connectFlowSummary)
+			if aws.StringValue(connectFlowSummary.Name) == name.(string) {
+				resp, err := conn.DescribeContactFlow(&connect.DescribeContactFlowInput{
+					ContactFlowId: connectFlowSummary.Id,
+					InstanceId:    aws.String(instanceID.(string)),
+				})
+				if err != nil {
+					return diag.FromErr(fmt.Errorf("error getting Connect Contact Flow by name (%s): %s", name, err))
+				}
+				matchedInstance = resp.ContactFlow
+				break
+			}
+		}
+	}
+
+	if matchedInstance == nil {
+		return diag.FromErr(fmt.Errorf("error finding Connect Contact Flow by name: %s", name))
+	}
+
+	d.Set("arn", matchedInstance.Arn)
+	d.Set("instance_id", instanceID)
+	d.Set("contact_flow_id", matchedInstance.Id)
+	d.Set("name", matchedInstance.Name)
+	d.Set("description", matchedInstance.Description)
+	d.Set("content", matchedInstance.Content)
+	d.Set("type", matchedInstance.Type)
+	if err := d.Set("tags", keyvaluetags.ConnectKeyValueTags(matchedInstance.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil {
+		return diag.FromErr(fmt.Errorf("error setting tags: %s", err))
+	}
+	d.SetId(fmt.Sprintf("%s:%s", instanceID, d.Get("contact_flow_id").(string)))
+
+	return nil
+}
+
+func dataSourceAwsConnectGetAllConnectContactFlowSummaries(ctx context.Context, conn *connect.Connect, instanceID string) ([]*connect.ContactFlowSummary, error) {
+	var instances []*connect.ContactFlowSummary
+	var nextToken string
+
+	for {
+		input := &connect.ListContactFlowsInput{
+			InstanceId: aws.String(instanceID),
+			// MaxResults Valid Range: Minimum value of 1. Maximum value of 60
+			MaxResults: aws.Int64(int64(60)),
+		}
+		if nextToken != "" {
+			input.NextToken = aws.String(nextToken)
+		}
+
+		log.Printf("[DEBUG] Listing Connect Contact Flows: %s", input)
+
+		output, err := conn.ListContactFlowsWithContext(ctx, input)
+		if err != nil {
+			return instances, err
+		}
+		instances = append(instances, output.ContactFlowSummaryList...)
+
+		if output.NextToken == nil {
+			break
+		}
+		nextToken = aws.StringValue(output.NextToken)
+	}
+
+	return instances, nil
+}

aws/data_source_aws_connect_contact_flow_test.go

@@ -0,0 +1,127 @@
+package aws
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccDataSourceAwsConnectContactFlow_basic(t *testing.T) {
+	rInt := acctest.RandInt()
+	resourceName := "aws_connect_contact_flow.foo"
+	datasourceName := "data.aws_connect_contact_flow.foo"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAwsConnectContactFlowDataSourceConfig_basic(rInt, 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 TestAccDataSourceAwsConnectContactFlow_byname(t *testing.T) {
+	rInt := acctest.RandInt()
+	resourceName := "aws_connect_contact_flow.foo"
+	datasourceName := "data.aws_connect_contact_flow.foo"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAwsConnectContactFlowDataSourceConfig_byname(rInt, 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 testAccAwsConnectContactFlowDataSourceBaseConfig(rInt int, contactFlowName string) string {
+	return fmt.Sprintf(`
+resource "aws_connect_instance" "foo" {
+  instance_alias = "resource-test-terraform-%d"
+}
+
+resource "aws_connect_contact_flow" "foo" {
+  instance_id = aws_connect_instance.foo.id
+  name        = "%[2]s"
+  description = "Test Contact Flow Description"
+  type        = "CONTACT_FLOW"
+  content     = <<JSON
+	{
+		"Version": "2019-10-30",
+		"StartAction": "12345678-1234-1234-1234-123456789012",
+		"Actions": [ 
+			{
+				"Identifier": "12345678-1234-1234-1234-123456789012",
+				"Type": "MessageParticipant",
+				"Transitions": {
+					"NextAction": "abcdef-abcd-abcd-abcd-abcdefghijkl",
+					"Errors": [],
+					"Conditions": []
+				},
+				"Parameters": {
+					"Text": "Thanks for calling the sample flow!"
+				}
+			},
+			{
+				"Identifier": "abcdef-abcd-abcd-abcd-abcdefghijkl",
+				"Type": "DisconnectParticipant",
+				"Transitions": {},
+				"Parameters": {}
+			}
+		]
+	}
+	JSON
+  tags = map(
+    "Name", "Test Contact Flow",
+    "Application", "Terraform",
+    "Method", "Create"
+  )
+}
+	`, rInt, contactFlowName)
+}
+
+func testAccAwsConnectContactFlowDataSourceConfig_basic(rInt int, contactFlowName string) string {
+	return fmt.Sprintf(testAccAwsConnectContactFlowDataSourceBaseConfig(rInt, contactFlowName) + `
+data "aws_connect_contact_flow" "foo" {
+  instance_id     = aws_connect_instance.foo.id
+  contact_flow_id = aws_connect_contact_flow.foo.contact_flow_id
+}
+`)
+}
+
+func testAccAwsConnectContactFlowDataSourceConfig_byname(rInt int, contactFlowName string) string {
+	return fmt.Sprintf(testAccAwsConnectContactFlowDataSourceBaseConfig(rInt, contactFlowName) + `
+data "aws_connect_contact_flow" "foo" {
+  instance_id = aws_connect_instance.foo.id
+  name        = aws_connect_contact_flow.foo.name
+}
+`)
+}

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

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

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

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

aws/internal/keyvaluetags/service_generation_customizations.go

@@ -34,6 +34,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"
@@ -183,6 +184,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/provider.go

@@ -196,6 +196,7 @@ func Provider() *schema.Provider {
 			"aws_codeartifact_repository_endpoint":           dataSourceAwsCodeArtifactRepositoryEndpoint(),
 			"aws_cognito_user_pools":                         dataSourceAwsCognitoUserPools(),
 			"aws_codecommit_repository":                      dataSourceAwsCodeCommitRepository(),
+			"aws_connect_contact_flow":                       dataSourceAwsConnectContactFlow(),
 			"aws_connect_instance":                           dataSourceAwsConnectInstance(),
 			"aws_cur_report_definition":                      dataSourceAwsCurReportDefinition(),
 			"aws_db_cluster_snapshot":                        dataSourceAwsDbClusterSnapshot(),
@@ -526,6 +527,7 @@ func Provider() *schema.Provider {
 			"aws_codepipeline":                                        resourceAwsCodePipeline(),
 			"aws_codepipeline_webhook":                                resourceAwsCodePipelineWebhook(),
 			"aws_codestarnotifications_notification_rule":             resourceAwsCodeStarNotificationsNotificationRule(),
+			"aws_connect_contact_flow":                                resourceAwsConnectContactFlow(),
 			"aws_connect_instance":                                    resourceAwsConnectInstance(),
 			"aws_cur_report_definition":                               resourceAwsCurReportDefinition(),
 			"aws_customer_gateway":                                    resourceAwsCustomerGateway(),