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

Convert to pathnames on upload and download

Browse Source
This commit is contained in:
Chris Roberts 2022-01-11 10:29:10 -08:00 committed by Paul Hinze
parent 2bf39a7dcf
commit b08ca1e109
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/commands/serve/client/communicator.rb
View File

@ -30,8 +30,8 @@ module VagrantPlugins
def ready(machine)
req = SDK::FuncSpec::Args.new(
args: [SDK::FuncSpec::Value.new(
name: "",
type: "hashicorp.vagrant.sdk.Args.Target.Machine",
name: "",
type: "hashicorp.vagrant.sdk.Args.Target.Machine",
value: Google::Protobuf::Any.pack(machine.to_proto)
)]
)
@ -48,8 +48,8 @@ module VagrantPlugins
def wait_for_ready(machine, time)
req = SDK::FuncSpec::Args.new(
args: [SDK::FuncSpec::Value.new(
name: "",
type: "hashicorp.vagrant.sdk.Args.Target.Machine",
name: "",
type: "hashicorp.vagrant.sdk.Args.Target.Machine",
value: Google::Protobuf::Any.pack(machine.to_proto)
),
SDK::FuncSpec::Value.new(
@ -70,21 +70,23 @@ module VagrantPlugins
# @param [String] remote path
# @param [String] local path
def download(machine, from, to)
from = Pathname.new(from.to_s) if !from.is_a?(Pathname)
to = Pathname.new(to.to_s) if !to.is_a?(Pathname)
from_val = mapper.map(from, to: SDK::Args::Path)
to_val = mapper.map(to, to: SDK::Args::Path)
req = SDK::FuncSpec::Args.new(
args: [
SDK::FuncSpec::Value.new(
name: "",
type: "hashicorp.vagrant.sdk.Args.Target.Machine",
name: "",
type: "hashicorp.vagrant.sdk.Args.Target.Machine",
value: Google::Protobuf::Any.pack(machine.to_proto)
),
SDK::FuncSpec::Value.new(
name: "source",
name: "source",
value: Google::Protobuf::Any.pack(from_val)
),
SDK::FuncSpec::Value.new(
name: "destination",
name: "destination",
value: Google::Protobuf::Any.pack(to_val)
),
]
@ -98,21 +100,23 @@ module VagrantPlugins
# @param [String] local path
# @param [String] remote path
def upload(machine, from, to)
from = Pathname.new(from.to_s) if !from.is_a?(Pathname)
to = Pathname.new(to.to_s) if !to.is_a?(Pathname)
from_val = mapper.map(from, to: SDK::Args::Path)
to_val = mapper.map(to, to: SDK::Args::Path)
req = SDK::FuncSpec::Args.new(
args: [
SDK::FuncSpec::Value.new(
name: "",
type: "hashicorp.vagrant.sdk.Args.Target.Machine",
name: "",
type: "hashicorp.vagrant.sdk.Args.Target.Machine",
value: Google::Protobuf::Any.pack(machine.to_proto)
),
SDK::FuncSpec::Value.new(
name: "source",
name: "source",
value: Google::Protobuf::Any.pack(from_val)
),
SDK::FuncSpec::Value.new(
name: "destination",
name: "destination",
value: Google::Protobuf::Any.pack(to_val)
),
]
@ -145,7 +149,7 @@ module VagrantPlugins
@logger.debug("privleged excution result: #{res}")
res
end
# @param [Vagrant::Machine]
# @param [String] command to run
# @param [Hash] options
@ -162,8 +166,8 @@ module VagrantPlugins
def reset(machine)
req = SDK::FuncSpec::Args.new(
args: [SDK::FuncSpec::Value.new(
name: "",
type: "hashicorp.vagrant.sdk.Args.Target.Machine",
name: "",
type: "hashicorp.vagrant.sdk.Args.Target.Machine",
value: Google::Protobuf::Any.pack(machine.to_proto)
)]
)
@ -181,8 +185,8 @@ module VagrantPlugins
SDK::FuncSpec::Args.new(
args: [
SDK::FuncSpec::Value.new(
name: "",
type: "hashicorp.vagrant.sdk.Args.Target.Machine",
name: "",
type: "hashicorp.vagrant.sdk.Args.Target.Machine",
value: Google::Protobuf::Any.pack(machine.to_proto)
),
SDK::FuncSpec::Value.new(