beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ruby execute func for new proto

Browse Source
This commit is contained in:
sophia 2021-04-21 15:11:47 -05:00 committed by Paul Hinze
parent 3107da72af
commit 9f51d87038
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
6 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/myplugin/command/command.go
View File

@ -37,7 +37,7 @@ func (c *Command) Documentation() (*docs.Documentation, error) {
}
// ExecuteFunc implements component.Command
func (c *Command) ExecuteFunc(name []string) interface{} {
func (c *Command) ExecuteFunc([]string) interface{} {
return c.Execute
}

2
builtin/myplugin/command/dothing.go
View File

@ -35,7 +35,7 @@ func (c *DoThing) Documentation() (*docs.Documentation, error) {
}
// ExecuteFunc implements component.Command
func (c *DoThing) ExecuteFunc(name []string) interface{} {
func (c *DoThing) ExecuteFunc([]string) interface{} {
return c.Execute
}

2
builtin/myplugin/command/info.go
View File

@ -37,7 +37,7 @@ func (c *Info) Documentation() (*docs.Documentation, error) {
}
// ExecuteFunc implements component.Command
func (c *Info) ExecuteFunc(name []string) interface{} {
func (c *Info) ExecuteFunc([]string) interface{} {
return c.Execute
}

3
internal/core/basis.go
View File

@ -87,9 +87,6 @@ func (b *Basis) Init() (result *vagrant_server.Job_InitResult, err error) {
f := b.factories[component.CommandType]
result = &vagrant_server.Job_InitResult{}
for _, name := range f.Registered() {
if name != "myplugin" {
continue
}
c, err := componentCreatorMap[component.CommandType].Create(context.Background(), b, name)
if err != nil {
b.logger.Error("failed to start plugin", "name", name, "error", err)

4
lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb
View File

@ -143,8 +143,8 @@ module Hashicorp
rpc :Documentation, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Config::Documentation
rpc :ExecuteSpec, ::Hashicorp::Vagrant::Sdk::Command::SpecReq, ::Hashicorp::Vagrant::Sdk::FuncSpec
rpc :Execute, ::Hashicorp::Vagrant::Sdk::Command::ExecuteReq, ::Hashicorp::Vagrant::Sdk::Command::ExecuteResp
rpc :CommandInfoSpec, ::Hashicorp::Vagrant::Sdk::Command::SpecReq, ::Hashicorp::Vagrant::Sdk::FuncSpec
rpc :CommandInfo, ::Hashicorp::Vagrant::Sdk::Command::CommandInfoReq, ::Hashicorp::Vagrant::Sdk::Command::CommandInfoResp
rpc :CommandInfoSpec, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::FuncSpec
rpc :CommandInfo, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Command::CommandInfoResp
end
Stub = Service.rpc_stub_class

4
plugins/commands/serve/service/command_service.rb
View File

@ -245,10 +245,10 @@ module VagrantPlugins
def execute(req, ctx)
ServiceInfo.with_info(ctx) do |info|
plugin_name = info.plugin_name
raw_terminal = req.args.detect { |a|
raw_terminal = req.args.args.detect { |a|
a.type == "hashicorp.vagrant.sdk.Args.TerminalUI"
}&.value&.value
raw_args = req.args.detect { |a|
raw_args = req.args.args.detect { |a|
a.type == "hashicorp.vagrant.sdk.Command.Arguments"
}&.value&.value