Add validation for update and delete too. These can make tests panic

grafana · Mar 20, 2024 · 5e3e192 · 5e3e192
1 parent 513d516
commit 5e3e192
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/internal/resources/grafana/resources.go b/internal/resources/grafana/resources.go
@@ -27,15 +27,33 @@ func grafanaOrgIDResourceValidation(d *schema.ResourceData, m interface{}) error
 
 func addValidation(resources map[string]*schema.Resource) map[string]*schema.Resource {
 	for _, r := range resources {
-		readFn := r.ReadContext
 		createFn := r.CreateContext
+		readFn := r.ReadContext
+		updateFn := r.UpdateContext
+		deleteFn := r.DeleteContext
 
 		r.ReadContext = func(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 			if err := grafanaClientResourceValidation(d, m); err != nil {
 				return diag.FromErr(err)
 			}
 			return readFn(ctx, d, m)
 		}
+		if updateFn != nil {
+			r.UpdateContext = func(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+				if err := grafanaClientResourceValidation(d, m); err != nil {
+					return diag.FromErr(err)
+				}
+				return updateFn(ctx, d, m)
+			}
+		}
+		if deleteFn != nil {
+			r.DeleteContext = func(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+				if err := grafanaClientResourceValidation(d, m); err != nil {
+					return diag.FromErr(err)
+				}
+				return deleteFn(ctx, d, m)
+			}
+		}
 		if createFn != nil {
 			r.CreateContext = func(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 				if err := grafanaClientResourceValidation(d, m); err != nil {