Skip to content

fix: use context.WithoutCancel for graceful shutdown (gosec G118) #3929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raphael merged 2 commits into from
May 27, 2026
+18 −18
Merged

fix: use context.WithoutCancel for graceful shutdown (gosec G118) #3929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e02517
fix: use context.WithoutCancel for graceful shutdown (gosec G118)
stakahashy May 25, 2026
1f8f588
Merge branch 'v3' into fix/shutdown-context-without-cancel
raphael May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions http/codegen/templates/server_end.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
log.Printf(ctx, "shutting down HTTP server at %q", u.Host)

{{ comment "Shutdown gracefully with a 30s timeout." }}
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
shutdownCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)
defer cancel()

err := srv.Shutdown(ctx)
err := srv.Shutdown(shutdownCtx)
if err != nil {
log.Printf(ctx, "failed to shutdown: %v", err)
log.Printf(shutdownCtx, "failed to shutdown: %v", err)
}
}()
}
6 changes: 3 additions & 3 deletions http/codegen/testdata/golden/server-no-server.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ func handleHTTPServer(ctx context.Context, u *url.URL, serviceEndpoints *service
log.Printf(ctx, "shutting down HTTP server at %q", u.Host)

// Shutdown gracefully with a 30s timeout.
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
shutdownCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)
defer cancel()

err := srv.Shutdown(ctx)
err := srv.Shutdown(shutdownCtx)
if err != nil {
log.Printf(ctx, "failed to shutdown: %v", err)
log.Printf(shutdownCtx, "failed to shutdown: %v", err)
}
}()
}
Expand Down
6 changes: 3 additions & 3 deletions http/codegen/testdata/golden/server-server-hosting-multiple-services.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ func handleHTTPServer(ctx context.Context, u *url.URL, serviceEndpoints *service
log.Printf(ctx, "shutting down HTTP server at %q", u.Host)

// Shutdown gracefully with a 30s timeout.
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
shutdownCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)
defer cancel()

err := srv.Shutdown(ctx)
err := srv.Shutdown(shutdownCtx)
if err != nil {
log.Printf(ctx, "failed to shutdown: %v", err)
log.Printf(shutdownCtx, "failed to shutdown: %v", err)
}
}()
}
Expand Down
6 changes: 3 additions & 3 deletions http/codegen/testdata/golden/server-server-hosting-service-subset.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ func handleHTTPServer(ctx context.Context, u *url.URL, serviceEndpoints *service
log.Printf(ctx, "shutting down HTTP server at %q", u.Host)

// Shutdown gracefully with a 30s timeout.
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
shutdownCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)
defer cancel()

err := srv.Shutdown(ctx)
err := srv.Shutdown(shutdownCtx)
if err != nil {
log.Printf(ctx, "failed to shutdown: %v", err)
log.Printf(shutdownCtx, "failed to shutdown: %v", err)
}
}()
}
Expand Down
6 changes: 3 additions & 3 deletions http/codegen/testdata/golden/server-server-hosting-service-with-file-server.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ func handleHTTPServer(ctx context.Context, u *url.URL, wg *sync.WaitGroup, errc
log.Printf(ctx, "shutting down HTTP server at %q", u.Host)

// Shutdown gracefully with a 30s timeout.
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
shutdownCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)
defer cancel()

err := srv.Shutdown(ctx)
err := srv.Shutdown(shutdownCtx)
if err != nil {
log.Printf(ctx, "failed to shutdown: %v", err)
log.Printf(shutdownCtx, "failed to shutdown: %v", err)
}
}()
}
Expand Down
6 changes: 3 additions & 3 deletions http/codegen/testdata/golden/server-streaming.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ func handleHTTPServer(ctx context.Context, u *url.URL, streamingServiceAEndpoint
log.Printf(ctx, "shutting down HTTP server at %q", u.Host)

// Shutdown gracefully with a 30s timeout.
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
shutdownCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)
defer cancel()

err := srv.Shutdown(ctx)
err := srv.Shutdown(shutdownCtx)
if err != nil {
log.Printf(ctx, "failed to shutdown: %v", err)
log.Printf(shutdownCtx, "failed to shutdown: %v", err)
}
}()
}
Expand Down
Loading