refactor: Remove unneeded code

Author: arthurpitman

dynatrace/export/enums.go

@@ -57,38 +57,6 @@ func (rt ResourceType) IsPotentialCircularDependencyTo(referringResourceID strin
 	return rt == ResourceTypes.JSONDashboard && referredToResourceType == ResourceTypes.JSONDashboardBase && referringResourceID != referredToResourceID
 }
 
-func (rt ResourceType) VoidResource(resource *Resource, contents []byte) ([]byte, bool) {
-	if !rt.CanGetVoidedIfNotReferenced() {
-		return contents, false
-	}
-	dashboardBaseReference := fmt.Sprintf(`${dynatrace_json_dashboard_base.%s.id}`, resource.UniqueName)
-	dashboardReference := fmt.Sprintf(`${dynatrace_json_dashboard.%s.id}`, resource.UniqueName)
-	var results string
-	lastLineWasSpace := false
-	for _, line := range strings.Split(string(contents), "\n") {
-		if strings.Contains(line, "link_id") && strings.Contains(line, dashboardBaseReference) {
-			continue
-		} else if strings.Contains(line, "dashboard_id") && strings.Contains(line, dashboardBaseReference) {
-			line = strings.Replace(line, dashboardBaseReference, dashboardReference, 1)
-		}
-		curLineIsSpace := len(strings.TrimSpace(line)) == 0
-		if curLineIsSpace {
-			if lastLineWasSpace {
-				continue
-			}
-		}
-		lastLineWasSpace = curLineIsSpace
-		results = results + "\n" + line
-	}
-	// Here we assume (see ResourceType.Less) that the resource block `dynatrace_json_dashboard_base`
-	// is located at the very end of the file. The resource block is expected to be empty.
-	// Therefore we can expect that the } before the last one signals the end of the
-	// resource blocks that are allowed to remain. Everything past that will get cut off
-	results = results[:strings.LastIndex(results, "}")]
-	results = results[:strings.LastIndex(results, "}")+1]
-	return []byte(results), true
-}
-
 func (rt ResourceType) CanGetVoidedIfNotReferenced() bool {
 	return rt == ResourceTypes.JSONDashboardBase
 }

dynatrace/export/environment.go

@@ -50,9 +50,6 @@ var NO_REFRESH_ON_IMPORT = os.Getenv("DYNATRACE_NO_REFRESH_ON_IMPORT") == "true"
 var QUICK_INIT = os.Getenv("DYNATRACE_QUICK_INIT") == "true"
 var ULTRA_PARALLEL = os.Getenv("DYNATRACE_ULTRA_PARALLEL") == "true"
 
-// var JSON_DASHBOARD_BASE_PLUS = os.Getenv("DYNATRACE_JSON_DASHBOARD_BASE_PLUS") == "true"
-var JSON_DASHBOARD_BASE_PLUS = true
-
 const ENV_VAR_CUSTOM_PROVIDER_LOCATION = "DYNATRACE_CUSTOM_PROVIDER_LOCATION"
 
 type Environment struct {
@@ -475,38 +472,6 @@ func (me *Environment) PostProcess() error {
 		}
 	}
 
-	if JSON_DASHBOARD_BASE_PLUS {
-		// pass
-	} else {
-		for _, resourcesByIDToVoid := range resourcesToVoid {
-			for _, resourceToVoid := range resourcesByIDToVoid {
-				if err := voidResource(resourceToVoid); err != nil {
-					logging.Debug.Warn.Printf("[POSTPROCESS] [%s][%s] Unable to remove resource: %s", resourceToVoid.Type, resourceToVoid.ID, err.Error())
-				}
-			}
-		}
-	}
-
-	return nil
-}
-
-func voidResource(resource *Resource) error {
-	if resource == nil {
-		return nil
-	}
-	var err error
-	var resourceBytes []byte
-	var changed bool
-	if resourceBytes, err = resource.ReadFile(); err != nil {
-		return err
-	}
-	if resourceBytes, changed = resource.Type.VoidResource(resource, resourceBytes); changed {
-		var resourceFile *os.File
-		if resourceFile, err = resource.CreateFile(); err == nil {
-			defer resourceFile.Close()
-			resourceFile.Write(resourceBytes)
-		}
-	}
 	return nil
 }