New resource aws_quicksight_template

.changelog/30453.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_quicksight_template
+```

internal/flex/flex.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -27,6 +28,20 @@ func ExpandStringList(configured []interface{}) []*string {
 	return vs
 }
 
+// Takes the result of flatmap.Expand for an array of strings
+// and returns a []*time.Time
+func ExpandStringTimeList(configured []interface{}, format string) []*time.Time {
+	vs := make([]*time.Time, 0, len(configured))
+	for _, v := range configured {
+		val, ok := v.(string)
+		if ok && val != "" {
+			t, _ := time.Parse(format, v.(string))
+			vs = append(vs, aws.Time(t))
+		}
+	}
+	return vs
+}
+
 // ExpandStringValueList takes the result of flatmap.Expand for an array of strings
 // and returns a []string
 func ExpandStringValueList(configured []interface{}) []string {
@@ -54,6 +69,16 @@ func FlattenStringList(list []*string) []interface{} {
 	return vs
 }
 
+// Takes list of pointers to time.Time. Expand to an array
+// of strings and returns a []interface{}
+func FlattenTimeStringList(list []*time.Time, format string) []interface{} {
+	vs := make([]interface{}, 0, len(list))
+	for _, v := range list {
+		vs = append(vs, v.Format(format))
+	}
+	return vs
+}
+
 // Takes list of strings. Expand to an array
 // of raw strings and returns a []interface{}
 // to keep compatibility w/ schema.NewSetschema.NewSet
@@ -150,6 +175,16 @@ func ExpandInt64List(configured []interface{}) []*int64 {
 	return vs
 }
 
+// Takes the result of flatmap.Expand for an array of float64
+// and returns a []*float64
+func ExpandFloat64List(configured []interface{}) []*float64 {
+	vs := make([]*float64, 0, len(configured))
+	for _, v := range configured {
+		vs = append(vs, aws.Float64(v.(float64)))
+	}
+	return vs
+}
+
 // Takes list of pointers to int64s. Expand to an array
 // of raw ints and returns a []interface{}
 // to keep compatibility w/ schema.NewSet
@@ -161,6 +196,17 @@ func FlattenInt64List(list []*int64) []interface{} {
 	return vs
 }
 
+// Takes list of pointers to float64s. Expand to an array
+// of raw floats and returns a []interface{}
+// to keep compatibility w/ schema.NewSet
+func FlattenFloat64List(list []*float64) []interface{} {
+	vs := make([]interface{}, 0, len(list))
+	for _, v := range list {
+		vs = append(vs, int(aws.Float64Value(v)))
+	}
+	return vs
+}
+
 func PointersMapToStringList(pointers map[string]*string) map[string]interface{} {
 	list := make(map[string]interface{}, len(pointers))
 	for i, v := range pointers {

internal/flex/flex_test.go

@@ -3,6 +3,7 @@ package flex
 import (
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/google/go-cmp/cmp"
@@ -39,6 +40,36 @@ func TestExpandStringListEmptyItems(t *testing.T) {
 	}
 }
 
+func TestExpandStringTimeList(t *testing.T) {
+	t.Parallel()
+
+	configured := []interface{}{"2006-01-02T15:04:05+07:00", "2023-04-13T10:25:05+01:00"}
+	got := ExpandStringTimeList(configured, time.RFC3339)
+	want := []*time.Time{
+		aws.Time(time.Date(2006, 1, 2, 15, 4, 5, 0, time.FixedZone("UTC-7", 7*60*60))),
+		aws.Time(time.Date(2023, 4, 13, 10, 25, 5, 0, time.FixedZone("UTC-1", 60*60))),
+	}
+
+	if !cmp.Equal(got, want) {
+		t.Errorf("expanded = %v, want = %v", got, want)
+	}
+}
+
+func TestExpandStringTimeListEmptyItems(t *testing.T) {
+	t.Parallel()
+
+	configured := []interface{}{"2006-01-02T15:04:05+07:00", "", "2023-04-13T10:25:05+01:00"}
+	got := ExpandStringTimeList(configured, time.RFC3339)
+	want := []*time.Time{
+		aws.Time(time.Date(2006, 1, 2, 15, 4, 5, 0, time.FixedZone("UTC+7", 7*60*60))),
+		aws.Time(time.Date(2023, 4, 13, 10, 25, 5, 0, time.FixedZone("UTC+1", 60*60))),
+	}
+
+	if !cmp.Equal(got, want) {
+		t.Errorf("expanded = %v, want = %v", got, want)
+	}
+}
+
 func TestExpandStringValueList(t *testing.T) {
 	t.Parallel()
 
@@ -156,3 +187,18 @@ func TestFlattenResourceIdSinglePart(t *testing.T) {
 		t.Fatalf("Expected an error when parsing ResourceId with single part count")
 	}
 }
+
+func TestFlattenTimeStringList(t *testing.T) {
+	t.Parallel()
+
+	configured := []*time.Time{
+		aws.Time(time.Date(2006, 1, 2, 15, 4, 5, 0, time.FixedZone("UTC-7", 7*60*60))),
+		aws.Time(time.Date(2023, 4, 13, 10, 25, 5, 0, time.FixedZone("UTC-1", 60*60))),
+	}
+	got := FlattenTimeStringList(configured, time.RFC3339)
+	want := []interface{}{"2006-01-02T15:04:05+07:00", "2023-04-13T10:25:05+01:00"}
+
+	if !cmp.Equal(got, want) {
+		t.Errorf("expanded = %v, want = %v", got, want)
+	}
+}

internal/service/quicksight/data_set.go

@@ -173,6 +173,26 @@ func ResourceDataSet() *schema.Resource {
 				Required:     true,
 				ValidateFunc: validation.StringLenBetween(1, 128),
 			},
+			"output_columns": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"description": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"type": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
 			"permissions": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -869,6 +889,10 @@ func resourceDataSetRead(ctx context.Context, d *schema.ResourceData, meta inter
 		return diag.Errorf("error setting logical_table_map: %s", err)
 	}
 
+	if err := d.Set("output_columns", flattenOutputColumns(dataSet.OutputColumns)); err != nil {
+		return diag.Errorf("error setting output_columns: %s", err)
+	}
+
 	if err := d.Set("physical_table_map", flattenPhysicalTableMap(dataSet.PhysicalTableMap, physicalTableMapSchema())); err != nil {
 		return diag.Errorf("error setting physical_table_map: %s", err)
 	}
@@ -913,33 +937,19 @@ func resourceDataSetUpdate(ctx context.Context, d *schema.ResourceData, meta int
 			Name:             aws.String(d.Get("name").(string)),
 		}
 
-		if d.HasChange("column_groups") {
-			params.ColumnGroups = expandDataSetColumnGroups(d.Get("column_groups").([]interface{}))
-		}
+		params.ColumnGroups = expandDataSetColumnGroups(d.Get("column_groups").([]interface{}))
 
-		if d.HasChange("column_level_permission_rules") {
-			params.ColumnLevelPermissionRules = expandDataSetColumnLevelPermissionRules(d.Get("column_level_permission_rules").([]interface{}))
-		}
+		params.ColumnLevelPermissionRules = expandDataSetColumnLevelPermissionRules(d.Get("column_level_permission_rules").([]interface{}))
 
-		if d.HasChange("data_set_usage_configuration") {
-			params.DataSetUsageConfiguration = expandDataSetUsageConfiguration(d.Get("data_set_usage_configuration").([]interface{}))
-		}
+		params.DataSetUsageConfiguration = expandDataSetUsageConfiguration(d.Get("data_set_usage_configuration").([]interface{}))
 
-		if d.HasChange("field_folders") {
-			params.FieldFolders = expandDataSetFieldFolders(d.Get("field_folders").(*schema.Set).List())
-		}
+		params.FieldFolders = expandDataSetFieldFolders(d.Get("field_folders").(*schema.Set).List())
 
-		if d.HasChange("logical_table_map") {
-			params.LogicalTableMap = expandDataSetLogicalTableMap(d.Get("logical_table_map").(*schema.Set))
-		}
+		params.LogicalTableMap = expandDataSetLogicalTableMap(d.Get("logical_table_map").(*schema.Set))
 
-		if d.HasChange("row_level_permission_data_set") {
-			params.RowLevelPermissionDataSet = expandDataSetRowLevelPermissionDataSet(d.Get("row_level_permission_data_set").([]interface{}))
-		}
+		params.RowLevelPermissionDataSet = expandDataSetRowLevelPermissionDataSet(d.Get("row_level_permission_data_set").([]interface{}))
 
-		if d.HasChange("row_level_permission_tag_configuration") {
-			params.RowLevelPermissionTagConfiguration = expandDataSetRowLevelPermissionTagConfigurations(d.Get("row_level_permission_tag_configuration").([]interface{}))
-		}
+		params.RowLevelPermissionTagConfiguration = expandDataSetRowLevelPermissionTagConfigurations(d.Get("row_level_permission_tag_configuration").([]interface{}))
 
 		_, err = conn.UpdateDataSetWithContext(ctx, params)
 		if err != nil {
@@ -1671,8 +1681,8 @@ func expandDataSetUploadSettings(tfMap map[string]interface{}) *quicksight.Uploa
 	if v, ok := tfMap["format"].(string); ok {
 		uploadSettings.Format = aws.String(v)
 	}
-	if v, ok := tfMap["start_from_row"].(int64); ok {
-		uploadSettings.StartFromRow = aws.Int64(v)
+	if v, ok := tfMap["start_from_row"].(int); ok {
+		uploadSettings.StartFromRow = aws.Int64(int64(v))
 	}
 	if v, ok := tfMap["text_qualifier"].(string); ok {
 		uploadSettings.TextQualifier = aws.String(v)
@@ -1797,6 +1807,35 @@ func flattenColumnGroups(apiObject []*quicksight.ColumnGroup) []interface{} {
 	return tfList
 }
 
+func flattenOutputColumns(apiObject []*quicksight.OutputColumn) []interface{} {
+	if len(apiObject) == 0 {
+		return nil
+	}
+
+	var tfList []interface{}
+	for _, column := range apiObject {
+		if column == nil {
+			continue
+		}
+
+		item := map[string]interface{}{}
+
+		if column.Description != nil {
+			item["description"] = aws.StringValue(column.Description)
+		}
+		if column.Name != nil {
+			item["name"] = aws.StringValue(column.Name)
+		}
+		if column.Type != nil {
+			item["type"] = aws.StringValue(column.Type)
+		}
+
+		tfList = append(tfList, item)
+	}
+
+	return tfList
+}
+
 func flattenGeoSpatialColumnGroup(apiObject *quicksight.GeoSpatialColumnGroup) []interface{} {
 	if apiObject == nil {
 		return nil
@@ -2328,7 +2367,7 @@ func flattenUploadSettings(apiObject *quicksight.UploadSettings) []interface{} {
 		tfMap["contains_header"] = aws.BoolValue(apiObject.ContainsHeader)
 	}
 	if apiObject.Delimiter != nil {
-		tfMap["contains_header"] = aws.StringValue(apiObject.Delimiter)
+		tfMap["delimiter"] = aws.StringValue(apiObject.Delimiter)
 	}
 	if apiObject.Format != nil {
 		tfMap["format"] = aws.StringValue(apiObject.Format)

internal/service/quicksight/data_set_test.go

@@ -225,6 +225,26 @@ func TestAccQuickSightDataSet_logicalTableMap(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "logical_table_map.0.alias", "Group1"),
 					resource.TestCheckResourceAttr(resourceName, "logical_table_map.0.source.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "logical_table_map.0.source.0.physical_table_id", rId),
+					resource.TestCheckResourceAttr(resourceName, "output_columns.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "output_columns.0.name", "Column1"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccDataSetConfigUpdateLogicalTableMap(rId, rName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckDataSetExists(ctx, resourceName, &dataSet),
+					resource.TestCheckResourceAttr(resourceName, "logical_table_map.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "logical_table_map.0.alias", "Group1"),
+					resource.TestCheckResourceAttr(resourceName, "logical_table_map.0.source.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "logical_table_map.0.source.0.physical_table_id", rId),
+					resource.TestCheckResourceAttr(resourceName, "output_columns.#", "2"),
+					resource.TestCheckResourceAttr(resourceName, "output_columns.0.name", "Column1"),
+					resource.TestCheckResourceAttr(resourceName, "output_columns.1.name", "Column2"),
 				),
 			},
 			{
@@ -657,9 +677,38 @@ resource "aws_quicksight_data_set" "test" {
         name = "Column1"
         type = "STRING"
       }
-      upload_settings {
-        format = "JSON"
+      upload_settings {}
+    }
+  }
+  logical_table_map {
+    logical_table_map_id = %[1]q
+    alias                = "Group1"
+    source {
+      physical_table_id = %[1]q
+    }
+  }
+}
+`, rId, rName))
+}
+
+func testAccDataSetConfigUpdateLogicalTableMap(rId, rName string) string {
+	return acctest.ConfigCompose(
+		testAccDataSetConfigBase(rId, rName),
+		fmt.Sprintf(`
+resource "aws_quicksight_data_set" "test" {
+  data_set_id = %[1]q
+  name        = %[2]q
+  import_mode = "SPICE"
+
+  physical_table_map {
+    physical_table_map_id = %[1]q
+    s3_source {
+      data_source_arn = aws_quicksight_data_source.test.arn
+      input_columns {
+        name = "Column1"
+        type = "STRING"
       }
+      upload_settings {}
     }
   }
   logical_table_map {
@@ -668,6 +717,15 @@ resource "aws_quicksight_data_set" "test" {
     source {
       physical_table_id = %[1]q
     }
+    data_transforms {
+      create_columns_operation {
+        columns {
+          column_id   = "Column2"
+          column_name = "Column2"
+          expression  = "Column1"
+        }
+      }
+    }
   }
 }
 `, rId, rName))