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

stakahashy · raphael · web-flow · commit 0c5fa350afd9 · 2026-05-27T14:57:42.000-07:00
Co-authored-by: Raphael Simon &lt;simon.raphael@gmail.com&gt;
diff --git a/http/codegen/templates/server_end.go.tpl b/http/codegen/templates/server_end.go.tpl
@@ -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)
 		}
 	}()
 }
diff --git a/http/codegen/testdata/golden/server-no-server.golden b/http/codegen/testdata/golden/server-no-server.golden
@@ -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)
 		}
 	}()
 }
diff --git a/http/codegen/testdata/golden/server-server-hosting-multiple-services.golden b/http/codegen/testdata/golden/server-server-hosting-multiple-services.golden
@@ -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)
 		}
 	}()
 }
diff --git a/http/codegen/testdata/golden/server-server-hosting-service-subset.golden b/http/codegen/testdata/golden/server-server-hosting-service-subset.golden
@@ -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)
 		}
 	}()
 }
diff --git a/http/codegen/testdata/golden/server-server-hosting-service-with-file-server.golden b/http/codegen/testdata/golden/server-server-hosting-service-with-file-server.golden
@@ -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)
 		}
 	}()
 }
diff --git a/http/codegen/testdata/golden/server-streaming.golden b/http/codegen/testdata/golden/server-streaming.golden
@@ -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)
 		}
 	}()
 }

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@`
`23`	`23`	`log.Printf(ctx, "shutting down HTTP server at %q", u.Host)`
`24`	`24`
`25`	`25`	`{{ comment "Shutdown gracefully with a 30s timeout." }}`
`26`		`- ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)`
	`26`	`+ shutdownCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)`
`27`	`27`	`defer cancel()`
`28`	`28`
`29`		`- err := srv.Shutdown(ctx)`
	`29`	`+ err := srv.Shutdown(shutdownCtx)`
`30`	`30`	`if err != nil {`
`31`		`- log.Printf(ctx, "failed to shutdown: %v", err)`
	`31`	`+ log.Printf(shutdownCtx, "failed to shutdown: %v", err)`
`32`	`32`	`}`
`33`	`33`	`}()`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,12 +67,12 @@ func handleHTTPServer(ctx context.Context, u url.URL, serviceEndpoints service`
`67`	`67`	`log.Printf(ctx, "shutting down HTTP server at %q", u.Host)`
`68`	`68`
`69`	`69`	`// Shutdown gracefully with a 30s timeout.`
`70`		`- ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)`
	`70`	`+ shutdownCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)`
`71`	`71`	`defer cancel()`
`72`	`72`
`73`		`- err := srv.Shutdown(ctx)`
	`73`	`+ err := srv.Shutdown(shutdownCtx)`
`74`	`74`	`if err != nil {`
`75`		`- log.Printf(ctx, "failed to shutdown: %v", err)`
	`75`	`+ log.Printf(shutdownCtx, "failed to shutdown: %v", err)`
`76`	`76`	`}`
`77`	`77`	`}()`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,12 @@ func handleHTTPServer(ctx context.Context, u url.URL, serviceEndpoints service`
`73`	`73`	`log.Printf(ctx, "shutting down HTTP server at %q", u.Host)`
`74`	`74`
`75`	`75`	`// Shutdown gracefully with a 30s timeout.`
`76`		`- ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)`
	`76`	`+ shutdownCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)`
`77`	`77`	`defer cancel()`
`78`	`78`
`79`		`- err := srv.Shutdown(ctx)`
	`79`	`+ err := srv.Shutdown(shutdownCtx)`
`80`	`80`	`if err != nil {`
`81`		`- log.Printf(ctx, "failed to shutdown: %v", err)`
	`81`	`+ log.Printf(shutdownCtx, "failed to shutdown: %v", err)`
`82`	`82`	`}`
`83`	`83`	`}()`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,12 +74,12 @@ func handleHTTPServer(ctx context.Context, u *url.URL, streamingServiceAEndpoint`
`74`	`74`	`log.Printf(ctx, "shutting down HTTP server at %q", u.Host)`
`75`	`75`
`76`	`76`	`// Shutdown gracefully with a 30s timeout.`
`77`		`- ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)`
	`77`	`+ shutdownCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)`
`78`	`78`	`defer cancel()`
`79`	`79`
`80`		`- err := srv.Shutdown(ctx)`
	`80`	`+ err := srv.Shutdown(shutdownCtx)`
`81`	`81`	`if err != nil {`
`82`		`- log.Printf(ctx, "failed to shutdown: %v", err)`
	`82`	`+ log.Printf(shutdownCtx, "failed to shutdown: %v", err)`
`83`	`83`	`}`
`84`	`84`	`}()`
`85`	`85`	`}`