diff --git a/pkg/github/actions.go b/pkg/github/actions.go index dc71ab5261..85161e4b9f 100644 --- a/pkg/github/actions.go +++ b/pkg/github/actions.go @@ -164,7 +164,11 @@ func downloadLogContent(ctx context.Context, logURL string, tailLines int, maxLi prof := profiler.New(nil, profiler.IsProfilingEnabled()) finish := prof.Start(ctx, "log_buffer_processing") - httpResp, err := http.Get(logURL) //nolint:gosec + request, err := http.NewRequestWithContext(ctx, http.MethodGet, logURL, nil) + if err != nil { + return "", 0, nil, fmt.Errorf("failed to create log download request: %w", err) + } + httpResp, err := http.DefaultClient.Do(request) //nolint:gosec if err != nil { return "", 0, httpResp, fmt.Errorf("failed to download logs: %w", err) } diff --git a/pkg/github/actions_log_cancellation_test.go b/pkg/github/actions_log_cancellation_test.go new file mode 100644 index 0000000000..bdbe0e7b01 --- /dev/null +++ b/pkg/github/actions_log_cancellation_test.go @@ -0,0 +1,90 @@ +package github + +import ( + "context" + "net/http" + "net/http/httptest" + "sync/atomic" + "testing" + "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestDownloadLogContentCancellation(t *testing.T) { + for _, stage := range []string{"before_request", "waiting_for_headers", "streaming_response"} { + t.Run(stage, func(t *testing.T) { + ctx, cancel := context.WithCancel(t.Context()) + defer cancel() + started := make(chan struct{}) + release := make(chan struct{}) + var requests atomic.Int32 + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + requests.Add(1) + if stage == "before_request" { + _, _ = w.Write([]byte("log line\n")) + return + } + if stage == "streaming_response" { + _, _ = w.Write([]byte("partial log line\n")) + w.(http.Flusher).Flush() + } + close(started) + select { + case <-r.Context().Done(): + case <-release: + } + })) + defer server.Close() + + if stage == "before_request" { + cancel() + } + done := make(chan error, 1) + completed := false + defer func() { + close(release) + if !completed { + <-done + } + }() + go func() { + _, _, _, err := downloadLogContent(ctx, server.URL, 10, 10) //nolint:bodyclose // downloadLogContent closes its response body. + done <- err + }() + if stage != "before_request" { + select { + case <-started: + case <-time.After(time.Second): + t.Fatal("log download did not reach the local server") + } + cancel() + } + select { + case err := <-done: + completed = true + if stage == "before_request" { + assert.Zero(t, requests.Load()) + } + require.Error(t, err) + assert.ErrorIs(t, err, context.Canceled) + case <-time.After(time.Second): + t.Error("log download did not stop after cancellation") + } + }) + } +} + +func TestDownloadLogContentUncanceled(t *testing.T) { + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { + _, _ = w.Write([]byte("first\nsecond\nthird\n")) + })) + defer server.Close() + content, totalLines, response, err := downloadLogContent(t.Context(), server.URL, 2, 10) //nolint:bodyclose // downloadLogContent closes its response body. + require.NoError(t, err) + require.NotNil(t, response) + assert.Equal(t, http.StatusOK, response.StatusCode) + assert.Equal(t, 3, totalLines) + assert.Equal(t, "second\nthird", content) +}