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

Upgrade bosh-cli from v6.4.1 to v6.4.2+ #537

Closed
wants to merge 2 commits into from
Closed

Upgrade bosh-cli from v6.4.1 to v6.4.2+ #537

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
0e663b4
Upgrade bosh-cli from v6.4.1 to v6.4.2+
fnaranjo-vmw Jun 2, 2022
9f8a040
Run `go mod tidy`
fnaranjo-vmw Jun 2, 2022
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
4 changes: 2 additions & 2 deletions bosh/build_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package bosh
import (
"github.com/cloudfoundry-incubator/bosh-backup-and-restore/instance"
"github.com/cloudfoundry-incubator/bosh-backup-and-restore/ssh"
"github.com/cloudfoundry/bosh-cli/director"
"github.com/cloudfoundry/bosh-cli/v6/director"
"github.com/pkg/errors"

boshuaa "github.com/cloudfoundry/bosh-cli/uaa"
boshuaa "github.com/cloudfoundry/bosh-cli/v6/uaa"
boshlog "github.com/cloudfoundry/bosh-utils/logger"
)

Expand Down
2 changes: 1 addition & 1 deletion bosh/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/cloudfoundry-incubator/bosh-backup-and-restore/instance"
"github.com/cloudfoundry-incubator/bosh-backup-and-restore/orchestrator"
"github.com/cloudfoundry-incubator/bosh-backup-and-restore/ssh"
"github.com/cloudfoundry/bosh-cli/director"
"github.com/cloudfoundry/bosh-cli/v6/director"
"github.com/cloudfoundry/bosh-utils/uuid"

"fmt"
Expand Down
4 changes: 2 additions & 2 deletions bosh/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/cloudfoundry-incubator/bosh-backup-and-restore/orchestrator"
"github.com/cloudfoundry-incubator/bosh-backup-and-restore/ssh"
sshfakes "github.com/cloudfoundry-incubator/bosh-backup-and-restore/ssh/fakes"
"github.com/cloudfoundry/bosh-cli/director"
boshfakes "github.com/cloudfoundry/bosh-cli/director/directorfakes"
"github.com/cloudfoundry/bosh-cli/v6/director"
boshfakes "github.com/cloudfoundry/bosh-cli/v6/director/directorfakes"
boshlog "github.com/cloudfoundry/bosh-utils/logger"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion bosh/deployed_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/cloudfoundry-incubator/bosh-backup-and-restore/instance"
"github.com/cloudfoundry-incubator/bosh-backup-and-restore/orchestrator"
"github.com/cloudfoundry-incubator/bosh-backup-and-restore/ssh"
"github.com/cloudfoundry/bosh-cli/director"
"github.com/cloudfoundry/bosh-cli/v6/director"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions bosh/deployed_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/cloudfoundry-incubator/bosh-backup-and-restore/bosh"
"github.com/cloudfoundry-incubator/bosh-backup-and-restore/orchestrator"
sshfakes "github.com/cloudfoundry-incubator/bosh-backup-and-restore/ssh/fakes"
"github.com/cloudfoundry/bosh-cli/director"
boshfakes "github.com/cloudfoundry/bosh-cli/director/directorfakes"
"github.com/cloudfoundry/bosh-cli/v6/director"
boshfakes "github.com/cloudfoundry/bosh-cli/v6/director/directorfakes"
boshlog "github.com/cloudfoundry/bosh-utils/logger"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion factory/bosh_deployment_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/cloudfoundry-incubator/bosh-backup-and-restore/bosh"
boshlog "github.com/cloudfoundry/bosh-utils/logger"

boshcmd "github.com/cloudfoundry/bosh-cli/cmd/opts"
boshcmd "github.com/cloudfoundry/bosh-cli/v6/cmd/opts"
boshsys "github.com/cloudfoundry/bosh-utils/system"
)

Expand Down
12 changes: 1 addition & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,19 @@ module github.com/cloudfoundry-incubator/bosh-backup-and-restore
go 1.14

require (
github.com/cheggaaa/pb v1.0.29 // indirect
github.com/cloudfoundry/bosh-cli v6.4.1+incompatible
github.com/cloudfoundry/bosh-cli/v6 v6.4.3-0.20220527084249-c351b0c63fc7
github.com/cloudfoundry/bosh-utils v0.0.316
github.com/cloudfoundry/config-server v0.1.21 // indirect
github.com/cloudfoundry/socks5-proxy v0.2.57
github.com/cppforlife/go-patch v0.2.0
github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/fatih/color v1.10.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/kr/pty v1.1.8 // indirect
github.com/mattn/go-runewidth v0.0.12 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.19.0
github.com/pivotal-cf-experimental/cf-webmock v0.0.0-20190222120028-6bf93e3bc5ed
github.com/pkg/errors v0.9.1
github.com/rivo/uniseg v0.2.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/urfave/cli v1.22.9
github.com/vito/go-interact v1.0.0 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
gopkg.in/yaml.v2 v2.4.0
)
444 changes: 433 additions & 11 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ssh/fakes/fake_opts_generator.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 ssh/opts_generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ssh

import (
"github.com/cloudfoundry/bosh-cli/director"
"github.com/cloudfoundry/bosh-cli/v6/director"
"github.com/cloudfoundry/bosh-utils/uuid"
)

Expand Down