From 231c99b133dbc02e7add08bad9064ac0aac85f96 Mon Sep 17 00:00:00 2001 From: sophia Date: Fri, 11 Feb 2022 11:09:00 -0600 Subject: [PATCH] go generate . --- .../proto/vagrant_plugin_sdk/plugin_pb.rb | 43 +++++++++++-------- .../vagrant_plugin_sdk/plugin_services_pb.rb | 26 +++++++++-- 2 files changed, 47 insertions(+), 22 deletions(-) diff --git a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb index 5b1234f01..b6b58798c 100644 --- a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb +++ b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb @@ -98,6 +98,11 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :network, :string, 2 optional :addr, :string, 3 end + add_message "hashicorp.vagrant.sdk.Args.Provisioner" do + optional :stream_id, :uint32, 1 + optional :network, :string, 2 + optional :addr, :string, 3 + end add_message "hashicorp.vagrant.sdk.Args.Target" do optional :stream_id, :uint32, 1 optional :network, :string, 2 @@ -155,23 +160,23 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_message "hashicorp.vagrant.sdk.Args.Connection" do end add_message "hashicorp.vagrant.sdk.Args.Connection.SSHInfo" do - optional :host, :string, 1 - optional :port, :string, 2 - optional :private_key_path, :string, 3 - optional :keys_only, :bool, 4 - optional :verify_host_key, :bool, 5 - optional :username, :string, 6 - optional :remote_user, :string, 7 - optional :compression, :bool, 8 - optional :dsa_authentication, :bool, 9 - optional :config, :string, 10 + proto3_optional :host, :string, 1 + proto3_optional :port, :string, 2 + proto3_optional :private_key_path, :string, 3 + proto3_optional :keys_only, :bool, 4 + proto3_optional :verify_host_key, :bool, 5 + proto3_optional :username, :string, 6 + proto3_optional :remote_user, :string, 7 + proto3_optional :compression, :bool, 8 + proto3_optional :dsa_authentication, :bool, 9 + proto3_optional :config, :string, 10 repeated :extra_args, :string, 11 - optional :forward_agent, :bool, 12 - optional :forward_x11, :bool, 13 + proto3_optional :forward_agent, :bool, 12 + proto3_optional :forward_x11, :bool, 13 repeated :forward_env, :string, 14 optional :connect_timeout, :int64, 15 - optional :ssh_command, :string, 16 - optional :proxy_command, :string, 17 + proto3_optional :ssh_command, :string, 16 + proto3_optional :proxy_command, :string, 17 end add_message "hashicorp.vagrant.sdk.Args.Connection.WinrmInfo" do optional :username, :string, 1 @@ -220,6 +225,9 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_message "hashicorp.vagrant.sdk.Args.Hash" do map :fields, :string, :message, 1, "google.protobuf.Any" end + add_message "hashicorp.vagrant.sdk.Args.Options" do + optional :options, :message, 1, "hashicorp.vagrant.sdk.Args.Hash" + end add_message "hashicorp.vagrant.sdk.Args.Null" do end add_message "hashicorp.vagrant.sdk.FuncSpec" do @@ -404,9 +412,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_message "hashicorp.vagrant.sdk.PluginInfo.Name" do optional :name, :string, 1 end - add_message "hashicorp.vagrant.sdk.PluginInfo.Priority" do - optional :priority, :int32, 1 - end add_message "hashicorp.vagrant.sdk.PluginManager" do end add_message "hashicorp.vagrant.sdk.PluginManager.PluginsRequest" do @@ -784,6 +789,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :current_version, :string, 3 repeated :machine_configs, :message, 4, "hashicorp.vagrant.sdk.Vagrantfile.MachineConfig" repeated :push_configs, :message, 5, "hashicorp.vagrant.sdk.Vagrantfile.PushConfig" + repeated :provisioners, :message, 6, "hashicorp.vagrant.sdk.Vagrantfile.Provisioner" end add_message "hashicorp.vagrant.sdk.TargetIndex" do end @@ -872,6 +878,7 @@ module Hashicorp Args::Basis = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Basis").msgclass Args::Project = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Project").msgclass Args::Provider = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Provider").msgclass + Args::Provisioner = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Provisioner").msgclass Args::Target = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Target").msgclass Args::Target::State = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Target.State").msgclass Args::Target::State::State = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Target.State.State").enummodule @@ -894,6 +901,7 @@ module Hashicorp Args::Direct = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Direct").msgclass Args::Array = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Array").msgclass Args::Hash = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Hash").msgclass + Args::Options = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Options").msgclass Args::Null = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Null").msgclass FuncSpec = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.FuncSpec").msgclass FuncSpec::Value = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.FuncSpec.Value").msgclass @@ -940,7 +948,6 @@ module Hashicorp PluginInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.PluginInfo").msgclass PluginInfo::ComponentList = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.PluginInfo.ComponentList").msgclass PluginInfo::Name = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.PluginInfo.Name").msgclass - PluginInfo::Priority = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.PluginInfo.Priority").msgclass PluginManager = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.PluginManager").msgclass PluginManager::PluginsRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.PluginManager.PluginsRequest").msgclass PluginManager::PluginsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.PluginManager.PluginsResponse").msgclass diff --git a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb index fa0bcfabf..3a20aa3fb 100644 --- a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb +++ b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb @@ -137,6 +137,8 @@ module Hashicorp rpc :HasCapabilitySpec, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::FuncSpec rpc :Seed, ::Hashicorp::Vagrant::Sdk::Args::Seeds, ::Google::Protobuf::Empty rpc :Seeds, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Args::Seeds + rpc :SetPluginName, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name, ::Google::Protobuf::Empty + rpc :PluginName, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name end Stub = Service.rpc_stub_class @@ -155,11 +157,16 @@ module Hashicorp self.unmarshal_class_method = :decode self.service_name = 'hashicorp.vagrant.sdk.ProvisionerService' - rpc :ConfigStruct, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Config::StructResp - rpc :Configure, ::Hashicorp::Vagrant::Sdk::Config::ConfigureRequest, ::Google::Protobuf::Empty - rpc :Documentation, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Config::Documentation + rpc :ConfigureSpec, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::FuncSpec + rpc :Configure, ::Hashicorp::Vagrant::Sdk::FuncSpec::Args, ::Google::Protobuf::Empty + rpc :ProvisionSpec, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::FuncSpec + rpc :Provision, ::Hashicorp::Vagrant::Sdk::FuncSpec::Args, ::Google::Protobuf::Empty + rpc :CleanupSpec, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::FuncSpec + rpc :Cleanup, ::Hashicorp::Vagrant::Sdk::FuncSpec::Args, ::Google::Protobuf::Empty rpc :Seed, ::Hashicorp::Vagrant::Sdk::Args::Seeds, ::Google::Protobuf::Empty rpc :Seeds, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Args::Seeds + rpc :SetPluginName, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name, ::Google::Protobuf::Empty + rpc :PluginName, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name end Stub = Service.rpc_stub_class @@ -182,6 +189,8 @@ module Hashicorp rpc :CommandInfo, ::Hashicorp::Vagrant::Sdk::FuncSpec::Args, ::Hashicorp::Vagrant::Sdk::Command::CommandInfoResp rpc :Seed, ::Hashicorp::Vagrant::Sdk::Args::Seeds, ::Google::Protobuf::Empty rpc :Seeds, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Args::Seeds + rpc :SetPluginName, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name, ::Google::Protobuf::Empty + rpc :PluginName, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name end Stub = Service.rpc_stub_class @@ -220,6 +229,8 @@ module Hashicorp rpc :Reset, ::Hashicorp::Vagrant::Sdk::FuncSpec::Args, ::Google::Protobuf::Empty rpc :Seed, ::Hashicorp::Vagrant::Sdk::Args::Seeds, ::Google::Protobuf::Empty rpc :Seeds, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Args::Seeds + rpc :SetPluginName, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name, ::Google::Protobuf::Empty + rpc :PluginName, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name end Stub = Service.rpc_stub_class @@ -262,6 +273,8 @@ module Hashicorp rpc :ParentSpec, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::FuncSpec rpc :Seed, ::Hashicorp::Vagrant::Sdk::Args::Seeds, ::Google::Protobuf::Empty rpc :Seeds, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Args::Seeds + rpc :SetPluginName, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name, ::Google::Protobuf::Empty + rpc :PluginName, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name end Stub = Service.rpc_stub_class @@ -288,6 +301,8 @@ module Hashicorp rpc :ParentSpec, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::FuncSpec rpc :Seed, ::Hashicorp::Vagrant::Sdk::Args::Seeds, ::Google::Protobuf::Empty rpc :Seeds, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Args::Seeds + rpc :SetPluginName, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name, ::Google::Protobuf::Empty + rpc :PluginName, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name end Stub = Service.rpc_stub_class @@ -318,7 +333,8 @@ module Hashicorp rpc :HasCapabilitySpec, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::FuncSpec rpc :Seed, ::Hashicorp::Vagrant::Sdk::Args::Seeds, ::Google::Protobuf::Empty rpc :Seeds, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Args::Seeds - rpc :PluginPriority, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::PluginInfo::Priority + rpc :SetPluginName, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name, ::Google::Protobuf::Empty + rpc :PluginName, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name end Stub = Service.rpc_stub_class @@ -554,6 +570,8 @@ module Hashicorp rpc :Push, ::Hashicorp::Vagrant::Sdk::FuncSpec::Args, ::Google::Protobuf::Empty rpc :Seed, ::Hashicorp::Vagrant::Sdk::Args::Seeds, ::Google::Protobuf::Empty rpc :Seeds, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Args::Seeds + rpc :SetPluginName, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name, ::Google::Protobuf::Empty + rpc :PluginName, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::PluginInfo::Name end Stub = Service.rpc_stub_class