Only resolve path with firmlink prefix on Catalina

This commit is contained in:
Chris Roberts 2021-11-02 16:44:06 -07:00
parent 6810c7b4bb
commit 5f0e5652b1
2 changed files with 25 additions and 1 deletions

View File

@ -6,6 +6,7 @@ module VagrantPlugins
FIRMLINK_DEFS = "/usr/share/firmlinks".freeze
FIRMLINK_DATA_PATH = "/System/Volumes/Data".freeze
CATALINA_CONSTRAINT = Gem::Requirement.new("~> 10.15")
# Resolve the given host path to the actual
# usable system path by detecting firmlinks
@ -15,6 +16,9 @@ module VagrantPlugins
# @return [String] resolved path
def self.resolve_host_path(env, path)
path = File.expand_path(path)
# Only expand firmlink paths on Catalina
return path if !CATALINA_CONSTRAINT.satisfied_by?(Cap::Version.version(env))
firmlink = firmlink_map.detect do |mount_path, data_path|
path.start_with?(mount_path)
end

View File

@ -1,13 +1,21 @@
require_relative "../../../../base"
require_relative "../../../../../../plugins/hosts/darwin/cap/path"
require_relative "../../../../../../plugins/hosts/darwin/cap/version"
describe VagrantPlugins::HostDarwin::Cap::Path do
describe ".resolve_host_path" do
let(:env) { double("environment") }
let(:path) { "/test/vagrant/path" }
let(:firmlink_map) { {} }
let(:macos_version) { Gem::Version.new("10.15.1") }
before { allow(described_class).to receive(:firmlink_map).and_return(firmlink_map) }
before do
allow(VagrantPlugins::HostDarwin::Cap::Version).to receive(:version).
with(anything).
and_return(macos_version)
allow(described_class).to receive(:firmlink_map).
and_return(firmlink_map)
end
it "should not change the path when no firmlinks are defined" do
expect(described_class.resolve_host_path(env, path)).to eq(path)
@ -48,6 +56,18 @@ describe VagrantPlugins::HostDarwin::Cap::Path do
expect(described_class.resolve_host_path(env, path)).to include("other")
end
end
context "when macos version is later than catalina" do
let(:macos_version) { Gem::Version.new("10.16.1") }
it "should not update the path" do
expect(described_class.resolve_host_path(env, path)).to eq(path)
end
it "should not prefix the path with the defined data path" do
expect(described_class.resolve_host_path(env, path)).not_to start_with(described_class.const_get(:FIRMLINK_DATA_PATH))
end
end
end
describe ".firmlink_map" do