Add support for include filters in AWS DataSync task

Closes hashicorp#20849

Author: shuichiro-makigaki

internal/service/datasync/task.go

@@ -64,6 +64,24 @@ func ResourceTask() *schema.Resource {
 					},
 				},
 			},
+			"includes": {
+				Type:     schema.TypeList,
+				Optional: true,
+				MaxItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"filter_type": {
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: validation.StringInSlice(datasync.FilterType_Values(), false),
+						},
+						"value": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+					},
+				},
+			},
 			"name": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -208,6 +226,10 @@ func resourceTaskCreate(d *schema.ResourceData, meta interface{}) error {
 		input.Excludes = expandFilterRules(v.([]interface{}))
 	}
 
+	if v, ok := d.GetOk("includes"); ok {
+		input.Includes = expandFilterRules(v.([]interface{}))
+	}
+
 	if v, ok := d.GetOk("name"); ok {
 		input.Name = aws.String(v.(string))
 	}
@@ -255,6 +277,9 @@ func resourceTaskRead(d *schema.ResourceData, meta interface{}) error {
 	if err := d.Set("excludes", flattenFilterRules(output.Excludes)); err != nil {
 		return fmt.Errorf("error setting excludes: %w", err)
 	}
+	if err := d.Set("includes", flattenFilterRules(output.Includes)); err != nil {
+		return fmt.Errorf("error setting includes: %w", err)
+	}
 	d.Set("name", output.Name)
 	if err := d.Set("options", flattenOptions(output.Options)); err != nil {
 		return fmt.Errorf("error setting options: %w", err)
@@ -300,6 +325,10 @@ func resourceTaskUpdate(d *schema.ResourceData, meta interface{}) error {
 			input.Excludes = expandFilterRules(d.Get("excludes").([]interface{}))
 		}
 
+		if d.HasChanges("includes") {
+			input.Includes = expandFilterRules(d.Get("includes").([]interface{}))
+		}
+
 		if d.HasChanges("name") {
 			input.Name = aws.String(d.Get("name").(string))
 		}

internal/service/datasync/task_test.go

@@ -197,6 +197,44 @@ func TestAccDataSyncTask_excludes(t *testing.T) {
 	})
 }
 
+func TestAccDataSyncTask_includes(t *testing.T) {
+	var task1 datasync.DescribeTaskOutput
+	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+	resourceName := "aws_datasync_task.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { acctest.PreCheck(t); testAccPreCheck(t) },
+		ErrorCheck:   acctest.ErrorCheck(t, datasync.EndpointsID),
+		Providers:    acctest.Providers,
+		CheckDestroy: testAccCheckTaskDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccTaskIncludesConfig(rName, "/folder1|/folder2"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckTaskExists(resourceName, &task1),
+					resource.TestCheckResourceAttr(resourceName, "includes.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "includes.0.filter_type", "SIMPLE_PATTERN"),
+					resource.TestCheckResourceAttr(resourceName, "includes.0.value", "/folder1|/folder2"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccTaskIncludesConfig(rName, "/test"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckTaskExists(resourceName, &task1),
+					resource.TestCheckResourceAttr(resourceName, "includes.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "includes.0.filter_type", "SIMPLE_PATTERN"),
+					resource.TestCheckResourceAttr(resourceName, "includes.0.value", "/test"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccDataSyncTask_DefaultSyncOptions_atimeMtime(t *testing.T) {
 	var task1, task2 datasync.DescribeTaskOutput
 	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

website/docs/r/datasync_task.html.markdown

@@ -50,6 +50,11 @@ resource "aws_datasync_task" "example" {
     filter_type = "SIMPLE_PATTERN"
     value       = "/folder1|/folder2"
   }
+
+  includes {
+    filter_type = "SIMPLE_PATTERN"
+    value       = "/folder1|/folder2"
+  }
 }
 ```
 
@@ -61,6 +66,7 @@ The following arguments are supported:
 * `source_location_arn` - (Required) Amazon Resource Name (ARN) of source DataSync Location.
 * `cloudwatch_log_group_arn` - (Optional) Amazon Resource Name (ARN) of the CloudWatch Log Group that is used to monitor and log events in the sync task.
 * `excludes` - (Optional) Filter rules that determines which files to exclude from a task.
+* `includes` - (Optional) Filter rules that determines which files to include in a task.
 * `name` - (Optional) Name of the DataSync Task.
 * `options` - (Optional) Configuration block containing option that controls the default behavior when you start an execution of this DataSync Task. For each individual task execution, you can override these options by specifying an overriding configuration in those executions.
 * `schedule` - (Optional) Specifies a schedule used to periodically transfer files from a source to a destination location.