Skip to content

Commit

Permalink
Unpin protobuf
Browse files Browse the repository at this point in the history
- client-go v0.22 does not work with protobuf v1.3.4.
- protobuf v1.5 leads to a runtime panic in go-loggregator and
go-log-cache. See:
cloudfoundry/go-log-cache#30
- pin go-log-cache to a fork containing this PR that fixes the above
problem: cloudfoundry/go-log-cache#31

Having done all this allows us to use the latest verson of the client-go
package, which is needed for the cf-on-k8s support.

Co-authored-by: Danail Branekov <[email protected]>
  • Loading branch information
2 people authored and gcapizzi committed Nov 9, 2021
1 parent 5822369 commit d3c4a59
Show file tree
Hide file tree
Showing 7 changed files with 353 additions and 37 deletions.
2 changes: 1 addition & 1 deletion actor/sharedaction/log_cache_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"time"

logcache "code.cloudfoundry.org/go-log-cache"
"code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2"
"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"
)

//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . LogCacheClient
Expand Down
2 changes: 1 addition & 1 deletion actor/sharedaction/logging.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

logcache "code.cloudfoundry.org/go-log-cache"
"code.cloudfoundry.org/go-log-cache/rpc/logcache_v1"
"code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2"
"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion actor/sharedaction/logging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"code.cloudfoundry.org/cli/actor/sharedaction"
"code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes"
logcache "code.cloudfoundry.org/go-log-cache"
"code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2"
"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion actor/v7action/logging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
"code.cloudfoundry.org/cli/resources"
logcache "code.cloudfoundry.org/go-log-cache"
"code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2"
"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
17 changes: 8 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
code.cloudfoundry.org/clock v1.0.0
code.cloudfoundry.org/diego-ssh v0.0.0-20170109142818-18cdb3586e7f
code.cloudfoundry.org/go-log-cache v1.0.1-0.20200316170138-f466e0302c34
code.cloudfoundry.org/go-loggregator v7.4.0+incompatible
code.cloudfoundry.org/go-loggregator/v8 v8.0.5
code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f
code.cloudfoundry.org/jsonry v1.1.3
code.cloudfoundry.org/lager v1.1.1-0.20191008172124-a9afc05ee5be
Expand Down Expand Up @@ -40,7 +40,7 @@ require (
github.com/moby/moby v1.4.2-0.20171120205147-9de84a78d76e
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.10.5
github.com/onsi/gomega v1.13.0
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
github.com/pkg/errors v0.9.1
github.com/sabhiram/go-gitignore v0.0.0-20171017070213-362f9845770f
Expand All @@ -50,14 +50,13 @@ require (
github.com/tedsuo/rata v1.0.1-0.20170830210128-07d200713958
github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
golang.org/x/net v0.0.0-20210716203947-853a461950ff
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781
golang.org/x/text v0.3.6
golang.org/x/tools v0.1.5 // indirect
gopkg.in/cheggaaa/pb.v1 v1.0.27
gopkg.in/yaml.v2 v2.3.0
gopkg.in/yaml.v2 v2.4.0
)

replace gopkg.in/fsnotify.v1 v1.4.7 => github.com/fsnotify/fsnotify v1.4.7

replace github.com/golang/protobuf => github.com/golang/protobuf v1.3.4
replace (
code.cloudfoundry.org/go-log-cache => github.com/eirini-forks/go-log-cache v0.0.0-20210929144118-0852bc312533
gopkg.in/fsnotify.v1 v1.4.7 => github.com/fsnotify/fsnotify v1.4.7
)
363 changes: 340 additions & 23 deletions go.sum

Large diffs are not rendered by default.

0 comments on commit d3c4a59

Please sign in to comment.