Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump go log cache and go loggregator v7 #2650

Merged
merged 2 commits into from
Nov 1, 2023
Merged

Bump go log cache and go loggregator v7 #2650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e19c26
Bump go-log-cache and go-loggregator to latest
moleske Nov 1, 2023
fb71392
bump blang/semver since it was bumped as indirect dependency
moleske Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion actor/pluginaction/install.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions actor/v2action/logging_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions actor/v7action/logging_test.go
View file
Open in desktop
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
View file
Open in desktop
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 cf/api_versions.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion cf/configuration/coreconfig/coreconfigfakes/fake_repository.go
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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/log_cache_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion command/v7/shared/version_checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package shared
import (
"fmt"

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

const minimumCCAPIVersionForV7 = "3.85.0"
Expand Down
20 changes: 9 additions & 11 deletions go.mod
View file
Open in desktop
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/cloudfoundry/noaa/v2 v2.3.0
github.com/cloudfoundry/sonde-go v0.0.0-20230710164515-a0a43d1dbbf8
Expand Down Expand Up @@ -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
Expand Down
Loading
Loading