fix golang.org/x/net/context deprecation

chombium · chombium · commit e02835df3d2c · 2025-11-17T14:32:49.000+01:00
diff --git a/src/integration_tests/router/grpc_v1_streaming_log_test.go b/src/integration_tests/router/grpc_v1_streaming_log_test.go
@@ -1,6 +1,7 @@
 package router_test
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -10,8 +11,6 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
-	"golang.org/x/net/context"
 )
 
 var _ = Describe("GRPC Streaming Logs", func() {
diff --git a/src/integration_tests/router/v2_egress_test.go b/src/integration_tests/router/v2_egress_test.go
@@ -1,13 +1,13 @@
 package router_test
 
 import (
+	"context"
 	"fmt"
 	"time"
 
 	"code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2"
 	"code.cloudfoundry.org/loggregator-release/src/integration_tests/fakes"
 	"code.cloudfoundry.org/loggregator-release/src/testservers"
-	"golang.org/x/net/context"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/src/metricemitter/client_test.go b/src/metricemitter/client_test.go
@@ -1,13 +1,13 @@
 package metricemitter_test
 
 import (
+	"context"
 	"log"
 	"net"
 	"time"
 
 	"code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2"
 	"code.cloudfoundry.org/loggregator-release/src/metricemitter"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
diff --git a/src/plumbing/grpc_connector.go b/src/plumbing/grpc_connector.go
@@ -1,6 +1,7 @@
 package plumbing
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"sync"
@@ -11,8 +12,6 @@ import (
 	"code.cloudfoundry.org/loggregator-release/src/metricemitter"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-
-	"golang.org/x/net/context"
 )
 
 const (
diff --git a/src/plumbing/grpc_connector_test.go b/src/plumbing/grpc_connector_test.go
@@ -1,6 +1,7 @@
 package plumbing_test
 
 import (
+	"context"
 	"log"
 	"net"
 	"time"
@@ -13,7 +14,6 @@ import (
 
 	"code.cloudfoundry.org/loggregator-release/src/plumbing"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
 	. "github.com/onsi/ginkgo/v2"
diff --git a/src/plumbing/pool.go b/src/plumbing/pool.go
@@ -1,13 +1,13 @@
 package plumbing
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"log"
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 
diff --git a/src/plumbing/pool_test.go b/src/plumbing/pool_test.go
@@ -1,9 +1,10 @@
 package plumbing_test
 
 import (
+	"context"
+
 	"code.cloudfoundry.org/loggregator-release/src/plumbing"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
diff --git a/src/rlp/internal/egress/server.go b/src/rlp/internal/egress/server.go
@@ -1,6 +1,7 @@
 package egress
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"log"
@@ -12,8 +13,6 @@ import (
 	"code.cloudfoundry.org/loggregator-release/src/plumbing/batching"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-
-	"golang.org/x/net/context"
 )
 
 const (
diff --git a/src/rlp/internal/egress/server_test.go b/src/rlp/internal/egress/server_test.go
@@ -1,11 +1,11 @@
 package egress_test
 
 import (
+	"context"
 	"errors"
 	"io"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/src/rlp/internal/ingress/grpc_connector.go b/src/rlp/internal/ingress/grpc_connector.go
@@ -1,6 +1,7 @@
 package ingress
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"sync"
@@ -11,7 +12,6 @@ import (
 	"code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2"
 	"code.cloudfoundry.org/loggregator-release/src/metricemitter"
 	"code.cloudfoundry.org/loggregator-release/src/plumbing"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
diff --git a/src/rlp/internal/ingress/grpc_connector_test.go b/src/rlp/internal/ingress/grpc_connector_test.go
@@ -1,6 +1,7 @@
 package ingress_test
 
 import (
+	"context"
 	"log"
 	"net"
 
@@ -9,7 +10,6 @@ import (
 	"code.cloudfoundry.org/loggregator-release/src/plumbing"
 	"code.cloudfoundry.org/loggregator-release/src/rlp/internal/ingress"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials/insecure"
diff --git a/src/rlp/internal/ingress/pool.go b/src/rlp/internal/ingress/pool.go
@@ -1,6 +1,7 @@
 package ingress
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"log"
@@ -11,7 +12,6 @@ import (
 	"unsafe"
 
 	"code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 
diff --git a/src/rlp/internal/ingress/pool_test.go b/src/rlp/internal/ingress/pool_test.go
@@ -1,10 +1,11 @@
 package ingress_test
 
 import (
+	"context"
+
 	"code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2"
 	"code.cloudfoundry.org/loggregator-release/src/rlp/internal/ingress"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
diff --git a/src/router/internal/server/v1/doppler_server.go b/src/router/internal/server/v1/doppler_server.go
@@ -1,6 +1,7 @@
 package v1
 
 import (
+	"context"
 	"log"
 	"sync/atomic"
 	"time"
@@ -10,7 +11,6 @@ import (
 	"code.cloudfoundry.org/loggregator-release/src/diodes"
 	"code.cloudfoundry.org/loggregator-release/src/metricemitter"
 	"code.cloudfoundry.org/loggregator-release/src/plumbing"
-	"golang.org/x/net/context"
 )
 
 // Registrar registers stream and firehose DataSetters to accept reads.
diff --git a/src/router/internal/server/v1/doppler_server_test.go b/src/router/internal/server/v1/doppler_server_test.go
@@ -1,6 +1,7 @@
 package v1_test
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"net"
@@ -11,7 +12,6 @@ import (
 	"code.cloudfoundry.org/loggregator-release/src/metricemitter/testhelper"
 	"code.cloudfoundry.org/loggregator-release/src/plumbing"
 	v1 "code.cloudfoundry.org/loggregator-release/src/router/internal/server/v1"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/protobuf/proto"
diff --git a/src/router/internal/server/v2/egress_server_test.go b/src/router/internal/server/v2/egress_server_test.go
@@ -1,6 +1,7 @@
 package v2_test
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"sync"
@@ -12,7 +13,6 @@ import (
 	v2 "code.cloudfoundry.org/loggregator-release/src/router/internal/server/v2"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 
diff --git a/src/router/internal/server/v2/ingress_server.go b/src/router/internal/server/v2/ingress_server.go
@@ -1,11 +1,12 @@
 package v2
 
 import (
+	"context"
+
 	"code.cloudfoundry.org/go-loggregator/v10/conversion"
 	"code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2"
 	"code.cloudfoundry.org/loggregator-release/src/diodes"
 	"code.cloudfoundry.org/loggregator-release/src/metricemitter"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
diff --git a/src/trafficcontroller/internal/proxy/doppler_proxy.go b/src/trafficcontroller/internal/proxy/doppler_proxy.go
@@ -1,6 +1,7 @@
 package proxy
 
 import (
+	"context"
 	"net/http"
 	"net/url"
 	"time"
@@ -10,7 +11,6 @@ import (
 	"code.cloudfoundry.org/loggregator-release/src/trafficcontroller/internal/auth"
 
 	"github.com/gorilla/mux"
-	"golang.org/x/net/context"
 )
 
 var MetricsInterval = 15 * time.Second
diff --git a/src/trafficcontroller/internal/proxy/firehose_handler_test.go b/src/trafficcontroller/internal/proxy/firehose_handler_test.go
@@ -1,6 +1,7 @@
 package proxy_test
 
 import (
+	"context"
 	"errors"
 	"net/http"
 	"net/http/httptest"
@@ -12,8 +13,6 @@ import (
 
 	"code.cloudfoundry.org/loggregator-release/src/trafficcontroller/internal/proxy"
 
-	"golang.org/x/net/context"
-
 	"github.com/gorilla/websocket"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -39,6 +38,9 @@ var _ = Describe("FirehoseHandler", func() {
 	})
 
 	It("connects to doppler servers with correct parameters", func() {
+		type ctxKey string
+		const subIDKey ctxKey = "subID"
+
 		handler := proxy.NewDopplerProxy(
 			auth.Authorize,
 			adminAuth.Authorize,
@@ -52,7 +54,7 @@ var _ = Describe("FirehoseHandler", func() {
 		req.Header.Add("Authorization", "token")
 
 		handler.ServeHTTP(recorder, req.WithContext(
-			context.WithValue(req.Context(), "subID", "abc-123")),
+			context.WithValue(req.Context(), subIDKey, "abc-123")),
 		)
 
 		Expect(connector.subscriptions.request).To(Equal(&plumbing.SubscriptionRequest{
diff --git a/src/trafficcontroller/internal/proxy/helheim_test.go b/src/trafficcontroller/internal/proxy/helheim_test.go
@@ -6,8 +6,9 @@
 package proxy_test
 
 import (
+	"context"
+
 	"code.cloudfoundry.org/loggregator-release/src/plumbing"
-	"golang.org/x/net/context"
 )
 
 type mockReceiver struct {
diff --git a/src/trafficcontroller/internal/proxy/proxy_suite_test.go b/src/trafficcontroller/internal/proxy/proxy_suite_test.go
@@ -1,6 +1,7 @@
 package proxy_test
 
 import (
+	"context"
 	"errors"
 	"log"
 	"net/http"
@@ -12,7 +13,6 @@ import (
 	"code.cloudfoundry.org/loggregator-release/src/plumbing"
 	"code.cloudfoundry.org/loggregator-release/src/trafficcontroller/internal/proxy"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/grpclog"
 
 	. "github.com/onsi/ginkgo/v2"
diff --git a/src/vendor/golang.org/x/net/context/context.go b/src/vendor/golang.org/x/net/context/context.go
diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
