Merge pull request #71 from softScheck/master

Only forcibly generate diagram files for report if missing - use custom diagrams in report

pkg/report/generate.go

@@ -3,6 +3,7 @@ package report
 import (
 	"crypto/sha256"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -74,9 +75,22 @@ type reportConfigReader interface {
 func Generate(config reportConfigReader, readResult *model.ReadResult, commands *GenerateCommands, riskRules types.RiskRules, progressReporter progressReporter) error {
 	generateDataFlowDiagram := commands.DataFlowDiagram
 	generateDataAssetsDiagram := commands.DataAssetDiagram
+
 	if commands.ReportPDF { // as the PDF report includes both diagrams
-		generateDataFlowDiagram = true
-		generateDataAssetsDiagram = true
+		if !generateDataFlowDiagram {
+			dataFlowFile := filepath.Join(config.GetOutputFolder(), config.GetDataFlowDiagramFilenamePNG())
+			if _, err := os.Stat(dataFlowFile); errors.Is(err, os.ErrNotExist) {
+				progressReporter.Warn("Forcibly create the needed Data-Flow Diagram file to enable report generation.")
+				generateDataFlowDiagram = true
+			}
+		}
+		if !generateDataAssetsDiagram {
+			dataAssetFile := filepath.Join(config.GetOutputFolder(), config.GetDataAssetDiagramFilenamePNG())
+			if _, err := os.Stat(dataAssetFile); errors.Is(err, os.ErrNotExist) {
+				progressReporter.Warn("Forcibly create the needed Data-Asset Diagram file to enable report generation.")
+				generateDataAssetsDiagram = true
+			}
+		}
 	}
 
 	diagramDPI := config.GetDiagramDPI()