migrate CliRpcCmd.AccessToken and clean up

Author: jcvrabo

cf/cmd/cmd.go

@@ -148,7 +148,7 @@ func Main(traceEnv string, args []string) {
 		os.Exit(1)
 	}
 
-	rpcService, err := rpc.NewRpcService(deps.TeePrinter, deps.TeePrinter, v3Config, deps.RepoLocator, rpc.NewCommandRunner(), deps.Logger, Writer, server, nil, nil, nil)
+	rpcService, err := rpc.NewRpcService(deps.TeePrinter, deps.TeePrinter, v3Config, Writer, server, nil, nil, nil)
 	if err != nil {
 		deps.UI.Say(T("Error initializing RPC service: ") + err.Error())
 		os.Exit(1)

cf/commands/plugin/install_plugin.go

@@ -89,7 +89,7 @@ func (cmd *PluginInstall) SetDependency(deps commandregistry.Dependency, pluginC
 		cmd.ui.Failed("Error loading config: " + err.Error())
 	}
 
-	rpcService, err := pluginRPCService.NewRpcService(deps.TeePrinter, deps.TeePrinter, v3Config, deps.RepoLocator, pluginRPCService.NewCommandRunner(), deps.Logger, cmd.ui.Writer(), server, nil, nil, nil)
+	rpcService, err := pluginRPCService.NewRpcService(deps.TeePrinter, deps.TeePrinter, v3Config, cmd.ui.Writer(), server, nil, nil, nil)
 	if err != nil {
 		cmd.ui.Failed("Error initializing RPC service: " + err.Error())
 	}

cf/commands/plugin/uninstall_plugin.go

@@ -62,7 +62,7 @@ func (cmd *PluginUninstall) SetDependency(deps commandregistry.Dependency, plugi
 		cmd.ui.Failed("Error loading config: " + err.Error())
 	}
 
-	RPCService, err := rpcService.NewRpcService(deps.TeePrinter, deps.TeePrinter, v3Config, deps.RepoLocator, rpcService.NewCommandRunner(), deps.Logger, cmd.ui.Writer(), server, nil, nil, nil)
+	RPCService, err := rpcService.NewRpcService(deps.TeePrinter, deps.TeePrinter, v3Config, cmd.ui.Writer(), server, nil, nil, nil)
 	if err != nil {
 		cmd.ui.Failed("Error initializing RPC service: " + err.Error())
 	}

command/plugin/shared/rpc.go

@@ -43,7 +43,7 @@ func NewRPCService(config Config, ui UI) (*RPCService, error) {
 	}
 
 	server := netrpc.NewServer()
-	rpcService, err := rpc.NewRpcService(deps.TeePrinter, deps.TeePrinter, v3Config, deps.RepoLocator, rpc.NewCommandRunner(), deps.Logger, ui.Writer(), server, nil, nil, nil)
+	rpcService, err := rpc.NewRpcService(deps.TeePrinter, deps.TeePrinter, v3Config, ui.Writer(), server, nil, nil, nil)
 	if err != nil {
 		return nil, err
 	}