CHEF-3307: translate empty strings coming back from the server to nil

2 files changed, 65 insertions, 50 deletions

diff --git a/lib/chef/cookbook/metadata.rb b/lib/chef/cookbook/metadata.rb
index 0cd740ea8f..0c03b25b00 100644
--- a/lib/chef/cookbook/metadata.rb
+++ b/lib/chef/cookbook/metadata.rb
@@ -468,6 +468,15 @@ class Chef
         @groupings                    = o[GROUPINGS] if o.has_key?(GROUPINGS)
         @recipes                      = o[RECIPES] if o.has_key?(RECIPES)
         @version                      = o[VERSION] if o.has_key?(VERSION)
+        #
+        # XXX: When a client (berkshelf in particular) uploads metadata without a name field, the hosted chef
+        #      ruby server will subsequently return empty string ("") for the metadata.name.  In erchef uploading
+        #      metadata without a name field will simply not store or retrieve a name field so we get @name = nil.
+        #      During the migration from ruby to erchef, metadata.name of "" was migrated faithfully even though it
+        #      fails validation, and erchef will return this, so we still have to handle this case unless the
+        #      database is sanitized to remove metadata.name == "".
+        #
+        @name = nil if !@name.nil? && @name.empty?
         self
       end
 
diff --git a/spec/unit/cookbook/metadata_spec.rb b/spec/unit/cookbook/metadata_spec.rb
index 2757f92506..2463333e6f 100644
--- a/spec/unit/cookbook/metadata_spec.rb
+++ b/spec/unit/cookbook/metadata_spec.rb
@@ -7,9 +7,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@
 require 'spec_helper'
 require 'chef/cookbook/metadata'
 
-describe Chef::Cookbook::Metadata do 
+describe Chef::Cookbook::Metadata do
   before(:each) do
     @cookbook = Chef::CookbookVersion.new('test_cookbook')
     @meta = Chef::Cookbook::Metadata.new(@cookbook)
@@ -86,7 +86,7 @@ describe Chef::Cookbook::Metadata do
     it "should return a Chef::Cookbook::Metadata object" do
       @meta.should be_a_kind_of(Chef::Cookbook::Metadata)
     end
-    
+
     it "should allow a cookbook as the first argument" do
       lambda { Chef::Cookbook::Metadata.new(@cookbook) }.should_not raise_error
     end
@@ -96,7 +96,7 @@ describe Chef::Cookbook::Metadata do
     end
 
     it "should set the maintainer name from the second argument" do
-      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown') 
+      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown')
       md.maintainer.should == 'Bobo T. Clown'
     end
 
@@ -105,7 +105,7 @@ describe Chef::Cookbook::Metadata do
     end
 
     it "should set the maintainer email from the third argument" do
-      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown', 'bobo@clown.co') 
+      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown', 'bobo@clown.co')
       md.maintainer_email.should == 'bobo@clown.co'
     end
 
@@ -114,10 +114,10 @@ describe Chef::Cookbook::Metadata do
     end
 
     it "should set the license from the fourth argument" do
-      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown', 'bobo@clown.co', 'Clown License v1') 
+      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown', 'bobo@clown.co', 'Clown License v1')
       md.license.should == 'Clown License v1'
     end
-  end 
+  end
 
   describe "cookbook" do
     it "should return the cookbook we were initialized with" do
@@ -133,7 +133,7 @@ describe Chef::Cookbook::Metadata do
 
   describe "platforms" do
     it "should return the current platform hash" do
-      @meta.platforms.should be_a_kind_of(Hash)  
+      @meta.platforms.should be_a_kind_of(Hash)
     end
   end
 
@@ -235,7 +235,7 @@ describe Chef::Cookbook::Metadata do
       end
     end
   end
-  
+
   describe "attribute groupings" do
     it "should allow you set a grouping" do
       group = {
@@ -312,7 +312,7 @@ describe Chef::Cookbook::Metadata do
       @meta.attribute("db/mysql/databases", {})
       @meta.attributes["db/mysql/databases"][:choice].should == []
     end
-    
+
      it "should let calculated be true or false" do
        lambda {
          @meta.attribute("db/mysql/databases", :calculated => true)
@@ -324,7 +324,7 @@ describe Chef::Cookbook::Metadata do
          @meta.attribute("db/mysql/databases", :calculated => Hash.new)
        }.should raise_error(ArgumentError)
      end
- 
+
      it "should set calculated to false by default" do
        @meta.attribute("db/mysql/databases", {})
        @meta.attributes["db/mysql/databases"][:calculated].should == false
@@ -350,7 +350,7 @@ describe Chef::Cookbook::Metadata do
         @meta.attribute("db/mysql/databases", :type => "symbol")
       }.should_not raise_error(ArgumentError)
     end
-    
+
      it "should let type be hash (backwards compatability only)" do
       lambda {
         @meta.attribute("db/mysql/databases", :type => "hash")
@@ -375,7 +375,7 @@ describe Chef::Cookbook::Metadata do
       }.should_not raise_error(ArgumentError)
       #attrib = @meta.attributes["db/mysql/databases"][:required].should == "required"
     end
-    
+
     it "should convert required false to optional" do
       lambda {
         @meta.attribute("db/mysql/databases", :required => false)
@@ -387,7 +387,7 @@ describe Chef::Cookbook::Metadata do
       @meta.attribute("db/mysql/databases", {})
       @meta.attributes["db/mysql/databases"][:required].should == 'optional'
     end
-  
+
     it "should make sure recipes is an array" do
       lambda {
         @meta.attribute("db/mysql/databases", :recipes => [])
@@ -399,7 +399,7 @@ describe Chef::Cookbook::Metadata do
 
     it "should set recipes to an empty array by default" do
       @meta.attribute("db/mysql/databases", {})
-      @meta.attributes["db/mysql/databases"][:recipes].should == [] 
+      @meta.attributes["db/mysql/databases"][:recipes].should == []
     end
 
     it "should allow the default value to be a string, array, or hash" do
@@ -438,14 +438,14 @@ describe Chef::Cookbook::Metadata do
       lambda {
         attrs = {
           :choice => [ "a", "b", "c"],
-          :default => "b" 
+          :default => "b"
         }
         @meta.attribute("db/mysql/databases", attrs)
       }.should_not raise_error(ArgumentError)
       lambda {
         attrs = {
           :choice => [ "a", "b", "c", "d", "e"],
-          :default => ["b", "d"] 
+          :default => ["b", "d"]
         }
         @meta.attribute("db/mysql/databases", attrs)
       }.should_not raise_error(ArgumentError)
@@ -455,7 +455,7 @@ describe Chef::Cookbook::Metadata do
       lambda {
         attrs = {
           :choice => [ "a", "b", "c"],
-          :default => "d" 
+          :default => "d"
         }
         @meta.attribute("db/mysql/databases", attrs)
       }.should raise_error(ArgumentError)
@@ -470,11 +470,11 @@ describe Chef::Cookbook::Metadata do
   end
 
   describe "recipes" do
-    before(:each) do 
+    before(:each) do
       @cookbook.recipe_files = [ "default.rb", "enlighten.rb" ]
       @meta = Chef::Cookbook::Metadata.new(@cookbook)
     end
-    
+
     it "should have the names of the recipes" do
       @meta.recipes["test_cookbook"].should == ""
       @meta.recipes["test_cookbook::enlighten"].should == ""
@@ -493,7 +493,7 @@ describe Chef::Cookbook::Metadata do
   end
 
   describe "json" do
-    before(:each) do 
+    before(:each) do
       @cookbook.recipe_files = [ "default.rb", "enlighten.rb" ]
       @meta = Chef::Cookbook::Metadata.new(@cookbook)
       @meta.version "1.0"
@@ -509,8 +509,8 @@ describe Chef::Cookbook::Metadata do
       @meta.provides "foo(:bar, :baz)"
       @meta.replaces "snarkitron"
       @meta.recipe "test_cookbook::enlighten", "is your buddy"
-      @meta.attribute "bizspark/has_login", 
-        :display_name => "You have nothing" 
+      @meta.attribute "bizspark/has_login",
+        :display_name => "You have nothing"
       @meta.version "1.2.3"
     end
 
@@ -524,23 +524,23 @@ describe Chef::Cookbook::Metadata do
       end
 
       %w{
-        name 
-        description 
-        long_description 
-        maintainer 
-        maintainer_email 
+        name
+        description
+        long_description
+        maintainer
+        maintainer_email
         license
-        platforms 
-        dependencies 
-        suggestions 
-        recommendations 
-        conflicting 
+        platforms
+        dependencies
+        suggestions
+        recommendations
+        conflicting
         providing
-        replacing 
-        attributes 
+        replacing
+        attributes
         recipes
         version
-      }.each do |t| 
+      }.each do |t|
         it "should include '#{t}'" do
           @serial[t].should == @meta.send(t.to_sym)
         end
@@ -557,23 +557,23 @@ describe Chef::Cookbook::Metadata do
       end
 
       %w{
-        name 
-        description 
-        long_description 
-        maintainer 
-        maintainer_email 
+        name
+        description
+        long_description
+        maintainer
+        maintainer_email
         license
-        platforms 
-        dependencies 
-        suggestions 
-        recommendations 
-        conflicting 
+        platforms
+        dependencies
+        suggestions
+        recommendations
+        conflicting
         providing
-        replacing 
-        attributes 
+        replacing
+        attributes
         recipes
         version
-      }.each do |t| 
+      }.each do |t|
         it "should match '#{t}'" do
           @deserial.send(t.to_sym).should == @meta.send(t.to_sym)
         end
@@ -585,6 +585,12 @@ describe Chef::Cookbook::Metadata do
         @hash = @meta.to_hash
       end
 
+      it "should convert a name field containing the empty string to nil" do
+        @hash['name'] = ""
+        deserial = Chef::Cookbook::Metadata.from_hash(@hash)
+        deserial.name.should be_nil
+      end
+
       [:dependencies,
        :recommendations,
        :suggestions,