Fixing linter errors

Author: scalvert

cmd/openapi_spec.go

@@ -76,7 +76,7 @@ func newOpenapiSpecCmd() *cobra.Command {
 			}
 
 			if outputFile != "" {
-				if err := os.WriteFile(outputFile, []byte(spec), 0644); err != nil {
+				if err := os.WriteFile(outputFile, []byte(spec), 0600); err != nil {
 					return fmt.Errorf("failed to write output file: %w", err)
 				}
 				fmt.Fprintf(cmd.OutOrStdout(), "OpenAPI spec written to %s\n", outputFile)

cmd/openapi_spec_test.go

@@ -14,8 +14,8 @@ import (
 )
 
 type mockClient struct {
-	response []byte
 	err      error
+	response []byte
 }
 
 func (m *mockClient) SendRequest(req *http.Request) ([]byte, error) {
@@ -67,6 +67,15 @@ type fragment struct {
 	Text string `json:"text"`
 }
 
+type testCase struct {
+	setupFiles  map[string]string
+	name        string
+	wantOutput  string
+	errContains string
+	args        []string
+	wantErr     bool
+}
+
 func TestOpenapiSpecCmd(t *testing.T) {
 	cleanup := setupTestConfig(t)
 	defer cleanup()
@@ -90,15 +99,7 @@ func TestOpenapiSpecCmd(t *testing.T) {
 	successRespBytes, err := json.Marshal(successResp)
 	require.NoError(t, err)
 
-	tests := []struct {
-		name        string
-		args        []string
-		input       string
-		setupFiles  map[string]string
-		wantErr     bool
-		errContains string
-		wantOutput  string
-	}{
+	tests := []testCase{
 		{
 			name:        "no input provided",
 			args:        []string{},

glean

@@ -10,12 +10,12 @@ import (
 )
 
 type chatRequest struct {
-	Messages    []message `json:"messages"`
-	Stream      bool      `json:"stream"`
 	AgentConfig struct {
 		Agent string `json:"agent"`
 		Mode  string `json:"mode"`
 	} `json:"agentConfig"`
+	Messages []message `json:"messages"`
+	Stream   bool      `json:"stream"`
 }
 
 type message struct {

pkg/llm/openapi.go

@@ -13,8 +13,8 @@ import (
 )
 
 type mockClient struct {
-	response []byte
 	err      error
+	response []byte
 }
 
 func (m *mockClient) SendRequest(req *gleanhttp.Request) ([]byte, error) {
@@ -62,6 +62,18 @@ func setupTestConfig(t *testing.T) func() {
 	}
 }
 
+//nolint:govet // Ignoring fieldalignment as it's just an optimization
+type testCase struct {
+	mockResp    []byte
+	mockErr     error
+	name        string
+	input       string
+	prompt      string
+	model       string
+	errContains string
+	wantErr     bool
+}
+
 func TestGenerateOpenAPISpec(t *testing.T) {
 	cleanup := setupTestConfig(t)
 	defer cleanup()
@@ -85,16 +97,7 @@ func TestGenerateOpenAPISpec(t *testing.T) {
 	successRespBytes, err := json.Marshal(successResp)
 	require.NoError(t, err)
 
-	tests := []struct {
-		name        string
-		input       string
-		prompt      string
-		model       string
-		mockResp    []byte
-		mockErr     error
-		wantErr     bool
-		errContains string
-	}{
+	tests := []testCase{
 		{
 			name:        "empty input",
 			input:       "",

pkg/llm/openapi_test.go

@@ -15,10 +15,15 @@ import (
 	"golang.org/x/term"
 )
 
+const (
+	FormatJSON = "json"
+	FormatYAML = "yaml"
+)
+
 // Options represents configuration for output formatting
 type Options struct {
+	Format  string
 	NoColor bool
-	Format  string // json, yaml, etc.
 }
 
 // Write formats and writes the content to the writer with optional syntax highlighting
@@ -41,7 +46,7 @@ func shouldColorize(opts Options) bool {
 
 func writeRaw(w io.Writer, content []byte, format string) error {
 	switch format {
-	case "json":
+	case FormatJSON:
 		var prettyJSON bytes.Buffer
 		if err := json.Indent(&prettyJSON, content, "", "  "); err != nil {
 			return fmt.Errorf("failed to format JSON: %w", err)
@@ -57,7 +62,7 @@ func writeRaw(w io.Writer, content []byte, format string) error {
 func writeColorized(w io.Writer, content []byte, format string) error {
 	var lexer chroma.Lexer
 	switch format {
-	case "json":
+	case FormatJSON:
 		lexer = lexers.Get("json")
 	case "yaml":
 		lexer = lexers.Get("yaml")