Skip to content

Commit

Permalink
Bump go log cache and go loggregator v8 (#2649)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
moleske committed Nov 1, 2023
1 parent 950aaa1 commit 93670c8
Show file tree
Hide file tree
Showing 32 changed files with 83 additions and 420 deletions.
2 changes: 1 addition & 1 deletion actor/pluginaction/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion actor/pluginaction/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions actor/sharedaction/log_cache_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions actor/sharedaction/logging.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions actor/sharedaction/logging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions actor/sharedaction/sharedactionfakes/fake_log_cache_client.go

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

4 changes: 2 additions & 2 deletions actor/v7action/logging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion actor/versioncheck/minimum_version_check.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package versioncheck

import (
"github.com/blang/semver"
"github.com/blang/semver/v4"
)

func IsMinimumAPIVersionMet(current string, minimum string) (bool, error) {
Expand Down
2 changes: 1 addition & 1 deletion api/logcache/log_cache_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"time"

logcache "code.cloudfoundry.org/go-log-cache"
logcache "code.cloudfoundry.org/go-log-cache/v2"

"code.cloudfoundry.org/cli/actor/v7action"
"code.cloudfoundry.org/cli/api/shared"
Expand Down
2 changes: 1 addition & 1 deletion cf/api_versions.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion cf/commands/service/create_user_provided_service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cf/commands/service/update_user_provided_service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cf/configuration/coreconfig/config_repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cf/configuration/coreconfig/config_repository_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

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

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

2 changes: 1 addition & 1 deletion cf/requirements/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cf/requirements/max_api_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cf/requirements/max_api_version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cf/requirements/min_api_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cf/requirements/min_api_version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cf/requirements/requirementsfakes/fake_factory.go

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

2 changes: 1 addition & 1 deletion command/api_version_warning.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
2 changes: 1 addition & 1 deletion command/api_version_warning_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion command/v7/shared/version_checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

"code.cloudfoundry.org/cli/api/cloudcontroller/ccversion"
"github.com/blang/semver"
"github.com/blang/semver/v4"
)

func CheckCCAPIVersion(currentAPIVersion string) (string, error) {
Expand Down
23 changes: 11 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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/cyphar/filepath-securejoin v0.2.4
github.com/docker/distribution v2.8.3+incompatible
Expand Down Expand Up @@ -64,8 +64,7 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // 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/imdario/mergo v0.3.6 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
Expand All @@ -76,16 +75,16 @@ require (
github.com/rivo/uniseg v0.2.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.12.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/grpc v1.57.0 // indirect
golang.org/x/tools v0.13.0 // indirect
google.golang.org/appengine v1.6.8 // 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/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
Expand Down
Loading

0 comments on commit 93670c8

Please sign in to comment.