Fixed #626

Author: Reinhard-Pilz-Dynatrace

dynatrace/api/v1/config/dashboardsbase/settings/json_dashboard_base.go

@@ -19,181 +19,40 @@ package dashboardsbase
 
 import (
 	"encoding/json"
-	"os"
-	"strings"
 
 	"github.com/google/uuid"
 
-	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings/meta"
-
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/terraform/hcl"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-// var JSON_DASHBOARD_BASE_PLUS = os.Getenv("DYNATRACE_JSON_DASHBOARD_BASE_PLUS") == "true"
-var JSON_DASHBOARD_BASE_PLUS = true
-var DYNATRACE_DASHBOARD_TESTS = len(os.Getenv("DYNATRACE_DASHBOARD_TESTS")) > 0
-
 type JSONDashboardBase struct {
 	Name     string
 	Contents string
 }
 
-func get(v any, key string) any {
-	if v == nil {
-		return nil
-	}
-	if m, ok := v.(map[string]any); ok {
-		if d, found := m[key]; found {
-			return d
-		}
-		return nil
-	}
-	return nil
-}
-
-func enrs(s []any, bc string, fordiff bool) {
-	bc = strings.TrimPrefix(bc, ".")
-	if len(s) == 0 {
-		return
-	}
-	for _, v := range s {
-		switch tv := v.(type) {
-		case map[string]any:
-			enrm(tv, bc+"[#]", fordiff)
-		case []any:
-			enrs(tv, bc+"[#]", fordiff)
-		default:
-		}
-	}
-}
-
-func ensure(m map[string]any, key string, value any) {
-	if _, found := m[key]; !found {
-		m[key] = value
-	}
-}
-
-func enrm(m map[string]any, bc string, fordiff bool) {
-	bc = strings.TrimPrefix(bc, ".")
-	if m == nil {
-		return
-	}
-	if bc == "dashboardMetadata" {
-		delete(m, "popularity")
-	}
-	if bc == "" {
-		ensure(m, "tiles", []any{})
-	}
-
-}
-
-func (me *JSONDashboardBase) EnrichRequireds() *JSONDashboardBase {
-	m := map[string]any{}
-	json.Unmarshal([]byte(me.Contents), &m)
-	enrm(m, "", false)
-	data, _ := json.Marshal(m)
-	me.Contents = string(data)
-	return me
-}
-
-func diffSuppressedContent(content string) string {
-	m := map[string]any{}
-	json.Unmarshal([]byte(content), &m)
-	if DYNATRACE_DASHBOARD_TESTS {
-		if dmd := get(m, "dashboardMetadata"); dmd != nil {
-			if df := get(dmd, "dashboardFilter"); df != nil {
-				if mgmz := get(df, "managementZone"); mgmz != nil {
-					delete(df.(map[string]any), "managementZone")
-				}
-			}
-		}
-	}
-	delete(m, "metadata")
-	enrm(m, "", true)
-	if DYNATRACE_DASHBOARD_TESTS {
-		if tiles, found := m["tiles"]; found {
-			if tileSlice, ok := tiles.([]any); ok {
-				for _, tile := range tileSlice {
-					if tm, ok := tile.(map[string]any); ok {
-						delete(tm, "metricExpressions")
-					}
-				}
-
-			}
-		}
-	}
-	data, _ := json.Marshal(m)
-	return string(data)
-}
-
 func (me *JSONDashboardBase) Schema() map[string]*schema.Schema {
-	if JSON_DASHBOARD_BASE_PLUS {
-		return map[string]*schema.Schema{
-			"contents": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				Description: "Contains the JSON Code of the Dashboard",
-				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
-					if len(old) == 0 && len(new) != 0 {
-						return false
-					}
-					if len(old) != 0 && len(new) == 0 {
-						return false
-					}
-					if !json.Valid([]byte(old)) || !json.Valid([]byte(new)) {
-						return false
-					}
-					old = diffSuppressedContent(old)
-					new = diffSuppressedContent(new)
-					result := hcl.JSONStringsEqual(old, new)
-					return result
-				},
-				StateFunc: func(val any) string {
-					if json.Valid([]byte(val.(string))) {
-						content := diffSuppressedContent(val.(string))
-						return content
-					}
-					return val.(string)
-				},
-			},
-		}
-	}
-
 	return map[string]*schema.Schema{
 		"contents": {
 			Type:             schema.TypeString,
-			Computed:         true,
 			Optional:         true,
 			Description:      "This attribute exists for backwards compatibility. You do not have to define it.",
-			DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { return len(old) != 0 },
+			DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { return true },
+			StateFunc:        func(val any) string { return "" },
 		},
 	}
 }
 
-var lifecycleIgnoreChanges = meta.LifeCycle{
-	IgnoreChanges: []string{
-		"contents",
-	},
-}
-
 func (me *JSONDashboardBase) MarshalHCL(properties hcl.Properties) error {
-	if JSON_DASHBOARD_BASE_PLUS {
-		return properties.EncodeAll(map[string]any{
-			"contents":  me.Contents,
-			"lifecycle": &lifecycleIgnoreChanges,
-		})
-	}
+	return properties.EncodeAll(map[string]any{"contents": me.Contents})
 	return nil
 }
 
 func (me *JSONDashboardBase) UnmarshalHCL(decoder hcl.Decoder) error {
-	if JSON_DASHBOARD_BASE_PLUS {
-		v, ok := decoder.GetOk("contents")
-		if ok {
-			me.Contents = v.(string)
-		}
+	v, ok := decoder.GetOk("contents")
+	if ok {
+		me.Contents = v.(string)
 	}
 	return nil
 }
@@ -225,10 +84,7 @@ func (me *JSONDashboardBase) UnmarshalJSON(data []byte) error {
 		return err
 	}
 	me.Name = md.Metadata.Name
-
-	if JSON_DASHBOARD_BASE_PLUS {
-		me.Contents = string(data)
-	}
+	me.Contents = string(data)
 
 	return nil
 }

dynatrace/api/v1/config/jsondashboardsbase/service.go

@@ -19,17 +19,13 @@ package jsondashboardsbase
 
 import (
 	"context"
-	"strings"
 
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/api"
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings"
 
 	dashboardsbase "github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/api/v1/config/dashboardsbase/settings"
 )
 
-// var JSON_DASHBOARD_BASE_PLUS = os.Getenv("DYNATRACE_JSON_DASHBOARD_BASE_PLUS") == "true"
-var JSON_DASHBOARD_BASE_PLUS = true
-
 const SchemaID = "v1:config:json-dashboards-base"
 
 func Service(credentials *settings.Credentials) settings.CRUDService[*dashboardsbase.JSONDashboardBase] {
@@ -59,40 +55,18 @@ func (me *service) List(ctx context.Context) (api.Stubs, error) {
 }
 
 func (me *service) Get(ctx context.Context, id string, v *dashboardsbase.JSONDashboardBase) error {
-	if JSON_DASHBOARD_BASE_PLUS {
-		if err := me.service.Get(ctx, id, v); err != nil {
-			return err
-		}
-	}
 	return nil
 }
 
 func (me *service) Validate(ctx context.Context, v *dashboardsbase.JSONDashboardBase) error {
-	if JSON_DASHBOARD_BASE_PLUS {
-		if validator, ok := me.service.(settings.Validator[*dashboardsbase.JSONDashboardBase]); ok {
-			return validator.Validate(ctx, v)
-		}
-	}
 	return nil
 }
 
 func (me *service) Create(ctx context.Context, v *dashboardsbase.JSONDashboardBase) (*api.Stub, error) {
-	if JSON_DASHBOARD_BASE_PLUS {
-		return me.service.Create(ctx, v.EnrichRequireds())
-	}
 	return me.service.Create(ctx, v)
 }
 
 func (me *service) Update(ctx context.Context, id string, v *dashboardsbase.JSONDashboardBase) error {
-
-	if JSON_DASHBOARD_BASE_PLUS {
-		jsonDashboard := v
-		oldContents := jsonDashboard.Contents
-		jsonDashboard.Contents = strings.Replace(oldContents, "{", `{ "id": "`+id+`", `, 1)
-		err := me.service.Update(ctx, id, v.EnrichRequireds())
-		jsonDashboard.Contents = oldContents
-		return err
-	}
 	return nil
 }