fix json keys; extract rego get rule name function; update debug flag desc

Signed-off-by: Sylwester Piskozub <sylwesterpiskozub@gmail.com>

Author: Piskoo

app/cli/cmd/output.go

@@ -55,7 +55,6 @@ type tabulatedData interface {
 		[]*action.APITokenItem |
 		*action.AttestationStatusMaterial |
 		*action.ListMembershipResult |
-		*action.PolicyEvalResult |
 		*action.PolicyLintResult
 }
 

app/cli/cmd/policy_develop_eval.go

@@ -76,7 +76,7 @@ evaluates the policy against the provided material or attestation.`,
 	cmd.Flags().StringVarP(&policyPath, "policy", "p", "policy.yaml", "Path to custom policy file")
 	cmd.Flags().StringSliceVar(&inputs, "input", []string{}, "Key-value pairs of policy inputs (key=value)")
 	cmd.Flags().StringSliceVar(&allowedHostnames, "allowed-hostnames", []string{}, "Additional hostnames allowed for http.send requests in policies")
-	cmd.Flags().BoolVarP(&debug, "debug", "", false, "Enable debug/verbose output and logging mode")
+	cmd.Flags().BoolVarP(&debug, "debug", "", false, "Include detailed evaluation inputs/outputs in JSON output and enable verbose logging")
 
 	return cmd
 }

app/cli/internal/action/policy_develop_eval.go

@@ -29,14 +29,6 @@ type PolicyEvalOpts struct {
 	Debug            bool
 }
 
-type PolicyEvalResult struct {
-	Violations  []string                 `json:"violations"`
-	SkipReasons []string                 `json:"skip_reasons"`
-	Skipped     bool                     `json:"skipped"`
-	Ignored     bool                     `json:"ignored,omitempty"`
-	RawResults  []map[string]interface{} `json:"raw_results,omitempty"`
-}
-
 type PolicyEval struct {
 	*ActionsOpts
 	opts *PolicyEvalOpts

app/cli/internal/policydevel/eval.go

@@ -40,9 +40,9 @@ type EvalOptions struct {
 }
 
 type EvalResult struct {
-	Skipped     bool
-	SkipReasons []string
-	Violations  []string
+	Violations  []string `json:"violations"`
+	SkipReasons []string `json:"skip_reasons"`
+	Skipped     bool     `json:"skipped"`
 }
 
 type EvalSummary struct {

pkg/policies/engine/rego/rego.go

@@ -155,7 +155,7 @@ func (r *Engine) Verify(ctx context.Context, policy *engine.Policy, input []byte
 	}
 
 	// Get raw results first
-	if err := executeQuery(fmt.Sprintf("%s\n", parsedModule.Package.Path), r.operatingMode == EnvironmentModeRestrictive); err != nil {
+	if err := executeQuery(getRuleName(parsedModule.Package.Path, ""), r.operatingMode == EnvironmentModeRestrictive); err != nil {
 		return nil, err
 	}
 
@@ -165,15 +165,15 @@ func (r *Engine) Verify(ctx context.Context, policy *engine.Policy, input []byte
 	}
 
 	// Try the main rule first
-	if err := executeQuery(fmt.Sprintf("%v.%s\n", parsedModule.Package.Path, mainRule), r.operatingMode == EnvironmentModeRestrictive); err != nil {
+	if err := executeQuery(getRuleName(parsedModule.Package.Path, mainRule), r.operatingMode == EnvironmentModeRestrictive); err != nil {
 		return nil, err
 	}
 
 	// If res is nil, it means that the rule hasn't been found
 	// TODO: Remove when this deprecated rule is not used anymore
 	if res == nil {
 		// Try with the deprecated main rule
-		if err := executeQuery(fmt.Sprintf("%v.%s\n", parsedModule.Package.Path, deprecatedRule), r.operatingMode == EnvironmentModeRestrictive); err != nil {
+		if err := executeQuery(getRuleName(parsedModule.Package.Path, deprecatedRule), r.operatingMode == EnvironmentModeRestrictive); err != nil {
 			return nil, err
 		}
 
@@ -325,3 +325,10 @@ func regoResultSetToRawResults(res rego.ResultSet) map[string]interface{} {
 	}
 	return raw
 }
+
+func getRuleName(packagePath ast.Ref, rule string) string {
+	if rule == "" {
+		return fmt.Sprintf("%s\n", packagePath)
+	}
+	return fmt.Sprintf("%v.%s\n", packagePath, rule)
+}