Merge pull request #153 from SumoLogic/scheduled-views-fixes

seansain · web-flow · commit 3fd7e34acb22 · 2021-02-11T19:36:53.000-08:00
bug fixes for partitions and scheduled views
diff --git a/sumologic/resource_sumologic_partition.go b/sumologic/resource_sumologic_partition.go
@@ -27,39 +27,48 @@ func resourceSumologicPartition() *schema.Resource {
 			"routing_expression": {
 				Type:         schema.TypeString,
 				Required:     true,
-				ValidateFunc: validation.StringLenBetween(0, 16384),
+				ValidateFunc: validation.StringLenBetween(1, 16384),
 			},
 			"analytics_tier": {
 				Type:         schema.TypeString,
 				Optional:     true,
 				ValidateFunc: validation.StringInSlice([]string{"continuous", "frequent", "infrequent"}, false),
 				Default:      "continuous",
 			},
-			// Terraform does not support reducing the retention period after creation
 			"retention_period": {
 				Type:         schema.TypeInt,
 				Optional:     true,
 				ValidateFunc: validation.IntAtLeast(-1),
 				Default:      -1,
 				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
-					if new == "-1" && old != "" {
-						return true
-					}
-					return false
+					return new == "-1" && old != ""
 				},
 			},
 			"is_compliant": {
 				Type:     schema.TypeBool,
-				Required: true,
+				Optional: true,
+				Default:  false,
+			},
+			"total_bytes": {
+				Type:     schema.TypeInt,
+				Computed: true,
 			},
 			"data_forwarding_id": {
 				Type:     schema.TypeString,
-				Optional: true,
+				Computed: true,
 			},
 			"is_active": {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
+			"index_type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"reduce_retention_period_immediately": {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
 		},
 	}
 }
@@ -104,6 +113,8 @@ func resourceSumologicPartitionRead(d *schema.ResourceData, meta interface{}) er
 	d.Set("is_compliant", spartition.IsCompliant)
 	d.Set("data_forwarding_id", spartition.DataForwardingId)
 	d.Set("is_active", spartition.IsActive)
+	d.Set("total_bytes", spartition.TotalBytes)
+	d.Set("index_type", spartition.IndexType)
 
 	return nil
 }
@@ -126,13 +137,16 @@ func resourceSumologicPartitionUpdate(d *schema.ResourceData, meta interface{})
 
 func resourceToPartition(d *schema.ResourceData) Partition {
 	return Partition{
-		ID:                d.Id(),
-		Name:              d.Get("name").(string),
-		RoutingExpression: d.Get("routing_expression").(string),
-		AnalyticsTier:     d.Get("analytics_tier").(string),
-		RetentionPeriod:   d.Get("retention_period").(int),
-		IsCompliant:       d.Get("is_compliant").(bool),
-		DataForwardingId:  d.Get("data_forwarding_id").(string),
-		IsActive:          d.Get("is_active").(bool),
+		ID:                               d.Id(),
+		Name:                             d.Get("name").(string),
+		RoutingExpression:                d.Get("routing_expression").(string),
+		AnalyticsTier:                    d.Get("analytics_tier").(string),
+		RetentionPeriod:                  d.Get("retention_period").(int),
+		IsCompliant:                      d.Get("is_compliant").(bool),
+		DataForwardingId:                 d.Get("data_forwarding_id").(string),
+		IsActive:                         d.Get("is_active").(bool),
+		TotalBytes:                       d.Get("total_bytes").(int),
+		IndexType:                        d.Get("index_type").(string),
+		ReduceRetentionPeriodImmediately: d.Get("reduce_retention_period_immediately").(bool),
 	}
 }
diff --git a/sumologic/resource_sumologic_scheduled_view.go b/sumologic/resource_sumologic_scheduled_view.go
@@ -28,11 +28,13 @@ func resourceSumologicScheduledView() *schema.Resource {
 			"index_name": {
 				Type:         schema.TypeString,
 				Required:     true,
+				ForceNew:     true,
 				ValidateFunc: validation.StringLenBetween(0, 255),
 			},
 			"start_time": {
 				Type:         schema.TypeString,
 				Required:     true,
+				ForceNew:     true,
 				ValidateFunc: validation.IsRFC3339Time,
 			},
 			"retention_period": {
@@ -41,14 +43,24 @@ func resourceSumologicScheduledView() *schema.Resource {
 				ValidateFunc: validation.IntAtLeast(-1),
 				Default:      -1,
 				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
-					// taken from https://stackoverflow.com/a/57785476/118587
-					return old == "-1"
+					return new == "-1" && old != ""
 				},
 			},
 			"data_forwarding_id": {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"parsing_mode": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ForceNew:     true,
+				Default:      "Manual",
+				ValidateFunc: validation.StringInSlice([]string{"AutoParse", "Manual"}, false),
+			},
+			"reduce_retention_period_immediately": {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
 		},
 	}
 }
@@ -92,6 +104,7 @@ func resourceSumologicScheduledViewRead(d *schema.ResourceData, meta interface{}
 	d.Set("start_time", sview.StartTime.Format(time.RFC3339))
 	d.Set("retention_period", sview.RetentionPeriod)
 	d.Set("data_forwarding_id", sview.DataForwardingId)
+	d.Set("parsing_mode", sview.ParsingMode)
 
 	return nil
 }
@@ -118,11 +131,13 @@ func resourceToScheduledView(d *schema.ResourceData) ScheduledView {
 		log.Fatal(err)
 	}
 	return ScheduledView{
-		ID:               d.Id(),
-		Query:            d.Get("query").(string),
-		IndexName:        d.Get("index_name").(string),
-		StartTime:        startTimeParsed,
-		RetentionPeriod:  d.Get("retention_period").(int),
-		DataForwardingId: d.Get("data_forwarding_id").(string),
+		ID:                               d.Id(),
+		Query:                            d.Get("query").(string),
+		IndexName:                        d.Get("index_name").(string),
+		StartTime:                        startTimeParsed,
+		RetentionPeriod:                  d.Get("retention_period").(int),
+		DataForwardingId:                 d.Get("data_forwarding_id").(string),
+		ParsingMode:                      d.Get("parsing_mode").(string),
+		ReduceRetentionPeriodImmediately: d.Get("reduce_retention_period_immediately").(bool),
 	}
 }
diff --git a/sumologic/sumologic_partition.go b/sumologic/sumologic_partition.go
@@ -65,12 +65,15 @@ func (s *Client) UpdatePartition(spartition Partition) error {
 }
 
 type Partition struct {
-	ID                string `json:"id,omitempty"`
-	Name              string `json:"name"`
-	RoutingExpression string `json:"routingExpression"`
-	AnalyticsTier     string `json:"analyticsTier"`
-	RetentionPeriod   int    `json:"retentionPeriod"`
-	IsCompliant       bool   `json:"isCompliant"`
-	DataForwardingId  string `json:"dataForwardingId"`
-	IsActive          bool   `json:"isActive"`
+	ID                               string `json:"id,omitempty"`
+	Name                             string `json:"name"`
+	RoutingExpression                string `json:"routingExpression"`
+	AnalyticsTier                    string `json:"analyticsTier"`
+	RetentionPeriod                  int    `json:"retentionPeriod"`
+	IsCompliant                      bool   `json:"isCompliant"`
+	DataForwardingId                 string `json:"dataForwardingId"`
+	IsActive                         bool   `json:"isActive"`
+	TotalBytes                       int    `json:"totalBytes"`
+	IndexType                        string `json:"indexType"`
+	ReduceRetentionPeriodImmediately bool   `json:"reduceRetentionPeriodImmediately"`
 }
diff --git a/sumologic/sumologic_scheduled_view.go b/sumologic/sumologic_scheduled_view.go
@@ -57,10 +57,12 @@ func (s *Client) UpdateScheduledView(sview ScheduledView) error {
 }
 
 type ScheduledView struct {
-	ID               string    `json:"id,omitempty"`
-	Query            string    `json:"query"`
-	IndexName        string    `json:"indexName"`
-	StartTime        time.Time `json:"startTime"`
-	RetentionPeriod  int       `json:"retentionPeriod"`
-	DataForwardingId string    `json:"dataForwardingId"`
+	ID                               string    `json:"id,omitempty"`
+	Query                            string    `json:"query"`
+	IndexName                        string    `json:"indexName"`
+	StartTime                        time.Time `json:"startTime"`
+	RetentionPeriod                  int       `json:"retentionPeriod"`
+	DataForwardingId                 string    `json:"dataForwardingId"`
+	ParsingMode                      string    `json:"parsingMode"`
+	ReduceRetentionPeriodImmediately bool      `json:"reduceRetentionPeriodImmediately"`
 }
diff --git a/website/docs/r/partition.html.markdown b/website/docs/r/partition.html.markdown
@@ -11,23 +11,26 @@ Provides a [Sumologic Partition][1].
 ## Example Usage
 ```hcl
 resource "sumologic_partition" "examplePartition" {
-    name = "terraform_examplePartition"
-    routing_expression = "_sourcecategory=*/Terraform"
-    analytics_tier = "enhanced"
-    is_compliant = false
+  name = "terraform_examplePartition"
+  routing_expression = "_sourcecategory=*/Terraform"
+  analytics_tier = "enhanced"
+  is_compliant = false
+  lifecycle {
+    prevent_destroy = true
+  }
 }
 ```
 
 ## Argument reference
 
 The following arguments are supported:
 
-- `name` - (Required) The name of the partition.
+- `name` - (Required, Forces new resource) The name of the partition.
 - `routing_expression` - (Required) The query that defines the data to be included in the partition.
-- `analytics_tier` - (Required) The Cloud Flex analytics tier for your data; only relevant if your account has basic analytics enabled. Possible values are: `enhanced`, `basic`, `cold`, `continuous`, `frequent`, `infrequent`
+- `analytics_tier` - (Required) The Cloud Flex analytics tier for your data; only relevant if your account has basic analytics enabled. Possible values are: `continuous`, `frequent`, `infrequent`
 - `retention_period` - (Optional) The number of days to retain data in the partition, or -1 to use the default value for your account. Only relevant if your account has variable retention enabled.
-- `is_compliant` - (Required) Whether the partition is compliant or not. Mark a partition as compliant if it contains data used for compliance or audit purpose. Retention for a compliant partition can only be increased and cannot be reduced after the partition is marked compliant. A partition once marked compliant, cannot be marked non-compliant later.
-- `data_forwarding_id` - (Optional) An optional ID of a data forwarding configuration to be used by the partition.
+- `is_compliant` - (Optional) Whether the partition is compliant or not. Mark a partition as compliant if it contains data used for compliance or audit purpose. Retention for a compliant partition can only be increased and cannot be reduced after the partition is marked compliant. A partition once marked compliant, cannot be marked non-compliant later.
+- `reduce_retention_period_immediately` - (Optional) This is required on update if the newly specified retention period is less than the existing retention period. In such a situation, a value of true says that data between the existing retention period and the new retention period should be deleted immediately; if false, such data will be deleted after seven days. This property is optional and ignored if the specified retentionPeriod is greater than or equal to the current retention period.
 
 ## Attributes reference
 
diff --git a/website/docs/r/scheduled_view.html.markdown b/website/docs/r/scheduled_view.html.markdown
@@ -21,18 +21,25 @@ _view=connections connectionStats
 QUERY
   start_time = "2019-09-01T00:00:00Z"
   retention_period = 365
+  lifecycle {
+    prevent_destroy = true
+  }
 }
 ```
 
 ## Argument reference
 
 The following arguments are supported:
 
-- `index_name` - (Required) Name of the index (scheduled view).
-- `query` - (Required) Log query defining the scheduled view. This value cannot be updated.
-- `start_time` - (Required) Starting date/time for log indexing.
-- `retention_period` - (Optional) Number of days to keep the scheduled view data for.
-- `data_forwarding_id` - (Optional) ID of a data forwarding configuration to be used by the scheduled view.
+~> For attributes that force a new resource, if the value is updated, it will destroy the resource and recreate it which may incur significant costs. We advise customers to set the `lifecycle` attribute `prevent_destroy` to `true` to avoid accidentally destroying and recreating expensive resources.
+
+- `index_name` - (Required, Forces new resource) Name of the index (scheduled view).
+- `query` - (Required, Forces new resource) Log query defining the scheduled view.
+- `start_time` - (Required, Forces new resource) Start timestamp in UTC in RFC3339 format.
+- `retention_period` - (Optional) The number of days to retain data in the scheduled view, or -1 to use the default value for your account. Only relevant if your account has multi-retention. enabled.
+- `data_forwarding_id` - (Optional) An optional ID of a data forwarding configuration to be used by the scheduled view.
+- `parsing_mode` - (Optional, Forces new resource) Default to `Manual`. Define the parsing mode to scan the JSON format log messages. Possible values are: `AutoParse` - In AutoParse mode, the system automatically figures out fields to parse based on the search query. `Manual` - While in the Manual mode, no fields are parsed out automatically. For more information see Dynamic Parsing.
+- `reduce_retention_period_immediately` - (Optional) This is required on update if the newly specified retention period is less than the existing retention period. In such a situation, a value of true says that data between the existing retention period and the new retention period should be deleted immediately; if false, such data will be deleted after seven days. This property is optional and ignored if the specified retentionPeriod is greater than or equal to the current retention period.
 
 The following attributes are exported:
 
