fix(dashboards): fix to dashboard name update failure with filter_cur…

…rent_dashboard
newrelic · Mar 21, 2024 · 88b308e · 88b308e
1 parent 2292003
commit 88b308e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/newrelic/resource_newrelic_one_dashboard.go b/newrelic/resource_newrelic_one_dashboard.go
@@ -648,7 +648,7 @@ func resourceNewRelicOneDashboardCreate(ctx context.Context, d *schema.ResourceD
 	defaultInfo := map[string]interface{}{
 		"account_id": accountID,
 	}
-	dashboard, err := expandDashboardInput(d, defaultInfo)
+	dashboard, err := expandDashboardInput(d, defaultInfo, "")
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -691,7 +691,7 @@ func resourceNewRelicOneDashboardCreate(ctx context.Context, d *schema.ResourceD
 			return diag.FromErr(err)
 		}
 
-		dashboard, err := expandDashboardInput(d, defaultInfo)
+		dashboard, err := expandDashboardInput(d, defaultInfo, created.EntityResult.Name)
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -748,7 +748,7 @@ func resourceNewRelicOneDashboardUpdate(ctx context.Context, d *schema.ResourceD
 		return diag.FromErr(err)
 	}
 
-	dashboard, err := expandDashboardInput(d, defaultInfo)
+	dashboard, err := expandDashboardInput(d, defaultInfo, "")
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -783,7 +783,7 @@ func resourceNewRelicOneDashboardUpdate(ctx context.Context, d *schema.ResourceD
 			return diag.FromErr(err)
 		}
 
-		dashboard, err = expandDashboardInput(d, defaultInfo)
+		dashboard, err = expandDashboardInput(d, defaultInfo, updated.EntityResult.Name)
 		if err != nil {
 			return diag.FromErr(err)
 		}

diff --git a/newrelic/structures_newrelic_one_dashboard.go b/newrelic/structures_newrelic_one_dashboard.go
@@ -19,11 +19,15 @@ import (
 
 // Assemble the *dashboards.DashboardInput struct.
 // Used by the newrelic_one_dashboard Create function.
-func expandDashboardInput(d *schema.ResourceData, meta interface{}) (*dashboards.DashboardInput, error) {
+func expandDashboardInput(d *schema.ResourceData, meta interface{}, dashboardNameCustom string) (*dashboards.DashboardInput, error) {
 	var err error
 
-	dash := dashboards.DashboardInput{
-		Name: d.Get("name").(string),
+	dash := dashboards.DashboardInput{}
+
+	if dashboardNameCustom != "" {
+		dash.Name = dashboardNameCustom
+	} else {
+		dash.Name = d.Get("name").(string)
 	}
 
 	dash.Pages, err = expandDashboardPageInput(d, d.Get("page").([]interface{}), meta)