Merge branch 'main' into bug/AST-73370

Author: cx-celso-silva

.github/workflows/release.yml

@@ -146,4 +146,5 @@ jobs:
       cli_release_version: ""
       release_author: "Phoenix Team"
       release_url: https://github.com/Checkmarx/ast-cli/releases/tag/${{ inputs.tag }}
+      jira_product_name: ASTCLI_${{ inputs.tag }}
     secrets: inherit

internal/commands/result.go

@@ -2237,21 +2237,25 @@ func findRule(ruleIds map[interface{}]bool, result *wrappers.ScanResult) *wrappe
 }
 
 func findRuleID(result *wrappers.ScanResult) (ruleID, ruleName, shortMessage string) {
+	caser := cases.Title(language.English)
+
 	if result.ScanResultData.QueryID == nil && result.ScanResultData.RuleID == nil {
 		return fmt.Sprintf("%s (%s)", result.ID, result.Type),
-			strings.Title(strings.ToLower(strings.ReplaceAll(result.ID, "-", ""))),
+			caser.String(strings.ToLower(strings.ReplaceAll(result.ID, "-", ""))),
 			fmt.Sprintf("%s (%s)", result.ScanResultData.PackageIdentifier, result.ID)
 	}
 
 	if result.ScanResultData.RuleID != nil {
-		return fmt.Sprintf("%s (%s)", *result.ScanResultData.RuleID, result.Type),
-			result.ScanResultData.RuleName,
-			result.ScanResultData.RuleName
+		ruleName = strings.ReplaceAll(result.ScanResultData.RuleName, "_", " ")
+		return fmt.Sprintf("%s - %s (%s)", ruleName, *result.ScanResultData.RuleID, result.Type),
+			ruleName,
+			ruleName
 	}
 
-	return fmt.Sprintf("%v (%s)", result.ScanResultData.QueryID, result.Type),
-		strings.ReplaceAll(result.ScanResultData.QueryName, "_", " "),
-		strings.ReplaceAll(result.ScanResultData.QueryName, "_", " ")
+	ruleName = strings.ReplaceAll(result.ScanResultData.QueryName, "_", " ")
+	return fmt.Sprintf("%v - %s (%s)", ruleName, result.ScanResultData.QueryID, result.Type),
+		ruleName,
+		ruleName
 }
 
 func findFullDescription(result *wrappers.ScanResult) wrappers.SarifDescription {