Skip to content

Commit 122e073

Browse files
committed
Update tests
1 parent bb3a1fa commit 122e073

File tree

3 files changed

+239
-59
lines changed

3 files changed

+239
-59
lines changed

sumologic/resource_sumologic_log_search.go

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func resourceSumologicLogSearch() *schema.Resource {
8484
"data_type": {
8585
Type: schema.TypeString,
8686
Required: true,
87-
ValidateFunc: validation.StringInSlice([]string{"NUMBER", "STRING", "QUERY_FRAGMENT", "SEARCH_KEYWORD"}, false),
87+
ValidateFunc: validation.StringInSlice([]string{"NUMBER", "STRING", "ANY", "KEYWORD"}, false),
8888
},
8989
},
9090
},
@@ -392,9 +392,10 @@ func resourceSumologicLogSearchRead(d *schema.ResourceData, meta interface{}) er
392392
d.SetId("")
393393
return nil
394394
}
395-
log.Println("[##DEBUG##] ===========================================================")
396-
log.Printf("[##DEBUG##] Read LogSearch : %+v", logSearch)
397-
log.Println("[##DEBUG##] ===========================================================")
395+
log.Println("=====================================================================")
396+
log.Printf("read log search - %+v", logSearch)
397+
log.Printf("log search schedule - %+v", logSearch.Schedule)
398+
log.Println("=====================================================================")
398399

399400
return setLogSearch(d, logSearch)
400401
}
@@ -403,7 +404,10 @@ func resourceSumologicLogSearchUpdate(d *schema.ResourceData, meta interface{})
403404
c := meta.(*Client)
404405

405406
logSearch := resourceToLogSearch(d)
406-
log.Printf("updating log search : %+v", logSearch)
407+
log.Println("=====================================================================")
408+
log.Printf("updating log search - %+v", logSearch)
409+
log.Printf("log search schedule - %+v", logSearch.Schedule)
410+
log.Println("=====================================================================")
407411
err := c.UpdateLogSearch(logSearch)
408412
if err != nil {
409413
return err
@@ -437,6 +441,14 @@ func setLogSearch(d *schema.ResourceData, logSearch *LogSearch) error {
437441
return err
438442
}
439443

444+
queryParameters := make([]map[string]interface{}, len(logSearch.QueryParameters))
445+
for i, parameter := range logSearch.QueryParameters {
446+
queryParameters[i] = getTerraformLogSearchQueryParameter(parameter)
447+
}
448+
if err := d.Set("query_parameter", queryParameters); err != nil {
449+
return err
450+
}
451+
440452
timeRange := GetTerraformTimeRange(logSearch.TimeRange.(map[string]interface{}))
441453
if err := d.Set("time_range", timeRange); err != nil {
442454
return err
@@ -452,8 +464,20 @@ func setLogSearch(d *schema.ResourceData, logSearch *LogSearch) error {
452464
return nil
453465
}
454466

455-
func getTerraformLogSearchSchedule(schedule *LogSearchSchedule) TerraformObject {
456-
tfSearchSchedule := MakeTerraformObject()
467+
func getTerraformLogSearchQueryParameter(parameter LogSearchQueryParameter) map[string]interface{} {
468+
tfSearchQueryParameter := map[string]interface{}{}
469+
470+
tfSearchQueryParameter["name"] = parameter.Name
471+
tfSearchQueryParameter["description"] = parameter.Description
472+
tfSearchQueryParameter["data_type"] = parameter.DataType
473+
tfSearchQueryParameter["value"] = parameter.Value
474+
return tfSearchQueryParameter
475+
}
476+
477+
func getTerraformLogSearchSchedule(schedule *LogSearchSchedule) []map[string]interface{} {
478+
tfSearchSchedule := []map[string]interface{}{}
479+
tfSearchSchedule = append(tfSearchSchedule, make(map[string]interface{}))
480+
457481
if schedule == nil {
458482
return tfSearchSchedule
459483
}

0 commit comments

Comments
 (0)