Remove dna and data bag secret prior to upload in Chef [GH-1111]

CHANGELOG.md

@@ -18,6 +18,8 @@ BUG FIXES:
   - Boxes downloaded as part of `vagrant up` are now done so _prior_ to
     config validation. This allows Vagrantfiles to references files that
     may be in the box itself. [GH-1061]
+  - Chef removes dna.json and encrypted data bag secret file prior to
+    uploading. [GH-1111]
   - NFS synced folders exporting sub-directories of other exported folders now
     works properly. [GH-785]
   - NFS shared folders properly dereference symlinks so that the real path

plugins/provisioners/chef/provisioner/base.rb

@@ -97,7 +97,11 @@ module VagrantPlugins
           temp.write(json)
           temp.close
 
-          @machine.communicate.upload(temp.path, File.join(@config.provisioning_path, "dna.json"))
+          remote_file = File.join(@config.provisioning_path, "dna.json")
+          @machine.communicate.tap do |comm|
+            comm.sudo("rm #{remote_file}", :error_check => false)
+            comm.upload(temp.path, remote_file)
+          end
         end
       end
     end

plugins/provisioners/chef/provisioner/chef_solo.rb

@@ -114,9 +114,12 @@ module VagrantPlugins
 
         def upload_encrypted_data_bag_secret
           @machine.env.ui.info I18n.t("vagrant.provisioners.chef.upload_encrypted_data_bag_secret_key")
-          @machine.communicate.upload(encrypted_data_bag_secret_key_path,
+          @machine.communicate.tap do |comm|
+            comm.sudo("rm #{@config.encrypted_data_bag_secret}", :error_check => false)
+            comm.upload(encrypted_data_bag_secret_key_path,
                         @config.encrypted_data_bag_secret)
           end
+        end
 
         def setup_solo_config
           cookbooks_path = guest_paths(@cookbook_folders)