Skip to content

set widget type set #145

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

set widget type set #145

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40a2229
set widget type set
Arthur1 Mar 13, 2023
5959b4a
use schema.Set in resource_dashboard
Arthur1 Mar 13, 2023
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
24 changes: 12 additions & 12 deletions mackerel/resource_mackerel_dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func resourceMackerelDashboard() *schema.Resource {
Optional: true,
},
"graph": {
Type: schema.TypeList,
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -231,7 +231,7 @@ func resourceMackerelDashboard() *schema.Resource {
},
},
"value": {
Type: schema.TypeList,
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -263,7 +263,7 @@ func resourceMackerelDashboard() *schema.Resource {
},
},
"markdown": {
Type: schema.TypeList,
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand All @@ -285,7 +285,7 @@ func resourceMackerelDashboard() *schema.Resource {
},
},
"alert_status": {
Type: schema.TypeList,
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -361,8 +361,8 @@ func expandDashboard(d *schema.ResourceData) *mackerel.Dashboard {
func expandDashboardWidgets(d *schema.ResourceData) []mackerel.Widget {
var widgets []mackerel.Widget
if _, ok := d.GetOk("graph"); ok {
graphs := d.Get("graph").([]interface{})
for _, graph := range graphs {
graphs := d.Get("graph").(*schema.Set)
for _, graph := range graphs.List() {
g := graph.(map[string]interface{})
var r mackerel.Range
if v, ok := g["range"].([]interface{}); ok && len(v) > 0 {
Expand Down Expand Up @@ -407,8 +407,8 @@ func expandDashboardWidgets(d *schema.ResourceData) []mackerel.Widget {
}
}
if _, ok := d.GetOk("value"); ok {
values := d.Get("value").([]interface{})
for _, value := range values {
values := d.Get("value").(*schema.Set)
for _, value := range values.List() {
v := value.(map[string]interface{})
host := v["metric"].([]interface{})[0].(map[string]interface{})["host"].([]interface{})
service := v["metric"].([]interface{})[0].(map[string]interface{})["service"].([]interface{})
Expand Down Expand Up @@ -446,8 +446,8 @@ func expandDashboardWidgets(d *schema.ResourceData) []mackerel.Widget {
}
}
if _, ok := d.GetOk("markdown"); ok {
markdowns := d.Get("markdown").([]interface{})
for _, markdown := range markdowns {
markdowns := d.Get("markdown").(*schema.Set)
for _, markdown := range markdowns.List() {
m := markdown.(map[string]interface{})
widgets = append(widgets, mackerel.Widget{
Type: "markdown",
Expand All @@ -458,8 +458,8 @@ func expandDashboardWidgets(d *schema.ResourceData) []mackerel.Widget {
}
}
if _, ok := d.GetOk("alert_status"); ok {
alert_statuses := d.Get("alert_status").([]interface{})
for _, alert_status := range alert_statuses {
alert_statuses := d.Get("alert_status").(*schema.Set)
for _, alert_status := range alert_statuses.List() {
a := alert_status.(map[string]interface{})
widgets = append(widgets, mackerel.Widget{
Type: "alertStatus",
Expand Down