Merge pull request #10 from pavel-elkin-klarna/LX-1689

LX-1689 Add ArrayFlattening to Terraform ChaosSearch provider

Author: pavel-elkin-klarna

.gitignore

@@ -35,4 +35,5 @@ override.tf.json
 # Ignore CLI configuration files
 .terraformrc
 terraform.rc
-terraform
+terraform
+*.log

Makefile

@@ -3,7 +3,7 @@ HOSTNAME=registry.terraform.io
 NAMESPACE=benzaita
 NAME=chaossearch
 BINARY=terraform-provider-${NAME}
-VERSION=0.6.2
+VERSION=0.7.0
 OS_ARCH=$(shell go env GOOS)_$(shell go env GOARCH)
 
 default: install

chaossearch/client/model.go

@@ -26,6 +26,7 @@ type ReadObjectGroupResponse struct {
 	PartitionBy      string
 	SourceBucket     string
 	IndexRetention   int
+	ArrayFlattenDepth *int
 	ColumnRenames    map[string]string
 }
 
@@ -39,6 +40,7 @@ type CreateObjectGroupRequest struct {
 	SourceBucket     string
 	Pattern          string
 	IndexRetention   int
+	ArrayFlattenDepth *int
 	ColumnRenames    map[string]interface{}
 }
 

chaossearch/client/operation_create_object_group.go

@@ -39,6 +39,7 @@ func marshalCreateObjectGroupRequest(req *CreateObjectGroupRequest) ([]byte, err
 			"_type":       req.Format,
 			"horizontal":  true,
 			"stripPrefix": true,
+			"arrayFlattenDepth": req.ArrayFlattenDepth,
 		},
 		"indexRetention": req.IndexRetention,
 		"options": map[string]interface{}{

chaossearch/client/operation_read_object_group.go

@@ -112,12 +112,14 @@ func mapBucketTaggingToResponse(tagging *s3.GetBucketTaggingOutput, v *ReadObjec
 	var filterObject struct {
 		Type    string `json:"_type"`
 		Pattern string `json:"pattern"`
+		ArrayFlattenDepth *int `json:"arrayFlattenDepth"`
 	}
 	if err := readJSONTagValue(tagging, "cs3.dataset-format", &filterObject); err != nil {
 		return err
 	}
 	v.Format = filterObject.Type
 	v.Pattern = filterObject.Pattern
+	v.ArrayFlattenDepth = filterObject.ArrayFlattenDepth
 
 	if err := readStringTagValue(tagging, "cs3.predicate", &v.FilterJSON); err != nil {
 		return err

chaossearch/resource_object_group.go

@@ -77,6 +77,14 @@ func resourceObjectGroup() *schema.Resource {
 				Optional:    true,
 				ForceNew:    false,
 			},
+			"array_flatten_depth": {
+				Type:        schema.TypeInt,
+				Default: 	 0,
+				Description: "Array flattening level. 0 - disabled, -1 - unlimited, >1 - the respective flattening level",
+				Optional:    true,
+				ForceNew:    true,
+				ValidateFunc: validation.IntAtLeast(-1),
+			},
 			"column_renames": {
 				Type: schema.TypeMap,
 				Elem: &schema.Schema{
@@ -98,9 +106,24 @@ func resourceObjectGroup() *schema.Resource {
 	}
 }
 
+
+
 func resourceObjectGroupCreate(ctx context.Context, data *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	c := meta.(*ProviderMeta).Client
 
+	// "unlimited" flattening represented as "null" in the api, and as -1 in the terraform module
+	// because the terraform sdk doesn't support nil values in configs https://github.com/hashicorp/terraform-plugin-sdk/issues/261
+	// We represent "null" as an int pointer to nil in the code.
+	array_flatten_tf := data.Get("array_flatten_depth").(int)
+	var array_flatten_cs *int
+	if (array_flatten_tf == -1) {
+		// -1 in terraform represents "null" in the ChaosSearch API call
+		array_flatten_cs = nil
+	} else {
+		// any other value is passed as is
+		array_flatten_cs = &array_flatten_tf
+	}
+
 	createObjectGroupRequest := &client.CreateObjectGroupRequest{
 		Name:             data.Get("name").(string),
 		SourceBucket:     data.Get("source_bucket").(string),
@@ -111,6 +134,7 @@ func resourceObjectGroupCreate(ctx context.Context, data *schema.ResourceData, m
 		PartitionBy:      data.Get("partition_by").(string),
 		Pattern:          data.Get("pattern").(string),
 		IndexRetention:   data.Get("index_retention").(int),
+		ArrayFlattenDepth: array_flatten_cs,
 		ColumnRenames:    data.Get("column_renames").(map[string]interface{}),
 	}
 
@@ -156,6 +180,15 @@ func resourceObjectGroupRead(ctx context.Context, data *schema.ResourceData, met
 	data.Set("pattern", resp.Pattern)
 	data.Set("source_bucket", resp.SourceBucket)
 
+	// "unlimited" flattening represented as "null" in the api, and as -1 in the terraform module
+	// because the terraform sdk doesn't support nil values in configs https://github.com/hashicorp/terraform-plugin-sdk/issues/261
+	// We represent "null" as an int pointer to nil in the code.
+	if (resp.ArrayFlattenDepth == nil) {
+		data.Set("array_flatten_depth", -1)
+	} else {
+		data.Set("array_flatten_depth", resp.ArrayFlattenDepth)
+	}
+
 	return diags
 }
 

examples/main.tf

@@ -32,6 +32,7 @@ resource "chaossearch_object_group" "my-object-group" {
   format = "JSON"
 
   partition_by = "<regex>"
+  array_flatten_depth = -1
 }
 
 resource "chaossearch_indexing_state" "my-object-group" {