Merge pull request #396 from chef/tp/sean-simmons-progress/CHEF-15585…

…-FixChefServerMetaDataIssue

Fixes?

lib/mixlib/install.rb

@@ -164,14 +164,14 @@ def upgrade_available?
     # Automatically set the platform options
     #
     def detect_platform
-      options.set_platform_info(self.class.detect_platform)
+      options.set_platform_info(self.class.detect_platform(options))
       self
     end
 
     #
     # Returns a Hash containing the platform info options
     #
-    def self.detect_platform
+    def self.detect_platform(options)
       product = options.product_name
       version = options.product_version
 
@@ -205,14 +205,14 @@ def self.detect_platform
       if product == "chef-server" && version >= "15.10.12" && platform == "el" && platform_version == "7"
         platform = "amazon"
         platform_version = "2"
-      else
+      end
+
       {
-        platform: platform_info[0],
-        platform_version: platform_info[1],
-        architecture: platform_info[2],
+        platform: platform,
+        platform_version: platform_version,
+        architecture: architecture
       }
     end
-  end
 
     #
     # Returns the platform_detection.sh script

spec/unit/mixlib/install_spec.rb

@@ -196,7 +196,14 @@
 
   context "self.detect_platform" do
     let(:product_name) { "chef" }
-    let(:platform_info) { Mixlib::Install.detect_platform }
+    let(:options) do
+      opts = Mixlib::Install::Options.new(
+        product_name: product_name,
+        product_version: '0.0.1',
+        channel: :stable
+      )
+    end
+    let(:platform_info) { Mixlib::Install.detect_platform(options) }
 
     it "should return platform info" do
       expect(platform_info.size).to eq 3