Merge pull request #6962 from mitchellh/revert-6589-sethvargo/escape_identity_file

Revert "Escape identify file path"

templates/commands/ssh_config/config.erb

@@ -6,7 +6,11 @@ Host <%= host_key %>
   StrictHostKeyChecking no
   PasswordAuthentication no
 <% private_key_path.each do |path| %>
-  IdentityFile <%= path.inspect %>
+<% if path.include?(" ") -%>
+  IdentityFile "<%= path %>"
+<% else -%>
+  IdentityFile <%= path %>
+<% end -%>
 <% end -%>
   IdentitiesOnly yes
   LogLevel FATAL

test/unit/plugins/commands/ssh_config/command_test.rb

@@ -92,8 +92,8 @@ Host #{machine.name}
 
       subject.execute
 
-      expect(output).to include('IdentityFile "foo"')
-      expect(output).to include('IdentityFile "bar"')
+      expect(output).to include("IdentityFile foo")
+      expect(output).to include("IdentityFile bar")
     end
 
     it "puts quotes around an identityfile path if it has a space" do
@@ -107,17 +107,5 @@ Host #{machine.name}
 
       expect(output).to include('IdentityFile "with a space"')
     end
-
-    it "escapes special characters" do
-      allow(machine).to receive(:ssh_info) { ssh_info.merge(private_key_path: ['/private/tmp/test of "vagrant" plugin/']) }
-      output = ""
-      allow(subject).to receive(:safe_puts) do |data|
-        output += data if data
-      end
-
-      subject.execute
-
-      expect(output).to include('"/private/tmp/test of \"vagrant\" plugin/"')
-    end
   end
 end