Fixed static check failures

Author: bhanurp

buildtools/cli.go

@@ -456,12 +456,10 @@ func GetCommands() []cli.Command {
 // so we can capture user-provided flags consistently in one place for all build commands.
 func decorateWithFlagCapture(cmds []cli.Command) []cli.Command {
 	for i := range cmds {
-		name := cmds[i].Name
-		aliases := append([]string(nil), cmds[i].Aliases...)
 		skipFlagParsing := cmds[i].SkipFlagParsing
 		origBefore := cmds[i].Before
 		cmds[i].Before = func(c *cli.Context) error {
-			captureUserFlagsForMetrics(c, name, aliases, skipFlagParsing)
+			captureUserFlagsForMetrics(c, skipFlagParsing)
 			if origBefore != nil {
 				return origBefore(c)
 			}
@@ -473,7 +471,7 @@ func decorateWithFlagCapture(cmds []cli.Command) []cli.Command {
 
 // captureUserFlagsForMetrics extracts flag names as provided by the end-user for the given command
 // and records them for usage metrics. Works even when SkipFlagParsing is true by scanning os.Args.
-func captureUserFlagsForMetrics(c *cli.Context, cmdName string, aliases []string, skipFlagParsing bool) {
+func captureUserFlagsForMetrics(c *cli.Context, skipFlagParsing bool) {
 	flagSet := map[string]struct{}{}
 
 	if !skipFlagParsing {
@@ -513,15 +511,6 @@ func captureUserFlagsForMetrics(c *cli.Context, cmdName string, aliases []string
 	commands.SetContextFlags(flags)
 }
 
-func containsString(list []string, target string) bool {
-	for _, s := range list {
-		if s == target {
-			return true
-		}
-	}
-	return false
-}
-
 func MvnCmd(c *cli.Context) (err error) {
 	if show, err := cliutils.ShowCmdHelpIfNeeded(c, c.Args()); show || err != nil {
 		return err

metrics_visibility_test.go

@@ -6,8 +6,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"os"
-	"sort"
-	"strings"
 	"testing"
 	"time"
 
@@ -79,18 +77,6 @@ func startVisMockServer(t *testing.T) (*httptest.Server, chan visReq) {
 	return srv, ch
 }
 
-func sortCSV(csv string) string {
-	if csv == "" {
-		return ""
-	}
-	parts := strings.Split(csv, ",")
-	for i := range parts {
-		parts[i] = strings.TrimSpace(parts[i])
-	}
-	sort.Strings(parts)
-	return strings.Join(parts, ",")
-}
-
 func TestVisibilitySendUsage_RtCurl_E2E(t *testing.T) {
 	srv, ch := startMockServer(t)
 	defer srv.Close()
@@ -187,8 +173,9 @@ func TestVisibilitySendUsage_RtPing_Flags(t *testing.T) {
 	}
 
 	// Run ping with a flag to assert capture
-	if err := jf.Exec("rt", "ping", "--server-id", "mock"); err != nil {
-		// ping may fail in some contexts; metrics should still be sent
+	err := jf.Exec("rt", "ping", "--server-id", "mock")
+	if err != nil {
+		t.Logf("jf exec failed: %v", err)
 	}
 
 	// Assert metric was posted with expected flags
@@ -260,7 +247,12 @@ func TestVisibility_GoBuild_Flags(t *testing.T) {
 		t.Fatalf("write go.yaml: %v", err)
 	}
 	cwd, _ := os.Getwd()
-	defer os.Chdir(cwd)
+	defer func(dir string) {
+		err := os.Chdir(dir)
+		if err != nil {
+			t.Fatalf("Failed to restore working directory: %v", err)
+		}
+	}(cwd)
 	_ = os.Chdir(projDir)
 
 	// Run a buildtools command (go build) with flags; ignore execution error