feat: write json output to local file on every policy check (datreeio…

…#760) * shtuyot yafot * fix: remove unnecessary interactive check * feat: write json output to local file on every policy check * feat: write json output to local file on every policy check * feat: write json output to local file on every policy check * add isCI check before saving local json * move formatted results to new function Co-authored-by: myishay <myishay@gmail.com>
shalev007 · Aug 23, 2022 · 72c6d6e · 72c6d6e
1 parent ed19375
commit 72c6d6e
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 20 deletions.
diff --git a/cmd/test/main.go b/cmd/test/main.go
@@ -401,6 +401,7 @@ func test(ctx *TestCommandContext, paths []string, testCommandData *TestCommandD
 		Verbose:               testCommandData.Verbose,
 		PolicyName:            testCommandData.Policy.Name,
 		K8sValidationWarnings: validationManager.k8sValidationWarningPerValidFile,
+		IsCI:                  ctx.CiContext.IsCI,
 	})
 
 	if evaluationResultData.PromptMessage != "" {

diff --git a/pkg/evaluation/evaluator.go b/pkg/evaluation/evaluator.go
@@ -147,9 +147,7 @@ func (e *Evaluator) Evaluate(policyCheckData PolicyCheckData) (PolicyCheckResult
 	formattedResults := FormattedResults{}
 	formattedResults.EvaluationResults = e.formatEvaluationResults(failedRulesByFiles, len(policyCheckData.FilesConfigurations), rulesCount)
 
-	if !policyCheckData.IsInteractiveMode {
-		formattedResults.NonInteractiveEvaluationResults = e.formatNonInteractiveEvaluationResults(formattedResults.EvaluationResults, failedRulesByFiles, policyCheckData.PolicyName, rulesCount)
-	}
+	formattedResults.NonInteractiveEvaluationResults = e.formatNonInteractiveEvaluationResults(formattedResults.EvaluationResults, failedRulesByFiles, policyCheckData.PolicyName, rulesCount)
 
 	return PolicyCheckResultData{formattedResults, rulesData, filesData, failedRulesByFiles, rulesCount}, nil
 }

diff --git a/pkg/evaluation/printer.go b/pkg/evaluation/printer.go
@@ -39,6 +39,7 @@ type PrintResultsData struct {
 	Verbose               bool
 	PolicyName            string
 	K8sValidationWarnings validation.K8sValidationWarningPerValidFile
+	IsCI                  bool
 }
 
 type textOutputData struct {
@@ -54,7 +55,37 @@ type textOutputData struct {
 	k8sValidationWarnings validation.K8sValidationWarningPerValidFile
 }
 
+func SaveLastResultToJson(resultsData *PrintResultsData) {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return
+	}
+
+	jsonOutput, err := GetjsonResult(resultsData)
+	if err != nil {
+		return
+	}
+
+	lastPolicyCheckPath := homeDir + "/.datree/lastPolicyCheck.json"
+	file, err := os.Create(lastPolicyCheckPath)
+	if err != nil {
+		return
+	}
+
+	defer file.Close()
+
+	byteOutput := []byte(jsonOutput)
+	err = os.WriteFile(lastPolicyCheckPath, byteOutput, 0644)
+	if err != nil {
+		return
+	}
+}
+
 func PrintResults(resultsData *PrintResultsData) error {
+	if resultsData.IsCI {
+		SaveLastResultToJson(resultsData)
+	}
+
 	resultsText, err := GetResultsText(resultsData)
 	if err != nil {
 		return err
@@ -67,25 +98,31 @@ func PrintResults(resultsData *PrintResultsData) error {
 	return nil
 }
 
+func getFormattedOutput(resultsData *PrintResultsData) FormattedOutput {
+	nonInteractiveEvaluationResults := resultsData.Results.NonInteractiveEvaluationResults
+	if nonInteractiveEvaluationResults == nil {
+		nonInteractiveEvaluationResults = &NonInteractiveEvaluationResults{}
+	}
+	formattedOutput := FormattedOutput{
+		PolicyValidationResults: nonInteractiveEvaluationResults.FormattedEvaluationResults,
+		PolicySummary:           nonInteractiveEvaluationResults.PolicySummary,
+		EvaluationSummary: NonInteractiveEvaluationSummary{
+			ConfigsCount:                resultsData.EvaluationSummary.ConfigsCount,
+			FilesCount:                  resultsData.EvaluationSummary.FilesCount,
+			PassedYamlValidationCount:   resultsData.EvaluationSummary.PassedYamlValidationCount,
+			K8sValidation:               resultsData.EvaluationSummary.K8sValidation,
+			PassedPolicyValidationCount: resultsData.EvaluationSummary.PassedPolicyCheckCount,
+		},
+		YamlValidationResults: resultsData.InvalidYamlFiles,
+		K8sValidationResults:  resultsData.InvalidK8sFiles,
+	}
+
+	return formattedOutput
+}
+
 func GetResultsText(resultsData *PrintResultsData) (string, error) {
 	if IsFormattedOutputOption(resultsData.OutputFormat) {
-		nonInteractiveEvaluationResults := resultsData.Results.NonInteractiveEvaluationResults
-		if nonInteractiveEvaluationResults == nil {
-			nonInteractiveEvaluationResults = &NonInteractiveEvaluationResults{}
-		}
-		formattedOutput := FormattedOutput{
-			PolicyValidationResults: nonInteractiveEvaluationResults.FormattedEvaluationResults,
-			PolicySummary:           nonInteractiveEvaluationResults.PolicySummary,
-			EvaluationSummary: NonInteractiveEvaluationSummary{
-				ConfigsCount:                resultsData.EvaluationSummary.ConfigsCount,
-				FilesCount:                  resultsData.EvaluationSummary.FilesCount,
-				PassedYamlValidationCount:   resultsData.EvaluationSummary.PassedYamlValidationCount,
-				K8sValidation:               resultsData.EvaluationSummary.K8sValidation,
-				PassedPolicyValidationCount: resultsData.EvaluationSummary.PassedPolicyCheckCount,
-			},
-			YamlValidationResults: resultsData.InvalidYamlFiles,
-			K8sValidationResults:  resultsData.InvalidK8sFiles,
-		}
+		formattedOutput := getFormattedOutput(resultsData)
 
 		switch resultsData.OutputFormat {
 		case "json":
@@ -114,6 +151,12 @@ func GetResultsText(resultsData *PrintResultsData) (string, error) {
 		})
 	}
 }
+func GetjsonResult(resultsData *PrintResultsData) (string, error) {
+
+	formattedOutput := getFormattedOutput(resultsData)
+
+	return getJsonOutput(&formattedOutput)
+}
 
 func getJsonOutput(formattedOutput *FormattedOutput) (string, error) {
 	jsonOutput, err := json.Marshal(formattedOutput)