Make changes to support testing individual commands, add a few tests

.github/workflows/lint.yml

@@ -2,19 +2,27 @@ name: "go-linter"
 
 on:
   pull_request:
+    types: [opened, synchronize, reopened]
   merge_group:
   workflow_dispatch:
+  push:
+    branches:
+      - 'main'
 
 permissions:
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     strategy:
       fail-fast: false
-    runs-on: ubuntu-latest-xl
+    runs-on: ubuntu-latest
     env:
-      GOPROXY: https://goproxy.githubapp.com/mod,https://proxy.golang.org/,direct
+      GOPROXY: https://proxy.golang.org/,direct
       GOPRIVATE: ""
       GONOPROXY: ""
       GONOSUMDB: github.com/github/*
@@ -24,9 +32,6 @@ jobs:
           go-version: ${{ vars.GOVERSION }}
           check-latest: true
       - uses: actions/checkout@v4
-      - name: Configure Go private module access
-        run: |
-          echo "machine goproxy.githubapp.com login nobody password ${{ secrets.GOPROXY_TOKEN }}" >> $HOME/.netrc
       - name: Lint
         # This also does checkout, setup-go, and proxy setup.
         uses: github/go-linter@v1.2.1

.github/workflows/test.yml

@@ -0,0 +1,46 @@
+name: "Build and test"
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+  workflow_dispatch:
+  merge_group:
+  push:
+    branches:
+      - 'main'
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      GOPROXY: https://proxy.golang.org/,direct
+      GOPRIVATE: ""
+      GONOPROXY: ""
+      GONOSUMDB: github.com/github/*
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: ${{ vars.GOVERSION }}
+          check-latest: true
+      - name: Verify go.sum is up to date
+        run: |
+          go mod tidy
+          git diff --exit-code go.sum
+          if [ $? -ne 0 ]; then
+            echo "Error: go.sum has changed, please run `go mod tidy` and commit the result"
+            exit 1
+          fi
+
+      - name: Build program
+        run: go build -v ./...
+
+      - name: Run tests
+        run: go test -race -cover ./...

cmd/list/list.go

@@ -4,12 +4,10 @@ package list
 import (
 	"fmt"
 
-	"github.com/cli/go-gh/v2/pkg/auth"
 	"github.com/cli/go-gh/v2/pkg/tableprinter"
-	"github.com/cli/go-gh/v2/pkg/term"
 	"github.com/github/gh-models/internal/azuremodels"
 	"github.com/github/gh-models/internal/ux"
-	"github.com/github/gh-models/pkg/util"
+	"github.com/github/gh-models/pkg/command"
 	"github.com/mgutz/ansi"
 	"github.com/spf13/cobra"
 )
@@ -19,24 +17,14 @@ var (
 )
 
 // NewListCommand returns a new command to list available GitHub models.
-func NewListCommand() *cobra.Command {
+func NewListCommand(cfg *command.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "list",
 		Short: "List available models",
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			terminal := term.FromEnv()
-			out := terminal.Out()
-
-			token, _ := auth.TokenForHost("github.com")
-			if token == "" {
-				util.WriteToOut(out, "No GitHub token found. Please run 'gh auth login' to authenticate.\n")
-				return nil
-			}
-
-			client := azuremodels.NewClient(token)
 			ctx := cmd.Context()
-
+			client := cfg.Client
 			models, err := client.ListModels(ctx)
 			if err != nil {
 				return err
@@ -47,16 +35,13 @@ func NewListCommand() *cobra.Command {
 			models = filterToChatModels(models)
 			ux.SortModels(models)
 
-			isTTY := terminal.IsTerminalOutput()
-
-			if isTTY {
-				util.WriteToOut(out, "\n")
-				util.WriteToOut(out, fmt.Sprintf("Showing %d available chat models\n", len(models)))
-				util.WriteToOut(out, "\n")
+			if cfg.IsTerminalOutput {
+				cfg.WriteToOut("\n")
+				cfg.WriteToOut(fmt.Sprintf("Showing %d available chat models\n", len(models)))
+				cfg.WriteToOut("\n")
 			}
 
-			width, _, _ := terminal.Size()
-			printer := tableprinter.New(out, isTTY, width)
+			printer := cfg.NewTablePrinter()
 
 			printer.AddHeader([]string{"DISPLAY NAME", "MODEL NAME"}, tableprinter.WithColor(lightGrayUnderline))
 			printer.EndRow()

cmd/list/list_test.go

@@ -0,0 +1,46 @@
+package list
+
+import (
+	"bytes"
+	"context"
+	"testing"
+
+	"github.com/github/gh-models/internal/azuremodels"
+	"github.com/github/gh-models/pkg/command"
+	"github.com/stretchr/testify/require"
+)
+
+func TestList(t *testing.T) {
+	t.Run("NewListCommand happy path", func(t *testing.T) {
+		client := azuremodels.NewMockClient()
+		modelSummary := &azuremodels.ModelSummary{
+			ID:           "test-id-1",
+			Name:         "test-model-1",
+			FriendlyName: "Test Model 1",
+			Task:         "chat-completion",
+			Publisher:    "OpenAI",
+			Summary:      "This is a test model",
+			Version:      "1.0",
+			RegistryName: "azure-openai",
+		}
+		listModelsCallCount := 0
+		client.MockListModels = func(ctx context.Context) ([]*azuremodels.ModelSummary, error) {
+			listModelsCallCount++
+			return []*azuremodels.ModelSummary{modelSummary}, nil
+		}
+		buf := new(bytes.Buffer)
+		cfg := command.NewConfig(buf, buf, client, true, 80)
+		listCmd := NewListCommand(cfg)
+
+		_, err := listCmd.ExecuteC()
+
+		require.NoError(t, err)
+		require.Equal(t, 1, listModelsCallCount)
+		output := buf.String()
+		require.Contains(t, output, "Showing 1 available chat models")
+		require.Contains(t, output, "DISPLAY NAME")
+		require.Contains(t, output, "MODEL NAME")
+		require.Contains(t, output, modelSummary.FriendlyName)
+		require.Contains(t, output, modelSummary.Name)
+	})
+}

cmd/root.go

@@ -4,9 +4,14 @@ package cmd
 import (
 	"strings"
 
+	"github.com/cli/go-gh/v2/pkg/auth"
+	"github.com/cli/go-gh/v2/pkg/term"
 	"github.com/github/gh-models/cmd/list"
 	"github.com/github/gh-models/cmd/run"
 	"github.com/github/gh-models/cmd/view"
+	"github.com/github/gh-models/internal/azuremodels"
+	"github.com/github/gh-models/pkg/command"
+	"github.com/github/gh-models/pkg/util"
 	"github.com/spf13/cobra"
 )
 
@@ -17,9 +22,24 @@ func NewRootCommand() *cobra.Command {
 		Short: "GitHub Models extension",
 	}
 
-	cmd.AddCommand(list.NewListCommand())
-	cmd.AddCommand(run.NewRunCommand())
-	cmd.AddCommand(view.NewViewCommand())
+	terminal := term.FromEnv()
+	out := terminal.Out()
+	token, _ := auth.TokenForHost("github.com")
+
+	var client azuremodels.Client
+
+	if token == "" {
+		util.WriteToOut(out, "No GitHub token found. Please run 'gh auth login' to authenticate.\n")
+		client = azuremodels.NewUnauthenticatedClient()
+	} else {
+		client = azuremodels.NewAzureClient(token)
+	}
+
+	cfg := command.NewConfigWithTerminal(terminal, client)
+
+	cmd.AddCommand(list.NewListCommand(cfg))
+	cmd.AddCommand(run.NewRunCommand(cfg))
+	cmd.AddCommand(view.NewViewCommand(cfg))
 
 	// Cobra doesn't have a way to specify a two word command (ie. "gh models"), so set a custom usage template
 	// with `gh`` in it. Cobra will use this template for the root and all child commands.