Merge pull request #10 from rebuy-de/fix-data-tiering

Author: der-eismann

graylog/convert/json.go

@@ -32,6 +32,9 @@ func DataToJSON(data map[string]interface{}, keys ...string) error {
 		return nil
 	}
 	for _, key := range keys {
+		if data[key] == nil {
+			continue
+		}
 		s, err := json.Marshal(data[key])
 		if err != nil {
 			return fmt.Errorf("failed to marshal the '%s' as JSON: %w", key, err)
@@ -58,6 +61,10 @@ func JSONToData(data map[string]interface{}, keys ...string) error {
 		if !ok {
 			continue
 		}
+		if v.(string) == "" {
+			data[key] = nil
+			continue
+		}
 		attr, err := dataeq.JSON.ConvertByte([]byte(v.(string)))
 		if err != nil {
 			return fmt.Errorf("failed to parse the '%s'. '%s' must be a JSON string: %w", key, key, err)

graylog/resource/system/indices/indexset/create.go

@@ -15,6 +15,11 @@ func create(d *schema.ResourceData, m interface{}) error {
 	if err != nil {
 		return err
 	}
+
+	if d.Get("data_tiering") != "" {
+		d.Set("use_legacy_rotation", false)
+	}
+
 	data, err := getDataFromResourceData(d)
 	if err != nil {
 		return err

graylog/resource/system/indices/indexset/resource.go

@@ -96,6 +96,11 @@ func Resource() *schema.Resource {
 				DiffSuppressFunc: util.SchemaDiffSuppressJSONString,
 				ValidateFunc:     util.ValidateIsJSON,
 			},
+			"use_legacy_rotation": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  true,
+			},
 			// field_type_refresh_interval was added from Graylog API v3
 			"field_type_refresh_interval": {
 				Type:     schema.TypeInt,

graylog/resource/system/indices/indexset/resource_test.go

@@ -2,7 +2,7 @@ package indexset
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 	"testing"
@@ -37,7 +37,7 @@ func TestAccIndexSet(t *testing.T) {
 			Response: func(req *http.Request) (*http.Response, error) {
 				return &http.Response{
 					StatusCode: 200,
-					Body:       ioutil.NopCloser(strings.NewReader(indexsetBody)),
+					Body:       io.NopCloser(strings.NewReader(indexsetBody)),
 				}, nil
 			},
 		},
@@ -62,7 +62,7 @@ func TestAccIndexSet(t *testing.T) {
 					"retention_strategy", "retention_strategy_class",
 					"index_analyzer", "index_optimization_max_num_segments",
 					"index_optimization_disabled", "field_type_refresh_interval",
-					"creation_date", "writable",
+					"creation_date", "writable", "use_legacy_rotation", "data_tiering",
 				}
 				if err := testutil.EqualMapKeys(body, keys...); err != nil {
 					t.Fatal(err)
@@ -101,7 +101,9 @@ func TestAccIndexSet(t *testing.T) {
   "index_optimization_disabled": true,
   "field_type_refresh_interval": 5000,
   "writable": true,
-  "default": false
+  "default": false,
+  "data_tiering": null,
+  "use_legacy_rotation": true
 }`
 			},
 		},
@@ -132,7 +134,9 @@ func TestAccIndexSet(t *testing.T) {
   "index_optimization_disabled": true,
   "field_type_refresh_interval": 5000,
   "writable": true,
-  "default": false
+  "default": false,
+  "data_tiering": null,
+  "use_legacy_rotation": true
 }`,
 		},
 	}
@@ -212,7 +216,7 @@ EOF
 					"retention_strategy", "retention_strategy_class",
 					"index_analyzer", "index_optimization_max_num_segments",
 					"index_optimization_disabled", "field_type_refresh_interval",
-					"creation_date", "writable",
+					"creation_date", "writable", "data_tiering", "use_legacy_rotation",
 				}
 				if err := testutil.EqualMapKeys(body, keys...); err != nil {
 					t.Fatal(err)
@@ -251,7 +255,9 @@ EOF
   "index_optimization_disabled": true,
   "field_type_refresh_interval": 5000,
   "writable": true,
-  "default": false
+  "default": false,
+  "data_tiering": null,
+  "use_legacy_rotation": true
 }`
 			},
 		},
@@ -282,7 +288,9 @@ EOF
   "index_optimization_disabled": true,
   "field_type_refresh_interval": 5000,
   "writable": true,
-  "default": false
+  "default": false,
+  "data_tiering": null,
+  "use_legacy_rotation": true
 }`,
 		},
 	}

graylog/resource/system/indices/indexset/update.go

@@ -15,6 +15,11 @@ func update(d *schema.ResourceData, m interface{}) error {
 	if err != nil {
 		return err
 	}
+
+	if d.Get("data_tiering") != "" {
+		d.Set("use_legacy_rotation", false)
+	}
+
 	data, err := getDataFromResourceData(d)
 	if err != nil {
 		return err