Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add column revamp properties to dashboard log stream #517

Merged
merged 6 commits into from
Jun 3, 2020
Merged

Add column revamp properties to dashboard log stream #517

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
98c1215
Added column revamp properties to dashboard log stream
Prepager May 22, 2020
812ba08
Added properties to tests and rerecorded cassettes
Prepager May 25, 2020
bc0acce
Added attribute assertions
Prepager May 28, 2020
e770d2a
Added new properties to dashboard docs
Prepager May 28, 2020
4a4f498
Made sort use TypeList instead of Map
Prepager May 28, 2020
345cac3
Fixed docs spacing
Prepager May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 101 additions & 0 deletions datadog/resource_datadog_dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2398,6 +2398,37 @@ func getLogStreamDefinitionSchema() map[string]*schema.Schema {
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
"show_date_column": {
Type: schema.TypeBool,
Optional: true,
},
"show_message_column": {
Type: schema.TypeBool,
Optional: true,
},
"message_display": {
Type: schema.TypeString,
Optional: true,
Description: "One of: ['inline', 'expanded-md', 'expanded-lg']",
ValidateFunc: func(val interface{}, key string) (warns []string, errs []error) {
value := val.(string)
switch value {
case "inline", "expanded-md", "expanded-lg":
break
default:
errs = append(errs, fmt.Errorf(
"%q contains an invalid value %q. Valid values are `inline`, `expanded-md`, or `expanded-lg`", key, value))
}
return
},
},
"sort": {
Type: schema.TypeMap,
Prepager marked this conversation as resolved.
Show resolved Hide resolved
Optional: true,
Elem: &schema.Resource{
Schema: getWidgetFieldSortSchema(),
},
},
"title": {
Type: schema.TypeString,
Optional: true,
Expand All @@ -2420,6 +2451,30 @@ func getLogStreamDefinitionSchema() map[string]*schema.Schema {
}
}

func getWidgetFieldSortSchema() map[string]*schema.Schema {
return map[string]*schema.Schema{
"column": {
Type: schema.TypeString,
Required: true,
},
"order": {
Type: schema.TypeString,
Required: true,
ValidateFunc: func(val interface{}, key string) (warns []string, errs []error) {
value := val.(string)
switch value {
case "asc", "desc":
break
default:
errs = append(errs, fmt.Errorf(
"%q contains an invalid value %q. Valid values are `asc`, or `desc`", key, value))
}
return
},
},
}
}

func buildDatadogLogStreamDefinition(terraformDefinition map[string]interface{}) *datadogV1.LogStreamWidgetDefinition {
datadogDefinition := datadogV1.NewLogStreamWidgetDefinitionWithDefaults()
// Required params
Expand All @@ -2441,6 +2496,18 @@ func buildDatadogLogStreamDefinition(terraformDefinition map[string]interface{})
}
datadogDefinition.SetColumns(datadogColumns)
}
if v, ok := terraformDefinition["show_date_column"].(bool); ok {
datadogDefinition.SetShowDateColumn(v)
}
if v, ok := terraformDefinition["show_message_column"].(bool); ok {
datadogDefinition.SetShowMessageColumn(v)
}
if v, ok := terraformDefinition["message_display"].(string); ok && len(v) != 0 {
datadogDefinition.SetMessageDisplay(datadogV1.WidgetMessageDisplay(v))
}
if v, ok := terraformDefinition["sort"].(map[string]interface{}); ok && len(v) > 0 {
datadogDefinition.Sort = buildDatadogWidgetFieldSort(v)
}
if v, ok := terraformDefinition["title"].(string); ok && len(v) != 0 {
datadogDefinition.SetTitle(v)
}
Expand All @@ -2456,6 +2523,17 @@ func buildDatadogLogStreamDefinition(terraformDefinition map[string]interface{})
return datadogDefinition
}

func buildDatadogWidgetFieldSort(terraformWidgetFieldSort map[string]interface{}) *datadogV1.WidgetFieldSort {
datadogWidgetFieldSort := &datadogV1.WidgetFieldSort{}
if v, ok := terraformWidgetFieldSort["column"].(string); ok && len(v) != 0 {
datadogWidgetFieldSort.SetColumn(v)
}
if v, ok := terraformWidgetFieldSort["order"].(string); ok && len(v) != 0 {
datadogWidgetFieldSort.SetOrder(datadogV1.WidgetSort(v))
}
return datadogWidgetFieldSort
}

func buildTerraformLogStreamDefinition(datadogDefinition datadogV1.LogStreamWidgetDefinition) map[string]interface{} {
terraformDefinition := map[string]interface{}{}
// Required params
Expand All @@ -2474,6 +2552,18 @@ func buildTerraformLogStreamDefinition(datadogDefinition datadogV1.LogStreamWidg
}
terraformDefinition["columns"] = terraformColumns
}
if v, ok := datadogDefinition.GetShowDateColumnOk(); ok {
terraformDefinition["show_date_column"] = *v
}
if v, ok := datadogDefinition.GetShowMessageColumnOk(); ok {
terraformDefinition["show_message_column"] = *v
}
if v, ok := datadogDefinition.GetMessageDisplayOk(); ok {
terraformDefinition["message_display"] = *v
}
if v, ok := datadogDefinition.GetSortOk(); ok {
terraformDefinition["sort"] = buildTerraformWidgetFieldSort(*v)
}
if v, ok := datadogDefinition.GetTitleOk(); ok {
terraformDefinition["title"] = *v
}
Expand All @@ -2489,6 +2579,17 @@ func buildTerraformLogStreamDefinition(datadogDefinition datadogV1.LogStreamWidg
return terraformDefinition
}

func buildTerraformWidgetFieldSort(datadogWidgetFieldSort datadogV1.WidgetFieldSort) map[string]string {
terraformWidgetFieldSort := map[string]string{}
if v, ok := datadogWidgetFieldSort.GetColumnOk(); ok {
terraformWidgetFieldSort["column"] = string(*v)
}
if v, ok := datadogWidgetFieldSort.GetOrderOk(); ok {
terraformWidgetFieldSort["order"] = string(*v)
}
return terraformWidgetFieldSort
}

//
// Manage Status Widget Definition helpers
//
Expand Down