From 3cbd3d94f21da81083371ea7a880010ec2c4cb86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Feb 2023 19:50:32 +0000 Subject: [PATCH] Bump github.com/cloudfoundry/cf-test-helpers/v2 from 2.3.0 to 2.5.0 Bumps [github.com/cloudfoundry/cf-test-helpers/v2](https://github.com/cloudfoundry/cf-test-helpers) from 2.3.0 to 2.5.0. - [Release notes](https://github.com/cloudfoundry/cf-test-helpers/releases) - [Commits](https://github.com/cloudfoundry/cf-test-helpers/compare/v2.3.0...v2.5.0) --- updated-dependencies: - dependency-name: github.com/cloudfoundry/cf-test-helpers/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- .../v2/workflowhelpers/internal/cf_auth.go | 7 ++++++- .../v2/workflowhelpers/internal/user.go | 13 ++++++++++++- .../v2/workflowhelpers/user_context.go | 5 ++++- vendor/modules.txt | 2 +- 6 files changed, 26 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index eaeb36b40..331bf9503 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( code.cloudfoundry.org/go-log-cache/v2 v2.0.0 code.cloudfoundry.org/go-loggregator/v9 v9.0.4 code.cloudfoundry.org/tlsconfig v0.0.0-20220621140725-0e6fbd869921 - github.com/cloudfoundry/cf-test-helpers/v2 v2.3.0 + github.com/cloudfoundry/cf-test-helpers/v2 v2.5.0 github.com/cloudfoundry/noaa/v2 v2.2.0 github.com/cloudfoundry/sonde-go v0.0.0-20220627221915-ff36de9c3435 github.com/mholt/archiver v3.1.1+incompatible diff --git a/go.sum b/go.sum index ca0ef46e5..b4ed09d53 100644 --- a/go.sum +++ b/go.sum @@ -13,8 +13,8 @@ github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 h1:afT88tB6u9JCK github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/cloudfoundry/cf-test-helpers/v2 v2.3.0 h1:ZK9su3BS5qBSl5/U+kre+OB/57rgCQPU953VosxpB44= -github.com/cloudfoundry/cf-test-helpers/v2 v2.3.0/go.mod h1:VXxqQ3k7t12i/BpZXGwKw2AsAxZf4PvPvPiJUgfzxBs= +github.com/cloudfoundry/cf-test-helpers/v2 v2.5.0 h1:1K7Mrjwq7/APbp2f+Rs/6LhBM58SWidJejmL9SEcUlI= +github.com/cloudfoundry/cf-test-helpers/v2 v2.5.0/go.mod h1:+obqhEjTB5aVVSKJSmXlSekcukso6YIeSlqTiSDeDq8= github.com/cloudfoundry/noaa/v2 v2.2.0 h1:IGQdK3HixMc1DdAalZ1q8yE4FwkbWgXDNZcdTMB80J4= github.com/cloudfoundry/noaa/v2 v2.2.0/go.mod h1:s35aUr+66FRbQCxc191Y0ewMUVOADE3lAkLpAPDpPK0= github.com/cloudfoundry/sonde-go v0.0.0-20220627221915-ff36de9c3435 h1:xDsJBppu1bIny3d5CqbOZuCzezFbKhnrmrNucWLpNOk= diff --git a/vendor/github.com/cloudfoundry/cf-test-helpers/v2/workflowhelpers/internal/cf_auth.go b/vendor/github.com/cloudfoundry/cf-test-helpers/v2/workflowhelpers/internal/cf_auth.go index baaad3db8..5169a72ae 100644 --- a/vendor/github.com/cloudfoundry/cf-test-helpers/v2/workflowhelpers/internal/cf_auth.go +++ b/vendor/github.com/cloudfoundry/cf-test-helpers/v2/workflowhelpers/internal/cf_auth.go @@ -13,8 +13,13 @@ import ( const VerboseAuth = "RELINT_VERBOSE_AUTH" const CFAuthRetries = 2 -func CfAuth(cmdStarter internal.Starter, reporter internal.Reporter, user string, password string, timeout time.Duration) error { +func CfAuth(cmdStarter internal.Starter, reporter internal.Reporter, user string, password string, origin string, timeout time.Duration) error { args := []string{"auth", user, password} + + if origin != "" { + args = append(args, "--origin", origin) + } + if os.Getenv(VerboseAuth) == "true" { args = append(args, "-v") } diff --git a/vendor/github.com/cloudfoundry/cf-test-helpers/v2/workflowhelpers/internal/user.go b/vendor/github.com/cloudfoundry/cf-test-helpers/v2/workflowhelpers/internal/user.go index c9515e696..5ea9cdce2 100644 --- a/vendor/github.com/cloudfoundry/cf-test-helpers/v2/workflowhelpers/internal/user.go +++ b/vendor/github.com/cloudfoundry/cf-test-helpers/v2/workflowhelpers/internal/user.go @@ -17,6 +17,7 @@ import ( type TestUser struct { username string password string + origin string cmdStarter internal.Starter timeout time.Duration shouldKeepUser bool @@ -26,6 +27,7 @@ type UserConfig interface { GetUseExistingUser() bool GetExistingUser() string GetExistingUserPassword() string + GetUserOrigin() string GetShouldKeepUser() bool GetConfigurableTestPassword() string } @@ -40,6 +42,7 @@ type userConfig interface { type AdminUserConfig interface { GetAdminUser() string GetAdminPassword() string + GetAdminOrigin() string } type ClientConfig interface { @@ -53,14 +56,16 @@ type AdminClientConfig interface { } func NewTestUser(config userConfig, cmdStarter internal.Starter) *TestUser { - var regUser, regUserPass string + var regUser, regUserPass, regUserOrigin string if config.GetUseExistingUser() { regUser = config.GetExistingUser() regUserPass = config.GetExistingUserPassword() + regUserOrigin = config.GetUserOrigin() } else { regUser = generator.PrefixedRandomName(config.GetNamePrefix(), "USER") regUserPass = generatePassword() + regUserOrigin = config.GetUserOrigin() } if config.GetConfigurableTestPassword() != "" { @@ -70,6 +75,7 @@ func NewTestUser(config userConfig, cmdStarter internal.Starter) *TestUser { return &TestUser{ username: regUser, password: regUserPass, + origin: regUserOrigin, cmdStarter: cmdStarter, timeout: config.GetScaledTimeout(1 * time.Minute), shouldKeepUser: config.GetShouldKeepUser(), @@ -80,6 +86,7 @@ func NewAdminUser(config AdminUserConfig, cmdStarter internal.Starter) *TestUser return &TestUser{ username: config.GetAdminUser(), password: config.GetAdminPassword(), + origin: config.GetAdminOrigin(), cmdStarter: cmdStarter, } } @@ -125,6 +132,10 @@ func (user *TestUser) Password() string { return user.password } +func (user *TestUser) Origin() string { + return user.origin +} + func (user *TestUser) ShouldRemain() bool { return user.shouldKeepUser } diff --git a/vendor/github.com/cloudfoundry/cf-test-helpers/v2/workflowhelpers/user_context.go b/vendor/github.com/cloudfoundry/cf-test-helpers/v2/workflowhelpers/user_context.go index 66bc4e00f..2da793c46 100644 --- a/vendor/github.com/cloudfoundry/cf-test-helpers/v2/workflowhelpers/user_context.go +++ b/vendor/github.com/cloudfoundry/cf-test-helpers/v2/workflowhelpers/user_context.go @@ -19,6 +19,7 @@ import ( type userValues interface { Username() string Password() string + Origin() string } type spaceValues interface { @@ -40,6 +41,7 @@ type UserContext struct { Password string Org string Space string + Origin string UseClientCredentials bool } @@ -74,6 +76,7 @@ func NewUserContext(apiUrl string, testUser userValues, testSpace spaceValues, s ApiUrl: apiUrl, Username: testUser.Username(), Password: testUser.Password(), + Origin: testUser.Origin(), TestSpace: testSpace, TestUser: testUser, Org: org, @@ -100,7 +103,7 @@ func (uc UserContext) Login() { if uc.UseClientCredentials { err = workflowhelpersinternal.CfClientAuth(uc.CommandStarter, redactingReporter, uc.TestUser.Username(), uc.TestUser.Password(), uc.Timeout) } else { - err = workflowhelpersinternal.CfAuth(uc.CommandStarter, redactingReporter, uc.TestUser.Username(), uc.TestUser.Password(), uc.Timeout) + err = workflowhelpersinternal.CfAuth(uc.CommandStarter, redactingReporter, uc.TestUser.Username(), uc.TestUser.Password(), uc.TestUser.Origin(), uc.Timeout) } Expect(err).NotTo(HaveOccurred()) diff --git a/vendor/modules.txt b/vendor/modules.txt index 34f378b5d..3b8d3becf 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -15,7 +15,7 @@ code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2 ## explicit; go 1.17 code.cloudfoundry.org/tlsconfig code.cloudfoundry.org/tlsconfig/certtest -# github.com/cloudfoundry/cf-test-helpers/v2 v2.3.0 +# github.com/cloudfoundry/cf-test-helpers/v2 v2.5.0 ## explicit; go 1.18 github.com/cloudfoundry/cf-test-helpers/v2/cf github.com/cloudfoundry/cf-test-helpers/v2/commandreporter