fix(template): correct check of old sarif template files (aquasecurit…

…y#2003)
BenjaminHerbert · Apr 16, 2022 · 407f3b6 · 407f3b6
1 parent a0047a7
commit 407f3b6
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/pkg/report/writer.go b/pkg/report/writer.go
@@ -2,7 +2,6 @@ package report
 
 import (
 	"io"
-	"path/filepath"
 	"strings"
 	"sync"
 	"time"
@@ -53,7 +52,7 @@ func Write(report types.Report, option Option) error {
 		writer = cyclonedx.NewWriter(option.Output, option.AppVersion)
 	case "template":
 		// We keep `sarif.tpl` template working for backward compatibility for a while.
-		if strings.HasPrefix(option.OutputTemplate, "@") && filepath.Base(option.OutputTemplate) == "sarif.tpl" {
+		if strings.HasPrefix(option.OutputTemplate, "@") && strings.HasSuffix(option.OutputTemplate, "sarif.tpl") {
 			log.Logger.Warn("Using `--template sarif.tpl` is deprecated. Please migrate to `--format sarif`. See https://github.com/aquasecurity/trivy/discussions/1571")
 			writer = SarifWriter{Output: option.Output, Version: option.AppVersion}
 			break