Merge pull request #11 from rebuy-de/add-legacy-rotation-to-datasource

Author: der-eismann

graylog/datasource/system/indices/indexset/data_source.go

@@ -43,6 +43,10 @@ func DataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"use_legacy_rotation": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 			"index_analyzer": {
 				Type:     schema.TypeString,
 				Computed: true,

graylog/datasource/system/indices/indexset/data_source_test.go

@@ -1,7 +1,7 @@
 package indexset
 
 import (
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 	"testing"
@@ -30,7 +30,7 @@ func TestAccIndexSet(t *testing.T) {
 			Response: func(req *http.Request) (*http.Response, error) {
 				return &http.Response{
 					StatusCode: 200,
-					Body: ioutil.NopCloser(strings.NewReader(`{
+					Body: io.NopCloser(strings.NewReader(`{
   "total": 3,
   "index_sets": [
     {
@@ -56,7 +56,9 @@ func TestAccIndexSet(t *testing.T) {
       "index_optimization_disabled": false,
       "field_type_refresh_interval": 5000,
       "writable": true,
-      "default": true
+      "default": true,
+      "data_tiering": null,
+      "use_legacy_rotation": true
     },
     {
       "id": "5ea81cc02ab79c00129dbf1c",
@@ -81,7 +83,9 @@ func TestAccIndexSet(t *testing.T) {
       "index_optimization_disabled": false,
       "field_type_refresh_interval": 60000,
       "writable": true,
-      "default": false
+      "default": false,
+      "data_tiering": null,
+      "use_legacy_rotation": true
     },
     {
       "id": "5ea81cc02ab79c00129dbf1f",
@@ -106,7 +110,9 @@ func TestAccIndexSet(t *testing.T) {
       "index_optimization_disabled": false,
       "field_type_refresh_interval": 60000,
       "writable": true,
-      "default": false
+      "default": false,
+      "data_tiering": null,
+      "use_legacy_rotation": true
     }
   ],
   "stats": {}
@@ -175,7 +181,7 @@ func TestAccIndexSet_byIndexSetID(t *testing.T) {
 			Response: func(req *http.Request) (*http.Response, error) {
 				return &http.Response{
 					StatusCode: 200,
-					Body: ioutil.NopCloser(strings.NewReader(`{
+					Body: io.NopCloser(strings.NewReader(`{
   "id": "5ea81cc02ab79c00129dbf1c",
   "title": "Graylog Events",
   "description": "Stores Graylog events.",
@@ -198,7 +204,9 @@ func TestAccIndexSet_byIndexSetID(t *testing.T) {
   "index_optimization_disabled": false,
   "field_type_refresh_interval": 60000,
   "writable": true,
-  "default": false
+  "default": false,
+  "data_tiering": null,
+  "use_legacy_rotation": true
 }`)),
 				}, nil
 			},

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

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

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

@@ -98,8 +98,7 @@ func Resource() *schema.Resource {
 			},
 			"use_legacy_rotation": {
 				Type:     schema.TypeBool,
-				Optional: true,
-				Default:  true,
+				Computed: true,
 			},
 			// field_type_refresh_interval was added from Graylog API v3
 			"field_type_refresh_interval": {

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

@@ -256,8 +256,12 @@ EOF
   "field_type_refresh_interval": 5000,
   "writable": true,
   "default": false,
-  "data_tiering": null,
-  "use_legacy_rotation": true
+  "data_tiering": {
+    "index_lifetime_max": "P40D",
+    "index_lifetime_min": "P30D",
+    "type": "hot_only"
+  },
+  "use_legacy_rotation": false
 }`
 			},
 		},
@@ -289,8 +293,12 @@ EOF
   "field_type_refresh_interval": 5000,
   "writable": true,
   "default": false,
-  "data_tiering": null,
-  "use_legacy_rotation": true
+  "data_tiering": {
+    "index_lifetime_max": "P40D",
+    "index_lifetime_min": "P30D",
+    "type": "hot_only"
+  },
+  "use_legacy_rotation": false
 }`,
 		},
 	}
@@ -327,6 +335,14 @@ EOF
   "max_docs_per_index": 40000000,
   "type": "org.graylog2.indexer.rotation.strategies.MessageCountRotationStrategyConfig"
 }
+EOF
+
+  data_tiering = <<EOF
+{
+  "index_lifetime_max": "P40D",
+  "index_lifetime_min": "P30D",
+  "type": "hot_only"
+}
 EOF
 }
 `,

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

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