Merge pull request #13647 from chrisroberts/box-add-arch

Fix box add action to include architecture

Author: chrisroberts

lib/vagrant/action/builtin/box_add.rb

@@ -292,7 +292,7 @@ def add_from_metadata(url, env, expanded)
             # If we have only one provider in the metadata, just use that
             # provider.
             metadata_provider = metadata_version.provider(
-              metadata_version.providers.first, architecture)
+              metadata_version.providers(architecture).first, architecture)
           else
             providers = metadata_version.providers(architecture).sort
 

test/unit/vagrant/action/builtin/box_add_test.rb

@@ -1033,6 +1033,57 @@ def with_web_server(path, **opts)
           subject.call(env)
         end
 
+        it "adds the latest version of a box with multiple providers and only one provider matching architecture" do
+          box_path = iso_env.box2_file(:virtualbox)
+          tf = Tempfile.new(["vagrant-box-latest-version", ".json"]).tap do |f|
+            # NOTE: The order of the providers here matters. The correct match needs
+            # to be last in order to trigger the error this test was written for to
+            # catch any regression.
+            f.write(
+              {
+                name: "foo/bar",
+                versions: [
+                  {
+                    version: "0.5",
+                  },
+                  {
+                    version: "0.7",
+                    providers: [
+                      {
+                        name: "virtualbox",
+                        url: "/dev/null/invalid.path",
+                        architecture: "amd64",
+                        default_architecture: true,
+                      },
+                      {
+                        name: "hyperv",
+                        url: "#{box_path}",
+                        architecture: "test-arch",
+                        default_architecture: true,
+                      }
+                    ]
+                  }
+                ]
+              }.to_json
+            )
+            f.close
+          end
+
+          env[:box_url] = tf.path
+          expect(box_collection).to receive(:add).with(any_args) { |path, name, version, opts|
+            expect(checksum(path)).to eq(checksum(box_path))
+            expect(name).to eq("foo/bar")
+            expect(version).to eq("0.7")
+            expect(opts[:metadata_url]).to eq("file://#{tf.path}")
+            expect(opts[:architecture]).to eq("test-arch")
+            true
+          }.and_return(box)
+
+          expect(app).to receive(:call).with(env)
+
+          subject.call(env)
+        end
+
         it "adds the latest version of a box with only one provider and unknown architecture set as default" do
           box_path = iso_env.box2_file(:virtualbox)
           tf = Tempfile.new(["vagrant-box-latest-version", ".json"]).tap do |f|