Bump go log cache and go loggregator v7 (#2650)

* Bump go-log-cache and go-loggregator to latest - this keeps us up to date since they maintain those versions * bump blang/semver since it was bumped as indirect dependency
cloudfoundry · Nov 1, 2023 · ccb5c4d · ccb5c4d
1 parent 8271eae
commit ccb5c4d
Show file tree

Hide file tree

Showing 33 changed files with 73 additions and 423 deletions.
diff --git a/actor/pluginaction/install.go b/actor/pluginaction/install.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 
 	"code.cloudfoundry.org/cli/actor/actionerror"
 	"code.cloudfoundry.org/cli/api/plugin"

diff --git a/actor/pluginaction/list.go b/actor/pluginaction/list.go
@@ -2,7 +2,7 @@ package pluginaction
 
 import (
 	"code.cloudfoundry.org/cli/actor/actionerror"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 type OutdatedPlugin struct {

diff --git a/actor/sharedaction/log_cache_client.go b/actor/sharedaction/log_cache_client.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	logcache "code.cloudfoundry.org/go-log-cache"
-	"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"
+	logcache "code.cloudfoundry.org/go-log-cache/v2"
+	"code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2"
 )
 
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . LogCacheClient

diff --git a/actor/sharedaction/logging.go b/actor/sharedaction/logging.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	logcache "code.cloudfoundry.org/go-log-cache"
-	"code.cloudfoundry.org/go-log-cache/rpc/logcache_v1"
-	"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"
+	logcache "code.cloudfoundry.org/go-log-cache/v2"
+	"code.cloudfoundry.org/go-log-cache/v2/rpc/logcache_v1"
+	"code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/actor/sharedaction/logging_test.go b/actor/sharedaction/logging_test.go
@@ -9,8 +9,8 @@ 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/v8/rpc/loggregator_v2"
+	logcache "code.cloudfoundry.org/go-log-cache/v2"
+	"code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go b/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go
diff --git a/actor/v2action/logging_test.go b/actor/v2action/logging_test.go
@@ -12,8 +12,8 @@ import (
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv2"
 	"code.cloudfoundry.org/cli/api/uaa"
 	"code.cloudfoundry.org/cli/integration/helpers"
-	logcache "code.cloudfoundry.org/go-log-cache"
-	"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"
+	logcache "code.cloudfoundry.org/go-log-cache/v2"
+	"code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/actor/v7action/logging_test.go b/actor/v7action/logging_test.go
@@ -11,8 +11,8 @@ import (
 	"code.cloudfoundry.org/cli/actor/v7action/v7actionfakes"
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
 	"code.cloudfoundry.org/cli/resources"
-	logcache "code.cloudfoundry.org/go-log-cache"
-	"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"
+	logcache "code.cloudfoundry.org/go-log-cache/v2"
+	"code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/actor/versioncheck/minimum_version_check.go b/actor/versioncheck/minimum_version_check.go
@@ -1,7 +1,7 @@
 package versioncheck
 
 import (
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 func IsMinimumAPIVersionMet(current string, minimum string) (bool, error) {

diff --git a/cf/api_versions.go b/cf/api_versions.go
@@ -1,6 +1,6 @@
 package cf
 
-import "github.com/blang/semver"
+import "github.com/blang/semver/v4"
 
 var (
 	UserProvidedServiceTagsMinimumAPIVersion, _ = semver.Make("2.104.0") // #158233239,#157770881

diff --git a/cf/commands/service/create_user_provided_service_test.go b/cf/commands/service/create_user_provided_service_test.go
@@ -11,7 +11,7 @@ import (
 	"code.cloudfoundry.org/cli/cf/flags"
 	"code.cloudfoundry.org/cli/cf/requirements"
 	"code.cloudfoundry.org/cli/cf/requirements/requirementsfakes"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 
 	"code.cloudfoundry.org/cli/cf/api/apifakes"
 	testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration"

diff --git a/cf/commands/service/update_user_provided_service_test.go b/cf/commands/service/update_user_provided_service_test.go
@@ -12,7 +12,7 @@ import (
 	"code.cloudfoundry.org/cli/cf/models"
 	"code.cloudfoundry.org/cli/cf/requirements"
 	"code.cloudfoundry.org/cli/cf/requirements/requirementsfakes"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 
 	"code.cloudfoundry.org/cli/cf/api/apifakes"
 	testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration"

diff --git a/cf/configuration/coreconfig/config_repository.go b/cf/configuration/coreconfig/config_repository.go
@@ -7,7 +7,7 @@ import (
 	"code.cloudfoundry.org/cli/cf/configuration"
 	"code.cloudfoundry.org/cli/cf/models"
 	"code.cloudfoundry.org/cli/version"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 type ConfigRepository struct {

diff --git a/cf/configuration/coreconfig/config_repository_test.go b/cf/configuration/coreconfig/config_repository_test.go
@@ -10,7 +10,7 @@ import (
 	"code.cloudfoundry.org/cli/cf/configuration/coreconfig"
 	"code.cloudfoundry.org/cli/cf/models"
 	"code.cloudfoundry.org/cli/version"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

diff --git a/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go b/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go
diff --git a/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go b/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go
diff --git a/cf/requirements/factory.go b/cf/requirements/factory.go
@@ -3,7 +3,7 @@ package requirements
 import (
 	"code.cloudfoundry.org/cli/cf/api"
 	"code.cloudfoundry.org/cli/cf/configuration/coreconfig"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Factory

diff --git a/cf/requirements/max_api_version.go b/cf/requirements/max_api_version.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"code.cloudfoundry.org/cli/cf/configuration/coreconfig"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 
 	. "code.cloudfoundry.org/cli/cf/i18n"
 )

diff --git a/cf/requirements/max_api_version_test.go b/cf/requirements/max_api_version_test.go
@@ -3,7 +3,7 @@ package requirements_test
 import (
 	"code.cloudfoundry.org/cli/cf/configuration/coreconfig"
 	"code.cloudfoundry.org/cli/cf/requirements"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 
 	testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration"
 

diff --git a/cf/requirements/min_api_version.go b/cf/requirements/min_api_version.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"code.cloudfoundry.org/cli/cf/configuration/coreconfig"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 
 	. "code.cloudfoundry.org/cli/cf/i18n"
 )

diff --git a/cf/requirements/min_api_version_test.go b/cf/requirements/min_api_version_test.go
@@ -3,7 +3,7 @@ package requirements_test
 import (
 	"code.cloudfoundry.org/cli/cf/configuration/coreconfig"
 	"code.cloudfoundry.org/cli/cf/requirements"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 
 	testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration"
 

diff --git a/cf/requirements/requirementsfakes/fake_factory.go b/cf/requirements/requirementsfakes/fake_factory.go
diff --git a/command/api_version_warning.go b/command/api_version_warning.go
@@ -3,7 +3,7 @@ package command
 import (
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccversion"
 	"code.cloudfoundry.org/cli/version"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 type APIVersionTooHighError struct{}

diff --git a/command/api_version_warning_test.go b/command/api_version_warning_test.go
@@ -9,7 +9,7 @@ import (
 	"code.cloudfoundry.org/cli/command/commandfakes"
 	"code.cloudfoundry.org/cli/util/ui"
 	"code.cloudfoundry.org/cli/version"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gbytes"

diff --git a/command/log_cache_client.go b/command/log_cache_client.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/cli/util"
-	logcache "code.cloudfoundry.org/go-log-cache"
+	logcache "code.cloudfoundry.org/go-log-cache/v2"
 )
 
 type RequestLoggerOutput interface {

diff --git a/command/v7/shared/version_checker.go b/command/v7/shared/version_checker.go
@@ -3,7 +3,7 @@ package shared
 import (
 	"fmt"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 const minimumCCAPIVersionForV7 = "3.85.0"

diff --git a/go.mod b/go.mod
@@ -9,15 +9,15 @@ require (
 	code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20201002233634-81722a1144e4
 	code.cloudfoundry.org/clock v1.1.0
 	code.cloudfoundry.org/diego-ssh v0.0.0-20170109142818-18cdb3586e7f
-	code.cloudfoundry.org/go-log-cache v1.0.1-0.20211011162012-ede82a99d3cc
-	code.cloudfoundry.org/go-loggregator/v8 v8.0.5
+	code.cloudfoundry.org/go-log-cache/v2 v2.0.5
+	code.cloudfoundry.org/go-loggregator/v9 v9.0.8
 	code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f
 	code.cloudfoundry.org/jsonry v1.1.4
 	code.cloudfoundry.org/lager v2.0.0+incompatible
 	code.cloudfoundry.org/tlsconfig v0.0.0-20230612153104-23c0622de227
 	code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d
 	github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2
-	github.com/blang/semver v3.5.1+incompatible
+	github.com/blang/semver/v4 v4.0.0
 	github.com/cloudfoundry/bosh-cli v6.4.1+incompatible
 	github.com/cloudfoundry/noaa/v2 v2.3.0
 	github.com/cloudfoundry/sonde-go v0.0.0-20230710164515-a0a43d1dbbf8
@@ -61,23 +61,21 @@ require (
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/pprof v0.0.0-20230901174712-0191c66da455 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/rogpeppe/go-internal v1.8.0 // indirect
 	golang.org/x/mod v0.12.0 // indirect
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/term v0.13.0 // indirect
-	golang.org/x/tools v0.12.0 // indirect
-	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/grpc v1.57.0 // indirect
+	golang.org/x/tools v0.13.0 // indirect
+	google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
+	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect