Get curent user with /whoami endpoint for all commands

Co-authored-by: Kieron Browne <[email protected]>
eirini-forks · Nov 18, 2021 · ab319eb · ab319eb
1 parent d7919f4
commit ab319eb
Show file tree

Hide file tree

Showing 319 changed files with 696 additions and 568 deletions.
diff --git a/command/v7/add_network_policy_command.go b/command/v7/add_network_policy_command.go
@@ -98,7 +98,7 @@ func (cmd AddNetworkPolicyCommand) Execute(args []string) error {
 		destSpaceGUID = destSpace.GUID
 	}
 
-	user, err := cmd.Config.CurrentUser()
+	user, err := cmd.Actor.GetCurrentUser()
 	if err != nil {
 		return err
 	}

diff --git a/command/v7/add_network_policy_command_test.go b/command/v7/add_network_policy_command_test.go
@@ -88,7 +88,7 @@ var _ = Describe("add-network-policy Command", func() {
 
 	When("the user is logged in, an org is targeted, and a space is targeted", func() {
 		BeforeEach(func() {
-			fakeConfig.CurrentUserReturns(configv3.User{Name: "some-user"}, nil)
+			fakeActor.GetCurrentUserReturns(configv3.User{Name: "some-user"}, nil)
 			fakeConfig.TargetedSpaceReturns(configv3.Space{Name: "some-space", GUID: "some-space-guid"})
 			fakeConfig.TargetedOrganizationReturns(configv3.Organization{Name: "some-org"})
 		})

diff --git a/command/v7/allow_space_ssh_command.go b/command/v7/allow_space_ssh_command.go
@@ -14,13 +14,12 @@ type AllowSpaceSSHCommand struct {
 }
 
 func (cmd *AllowSpaceSSHCommand) Execute(args []string) error {
-
 	err := cmd.SharedActor.CheckTarget(true, false)
 	if err != nil {
 		return err
 	}
 
-	currentUserName, err := cmd.Config.CurrentUserName()
+	currentUser, err := cmd.Actor.GetCurrentUser()
 	if err != nil {
 		return err
 	}
@@ -30,7 +29,7 @@ func (cmd *AllowSpaceSSHCommand) Execute(args []string) error {
 
 	cmd.UI.DisplayTextWithFlavor("Enabling ssh support for space {{.Space}} as {{.CurrentUserName}}...", map[string]interface{}{
 		"Space":           inputSpace,
-		"CurrentUserName": currentUserName,
+		"CurrentUserName": currentUser.Name,
 	})
 
 	warnings, err := cmd.Actor.UpdateSpaceFeature(inputSpace, targetedOrgGUID, true, "ssh")
@@ -50,5 +49,4 @@ func (cmd *AllowSpaceSSHCommand) Execute(args []string) error {
 	cmd.UI.DisplayOK()
 
 	return err
-
 }
diff --git a/command/v7/allow_space_ssh_command_test.go b/command/v7/allow_space_ssh_command_test.go
@@ -8,6 +8,7 @@ import (
 	"code.cloudfoundry.org/cli/command/commandfakes"
 	. "code.cloudfoundry.org/cli/command/v7"
 	"code.cloudfoundry.org/cli/command/v7/v7fakes"
+	"code.cloudfoundry.org/cli/util/configv3"
 	"code.cloudfoundry.org/cli/util/ui"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -47,7 +48,7 @@ var _ = Describe("allow-space-ssh Command", func() {
 		binaryName = "faceman"
 		fakeConfig.BinaryNameReturns(binaryName)
 		currentUserName = "some-user"
-		fakeConfig.CurrentUserNameReturns(currentUserName, nil)
+		fakeActor.GetCurrentUserReturns(configv3.User{Name: currentUserName}, nil)
 	})
 
 	JustBeforeEach(func() {
@@ -71,7 +72,7 @@ var _ = Describe("allow-space-ssh Command", func() {
 
 	When("checking the current user fails", func() {
 		BeforeEach(func() {
-			fakeConfig.CurrentUserNameReturns("", errors.New("uh oh"))
+			fakeActor.GetCurrentUserReturns(configv3.User{}, errors.New("uh oh"))
 		})
 
 		It("returns the error", func() {

diff --git a/command/v7/api_command_test.go b/command/v7/api_command_test.go
@@ -144,9 +144,7 @@ API version:    100.200.300`,
 		})
 
 		When("the URL host does not exist", func() {
-			var (
-				requestErr ccerror.RequestError
-			)
+			var requestErr ccerror.RequestError
 
 			BeforeEach(func() {
 				CCAPI = "i.do.not.exist.com"

diff --git a/command/v7/app_command.go b/command/v7/app_command.go
@@ -24,7 +24,7 @@ func (cmd AppCommand) Execute(args []string) error {
 		return cmd.displayAppGUID()
 	}
 
-	user, err := cmd.Config.CurrentUser()
+	user, err := cmd.Actor.GetCurrentUser()
 	if err != nil {
 		return err
 	}

diff --git a/command/v7/app_command_test.go b/command/v7/app_command_test.go
@@ -60,7 +60,7 @@ var _ = Describe("app Command", func() {
 			GUID: "some-space-guid",
 		})
 
-		fakeConfig.CurrentUserReturns(configv3.User{Name: "steve"}, nil)
+		fakeActor.GetCurrentUserReturns(configv3.User{Name: "steve"}, nil)
 	})
 
 	JustBeforeEach(func() {
@@ -87,7 +87,7 @@ var _ = Describe("app Command", func() {
 
 		BeforeEach(func() {
 			expectedErr = errors.New("some current user error")
-			fakeConfig.CurrentUserReturns(configv3.User{}, expectedErr)
+			fakeActor.GetCurrentUserReturns(configv3.User{}, expectedErr)
 		})
 
 		It("return an error", func() {

diff --git a/command/v7/apply_manifest_command.go b/command/v7/apply_manifest_command.go
@@ -50,7 +50,7 @@ func (cmd ApplyManifestCommand) Execute(args []string) error {
 		return err
 	}
 
-	user, err := cmd.Config.CurrentUser()
+	user, err := cmd.Actor.GetCurrentUser()
 	if err != nil {
 		return err
 	}

diff --git a/command/v7/apply_manifest_command_test.go b/command/v7/apply_manifest_command_test.go
@@ -88,7 +88,7 @@ var _ = Describe("apply-manifest Command", func() {
 
 		BeforeEach(func() {
 			expectedErr = errors.New("some current user error")
-			fakeConfig.CurrentUserReturns(configv3.User{}, expectedErr)
+			fakeActor.GetCurrentUserReturns(configv3.User{}, expectedErr)
 		})
 
 		It("return an error", func() {
@@ -109,7 +109,7 @@ var _ = Describe("apply-manifest Command", func() {
 				Name: "some-space",
 				GUID: "some-space-guid",
 			})
-			fakeConfig.CurrentUserReturns(configv3.User{Name: "steve"}, nil)
+			fakeActor.GetCurrentUserReturns(configv3.User{Name: "steve"}, nil)
 		})
 
 		When("the manifest location is specified with `-f`", func() {

diff --git a/command/v7/apps_command.go b/command/v7/apps_command.go
@@ -22,7 +22,7 @@ func (cmd AppsCommand) Execute(args []string) error {
 		return err
 	}
 
-	user, err := cmd.Config.CurrentUser()
+	user, err := cmd.Actor.GetCurrentUser()
 	if err != nil {
 		return err
 	}

diff --git a/command/v7/apps_command_test.go b/command/v7/apps_command_test.go
@@ -56,7 +56,7 @@ var _ = Describe("apps Command", func() {
 			GUID: "some-space-guid",
 		})
 
-		fakeConfig.CurrentUserReturns(configv3.User{Name: "steve"}, nil)
+		fakeActor.GetCurrentUserReturns(configv3.User{Name: "steve"}, nil)
 	})
 
 	JustBeforeEach(func() {
@@ -87,7 +87,7 @@ var _ = Describe("apps Command", func() {
 
 		BeforeEach(func() {
 			expectedErr = errors.New("some current user error")
-			fakeConfig.CurrentUserReturns(configv3.User{}, expectedErr)
+			fakeActor.GetCurrentUserReturns(configv3.User{}, expectedErr)
 		})
 
 		It("return an error", func() {

diff --git a/command/v7/bind_route_service_command.go b/command/v7/bind_route_service_command.go
@@ -76,7 +76,7 @@ In Windows Command Line use single-quoted, escaped JSON: '{\"valid\":\"json\"}'
 }
 
 func (cmd BindRouteServiceCommand) displayIntro() error {
-	user, err := cmd.Config.CurrentUser()
+	user, err := cmd.Actor.GetCurrentUser()
 	if err != nil {
 		return err
 	}

diff --git a/command/v7/bind_route_service_command_test.go b/command/v7/bind_route_service_command_test.go
@@ -60,7 +60,7 @@ var _ = Describe("bind-route-service Command", func() {
 
 		fakeConfig.TargetedOrganizationReturns(configv3.Organization{Name: fakeOrgName})
 
-		fakeConfig.CurrentUserReturns(configv3.User{Name: fakeUserName}, nil)
+		fakeActor.GetCurrentUserReturns(configv3.User{Name: fakeUserName}, nil)
 
 		fakeActor.CreateRouteBindingReturns(
 			nil,
@@ -346,7 +346,7 @@ var _ = Describe("bind-route-service Command", func() {
 
 	When("getting the username returns an error", func() {
 		BeforeEach(func() {
-			fakeConfig.CurrentUserReturns(configv3.User{}, errors.New("bad thing"))
+			fakeActor.GetCurrentUserReturns(configv3.User{}, errors.New("bad thing"))
 		})
 
 		It("returns the error", func() {

diff --git a/command/v7/bind_running_security_group_command.go b/command/v7/bind_running_security_group_command.go
@@ -21,7 +21,7 @@ func (cmd BindRunningSecurityGroupCommand) Execute(args []string) error {
 		return err
 	}
 
-	user, err := cmd.Config.CurrentUser()
+	user, err := cmd.Actor.GetCurrentUser()
 	if err != nil {
 		return err
 	}

diff --git a/command/v7/bind_running_security_group_command_test.go b/command/v7/bind_running_security_group_command_test.go
@@ -47,7 +47,7 @@ var _ = Describe("bind-running-security-group Command", func() {
 		binaryName = "faceman"
 		fakeConfig.BinaryNameReturns(binaryName)
 
-		fakeConfig.CurrentUserReturns(
+		fakeActor.GetCurrentUserReturns(
 			configv3.User{Name: "some-user"},
 			nil)
 	})
@@ -63,7 +63,7 @@ var _ = Describe("bind-running-security-group Command", func() {
 
 	When("the current user is invalid", func() {
 		BeforeEach(func() {
-			fakeConfig.CurrentUserReturns(
+			fakeActor.GetCurrentUserReturns(
 				configv3.User{},
 				errors.New("some-error"))
 		})

diff --git a/command/v7/bind_security_group_command.go b/command/v7/bind_security_group_command.go
@@ -27,7 +27,7 @@ func (cmd BindSecurityGroupCommand) Execute(args []string) error {
 		return err
 	}
 
-	user, err := cmd.Config.CurrentUser()
+	user, err := cmd.Actor.GetCurrentUser()
 	if err != nil {
 		return err
 	}

diff --git a/command/v7/bind_security_group_command_test.go b/command/v7/bind_security_group_command_test.go
@@ -53,7 +53,7 @@ var _ = Describe("bind-security-group Command", func() {
 		cmd.RequiredArgs.SecurityGroupName = "some-security-group"
 		cmd.RequiredArgs.OrganizationName = "some-org"
 
-		fakeConfig.CurrentUserReturns(
+		fakeActor.GetCurrentUserReturns(
 			configv3.User{Name: "some-user"},
 			nil)
 		fakeActor.GetSecurityGroupReturns(
@@ -95,7 +95,7 @@ var _ = Describe("bind-security-group Command", func() {
 
 			BeforeEach(func() {
 				expectedErr = errors.New("getting current user error")
-				fakeConfig.CurrentUserReturns(
+				fakeActor.GetCurrentUserReturns(
 					configv3.User{},
 					expectedErr)
 			})

diff --git a/command/v7/bind_service_command.go b/command/v7/bind_service_command.go
@@ -101,7 +101,7 @@ CF_NAME bind-service myapp mydb -c ~/workspace/tmp/instance_config.json --bindin
 }
 
 func (cmd BindServiceCommand) displayIntro() error {
-	user, err := cmd.Config.CurrentUser()
+	user, err := cmd.Actor.GetCurrentUser()
 	if err != nil {
 		return err
 	}

diff --git a/command/v7/bind_service_command_test.go b/command/v7/bind_service_command_test.go
@@ -58,7 +58,7 @@ var _ = Describe("bind-service Command", func() {
 
 		fakeConfig.TargetedOrganizationReturns(configv3.Organization{Name: fakeOrgName})
 
-		fakeConfig.CurrentUserReturns(configv3.User{Name: fakeUserName}, nil)
+		fakeActor.GetCurrentUserReturns(configv3.User{Name: fakeUserName}, nil)
 
 		fakeActor.CreateServiceAppBindingReturns(
 			nil,
@@ -323,7 +323,7 @@ var _ = Describe("bind-service Command", func() {
 
 	When("getting the username returns an error", func() {
 		BeforeEach(func() {
-			fakeConfig.CurrentUserReturns(configv3.User{}, errors.New("bad thing"))
+			fakeActor.GetCurrentUserReturns(configv3.User{}, errors.New("bad thing"))
 		})
 
 		It("returns the error", func() {

diff --git a/command/v7/bind_staging_security_group_command.go b/command/v7/bind_staging_security_group_command.go
@@ -21,7 +21,7 @@ func (cmd BindStagingSecurityGroupCommand) Execute(args []string) error {
 		return err
 	}
 
-	user, err := cmd.Config.CurrentUser()
+	user, err := cmd.Actor.GetCurrentUser()
 	if err != nil {
 		return err
 	}

diff --git a/command/v7/bind_staging_security_group_command_test.go b/command/v7/bind_staging_security_group_command_test.go
@@ -47,7 +47,7 @@ var _ = Describe("bind-staging-security-group Command", func() {
 		binaryName = "faceman"
 		fakeConfig.BinaryNameReturns(binaryName)
 
-		fakeConfig.CurrentUserReturns(
+		fakeActor.GetCurrentUserReturns(
 			configv3.User{Name: "some-user"},
 			nil)
 	})
@@ -63,7 +63,7 @@ var _ = Describe("bind-staging-security-group Command", func() {
 
 	When("the current user is invalid", func() {
 		BeforeEach(func() {
-			fakeConfig.CurrentUserReturns(
+			fakeActor.GetCurrentUserReturns(
 				configv3.User{},
 				errors.New("some-error"))
 		})

diff --git a/command/v7/buildpacks_command.go b/command/v7/buildpacks_command.go
@@ -21,7 +21,7 @@ func (cmd BuildpacksCommand) Execute(args []string) error {
 		return err
 	}
 
-	user, err := cmd.Config.CurrentUser()
+	user, err := cmd.Actor.GetCurrentUser()
 	if err != nil {
 		return err
 	}

diff --git a/command/v7/buildpacks_command_test.go b/command/v7/buildpacks_command_test.go
@@ -72,7 +72,7 @@ var _ = Describe("buildpacks Command", func() {
 
 	When("the environment is setup correctly", func() {
 		BeforeEach(func() {
-			fakeConfig.CurrentUserReturns(configv3.User{Name: "apple"}, nil)
+			fakeActor.GetCurrentUserReturns(configv3.User{Name: "apple"}, nil)
 		})
 
 		It("should print text indicating its runnning", func() {

diff --git a/command/v7/cancel_deployment_command.go b/command/v7/cancel_deployment_command.go
@@ -18,7 +18,7 @@ func (cmd *CancelDeploymentCommand) Execute(args []string) error {
 		return err
 	}
 
-	userName, err := cmd.Config.CurrentUserName()
+	user, err := cmd.Actor.GetCurrentUser()
 	if err != nil {
 		return err
 	}
@@ -29,7 +29,7 @@ func (cmd *CancelDeploymentCommand) Execute(args []string) error {
 			"AppName":   cmd.RequiredArgs.AppName,
 			"OrgName":   cmd.Config.TargetedOrganization().Name,
 			"SpaceName": cmd.Config.TargetedSpace().Name,
-			"UserName":  userName,
+			"UserName":  user.Name,
 		},
 	)
 

diff --git a/command/v7/cancel_deployment_command_test.go b/command/v7/cancel_deployment_command_test.go
@@ -63,7 +63,7 @@ var _ = Describe("Cancel deployment command", func() {
 			GUID: spaceGUID,
 		})
 
-		fakeConfig.CurrentUserReturns(configv3.User{Name: "timmyD"}, nil)
+		fakeActor.GetCurrentUserReturns(configv3.User{Name: "timmyD"}, nil)
 	})
 
 	JustBeforeEach(func() {
@@ -90,7 +90,7 @@ var _ = Describe("Cancel deployment command", func() {
 
 		BeforeEach(func() {
 			expectedErr = errors.New("some current user error")
-			fakeConfig.CurrentUserNameReturns("", expectedErr)
+			fakeActor.GetCurrentUserReturns(configv3.User{}, expectedErr)
 		})
 
 		It("return an error", func() {

diff --git a/command/v7/check_route_command.go b/command/v7/check_route_command.go
@@ -37,7 +37,7 @@ func (cmd CheckRouteCommand) Execute(args []string) error {
 		return err
 	}
 
-	_, err = cmd.Config.CurrentUser()
+	_, err = cmd.Actor.GetCurrentUser()
 	if err != nil {
 		return err
 	}

diff --git a/command/v7/check_route_command_test.go b/command/v7/check_route_command_test.go
@@ -47,7 +47,7 @@ var _ = Describe("check-route Command", func() {
 
 		fakeConfig.TargetedSpaceReturns(configv3.Space{Name: "some-space", GUID: "some-space-guid"})
 		fakeConfig.TargetedOrganizationReturns(configv3.Organization{Name: "some-org"})
-		fakeConfig.CurrentUserReturns(configv3.User{Name: "some-user"}, nil)
+		fakeActor.GetCurrentUserReturns(configv3.User{Name: "some-user"}, nil)
 		fakeActor.CheckRouteReturns(
 			true,
 			v7action.Warnings{"check-route-warning"},
@@ -77,12 +77,12 @@ var _ = Describe("check-route Command", func() {
 	})
 
 	It("checks if the user is logged in", func() {
-		Expect(fakeConfig.CurrentUserCallCount()).To(Equal(1))
+		Expect(fakeActor.GetCurrentUserCallCount()).To(Equal(1))
 	})
 
 	When("the user is not logged in", func() {
 		BeforeEach(func() {
-			fakeConfig.CurrentUserReturns(configv3.User{}, errors.New("no current user"))
+			fakeActor.GetCurrentUserReturns(configv3.User{}, errors.New("no current user"))
 		})
 
 		It("returns an error", func() {

diff --git a/command/v7/copy_source_command.go b/command/v7/copy_source_command.go
@@ -67,7 +67,7 @@ func (cmd CopySourceCommand) Execute(args []string) error {
 		return err
 	}
 
-	user, err := cmd.Config.CurrentUser()
+	user, err := cmd.Actor.GetCurrentUser()
 	if err != nil {
 		return err
 	}