Bump to code.cloudfoundry.org/go-log-cache/v3 and go-loggregator/v10

Signed-off-by: Glenn Oppegard <glenn.oppegard@broadcom.com>
cloudfoundry · Jul 23, 2024 · c318405 · c318405
1 parent fbf38a6
commit c318405
Show file tree

Hide file tree

Showing 45 changed files with 422 additions and 735 deletions.
diff --git a/apps/loggregator.go b/apps/loggregator.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"code.cloudfoundry.org/go-loggregator/v9"
-	"code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2"
+	"code.cloudfoundry.org/go-loggregator/v10"
+	"code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2"
 	. "github.com/cloudfoundry/cf-acceptance-tests/cats_suite_helpers"
 
 	"net/http"

diff --git a/go.mod b/go.mod
@@ -4,8 +4,8 @@ go 1.21
 
 require (
 	code.cloudfoundry.org/archiver v0.0.0-20230220125704-e06c77649d28
-	code.cloudfoundry.org/go-log-cache/v2 v2.0.7
-	code.cloudfoundry.org/go-loggregator/v9 v9.2.1
+	code.cloudfoundry.org/go-log-cache/v3 v3.0.1
+	code.cloudfoundry.org/go-loggregator/v10 v10.0.0
 	code.cloudfoundry.org/tlsconfig v0.0.0-20220621140725-0e6fbd869921
 	github.com/cloudfoundry/cf-test-helpers/v2 v2.9.0
 	github.com/cloudfoundry/noaa/v2 v2.4.0
@@ -41,7 +41,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.25.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/sys v0.22.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect

diff --git a/go.sum b/go.sum
@@ -2,10 +2,10 @@ code.cloudfoundry.org/archiver v0.0.0-20230220125704-e06c77649d28 h1:cVu8EDKWxiu
 code.cloudfoundry.org/archiver v0.0.0-20230220125704-e06c77649d28/go.mod h1:GVdUyXGwNzynu/xqsYduEmfqLebg+kafU+P4EllyOUo=
 code.cloudfoundry.org/go-diodes v0.0.0-20220325013804-800fb6f70e2f h1:BMwVyadJ0dYvvXTdLNtjxtX3jSCR45rv/apUxuFc6bY=
 code.cloudfoundry.org/go-diodes v0.0.0-20220325013804-800fb6f70e2f/go.mod h1:cCrRt/O3uipyXfV4hZsKe5WyRNgFTgiMHnwAQqFlNjM=
-code.cloudfoundry.org/go-log-cache/v2 v2.0.7 h1:yR/JjQ/RscO1n4xVAT9HDYcpx5ET/3Cq2/RhpJml6ZU=
-code.cloudfoundry.org/go-log-cache/v2 v2.0.7/go.mod h1:6KQe2FeeaqRheD5vCvpyTa80YoJojB/r21E54mT97Mc=
-code.cloudfoundry.org/go-loggregator/v9 v9.2.1 h1:S6Lgg5UJbhh2bt2TGQxs6R00CF8PrUA3GFPYDxy56Fk=
-code.cloudfoundry.org/go-loggregator/v9 v9.2.1/go.mod h1:FTFFruqGeOhVCDFvyLgl8EV8YW63NNwRzLhxJcporu8=
+code.cloudfoundry.org/go-log-cache/v3 v3.0.1 h1:+6Lg5IQMCzqZw4aMF2hwjRar7z1SfSUop08+n21g8Xk=
+code.cloudfoundry.org/go-log-cache/v3 v3.0.1/go.mod h1:NkNQXq92zrE64fFTqsLjO4qn5gs3ijiznUzbte8FDl4=
+code.cloudfoundry.org/go-loggregator/v10 v10.0.0 h1:7tSJp4QFh8064jp13zNGoKoIuu8a2GhoGkr53nr9uu0=
+code.cloudfoundry.org/go-loggregator/v10 v10.0.0/go.mod h1:gRbT/3OQzBaXtII0vMmCVnF52B0Fvz9XZcCXUrcXpkg=
 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=
@@ -137,8 +137,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.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 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/helpers/logs/logs_helper.go b/helpers/logs/logs_helper.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	logcache "code.cloudfoundry.org/go-log-cache/v2/rpc/logcache_v1"
+	logcache "code.cloudfoundry.org/go-log-cache/v3/rpc/logcache_v1"
 	"github.com/cloudfoundry/cf-acceptance-tests/helpers/config"
 	"github.com/cloudfoundry/cf-test-helpers/v2/cf"
 	"github.com/cloudfoundry/cf-test-helpers/v2/helpers"

diff --git a/....cloudfoundry.org/go-log-cache/v2/LICENSE → ....cloudfoundry.org/go-log-cache/v3/LICENSE b/....cloudfoundry.org/go-log-cache/v2/LICENSE → ....cloudfoundry.org/go-log-cache/v3/LICENSE
diff --git a/...e.cloudfoundry.org/go-log-cache/v2/NOTICE → ...e.cloudfoundry.org/go-log-cache/v3/NOTICE b/...e.cloudfoundry.org/go-log-cache/v2/NOTICE → ...e.cloudfoundry.org/go-log-cache/v3/NOTICE
diff --git a/...rg/go-log-cache/v2/rpc/logcache_v1/doc.go → ...rg/go-log-cache/v3/rpc/logcache_v1/doc.go b/...rg/go-log-cache/v2/rpc/logcache_v1/doc.go → ...rg/go-log-cache/v3/rpc/logcache_v1/doc.go
diff --git a/...log-cache/v2/rpc/logcache_v1/egress.pb.go → ...log-cache/v3/rpc/logcache_v1/egress.pb.go b/...log-cache/v2/rpc/logcache_v1/egress.pb.go → ...log-cache/v3/rpc/logcache_v1/egress.pb.go
diff --git a/...-cache/v2/rpc/logcache_v1/egress.pb.gw.go → ...-cache/v3/rpc/logcache_v1/egress.pb.gw.go b/...-cache/v2/rpc/logcache_v1/egress.pb.gw.go → ...-cache/v3/rpc/logcache_v1/egress.pb.gw.go
diff --git a/...ache/v2/rpc/logcache_v1/egress_grpc.pb.go → ...ache/v3/rpc/logcache_v1/egress_grpc.pb.go b/...ache/v2/rpc/logcache_v1/egress_grpc.pb.go → ...ache/v3/rpc/logcache_v1/egress_grpc.pb.go
diff --git a/...-log-cache/v2/rpc/logcache_v1/generate.sh → ...-log-cache/v3/rpc/logcache_v1/generate.sh b/...-log-cache/v2/rpc/logcache_v1/generate.sh → ...-log-cache/v3/rpc/logcache_v1/generate.sh