Merge branch 'jm/warn_on_everything' PR #1913

3 files changed, 70 insertions, 3 deletions

diff --git a/lib/chef/chef_fs/config.rb b/lib/chef/chef_fs/config.rb
index e08b976961..536409a109 100644
--- a/lib/chef/chef_fs/config.rb
+++ b/lib/chef/chef_fs/config.rb
@@ -25,14 +25,19 @@ class Chef
     # Helpers to take Chef::Config and create chef_fs and local_fs from it
     #
     class Config
-      def initialize(chef_config = Chef::Config, cwd = Dir.pwd, options = {})
+      def initialize(chef_config = Chef::Config, cwd = Dir.pwd, options = {}, ui = nil)
         @chef_config = chef_config
         @cwd = cwd
         @cookbook_version = options[:cookbook_version]
 
+        if @chef_config[:repo_mode] == 'everything' && is_hosted? && !ui.nil?
+          ui.warn %Q{You have repo_mode set to 'everything', but your chef_server_url
+              looks like it might be a hosted setup.  If this is the case please use
+              hosted_everything or allow repo_mode to default}
+        end
         # Default to getting *everything* from the server.
         if !@chef_config[:repo_mode]
-          if @chef_config[:chef_server_url] =~ /\/+organizations\/.+/
+          if is_hosted?
             @chef_config[:repo_mode] = 'hosted_everything'
           else
             @chef_config[:repo_mode] = 'everything'
@@ -44,6 +49,10 @@ class Chef
       attr_reader :cwd
       attr_reader :cookbook_version
 
+      def is_hosted?
+        @chef_config[:chef_server_url] =~ /\/+organizations\/.+/
+      end
+
       def chef_fs
         @chef_fs ||= create_chef_fs
       end
diff --git a/lib/chef/chef_fs/knife.rb b/lib/chef/chef_fs/knife.rb
index 652c728550..86872dab71 100644
--- a/lib/chef/chef_fs/knife.rb
+++ b/lib/chef/chef_fs/knife.rb
@@ -68,7 +68,7 @@ class Chef
           end
         end
 
-        @chef_fs_config = Chef::ChefFS::Config.new(Chef::Config, Dir.pwd, config)
+        @chef_fs_config = Chef::ChefFS::Config.new(Chef::Config, Dir.pwd, config, ui)
 
         Chef::ChefFS::Parallelizer.threads = (Chef::Config[:concurrency] || 10) - 1
       end
diff --git a/spec/unit/chef_fs/config_spec.rb b/spec/unit/chef_fs/config_spec.rb
new file mode 100644
index 0000000000..031da6c4b5
--- /dev/null
+++ b/spec/unit/chef_fs/config_spec.rb
@@ -0,0 +1,58 @@
+#
+# Author:: Jess Mink (<jmink@getchef.com>)
+# Copyright:: Copyright (c) 2014 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'chef/exceptions'
+require 'lib/chef/chef_fs/config.rb'
+
+describe Chef::ChefFS::Config do
+  describe "initialize" do
+    it "warns when hosted setups use 'everything'" do
+      base_config = Hash.new()
+      base_config[:repo_mode] = 'everything'
+      base_config[:chef_server_url] = 'http://foo.com/organizations/fake_org/'
+
+      ui = double("ui")
+      expect(ui).to receive(:warn)
+
+      Chef::ChefFS::Config.new(base_config, Dir.pwd, {}, ui)
+    end
+
+    it "doesn't warn when hosted setups use 'hosted_everything'" do
+      base_config = Hash.new()
+      base_config[:repo_mode] = 'hosted_everything'
+      base_config[:chef_server_url] = 'http://foo.com/organizations/fake_org/'
+
+      ui = double("ui")
+      expect(ui).to receive(:warn).exactly(0).times
+
+      Chef::ChefFS::Config.new(base_config, Dir.pwd, {}, ui)
+    end
+
+    it "doesn't warn when non-hosted setups use 'everything'" do
+      base_config = Hash.new()
+      base_config[:repo_mode] = 'everything'
+      base_config[:chef_server_url] = 'http://foo.com/'
+
+      ui = double("ui")
+      expect(ui).to receive(:warn).exactly(0).times
+
+      Chef::ChefFS::Config.new(base_config, Dir.pwd, {}, ui)
+    end
+  end
+end