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

Jump to bottom

[dashboards] Add new Dashboard resource #249

Merged
merged 14 commits into from
Jul 24, 2019
Merged

[dashboards] Add new Dashboard resource #249

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b56b7ca
Merge pull request #2 from terraform-providers/master
enbashi May 21, 2019
7692051
Merge pull request #3 from terraform-providers/master
enbashi Jun 26, 2019
cb96bc6
Add new Dashboard resource
enbashi Jun 26, 2019
6538824
Fix tests + review feedback
enbashi Jun 27, 2019
eba726a
Add datadog_dashboard docs
enbashi Jun 28, 2019
9a9b481
Merge pull request #4 from terraform-providers/master
enbashi Jun 28, 2019
5503a93
Resolve conflicts
enbashi Jun 28, 2019
4926cad
Update docs with review comments
enbashi Jul 2, 2019
b73f8bc
Update inner Note widget example in tests and docs
enbashi Jul 18, 2019
1088f7b
Use TypeList for axis to correctly parse bool values
enbashi Jul 23, 2019
76457b1
Add ValidateFunc for layout_type
enbashi Jul 23, 2019
62b8a3e
Add aliased import
enbashi Jul 23, 2019
75465a5
Split examples in docs into two blocks
enbashi Jul 23, 2019
0d483ad
Update examples to not use optional params not used in the UI
enbashi Jul 23, 2019
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
37 changes: 31 additions & 6 deletions datadog/resource_datadog_dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ func resourceDatadogDashboard() *schema.Resource {
},
},
"layout_type": {
Type: schema.TypeString,
Required: true,
Description: "The layout type of the dashboard, either 'free' or 'ordered'.",
Type: schema.TypeString,
Required: true,
Description: "The layout type of the dashboard, either 'free' or 'ordered'.",
ValidateFunc: validateDashboardLayoutType,
},
"description": {
Type: schema.TypeString,
Expand Down Expand Up @@ -815,9 +816,10 @@ func getGroupDefinitionSchema() map[string]*schema.Schema {
},
},
"layout_type": {
Type: schema.TypeString,
Required: true,
Description: "The layout type of the group, only 'ordered' for now.",
Type: schema.TypeString,
Required: true,
Description: "The layout type of the group, only 'ordered' for now.",
ValidateFunc: validateGroupWidgetLayoutType,
},
"title": {
Type: schema.TypeString,
Expand Down Expand Up @@ -3850,3 +3852,26 @@ func buildTerraformWidgetAxis(datadogWidgetAxis datadog.WidgetAxis) map[string]i
}
return terraformWidgetAxis
}

func validateDashboardLayoutType(val interface{}, key string) (warns []string, errs []error) {
value := val.(string)
switch value {
case "free", "ordered":
break
default:
errs = append(errs, fmt.Errorf(
"%q contains an invalid value %q. Valid values are `free` or `ordered`", key, value))
}
return
}
func validateGroupWidgetLayoutType(val interface{}, key string) (warns []string, errs []error) {
value := val.(string)
switch value {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding a switch despite this being one value only because we plan to support more layout types in the future.

case "ordered":
break
default:
errs = append(errs, fmt.Errorf(
"%q contains an invalid value %q. Only `ordered` is a valid value", key, value))
}
return
}