Add more gitter test cases. Rename endpoints

Author: Ly-Joey

go/cmd/gitter/gitter.go

@@ -30,9 +30,9 @@ import (
 
 // API Endpoints
 var endpointHandlers = map[string]http.HandlerFunc{
-	"GET /repo":              gitHandler,
+	"GET /git":               gitHandler,
 	"POST /cache":            cacheHandler,
-	"POST /affected-commits": affectCommitsHandler,
+	"POST /affected-commits": affectedCommitsHandler,
 }
 
 const defaultGitterWorkDir = "/work/gitter"
@@ -72,15 +72,15 @@ func runCmd(ctx context.Context, dir string, env []string, name string, args ...
 	// Ensure it eventually dies if it ignores SIGINT
 	cmd.WaitDelay = shutdownTimeout / 2
 
-	out, err := cmd.Output()
+	out, err := cmd.CombinedOutput()
 	if err != nil {
 		if ctx.Err() != nil {
 			// Log separately if cancelled
 			logger.Warn("Command cancelled", slog.String("cmd", name), slog.Any("err", ctx.Err()))
 			return nil, fmt.Errorf("command %s cancelled: %w", name, ctx.Err())
 		}
 
-		return nil, fmt.Errorf("command %s failed, stdout: %s, stderr: %s", name, out, err)
+		return nil, fmt.Errorf("command %s failed: %w, output: %s", name, err, out)
 	}
 
 	return out, nil
@@ -388,12 +388,15 @@ func cacheHandler(w http.ResponseWriter, r *http.Request) {
 	logger.Info("Received request: /cache", slog.String("url", url))
 
 	// Fetch repo if it's not fresh
-	_, err, _ = gFetch.Do(url, func() (any, error) {
+	if _, err, _ := gFetch.Do(url, func() (any, error) {
 		return nil, fetchRepo(r.Context(), url)
-	})
-	if err != nil {
-		logger.Error("Failed to update repo", slog.String("url", url), slog.Any("error", err))
-		http.Error(w, fmt.Sprintf("Failed to update repo: %v", err), http.StatusInternalServerError)
+	}); err != nil {
+		logger.Error("Error fetching blob", slog.String("url", url), slog.Any("error", err))
+		if isAuthError(err) {
+			http.Error(w, fmt.Sprintf("Error fetching blob: %v", err), http.StatusForbidden)
+			return
+		}
+		http.Error(w, fmt.Sprintf("Error fetching blob: %v", err), http.StatusInternalServerError)
 		return
 	}
 
@@ -413,7 +416,7 @@ func cacheHandler(w http.ResponseWriter, r *http.Request) {
 	logger.Info("Request completed successfully: /cache", slog.String("url", url), slog.Duration("duration", time.Since(start)))
 }
 
-func affectCommitsHandler(w http.ResponseWriter, r *http.Request) {
+func affectedCommitsHandler(w http.ResponseWriter, r *http.Request) {
 	start := time.Now()
 	// POST requets body processing
 	var body struct {
@@ -468,8 +471,12 @@ func affectCommitsHandler(w http.ResponseWriter, r *http.Request) {
 	if _, err, _ := gFetch.Do(url, func() (any, error) {
 		return nil, fetchRepo(r.Context(), url)
 	}); err != nil {
-		logger.Error("Failed to update repo", slog.String("url", url), slog.Any("error", err))
-		http.Error(w, fmt.Sprintf("Failed to update repo: %v", err), http.StatusInternalServerError)
+		logger.Error("Error fetching blob", slog.String("url", url), slog.Any("error", err))
+		if isAuthError(err) {
+			http.Error(w, fmt.Sprintf("Error fetching blob: %v", err), http.StatusForbidden)
+			return
+		}
+		http.Error(w, fmt.Sprintf("Error fetching blob: %v", err), http.StatusInternalServerError)
 		return
 	}
 

go/cmd/gitter/gitter_test.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"bytes"
+	"encoding/json"
 	"errors"
 	"net/http"
 	"net/http/httptest"
@@ -62,7 +64,7 @@ func TestGitHandler_InvalidURL(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		req, err := http.NewRequest(http.MethodGet, "/getgit?url="+tt.url, nil)
+		req, err := http.NewRequest(http.MethodGet, "/git?url="+tt.url, nil)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -114,7 +116,7 @@ func TestGitHandler_Integration(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			req, err := http.NewRequest(http.MethodGet, "/getgit?url="+tt.url, nil)
+			req, err := http.NewRequest(http.MethodGet, "/git?url="+tt.url, nil)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -128,3 +130,142 @@ func TestGitHandler_Integration(t *testing.T) {
 		})
 	}
 }
+
+func TestCacheHandler(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test in short mode")
+	}
+
+	// Setup valid workdir
+	tmpDir := t.TempDir()
+
+	// Override global variables for test
+	// Note: In a real app we might want to dependency inject these,
+	// but for this simple script we modify package globals.
+	gitStorePath = tmpDir
+	fetchTimeout = time.Minute
+	// Ensure lastFetch map is initialized
+	if lastFetch == nil {
+		loadLastFetchMap()
+	}
+
+	tests := []struct {
+		name         string
+		url          string
+		expectedCode int
+	}{
+		{
+			name:         "Valid public repo",
+			url:          "https://github.com/google/oss-fuzz-vulns.git", // Small repo
+			expectedCode: http.StatusOK,
+		},
+		{
+			name:         "Non-existent repo",
+			url:          "https://github.com/google/this-repo-does-not-exist-12345.git",
+			expectedCode: http.StatusForbidden,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			body, _ := json.Marshal(map[string]string{"url": tt.url})
+			req, err := http.NewRequest(http.MethodPost, "/cache", bytes.NewBuffer(body))
+			if err != nil {
+				t.Fatal(err)
+			}
+			rr := httptest.NewRecorder()
+			cacheHandler(rr, req)
+
+			if status := rr.Code; status != tt.expectedCode {
+				t.Errorf("handler returned wrong status code: got %v want %v",
+					status, tt.expectedCode)
+			}
+		})
+	}
+}
+
+func TestAffectedCommitsHandler(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test in short mode")
+	}
+
+	// Setup valid workdir
+	tmpDir := t.TempDir()
+
+	// Override global variables for test
+	// Note: In a real app we might want to dependency inject these,
+	// but for this simple script we modify package globals.
+	gitStorePath = tmpDir
+	fetchTimeout = time.Minute
+	// Ensure lastFetch map is initialized
+	if lastFetch == nil {
+		loadLastFetchMap()
+	}
+
+	tests := []struct {
+		name         string
+		url          string
+		introduced   []string
+		fixed        []string
+		lastAffected []string
+		limit        []string
+		expectedCode int
+	}{
+		{
+			name:         "Valid range in public repo",
+			url:          "https://github.com/google/oss-fuzz-vulns.git",
+			introduced:   []string{"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},
+			fixed:        []string{"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"},
+			expectedCode: http.StatusOK,
+		},
+		{
+			name:         "Invalid mixed limit and fixed",
+			url:          "https://github.com/google/oss-fuzz-vulns.git",
+			fixed:        []string{"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},
+			limit:        []string{"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"},
+			expectedCode: http.StatusBadRequest,
+		},
+		{
+			name:         "Non-existent repo",
+			url:          "https://github.com/google/this-repo-does-not-exist-12345.git",
+			introduced:   []string{"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},
+			expectedCode: http.StatusForbidden,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var events []Event
+			for _, h := range tt.introduced {
+				events = append(events, Event{EventType: "introduced", Hash: h})
+			}
+			for _, h := range tt.fixed {
+				events = append(events, Event{EventType: "fixed", Hash: h})
+			}
+			for _, h := range tt.lastAffected {
+				events = append(events, Event{EventType: "last_affected", Hash: h})
+			}
+			for _, h := range tt.limit {
+				events = append(events, Event{EventType: "limit", Hash: h})
+			}
+
+			reqBody := map[string]interface{}{
+				"url":    tt.url,
+				"events": events,
+			}
+
+			body, _ := json.Marshal(reqBody)
+			req, err := http.NewRequest(http.MethodPost, "/affected-commits", bytes.NewBuffer(body))
+			if err != nil {
+				t.Fatal(err)
+			}
+			rr := httptest.NewRecorder()
+			affectedCommitsHandler(rr, req)
+
+			if status := rr.Code; status != tt.expectedCode {
+				t.Errorf("handler returned wrong status code: got %v want %v",
+					status, tt.expectedCode)
+			}
+		})
+	}
+}