From d6c562612dfddfcd35c506e48e408ea3f51c6110 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 14 Jun 2022 09:46:23 -0700 Subject: [PATCH] Update signature and add more vagrantfile loaders --- internal/serverclient/ruby_client.go | 34 ++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/internal/serverclient/ruby_client.go b/internal/serverclient/ruby_client.go index c0a613897..bfcf6fac2 100644 --- a/internal/serverclient/ruby_client.go +++ b/internal/serverclient/ruby_client.go @@ -65,7 +65,7 @@ func (r *RubyVagrantClient) GetPlugins() ([]*ruby_vagrant.Plugin, error) { return plugins.Plugins, nil } -func (r *RubyVagrantClient) ParseVagrantfile(path string) (*vagrant_plugin_sdk.Vagrantfile_Vagrantfile, error) { +func (r *RubyVagrantClient) ParseVagrantfile(path string) (*vagrant_plugin_sdk.Args_Hash, error) { vf, err := r.client.ParseVagrantfile( context.Background(), &ruby_vagrant.ParseVagrantfileRequest{Path: path}, @@ -73,5 +73,35 @@ func (r *RubyVagrantClient) ParseVagrantfile(path string) (*vagrant_plugin_sdk.V if err != nil { return nil, err } - return vf.Vagrantfile, nil + + return vf.Data, nil +} + +func (r *RubyVagrantClient) ParseVagrantfileProc(ref *vagrant_plugin_sdk.Args_ProcRef) (*vagrant_plugin_sdk.Args_Hash, error) { + vf, err := r.client.ParseVagrantfileProc( + context.Background(), + &ruby_vagrant.ParseVagrantfileProcRequest{ + Proc: ref, + }, + ) + if err != nil { + return nil, err + } + + return vf.Data, nil +} + +func (r *RubyVagrantClient) ParseVagrantfileSubvm(subvm *vagrant_plugin_sdk.Config_RawRubyValue) (*vagrant_plugin_sdk.Args_Hash, error) { + resp, err := r.client.ParseVagrantfileSubvm( + context.Background(), + &ruby_vagrant.ParseVagrantfileSubvmRequest{ + Subvm: subvm, + }, + ) + + if err != nil { + return nil, err + } + + return resp.Data, nil }