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

[datadog_powerpack] Re-introduce powerpack resource #2187

Merged
merged 15 commits into from
Dec 8, 2023
+14,543 −6
Merged

[datadog_powerpack] Re-introduce powerpack resource #2187

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0a80e3c
Revert "[datadog_powerpack] Revert Powerpack commits (#2184)"
skarimo Nov 22, 2023
aed1e19
Simplify powerpack resource and fallback on dashboard helpers
skarimo Nov 22, 2023
2e3de25
reuse schema from dashboard
skarimo Nov 22, 2023
2e5eb44
copy over cassettes and tests from #2161
skarimo Nov 22, 2023
a45ca2f
timeseries test coverage
dashashifrina Nov 28, 2023
95f32ef
query table test coverage
dashashifrina Nov 28, 2023
008cab0
treemap test coverage
dashashifrina Nov 28, 2023
6ff05a8
geomap test coverage
dashashifrina Nov 28, 2023
13ac218
sunburst test coverage
dashashifrina Nov 28, 2023
714daa0
slo list test coverage
dashashifrina Nov 28, 2023
5151189
remove layout conditional since bug was fixed
dashashifrina Nov 28, 2023
0ca3265
re-record tests
skarimo Nov 28, 2023
b67781a
add examples and fix state setting
skarimo Dec 4, 2023
f8ad423
fmt
skarimo Dec 4, 2023
7c99299
Update datadog/resource_datadog_powerpack.go
skarimo Dec 8, 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
9 changes: 9 additions & 0 deletions datadog/internal/utils/api_instances_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ type ApiInstances struct {
opsgenieIntegrationApiV2 *datadogV2.OpsgenieIntegrationApi
organizationsApiV2 *datadogV2.OrganizationsApi
processesApiV2 *datadogV2.ProcessesApi
powerpackApiV2 *datadogV2.PowerpackApi
restrictionPolicyApiV2 *datadogV2.RestrictionPoliciesApi
rolesApiV2 *datadogV2.RolesApi
rumApiV2 *datadogV2.RUMApi
Expand Down Expand Up @@ -488,6 +489,14 @@ func (i *ApiInstances) GetProcessesApiV2() *datadogV2.ProcessesApi {
return i.processesApiV2
}

// GetPowerpackApiV2 get instance of PowerpackApi
func (i *ApiInstances) GetPowerpackApiV2() *datadogV2.PowerpackApi {
if i.powerpackApiV2 == nil {
i.powerpackApiV2 = datadogV2.NewPowerpackApi(i.HttpClient)
}
return i.powerpackApiV2
}

// GetRolesApiV2 get instance of RolesApi
func (i *ApiInstances) GetRolesApiV2() *datadogV2.RolesApi {
if i.rolesApiV2 == nil {
Expand Down
1 change: 1 addition & 0 deletions datadog/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ func Provider() *schema.Provider {
"datadog_monitor_config_policy": resourceDatadogMonitorConfigPolicy(),
"datadog_monitor_json": resourceDatadogMonitorJSON(),
"datadog_organization_settings": resourceDatadogOrganizationSettings(),
"datadog_powerpack": resourceDatadogPowerpack(),
"datadog_role": resourceDatadogRole(),
"datadog_rum_application": resourceDatadogRUMApplication(),
"datadog_service_account": resourceDatadogServiceAccount(),
Expand Down
18 changes: 12 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 @@ -695,7 +695,7 @@ func buildTerraformNotifyList(datadogNotifyList *[]string) *[]string {
// The generic widget schema is a combination of the schema for a non-group widget
// and the schema for a Group Widget (which can contains only non-group widgets)
func getWidgetSchema() map[string]*schema.Schema {
widgetSchema := getNonGroupWidgetSchema()
widgetSchema := getNonGroupWidgetSchema(false)
widgetSchema["group_definition"] = &schema.Schema{
Type: schema.TypeList,
Optional: true,
Expand All @@ -708,8 +708,8 @@ func getWidgetSchema() map[string]*schema.Schema {
return widgetSchema
}

func getNonGroupWidgetSchema() map[string]*schema.Schema {
return map[string]*schema.Schema{
func getNonGroupWidgetSchema(isPowerpackSchema bool) map[string]*schema.Schema {
s := map[string]*schema.Schema{
"widget_layout": {
Type: schema.TypeList,
MaxItems: 1,
Expand Down Expand Up @@ -995,16 +995,22 @@ func getNonGroupWidgetSchema() map[string]*schema.Schema {
Schema: getRunWorkflowDefinitionSchema(),
},
},
"split_graph_definition": {
}

// Non powerpack specific widgets
if !isPowerpackSchema {
s["split_graph_definition"] = &schema.Schema{
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Description: "The definition for a Split Graph widget.",
Elem: &schema.Resource{
Schema: getSplitGraphDefinitionSchema(),
},
},
}
}

return s
}

func getSplitGraphSourceWidgetSchema() map[string]*schema.Schema {
Expand Down Expand Up @@ -1598,7 +1604,7 @@ func getGroupDefinitionSchema() map[string]*schema.Schema {
Optional: true,
Description: "The list of widgets in this group.",
Elem: &schema.Resource{
Schema: getNonGroupWidgetSchema(),
Schema: getNonGroupWidgetSchema(false),
},
},
"layout_type": {
Expand Down
Loading