Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions cmd/uaa_login_strategy.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ func (c UAALoginStrategy) tryClient(uaa boshuaa.UAA) error {
_, err := uaa.ClientCredentialsGrant()

if err == nil {
c.ui.PrintLinef(c.successMsg)
c.ui.PrintLinef("%s", c.successMsg)
} else {
c.ui.ErrorLinef(c.failureMsg)
c.ui.ErrorLinef("%s", c.failureMsg)
}

// Dont bother saving client token since there is no way to refresh it
// Don't bother saving client token since there is no way to refresh it
return err
}

Expand Down Expand Up @@ -114,7 +114,7 @@ func (c UAALoginStrategy) tryUserOnce(environment string, prompts []boshuaa.Prom
accessToken, err := uaa.OwnerPasswordCredentialsGrant(answers)
if err != nil {
c.logger.Error(c.logTag, "Failed to get access token: %s", err)
c.ui.ErrorLinef(c.failureMsg)
c.ui.ErrorLinef("%s", c.failureMsg)
return false, nil
}

Expand All @@ -134,7 +134,7 @@ func (c UAALoginStrategy) tryUserOnce(environment string, prompts []boshuaa.Prom
return false, err
}

c.ui.PrintLinef(c.successMsg)
c.ui.PrintLinef("%s", c.successMsg)

return true, nil
}
6 changes: 3 additions & 3 deletions director/factory_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ var _ = Describe("NewConfigFromURL", func() {
It("returns error if port cannot be extracted", func() {
_, err := NewConfigFromURL("https://host::")
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("Extracting host/port from URL"))
Expect(err.Error()).To(ContainSubstring("invalid port"))
})

It("returns error if port is empty", func() {
Expand All @@ -71,7 +71,7 @@ var _ = Describe("NewConfigFromURL", func() {
It("returns error if port cannot be parsed as int", func() {
_, err := NewConfigFromURL("https://host:abc")
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(MatchRegexp("(Extracting port from URL|Parsing Director URL)")) // go1.12 validates port in Parse
Expect(err.Error()).To(ContainSubstring("Parsing Director URL"))
})
})

Expand All @@ -88,7 +88,7 @@ var _ = Describe("FactoryConfig", func() {
Expect(err.Error()).To(Equal("Missing 'Host'"))
})

It("returns error if host is empty", func() {
It("returns error if port is empty", func() {
err := FactoryConfig{Host: "host"}.Validate()
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(Equal("Missing 'Port'"))
Expand Down
98 changes: 49 additions & 49 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
module github.com/cloudfoundry/bosh-cli/v7

go 1.25.0
go 1.26.0

require (
code.cloudfoundry.org/clock v1.86.0
code.cloudfoundry.org/clock v1.88.0
code.cloudfoundry.org/workpool v0.0.0-20250911194158-1489753f182e
github.com/cheggaaa/pb/v3 v3.2.1
github.com/cloudfoundry/bosh-agent/v2 v2.890.0
github.com/cloudfoundry/bosh-davcli v0.0.505
github.com/cloudfoundry/bosh-gcscli v0.0.413
github.com/cloudfoundry/bosh-agent/v2 v2.892.0
github.com/cloudfoundry/bosh-davcli v0.0.510
github.com/cloudfoundry/bosh-gcscli v0.0.418
github.com/cloudfoundry/bosh-s3cli v0.0.437
github.com/cloudfoundry/bosh-utils v0.0.647
github.com/cloudfoundry/bosh-utils v0.0.652
github.com/cloudfoundry/config-server v0.1.287
github.com/cloudfoundry/socks5-proxy v0.2.187
github.com/cloudfoundry/socks5-proxy v0.2.188
github.com/cppforlife/go-patch v0.2.0
github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4
github.com/dustin/go-humanize v1.0.1
github.com/fatih/color v1.19.0
github.com/gopacket/gopacket v1.7.1
github.com/gopacket/gopacket v1.7.2
github.com/hashicorp/go-multierror v1.1.1
github.com/jessevdk/go-flags v1.6.1
github.com/mattn/go-isatty v0.0.24
github.com/maxbrunsfeld/counterfeiter/v6 v6.12.2
github.com/onsi/ginkgo/v2 v2.32.1
github.com/maxbrunsfeld/counterfeiter/v6 v6.13.0
github.com/onsi/ginkgo/v2 v2.32.2
github.com/onsi/gomega v1.43.0
github.com/peterbourgon/diskv v2.0.1+incompatible
github.com/spf13/cobra v1.10.2
github.com/vito/go-interact v1.0.2
golang.org/x/crypto v0.55.0
golang.org/x/text v0.41.0
golang.org/x/tools v0.49.0
golang.org/x/crypto v0.57.0
golang.org/x/text v0.42.0
golang.org/x/tools v0.50.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
)
Expand All @@ -42,31 +42,31 @@ require (
cloud.google.com/go/compute/metadata v0.9.0 // indirect
cloud.google.com/go/iam v1.13.0 // indirect
cloud.google.com/go/monitoring v1.30.0 // indirect
cloud.google.com/go/storage v1.67.0 // indirect
code.cloudfoundry.org/tlsconfig v0.53.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.36.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.60.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.60.0 // indirect
cloud.google.com/go/storage v1.67.1 // indirect
code.cloudfoundry.org/tlsconfig v0.67.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.38.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.62.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.62.0 // indirect
github.com/Masterminds/semver/v3 v3.5.0 // indirect
github.com/VividCortex/ewma v1.2.0 // indirect
github.com/aws/aws-sdk-go-v2 v1.46.0 // indirect
github.com/aws/aws-sdk-go-v2 v1.47.0 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.20 // indirect
github.com/aws/aws-sdk-go-v2/config v1.33.3 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.20.3 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.19.2 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.23.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.2 // indirect
github.com/aws/aws-sdk-go-v2/config v1.33.5 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.20.5 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.20.0 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.23.7 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.19 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.11.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.20.2 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.111.0 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.9.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.37.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.42.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.49.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.11.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.20.3 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.113.1 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.10.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.38.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.43.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.51.0 // indirect
github.com/aws/smithy-go v1.28.1 // indirect
github.com/bmatcuk/doublestar v1.3.4 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
Expand All @@ -82,16 +82,16 @@ require (
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/pprof v0.0.0-20260903180319-d6c3cb2f37ec // indirect
github.com/google/pprof v0.0.0-20260906184651-6331bc6350fe // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.21 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.22 // indirect
github.com/googleapis/gax-go/v2 v2.24.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/mattn/go-colorable v0.1.15 // indirect
github.com/mattn/go-runewidth v0.0.29 // indirect
github.com/mattn/go-runewidth v0.0.30 // indirect
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/spf13/pflag v1.0.10 // indirect
Expand All @@ -106,18 +106,18 @@ require (
go.opentelemetry.io/otel/sdk/metric v1.46.0 // indirect
go.opentelemetry.io/otel/trace v1.46.0 // indirect
go.yaml.in/yaml/v3 v3.0.5 // indirect
golang.org/x/mod v0.40.0 // indirect
golang.org/x/net v0.58.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.22.0 // indirect
golang.org/x/sys v0.47.0 // indirect
golang.org/x/telemetry v0.0.0-20260814151720-d8c169486af1 // indirect
golang.org/x/term v0.45.0 // indirect
golang.org/x/time v0.15.0 // indirect
google.golang.org/api v0.296.0 // indirect
google.golang.org/genproto v0.0.0-20260904194346-d0f1323225a4 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260904194346-d0f1323225a4 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260904194346-d0f1323225a4 // indirect
golang.org/x/mod v0.41.0 // indirect
golang.org/x/net v0.59.0 // indirect
golang.org/x/oauth2 v0.37.0 // indirect
golang.org/x/sync v0.23.0 // indirect
golang.org/x/sys v0.48.0 // indirect
golang.org/x/telemetry v0.0.0-20260910141331-15ceca2b0a1f // indirect
golang.org/x/term v0.46.0 // indirect
golang.org/x/time v0.16.0 // indirect
google.golang.org/api v0.298.0 // indirect
google.golang.org/genproto v0.0.0-20260911204522-f61a6ca850bd // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260911204522-f61a6ca850bd // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260911204522-f61a6ca850bd // indirect
google.golang.org/grpc v1.83.2 // indirect
google.golang.org/protobuf v1.36.12 // indirect
)
Loading