diff --git a/go.mod b/go.mod index a823a099f..389b40c34 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( code.cloudfoundry.org/archiver v0.0.0-20230220125704-e06c77649d28 code.cloudfoundry.org/go-log-cache/v2 v2.0.3 - code.cloudfoundry.org/go-loggregator/v9 v9.0.7 + code.cloudfoundry.org/go-loggregator/v9 v9.0.8 code.cloudfoundry.org/tlsconfig v0.0.0-20220621140725-0e6fbd869921 github.com/cloudfoundry/cf-test-helpers/v2 v2.7.0 github.com/cloudfoundry/noaa/v2 v2.3.0 @@ -38,7 +38,7 @@ require ( github.com/square/certstrap v1.2.0 // indirect github.com/ulikunitz/xz v0.5.10 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect - golang.org/x/net v0.14.0 // indirect + golang.org/x/net v0.15.0 // indirect golang.org/x/sys v0.12.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/tools v0.12.0 // indirect diff --git a/go.sum b/go.sum index 18a603aee..3322acfb6 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,8 @@ code.cloudfoundry.org/go-diodes v0.0.0-20220325013804-800fb6f70e2f h1:BMwVyadJ0d code.cloudfoundry.org/go-diodes v0.0.0-20220325013804-800fb6f70e2f/go.mod h1:cCrRt/O3uipyXfV4hZsKe5WyRNgFTgiMHnwAQqFlNjM= code.cloudfoundry.org/go-log-cache/v2 v2.0.3 h1:oeklZRM0lJhbegkqS3eyKvS2996I02FR8h6pCyyR72s= code.cloudfoundry.org/go-log-cache/v2 v2.0.3/go.mod h1:I4LDSjGRYAR2EqC/T/H3UeJ1qdA1TcPcDjtVUhIE+VY= -code.cloudfoundry.org/go-loggregator/v9 v9.0.7 h1:vM351mliuq6Olxarar6BYFqVPYR8D5SmomD2SZA9fUY= -code.cloudfoundry.org/go-loggregator/v9 v9.0.7/go.mod h1:THyXb1L629OSRLh73ER7SwaRV1OPmWgh0TFgmTsgJMk= +code.cloudfoundry.org/go-loggregator/v9 v9.0.8 h1:Ntt6dubOuV2Rk2Yw0C2OOvaGjZNWSKJoWM72ihTaPo4= +code.cloudfoundry.org/go-loggregator/v9 v9.0.8/go.mod h1:+U07+rozDh39Wd0MmS5Bd9mn/gOwg8NLqv3gnxRvuHI= code.cloudfoundry.org/tlsconfig v0.0.0-20220621140725-0e6fbd869921 h1:1PLAuQR56K2pw0lnlcXe+37uOaGg939W1Lqv8wxYpu4= code.cloudfoundry.org/tlsconfig v0.0.0-20220621140725-0e6fbd869921/go.mod h1:oItDsgL/IixCV1BTTY9XqyhGojI5wyEgyPcBwXfKbvs= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -128,8 +128,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/egress.pb.go b/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/egress.pb.go index 13b5ed7d6..a1ec073b7 100644 --- a/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/egress.pb.go +++ b/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/egress.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.21.12 +// protoc-gen-go v1.31.0 +// protoc v4.24.2 // source: loggregator-api/v2/egress.proto package loggregator_v2 diff --git a/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/egress_grpc.pb.go b/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/egress_grpc.pb.go index 137e783d6..b2d3b4113 100644 --- a/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/egress_grpc.pb.go +++ b/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/egress_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v4.24.2 // source: loggregator-api/v2/egress.proto package loggregator_v2 @@ -18,6 +18,11 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + Egress_Receiver_FullMethodName = "/loggregator.v2.Egress/Receiver" + Egress_BatchedReceiver_FullMethodName = "/loggregator.v2.Egress/BatchedReceiver" +) + // EgressClient is the client API for Egress service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -35,7 +40,7 @@ func NewEgressClient(cc grpc.ClientConnInterface) EgressClient { } func (c *egressClient) Receiver(ctx context.Context, in *EgressRequest, opts ...grpc.CallOption) (Egress_ReceiverClient, error) { - stream, err := c.cc.NewStream(ctx, &Egress_ServiceDesc.Streams[0], "/loggregator.v2.Egress/Receiver", opts...) + stream, err := c.cc.NewStream(ctx, &Egress_ServiceDesc.Streams[0], Egress_Receiver_FullMethodName, opts...) if err != nil { return nil, err } @@ -67,7 +72,7 @@ func (x *egressReceiverClient) Recv() (*Envelope, error) { } func (c *egressClient) BatchedReceiver(ctx context.Context, in *EgressBatchRequest, opts ...grpc.CallOption) (Egress_BatchedReceiverClient, error) { - stream, err := c.cc.NewStream(ctx, &Egress_ServiceDesc.Streams[1], "/loggregator.v2.Egress/BatchedReceiver", opts...) + stream, err := c.cc.NewStream(ctx, &Egress_ServiceDesc.Streams[1], Egress_BatchedReceiver_FullMethodName, opts...) if err != nil { return nil, err } diff --git a/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/envelope.pb.go b/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/envelope.pb.go index 3c8cf9e90..4682fe460 100644 --- a/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/envelope.pb.go +++ b/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/envelope.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.21.12 +// protoc-gen-go v1.31.0 +// protoc v4.24.2 // source: loggregator-api/v2/envelope.proto package loggregator_v2 diff --git a/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/ingress.pb.go b/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/ingress.pb.go index 7fe9202d1..c10da0364 100644 --- a/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/ingress.pb.go +++ b/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/ingress.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.21.12 +// protoc-gen-go v1.31.0 +// protoc v4.24.2 // source: loggregator-api/v2/ingress.proto package loggregator_v2 diff --git a/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/ingress_grpc.pb.go b/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/ingress_grpc.pb.go index 2a71c3cfe..5eadc3687 100644 --- a/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/ingress_grpc.pb.go +++ b/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/ingress_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v4.24.2 // source: loggregator-api/v2/ingress.proto package loggregator_v2 @@ -18,6 +18,12 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + Ingress_Sender_FullMethodName = "/loggregator.v2.Ingress/Sender" + Ingress_BatchSender_FullMethodName = "/loggregator.v2.Ingress/BatchSender" + Ingress_Send_FullMethodName = "/loggregator.v2.Ingress/Send" +) + // IngressClient is the client API for Ingress service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -36,7 +42,7 @@ func NewIngressClient(cc grpc.ClientConnInterface) IngressClient { } func (c *ingressClient) Sender(ctx context.Context, opts ...grpc.CallOption) (Ingress_SenderClient, error) { - stream, err := c.cc.NewStream(ctx, &Ingress_ServiceDesc.Streams[0], "/loggregator.v2.Ingress/Sender", opts...) + stream, err := c.cc.NewStream(ctx, &Ingress_ServiceDesc.Streams[0], Ingress_Sender_FullMethodName, opts...) if err != nil { return nil, err } @@ -70,7 +76,7 @@ func (x *ingressSenderClient) CloseAndRecv() (*IngressResponse, error) { } func (c *ingressClient) BatchSender(ctx context.Context, opts ...grpc.CallOption) (Ingress_BatchSenderClient, error) { - stream, err := c.cc.NewStream(ctx, &Ingress_ServiceDesc.Streams[1], "/loggregator.v2.Ingress/BatchSender", opts...) + stream, err := c.cc.NewStream(ctx, &Ingress_ServiceDesc.Streams[1], Ingress_BatchSender_FullMethodName, opts...) if err != nil { return nil, err } @@ -105,7 +111,7 @@ func (x *ingressBatchSenderClient) CloseAndRecv() (*BatchSenderResponse, error) func (c *ingressClient) Send(ctx context.Context, in *EnvelopeBatch, opts ...grpc.CallOption) (*SendResponse, error) { out := new(SendResponse) - err := c.cc.Invoke(ctx, "/loggregator.v2.Ingress/Send", in, out, opts...) + err := c.cc.Invoke(ctx, Ingress_Send_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -210,7 +216,7 @@ func _Ingress_Send_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/loggregator.v2.Ingress/Send", + FullMethod: Ingress_Send_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IngressServer).Send(ctx, req.(*EnvelopeBatch)) diff --git a/vendor/golang.org/x/net/http2/Dockerfile b/vendor/golang.org/x/net/http2/Dockerfile deleted file mode 100644 index 851224595..000000000 --- a/vendor/golang.org/x/net/http2/Dockerfile +++ /dev/null @@ -1,51 +0,0 @@ -# -# This Dockerfile builds a recent curl with HTTP/2 client support, using -# a recent nghttp2 build. -# -# See the Makefile for how to tag it. If Docker and that image is found, the -# Go tests use this curl binary for integration tests. -# - -FROM ubuntu:trusty - -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get install -y git-core build-essential wget - -RUN apt-get install -y --no-install-recommends \ - autotools-dev libtool pkg-config zlib1g-dev \ - libcunit1-dev libssl-dev libxml2-dev libevent-dev \ - automake autoconf - -# The list of packages nghttp2 recommends for h2load: -RUN apt-get install -y --no-install-recommends make binutils \ - autoconf automake autotools-dev \ - libtool pkg-config zlib1g-dev libcunit1-dev libssl-dev libxml2-dev \ - libev-dev libevent-dev libjansson-dev libjemalloc-dev \ - cython python3.4-dev python-setuptools - -# Note: setting NGHTTP2_VER before the git clone, so an old git clone isn't cached: -ENV NGHTTP2_VER 895da9a -RUN cd /root && git clone https://github.com/tatsuhiro-t/nghttp2.git - -WORKDIR /root/nghttp2 -RUN git reset --hard $NGHTTP2_VER -RUN autoreconf -i -RUN automake -RUN autoconf -RUN ./configure -RUN make -RUN make install - -WORKDIR /root -RUN wget https://curl.se/download/curl-7.45.0.tar.gz -RUN tar -zxvf curl-7.45.0.tar.gz -WORKDIR /root/curl-7.45.0 -RUN ./configure --with-ssl --with-nghttp2=/usr/local -RUN make -RUN make install -RUN ldconfig - -CMD ["-h"] -ENTRYPOINT ["/usr/local/bin/curl"] - diff --git a/vendor/golang.org/x/net/http2/Makefile b/vendor/golang.org/x/net/http2/Makefile deleted file mode 100644 index 55fd826f7..000000000 --- a/vendor/golang.org/x/net/http2/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -curlimage: - docker build -t gohttp2/curl . - diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go index 033b6e6db..6d5e00887 100644 --- a/vendor/golang.org/x/net/http2/server.go +++ b/vendor/golang.org/x/net/http2/server.go @@ -1012,14 +1012,6 @@ func (sc *serverConn) serve() { } } -func (sc *serverConn) awaitGracefulShutdown(sharedCh <-chan struct{}, privateCh chan struct{}) { - select { - case <-sc.doneServing: - case <-sharedCh: - close(privateCh) - } -} - type serverMessage int // Message values sent to serveMsgCh. diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go index b0d482f9f..4515b22c4 100644 --- a/vendor/golang.org/x/net/http2/transport.go +++ b/vendor/golang.org/x/net/http2/transport.go @@ -291,8 +291,7 @@ func (t *Transport) initConnPool() { // HTTP/2 server. type ClientConn struct { t *Transport - tconn net.Conn // usually *tls.Conn, except specialized impls - tconnClosed bool + tconn net.Conn // usually *tls.Conn, except specialized impls tlsState *tls.ConnectionState // nil only for specialized impls reused uint32 // whether conn is being reused; atomic singleUse bool // whether being used for a single http.Request diff --git a/vendor/modules.txt b/vendor/modules.txt index ce9352414..ee0e2ef5f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -7,7 +7,7 @@ code.cloudfoundry.org/go-diodes # code.cloudfoundry.org/go-log-cache/v2 v2.0.3 ## explicit; go 1.19 code.cloudfoundry.org/go-log-cache/v2/rpc/logcache_v1 -# code.cloudfoundry.org/go-loggregator/v9 v9.0.7 +# code.cloudfoundry.org/go-loggregator/v9 v9.0.8 ## explicit; go 1.18 code.cloudfoundry.org/go-loggregator/v9 code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2 @@ -186,7 +186,7 @@ golang.org/x/crypto/internal/alias golang.org/x/crypto/internal/poly1305 golang.org/x/crypto/ssh golang.org/x/crypto/ssh/internal/bcrypt_pbkdf -# golang.org/x/net v0.14.0 +# golang.org/x/net v0.15.0 ## explicit; go 1.17 golang.org/x/net/context golang.org/x/net/html