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

Make Vagrantfile protos more closely resemble the Vagrantfile

Browse Source
This commit is contained in:
sophia 2021-05-12 15:42:13 -05:00 committed by Paul Hinze
parent ec54c07f34
commit 6899a2a00d
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
2 changed files with 82 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
internal/server/proto/ruby_vagrant/ruby-server.proto
View File

@ -59,26 +59,58 @@ message ParseVagrantfileResponse {
}
message VagrantfileComponents {
// TODO: Review what needs to be sent here
message Provisioner {
string name = 1;
google.protobuf.Any config = 2;
message ConfigVM {
bool allow_fstab_modification = 1;
bool allow_hosts_modificaion = 2;
string box = 3;
repeated Provisioner provisioners = 4;
// TODO
}
message ConfigSSH {
bool compresssion = 1;
int64 connect_timeout = 2;
// TODO
}
message ConfigWinRM {
string username = 1;
string password = 2;
// TODO
}
message ConfigWinssh {
bool forward_agent = 1;
repeated string forward_env = 2;
// TODO
}
message ConfigVagrant {
string host = 1;
repeated string plugins = 2;
// TODO
}
// TODO: Review what needs to be sent here
message MachineConfig {
string name = 1;
string box = 2;
repeated Provisioner provisioners = 3;
ConfigVM config_vm = 2;
ConfigSSH config_ssh = 3;
ConfigWinRM config_winrm = 4;
ConfigWinssh config_winssh = 5;
ConfigVagrant config_vagrant = 6;
}
// TODO: Review what needs to be sent here
message Communicator {
message Provisioner {
string name = 1;
// This is the config that belongs to the communicator.
// Should be a message type from the core plugin or defined
// by a plugin author
google.protobuf.Any config = 2;
string type = 2;
string before = 3;
string after = 4;
bool communicator_required = 5;
// A Provisioner plugin defines it's own configuration,
// that gets added in here
google.protobuf.Any config = 6;
}
// TODO: Review what needs to be sent here
@ -87,6 +119,5 @@ message VagrantfileComponents {
string raw = 2;
string current_version = 3;
repeated MachineConfig machine_configs = 4;
repeated Communicator communicators = 5;
}
}

48
lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb.rb
View File

@ -31,25 +31,49 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
end
add_message "hashicorp.vagrant.VagrantfileComponents" do
end
add_message "hashicorp.vagrant.VagrantfileComponents.Provisioner" do
optional :name, :string, 1
optional :config, :message, 2, "google.protobuf.Any"
add_message "hashicorp.vagrant.VagrantfileComponents.ConfigVM" do
optional :allow_fstab_modification, :bool, 1
optional :allow_hosts_modificaion, :bool, 2
optional :box, :string, 3
repeated :provisioners, :message, 4, "hashicorp.vagrant.VagrantfileComponents.Provisioner"
end
add_message "hashicorp.vagrant.VagrantfileComponents.ConfigSSH" do
optional :compresssion, :bool, 1
optional :connect_timeout, :int64, 2
end
add_message "hashicorp.vagrant.VagrantfileComponents.ConfigWinRM" do
optional :username, :string, 1
optional :password, :string, 2
end
add_message "hashicorp.vagrant.VagrantfileComponents.ConfigWinssh" do
optional :forward_agent, :bool, 1
repeated :forward_env, :string, 2
end
add_message "hashicorp.vagrant.VagrantfileComponents.ConfigVagrant" do
optional :host, :string, 1
repeated :plugins, :string, 2
end
add_message "hashicorp.vagrant.VagrantfileComponents.MachineConfig" do
optional :name, :string, 1
optional :box, :string, 2
repeated :provisioners, :message, 3, "hashicorp.vagrant.VagrantfileComponents.Provisioner"
optional :config_vm, :message, 2, "hashicorp.vagrant.VagrantfileComponents.ConfigVM"
optional :config_ssh, :message, 3, "hashicorp.vagrant.VagrantfileComponents.ConfigSSH"
optional :config_winrm, :message, 4, "hashicorp.vagrant.VagrantfileComponents.ConfigWinRM"
optional :config_winssh, :message, 5, "hashicorp.vagrant.VagrantfileComponents.ConfigWinssh"
optional :config_vagrant, :message, 6, "hashicorp.vagrant.VagrantfileComponents.ConfigVagrant"
end
add_message "hashicorp.vagrant.VagrantfileComponents.Communicator" do
add_message "hashicorp.vagrant.VagrantfileComponents.Provisioner" do
optional :name, :string, 1
optional :config, :message, 2, "google.protobuf.Any"
optional :type, :string, 2
optional :before, :string, 3
optional :after, :string, 4
optional :communicator_required, :bool, 5
optional :config, :message, 6, "google.protobuf.Any"
end
add_message "hashicorp.vagrant.VagrantfileComponents.Vagrantfile" do
optional :path, :string, 1
optional :raw, :string, 2
optional :current_version, :string, 3
repeated :machine_configs, :message, 4, "hashicorp.vagrant.VagrantfileComponents.MachineConfig"
repeated :communicators, :message, 5, "hashicorp.vagrant.VagrantfileComponents.Communicator"
end
end
end
@ -62,9 +86,13 @@ module Hashicorp
ParseVagrantfileRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.ParseVagrantfileRequest").msgclass
ParseVagrantfileResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.ParseVagrantfileResponse").msgclass
VagrantfileComponents = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.VagrantfileComponents").msgclass
VagrantfileComponents::Provisioner = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.VagrantfileComponents.Provisioner").msgclass
VagrantfileComponents::ConfigVM = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.VagrantfileComponents.ConfigVM").msgclass
VagrantfileComponents::ConfigSSH = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.VagrantfileComponents.ConfigSSH").msgclass
VagrantfileComponents::ConfigWinRM = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.VagrantfileComponents.ConfigWinRM").msgclass
VagrantfileComponents::ConfigWinssh = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.VagrantfileComponents.ConfigWinssh").msgclass
VagrantfileComponents::ConfigVagrant = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.VagrantfileComponents.ConfigVagrant").msgclass
VagrantfileComponents::MachineConfig = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.VagrantfileComponents.MachineConfig").msgclass
VagrantfileComponents::Communicator = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.VagrantfileComponents.Communicator").msgclass
VagrantfileComponents::Provisioner = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.VagrantfileComponents.Provisioner").msgclass
VagrantfileComponents::Vagrantfile = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.VagrantfileComponents.Vagrantfile").msgclass
end
end