vagrant-unbundled 1.9.5.1 → 1.9.7.1

data/test/unit/plugins/guests/smartos/cap/change_host_name_test.rb

@@ -1,33 +1,39 @@
 require_relative "../../../../base"
-require_relative "../../../../../../plugins/guests/smartos/config"
 
-describe "VagrantPlugins::VagrantPlugins::Cap::ChangeHostName" do
-  let(:plugin) { VagrantPlugins::GuestSmartos::Plugin.components.guest_capabilities[:smartos].get(:change_host_name) }
+describe "VagrantPlugins::GuestSmartos::Cap::ChangeHostName" do
+  let(:caps) do
+    VagrantPlugins::GuestSmartos::Plugin
+        .components
+        .guest_capabilities[:smartos]
+  end
+
   let(:machine) { double("machine") }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
   let(:config) { double("config", smartos: VagrantPlugins::GuestSmartos::Config.new) }
-  let(:communicator) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
-  let(:old_hostname) { 'oldhostname.olddomain.tld' }
-  let(:new_hostname) { 'newhostname.olddomain.tld' }
 
   before do
-    machine.stub(:communicate).and_return(communicator)
+    machine.stub(:communicate).and_return(comm)
     machine.stub(:config).and_return(config)
-    communicator.stub_command("hostname | grep '#{old_hostname}'", stdout: old_hostname)
   end
 
   after do
-    communicator.verify_expectations!
+    comm.verify_expectations!
   end
 
   describe ".change_host_name" do
-    it "refreshes the hostname service with the hostname command" do
-      communicator.expect_command(%Q(pfexec hostname #{new_hostname}))
-      plugin.change_host_name(machine, new_hostname)
-    end
+    let(:cap) { caps.get(:change_host_name) }
+
+    it "changes the hostname if appropriate" do
+      cap.change_host_name(machine, "testhost")
 
-    it "writes the hostname into /etc/nodename" do
-      communicator.expect_command(%Q(pfexec sh -c "echo '#{new_hostname}' > /etc/nodename"))
-      plugin.change_host_name(machine, new_hostname)
+      expect(comm.received_commands[0]).to match(/if hostname | grep 'testhost' ; then/)
+      expect(comm.received_commands[0]).to match(/exit 0/)
+      expect(comm.received_commands[0]).to match(/fi/)
+      expect(comm.received_commands[0]).to match(/if \[ -d \/usbkey \] && \[ "\$\(zonename\)" == "global" \] ; then/)
+      expect(comm.received_commands[0]).to match(/pfexec sed -i '' 's\/hostname=\.\*\/hostname=testhost\/' \/usbkey\/config/)
+      expect(comm.received_commands[0]).to match(/fi/)
+      expect(comm.received_commands[0]).to match(/pfexec echo 'testhost' > \/etc\/nodename/)
+      expect(comm.received_commands[0]).to match(/pfexec hostname testhost/)
     end
   end
 end

data/test/unit/plugins/guests/smartos/cap/halt_test.rb

@@ -5,7 +5,7 @@ describe "VagrantPlugins::GuestSmartos::Cap::Halt" do
   let(:machine) { double("machine") }
   let(:config) { double("config", smartos: double("smartos", suexec_cmd: 'pfexec')) }
   let(:communicator) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
-  let(:shutdown_command){ "pfexec /usr/sbin/shutdown -y -i5 -g0" }
+  let(:shutdown_command){ "pfexec /usr/sbin/poweroff" }
 
   before do
     machine.stub(:communicate).and_return(communicator)

data/test/unit/plugins/guests/smartos/cap/insert_public_key_test.rb

@@ -0,0 +1,38 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestSmartos::Cap::InsertPublicKey" do
+  let(:caps) do
+    VagrantPlugins::GuestSmartos::Plugin
+        .components
+        .guest_capabilities[:smartos]
+  end
+
+  let(:machine) { double("machine") }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+
+  before do
+    machine.stub(:communicate).and_return(comm)
+  end
+
+  after do
+    comm.verify_expectations!
+  end
+
+  describe ".insert_public_key" do
+    let(:cap) { caps.get(:insert_public_key) }
+
+    it "inserts the public key" do
+      cap.insert_public_key(machine, "ssh-rsa ...")
+
+      expect(comm.received_commands[0]).to match(/if \[ -d \/usbkey \] && \[ "\$\(zonename\)" == "global" \] ; then/)
+      expect(comm.received_commands[0]).to match(/printf 'ssh-rsa ...\\n' >> \/usbkey\/config.inc\/authorized_keys/)
+      expect(comm.received_commands[0]).to match(/cp \/usbkey\/config.inc\/authorized_keys ~\/.ssh\/authorized_keys/)
+      expect(comm.received_commands[0]).to match(/else/)
+      expect(comm.received_commands[0]).to match(/mkdir -p ~\/.ssh/)
+      expect(comm.received_commands[0]).to match(/chmod 0700 ~\/.ssh/)
+      expect(comm.received_commands[0]).to match(/printf 'ssh-rsa ...\\n' >> ~\/.ssh\/authorized_keys/)
+      expect(comm.received_commands[0]).to match(/chmod 0600 ~\/.ssh\/authorized_keys/)
+      expect(comm.received_commands[0]).to match(/fi/)
+    end
+  end
+end

data/test/unit/plugins/guests/smartos/cap/mount_nfs_test.rb

@@ -1,30 +1,38 @@
 require_relative "../../../../base"
+require_relative "../../../../../../plugins/guests/smartos/config"
+
+describe "VagrantPlugins::GuestSmartos::Cap::MountNFS" do
+  let(:caps) do
+    VagrantPlugins::GuestSmartos::Plugin
+        .components
+        .guest_capabilities[:smartos]
+  end
 
-describe "VagrantPlugins::VagrantPlugins::Cap::MountNFS" do
-  let(:plugin) { VagrantPlugins::GuestSmartos::Plugin.components.guest_capabilities[:smartos].get(:mount_nfs_folder) }
   let(:machine) { double("machine") }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
   let(:config) { double("config", smartos: VagrantPlugins::GuestSmartos::Config.new) }
-  let(:communicator) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
 
   before do
-    machine.stub(:communicate).and_return(communicator)
+    machine.stub(:communicate).and_return(comm)
     machine.stub(:config).and_return(config)
   end
 
   after do
-    communicator.verify_expectations!
+    comm.verify_expectations!
   end
 
   describe ".mount_nfs_folder" do
-    it "creates the directory mount point" do
-      communicator.expect_command(%Q(pfexec mkdir -p /mountpoint))
-      plugin.mount_nfs_folder(machine, '1.1.1.1', {'nfs' => {guestpath: '/mountpoint'}})
-    end
+    let(:cap) { caps.get(:mount_nfs_folder) }
 
-    it "mounts the NFS share" do
-      communicator.expect_command(%Q(pfexec /usr/sbin/mount -F nfs '1.1.1.1:/some/share' '/mountpoint'))
-      plugin.mount_nfs_folder(machine, '1.1.1.1', {'nfs' => {guestpath: '/mountpoint', hostpath: '/some/share'}})
+    it "mounts the folder" do
+      cap.mount_nfs_folder(machine, '1.1.1.1', {'nfs' => {guestpath: '/mountpoint', hostpath: '/some/share'}})
+
+      expect(comm.received_commands[0]).to match(/if \[ -d \/usbkey \] && \[ "\$\(zonename\)" == "global" \] ; then/)
+      expect(comm.received_commands[0]).to match(/pfexec mkdir -p \/usbkey\/config.inc/)
+      expect(comm.received_commands[0]).to match(/printf '1\.1\.1\.1:\/some\/share:\/mountpoint' | pfexec tee -a \/usbkey\/config.inc\/nfs_mounts/)
+      expect(comm.received_commands[0]).to match(/fi/)
+      expect(comm.received_commands[0]).to match(/pfexec mkdir -p \/mountpoint/)
+      expect(comm.received_commands[0]).to match(/pfexec \/usr\/sbin\/mount -F nfs '1\.1\.1\.1:\/some\/share' '\/mountpoint'/)
     end
   end
 end
-

data/test/unit/plugins/guests/smartos/cap/remove_public_key_test.rb

@@ -0,0 +1,34 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestSmartos::Cap::RemovePublicKey" do
+  let(:caps) do
+    VagrantPlugins::GuestSmartos::Plugin
+      .components
+      .guest_capabilities[:smartos]
+  end
+
+  let(:machine) { double("machine") }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(comm)
+  end
+
+  after do
+    comm.verify_expectations!
+  end
+
+  describe ".remove_public_key" do
+    let(:cap) { caps.get(:remove_public_key) }
+
+    it "removes the public key" do
+      cap.remove_public_key(machine, "ssh-rsa keyvalue comment")
+      expect(comm.received_commands[0]).to match(/if test -f \/usbkey\/config.inc\/authorized_keys ; then/)
+      expect(comm.received_commands[0]).to match(/sed -i '' '\/\^.*ssh-rsa keyvalue comment.*\$\/d' \/usbkey\/config.inc\/authorized_keys/)
+      expect(comm.received_commands[0]).to match(/fi/)
+      expect(comm.received_commands[0]).to match(/if test -f ~\/.ssh\/authorized_keys ; then/)
+      expect(comm.received_commands[0]).to match(/sed -i '' '\/\^.*ssh-rsa keyvalue comment.*\$\/d' ~\/.ssh\/authorized_keys/)
+      expect(comm.received_commands[0]).to match(/fi/)
+    end
+  end
+end

data/test/unit/plugins/guests/windows/cap/insert_public_key_test.rb

@@ -0,0 +1,75 @@
+require "tempfile"
+require_relative "../../../../base"
+require_relative "../../../../../../plugins/communicators/winssh/communicator"
+
+describe "VagrantPlugins::GuestWindows::Cap::InsertPublicKey" do
+  let(:caps) do
+    VagrantPlugins::GuestWindows::Plugin
+      .components
+      .guest_capabilities[:windows]
+  end
+
+  let(:machine) { double("machine") }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+  let(:auth_keys_check_result){ 1 }
+
+  before do
+    @tempfile = Tempfile.new("vagrant-test")
+    allow(Tempfile).to receive(:new).and_return(@tempfile)
+    allow(comm).to receive(:is_a?).and_return(true)
+    allow(machine).to receive(:communicate).and_return(comm)
+
+    allow(comm).to receive(:execute).with(/echo .+/, shell: "cmd").and_yield(:stdout, "TEMP\r\nHOME\r\n")
+    allow(comm).to receive(:execute).with(/dir .+\.ssh/, shell: "cmd")
+    allow(comm).to receive(:execute).with(/dir .+authorized_keys/, shell: "cmd", error_check: false).and_return(auth_keys_check_result)
+  end
+
+  after do
+    @tempfile.delete
+  end
+
+  describe ".insert_public_key" do
+    let(:cap) { caps.get(:insert_public_key) }
+
+    context "when authorized_keys exists on guest" do
+      let(:auth_keys_check_result){ 0 }
+      before do
+        expect(@tempfile).to receive(:delete).and_return(true)
+        expect(@tempfile).to receive(:delete).and_call_original
+      end
+
+      it "inserts the public key" do
+        expect(comm).to receive(:download)
+        expect(comm).to receive(:upload)
+        expect(comm).to receive(:execute).with(/move .*/, shell: "cmd")
+        cap.insert_public_key(machine, "ssh-rsa ...")
+        expect(File.read(@tempfile.path)).to include("ssh-rsa ...")
+      end
+    end
+
+    context "when authorized_keys does not exist on guest" do
+      before do
+        expect(@tempfile).to receive(:delete).and_return(true)
+        expect(@tempfile).to receive(:delete).and_call_original
+      end
+
+      it "inserts the public key" do
+        expect(comm).to_not receive(:download)
+        expect(comm).to receive(:upload)
+        expect(comm).to receive(:execute).with(/move .*/, shell: "cmd")
+        cap.insert_public_key(machine, "ssh-rsa ...")
+        expect(File.read(@tempfile.path)).to include("ssh-rsa ...")
+      end
+    end
+
+    context "when required directories cannot be fetched from the guest" do
+      before do
+        expect(comm).to receive(:execute).with(/echo .+/, shell: "cmd").and_yield(:stdout, "TEMP\r\n")
+      end
+
+      it "should raise an error" do
+        expect{ cap.insert_public_key(machine, "ssh-rsa ...") }.to raise_error(VagrantPlugins::GuestWindows::Errors::PublicKeyDirectoryFailure)
+      end
+    end
+  end
+end

data/test/unit/plugins/guests/windows/cap/remove_public_key_test.rb

@@ -0,0 +1,66 @@
+require "tempfile"
+require_relative "../../../../base"
+require_relative "../../../../../../plugins/communicators/winssh/communicator"
+
+describe "VagrantPlugins::GuestWindows::Cap::RemovePublicKey" do
+  let(:caps) do
+    VagrantPlugins::GuestWindows::Plugin
+      .components
+      .guest_capabilities[:windows]
+  end
+
+  let(:machine) { double("machine") }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+  let(:public_key_insecure){ "ssh-rsa...insecure" }
+  let(:public_key_other){ "ssh-rsa...other" }
+
+  let(:auth_keys_check_result){ 1 }
+
+  before do
+    @tempfile = Tempfile.new("vagrant-test")
+    @tempfile.puts(public_key_insecure)
+    @tempfile.puts(public_key_other)
+    @tempfile.flush
+    @tempfile.rewind
+    allow(Tempfile).to receive(:new).and_return(@tempfile)
+    allow(comm).to receive(:is_a?).and_return(true)
+    allow(machine).to receive(:communicate).and_return(comm)
+
+    allow(comm).to receive(:execute).with(/echo .+/, shell: "cmd").and_yield(:stdout, "TEMP\r\nHOME\r\n")
+    allow(comm).to receive(:execute).with(/dir .+authorized_keys/, shell: "cmd", error_check: false).and_return(auth_keys_check_result)
+  end
+
+  after do
+    @tempfile.delete
+  end
+
+  describe ".remove_public_key" do
+    let(:cap) { caps.get(:remove_public_key) }
+
+    context "when authorized_keys exists on guest" do
+      let(:auth_keys_check_result){ 0 }
+      before do
+        expect(@tempfile).to receive(:delete).and_return(true)
+        expect(@tempfile).to receive(:delete).and_call_original
+      end
+
+      it "removes the public key" do
+        expect(comm).to receive(:download)
+        expect(comm).to receive(:upload)
+        expect(comm).to receive(:execute).with(/move .*/, shell: "cmd")
+        cap.remove_public_key(machine, public_key_insecure)
+        expect(File.read(@tempfile.path)).to include(public_key_other)
+        expect(File.read(@tempfile.path)).to_not include(public_key_insecure)
+      end
+    end
+
+    context "when authorized_keys does not exist on guest" do
+      it "does nothing" do
+        expect(comm).to_not receive(:download)
+        expect(comm).to_not receive(:upload)
+        expect(comm).to_not receive(:execute).with(/move .*/, shell: "cmd")
+        cap.remove_public_key(machine, public_key_insecure)
+      end
+    end
+  end
+end

data/test/unit/plugins/guests/windows/cap/rsync_test.rb

@@ -19,7 +19,7 @@ describe "VagrantPlugins::GuestWindows::Cap::RSync" do
 
   describe ".rsync_pre" do
     it 'makes the guestpath directory with mkdir' do
-      communicator.expect_command("mkdir '/sync_dir'")
+      communicator.expect_command("mkdir -p '/sync_dir'")
       described_class.rsync_pre(machine, guestpath: '/sync_dir')
     end
   end

data/test/unit/plugins/kernel_v2/config/vm_test.rb

@@ -424,6 +424,24 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
       expect{ subject.finalize! }.to_not raise_error
     end
 
+    it "generates a uuid if no name was provided" do
+      allow(SecureRandom).to receive(:uuid).and_return("MY_CUSTOM_VALUE")
+
+      subject.provision("shell", path: "foo") { |s| s.inline = "foo" }
+      subject.finalize!
+
+      r = subject.provisioners
+      expect(r[0].id).to eq("MY_CUSTOM_VALUE")
+    end
+
+    it "sets id as name if a name was provided" do
+      subject.provision("ghost", type: "shell", path: "motoko") { |s| s.inline = "motoko" }
+      subject.finalize!
+
+      r = subject.provisioners
+      expect(r[0].id).to eq(:ghost)
+    end
+
     describe "merging" do
       it "ignores non-overriding runs" do
         subject.provision("shell", inline: "foo", run: "once")
@@ -439,6 +457,16 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
         expect(merged_provs[1].run).to eq("always")
       end
 
+      it "does not merge duplicate provisioners" do
+        subject.provision("shell", inline: "foo")
+        subject.provision("shell", inline: "bar")
+
+        merged = subject.merge(subject)
+        merged_provs = merged.provisioners
+
+        expect(merged_provs.length).to eql(2)
+      end
+
       it "copies the configs" do
         subject.provision("shell", inline: "foo")
         subject_provs = subject.provisioners

data/test/unit/plugins/provisioners/ansible/provisioner_test.rb

@@ -40,6 +40,7 @@ VF
   let(:config)  { VagrantPlugins::Ansible::Config::Host.new }
   let(:ssh_info) {{
     private_key_path: ['/path/to/my/key'],
+    keys_only: true,
     username: 'testuser',
     host: '127.0.0.1',
     port: 2223
@@ -988,5 +989,20 @@ VF
       end
 
     end
+
+    describe 'with config.ssh.keys_only = false' do
+      it 'does not set IdentitiesOnly=yes in ANSIBLE_SSH_ARGS' do
+        ssh_info[:keys_only] = false
+
+        expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
+          cmd_opts = args.last
+          expect(cmd_opts[:env]['ANSIBLE_SSH_ARGS']).to_not include("-o IdentitiesOnly=yes")
+
+          # Ending this block with a negative expectation (to_not / not_to)
+          # would lead to a failure of the above expectation.
+          true
+        }
+      end
+    end
   end
 end

data/test/unit/plugins/provisioners/docker/config_test.rb

@@ -1,6 +1,7 @@
 require File.expand_path("../../../../base", __FILE__)
 
 require Vagrant.source_root.join("plugins/provisioners/docker/config")
+require Vagrant.source_root.join("plugins/kernel_v2/config/vm")
 
 describe VagrantPlugins::DockerProvisioner::Config do
   subject { described_class.new }
@@ -137,4 +138,25 @@ describe VagrantPlugins::DockerProvisioner::Config do
       })
     end
   end
+
+  describe "#post_install_provision" do
+    it "raises an error if 'docker' provisioner was provided" do
+      expect {subject.post_install_provision("myprov", :type=>"docker", :inline=>"echo 'hello'")}
+        .to raise_error()
+    end
+
+    it "setups a basic provisioner" do
+      prov = double()
+      mock_provisioner = "mock"
+      mock_provisioners = [mock_provisioner]
+
+      allow(VagrantPlugins::Kernel_V2::VMConfig).to receive(:new).
+        and_return(prov)
+      allow(prov).to receive(:provision).and_return(mock_provisioners)
+      allow(prov).to receive(:provisioners).and_return(mock_provisioners)
+
+      subject.post_install_provision("myprov", :inline=>"echo 'hello'")
+      expect(subject.post_install_provisioner).to eq(mock_provisioner)
+    end
+  end
 end