Skip to content

Commit d8358b9

Browse files
committed
simplify NewRpcService signature, support output capture for core command calls and cleanup warning outputs
1 parent 7d7de9f commit d8358b9

9 files changed

Lines changed: 532 additions & 748 deletions

File tree

cf/cmd/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func Main(traceEnv string, args []string) {
148148
os.Exit(1)
149149
}
150150

151-
rpcService, err := rpc.NewRpcService(deps.TeePrinter, deps.TeePrinter, v3Config, Writer, server, nil, nil, nil)
151+
rpcService, err := rpc.NewRpcService(v3Config, server, nil, nil, nil)
152152
if err != nil {
153153
deps.UI.Say(T("Error initializing RPC service: ") + err.Error())
154154
os.Exit(1)

cf/commands/plugin/install_plugin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (cmd *PluginInstall) SetDependency(deps commandregistry.Dependency, pluginC
8989
cmd.ui.Failed("Error loading config: " + err.Error())
9090
}
9191

92-
rpcService, err := pluginRPCService.NewRpcService(deps.TeePrinter, deps.TeePrinter, v3Config, cmd.ui.Writer(), server, nil, nil, nil)
92+
rpcService, err := pluginRPCService.NewRpcService(v3Config, server, nil, nil, nil)
9393
if err != nil {
9494
cmd.ui.Failed("Error initializing RPC service: " + err.Error())
9595
}

cf/commands/plugin/uninstall_plugin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (cmd *PluginUninstall) SetDependency(deps commandregistry.Dependency, plugi
6262
cmd.ui.Failed("Error loading config: " + err.Error())
6363
}
6464

65-
RPCService, err := rpcService.NewRpcService(deps.TeePrinter, deps.TeePrinter, v3Config, cmd.ui.Writer(), server, nil, nil, nil)
65+
RPCService, err := rpcService.NewRpcService(v3Config, server, nil, nil, nil)
6666
if err != nil {
6767
cmd.ui.Failed("Error initializing RPC service: " + err.Error())
6868
}

command/plugin/shared/rpc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func NewRPCService(config Config, ui UI) (*RPCService, error) {
4343
}
4444

4545
server := netrpc.NewServer()
46-
rpcService, err := rpc.NewRpcService(deps.TeePrinter, deps.TeePrinter, v3Config, ui.Writer(), server, nil, nil, nil)
46+
rpcService, err := rpc.NewRpcService(v3Config, server, nil, nil, nil)
4747
if err != nil {
4848
return nil, err
4949
}

0 commit comments

Comments
 (0)