Merge pull request #10468 from briancain/raise-error-if-provider-file-missing

Fixes #10432: Validate that provider file exists prior to upload

lib/vagrant/errors.rb

@@ -160,6 +160,10 @@ module Vagrant
       error_key(:box_config_changing_box)
     end
 
+    class BoxFileNotExist < VagrantError
+      error_key(:box_file_not_exist)
+    end
+
     class BoxMetadataCorrupted < VagrantError
       error_key(:box_metadata_corrupted)
     end

plugins/commands/cloud/publish.rb

@@ -9,7 +9,7 @@ module VagrantPlugins
           options = {}
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant cloud publish [options] organization/box-name version provider-name [provider-file]"
+            o.banner = "Usage: vagrant cloud publish [options] organization/box-name version provider-name provider-file"
             o.separator ""
             o.separator "Create and release a new Vagrant Box on Vagrant Cloud"
             o.separator ""
@@ -48,19 +48,26 @@ module VagrantPlugins
           # Parse the options
           argv = parse_options(opts)
           return if !argv
+
           if argv.empty? || argv.length > 4 || argv.length < 3
             raise Vagrant::Errors::CLIInvalidUsage,
               help: opts.help.chomp
           end
 
-          @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
-
           box = argv.first.split('/', 2)
           org = box[0]
           box_name = box[1]
           version = argv[1]
           provider_name = argv[2]
-          box_file = argv[3] # path expand
+          box_file = argv[3]
+
+          if !options[:url] && !File.file?(box_file)
+            raise Vagrant::Errors::BoxFileNotExist,
+              file: box_file
+          end
+
+          @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
+
           publish_box(org, box_name, version, provider_name, box_file, options, @client.token)
         end
 

templates/locales/en.yml

@@ -568,6 +568,11 @@ en:
         a new box. This box, in turn, specified a different box. This isn't
         allowed, as it could lead to infinite recursion of Vagrant configuration
         loading. Please fix this.
+      box_file_not_exist: |-
+        The file you are attempting to upload does not exist. Please recheck
+        that the file exists and was passed in correctly.
+
+        File: %{file}
       box_metadata_corrupted: |-
         The metadata associated with the box '%{name}' appears corrupted.
         This is most often caused by a disk issue or system crash. Please

test/unit/plugins/commands/cloud/publish_test.rb

@@ -38,6 +38,7 @@ describe VagrantPlugins::CloudCommand::Command::Publish do
     allow(VagrantCloud::Provider).to receive(:new).and_return(provider)
 
     allow(File).to receive(:absolute_path).and_return("/full/#{box_path}")
+    allow(File).to receive(:file?).and_return(true)
   end
 
   context "with no arguments" do
@@ -47,6 +48,16 @@ describe VagrantPlugins::CloudCommand::Command::Publish do
     end
   end
 
+  context "missing required arguments" do
+    let(:argv) { ["vagrant/box", "1.0.0", "virtualbox"] }
+
+    it "shows help" do
+      allow(File).to receive(:file?).and_return(false)
+      expect { subject.execute }.
+        to raise_error(Vagrant::Errors::BoxFileNotExist)
+    end
+  end
+
   context "with arguments" do
     let(:argv) { ["vagrant/box", "1.0.0", "virtualbox", box_path] }