From 5f532fc9867f4069ddded041f5d854d33e3452ba Mon Sep 17 00:00:00 2001 From: sophia Date: Tue, 25 May 2021 14:04:46 -0500 Subject: [PATCH] Make box url a repeated field --- internal/server/proto/ruby_vagrant/ruby-server.pb.go | 8 ++++---- internal/server/proto/ruby_vagrant/ruby-server.proto | 2 +- .../protobufs/proto/ruby_vagrant/ruby-server_pb.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/server/proto/ruby_vagrant/ruby-server.pb.go b/internal/server/proto/ruby_vagrant/ruby-server.pb.go index 5f20d2763..44897291d 100644 --- a/internal/server/proto/ruby_vagrant/ruby-server.pb.go +++ b/internal/server/proto/ruby_vagrant/ruby-server.pb.go @@ -343,7 +343,7 @@ type VagrantfileComponents_ConfigVM struct { Box string `protobuf:"bytes,7,opt,name=box,proto3" json:"box,omitempty"` IgnoreBoxVagrantfile bool `protobuf:"varint,8,opt,name=ignore_box_vagrantfile,json=ignoreBoxVagrantfile,proto3" json:"ignore_box_vagrantfile,omitempty"` BoxCheckUpdate bool `protobuf:"varint,9,opt,name=box_check_update,json=boxCheckUpdate,proto3" json:"box_check_update,omitempty"` - BoxUrl string `protobuf:"bytes,10,opt,name=box_url,json=boxUrl,proto3" json:"box_url,omitempty"` + BoxUrl []string `protobuf:"bytes,10,rep,name=box_url,json=boxUrl,proto3" json:"box_url,omitempty"` BoxServerUrl string `protobuf:"bytes,11,opt,name=box_server_url,json=boxServerUrl,proto3" json:"box_server_url,omitempty"` BoxVersion string `protobuf:"bytes,12,opt,name=box_version,json=boxVersion,proto3" json:"box_version,omitempty"` BoxDownloadCaCert string `protobuf:"bytes,13,opt,name=box_download_ca_cert,json=boxDownloadCaCert,proto3" json:"box_download_ca_cert,omitempty"` @@ -464,11 +464,11 @@ func (x *VagrantfileComponents_ConfigVM) GetBoxCheckUpdate() bool { return false } -func (x *VagrantfileComponents_ConfigVM) GetBoxUrl() string { +func (x *VagrantfileComponents_ConfigVM) GetBoxUrl() []string { if x != nil { return x.BoxUrl } - return "" + return nil } func (x *VagrantfileComponents_ConfigVM) GetBoxServerUrl() string { @@ -1375,7 +1375,7 @@ var file_proto_ruby_vagrant_ruby_server_proto_rawDesc = []byte{ 0x65, 0x12, 0x28, 0x0a, 0x10, 0x62, 0x6f, 0x78, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x62, 0x6f, 0x78, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x62, - 0x6f, 0x78, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, 0x6f, + 0x6f, 0x78, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x62, 0x6f, 0x78, 0x55, 0x72, 0x6c, 0x12, 0x24, 0x0a, 0x0e, 0x62, 0x6f, 0x78, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x62, 0x6f, 0x78, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x6f, diff --git a/internal/server/proto/ruby_vagrant/ruby-server.proto b/internal/server/proto/ruby_vagrant/ruby-server.proto index d0ad5c07c..25d8724d0 100644 --- a/internal/server/proto/ruby_vagrant/ruby-server.proto +++ b/internal/server/proto/ruby_vagrant/ruby-server.proto @@ -70,7 +70,7 @@ message VagrantfileComponents { string box = 7; bool ignore_box_vagrantfile = 8; bool box_check_update = 9; - string box_url = 10; + repeated string box_url = 10; string box_server_url = 11; string box_version = 12; string box_download_ca_cert = 13; diff --git a/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb.rb b/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb.rb index 844d53f07..953f129cd 100644 --- a/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb.rb +++ b/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb.rb @@ -41,7 +41,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :box, :string, 7 optional :ignore_box_vagrantfile, :bool, 8 optional :box_check_update, :bool, 9 - optional :box_url, :string, 10 + repeated :box_url, :string, 10 optional :box_server_url, :string, 11 optional :box_version, :string, 12 optional :box_download_ca_cert, :string, 13