chef 12.0.3-x86-mingw32 → 12.1.0.rc.0-x86-mingw32

data/lib/chef/knife/cookbook_test.rb

@@ -43,6 +43,7 @@ class Chef
         :description => "Test all cookbooks, rather than just a single cookbook"
 
       def run
+        ui.warn("DEPRECATED: Please use ChefSpec or Rubocop to syntax-check cookbooks.")
         config[:cookbook_path] ||= Chef::Config[:cookbook_path]
 
         checked_a_cookbook = false

data/lib/chef/knife/cookbook_upload.rb

@@ -104,18 +104,23 @@ class Chef
         justify_width = @server_side_cookbooks.map {|name| name.size}.max.to_i + 2
         if config[:all]
           cookbook_repo.load_cookbooks
-          cbs = []
+          cookbooks_for_upload = []
           cookbook_repo.each do |cookbook_name, cookbook|
-            cbs << cookbook
+            cookbooks_for_upload << cookbook
             cookbook.freeze_version if config[:freeze]
             version_constraints_to_update[cookbook_name] = cookbook.version
           end
-          begin
-            upload(cbs, justify_width)
-          rescue Exceptions::CookbookFrozen
-            ui.warn("Not updating version constraints for some cookbooks in the environment as the cookbook is frozen.")
+          if cookbooks_for_upload.any?
+            begin
+              upload(cookbooks_for_upload, justify_width)
+            rescue Exceptions::CookbookFrozen
+              ui.warn("Not updating version constraints for some cookbooks in the environment as the cookbook is frozen.")
+            end
+            ui.info("Uploaded all cookbooks.")
+          else
+            cookbook_path = config[:cookbook_path].respond_to?(:join) ? config[:cookbook_path].join(', ') : config[:cookbook_path]
+            ui.warn("Could not find any cookbooks in your cookbook path: #{cookbook_path}. Use --cookbook-path to specify the desired path.")
           end
-          ui.info("Uploaded all cookbooks.")
         else
           if @name_args.empty?
             show_usage
@@ -204,7 +209,7 @@ class Chef
         # because cookbooks are lazy-loaded, we have to force the loader
         # to load the cookbooks the user intends to upload here:
         cookbooks_to_upload
-        
+
         unless cookbook_repo.merged_cookbooks.empty?
           ui.warn "* " * 40
           ui.warn(<<-WARNING)

data/lib/chef/knife/core/bootstrap_context.rb

@@ -23,13 +23,15 @@ class Chef
   class Knife
     module Core
       # Instances of BootstrapContext are the context objects (i.e., +self+) for
-      # bootstrap templates. For backwards compatability, they +must+ set the
+      # bootstrap templates. For backwards compatibility, they +must+ set the
       # following instance variables:
       # * @config   - a hash of knife's config values
       # * @run_list - the run list for the node to boostrap
       #
       class BootstrapContext
 
+        attr_accessor :client_pem
+
         def initialize(config, run_list, chef_config, secret = nil)
           @config       = config
           @run_list     = run_list
@@ -42,13 +44,19 @@ class Chef
         end
 
         def validation_key
-          IO.read(File.expand_path(@chef_config[:validation_key]))
+          if File.exist?(File.expand_path(@chef_config[:validation_key]))
+            IO.read(File.expand_path(@chef_config[:validation_key]))
+          else
+            false
+          end
         end
 
         def encrypted_data_bag_secret
           @secret
         end
 
+        # Contains commands and content, see trusted_certs_content
+        # TODO: Rename to trusted_certs_script
         def trusted_certs
           @trusted_certs ||= trusted_certs_content
         end
@@ -135,7 +143,7 @@ CONFIG
         def latest_current_chef_version_string
           installer_version_string = nil
           if @config[:prerelease]
-            installer_version_string = "-p"
+            installer_version_string = ["-p"]
           else
             chef_version_string = if knife_config[:bootstrap_version]
               knife_config[:bootstrap_version]
@@ -159,6 +167,9 @@ CONFIG
         end
 
         private
+       
+        # Returns a string for copying the trusted certificates on the workstation to the system being bootstrapped
+        # This string should contain both the commands necessary to both create the files, as well as their content
         def trusted_certs_content
           content = ""
           if @chef_config[:trusted_certs_dir]

data/lib/chef/knife/core/generic_presenter.rb

@@ -178,10 +178,13 @@ class Chef
           nested_value_spec.split(".").each do |attr|
             if data.nil?
               nil # don't get no method error on nil
-            elsif data.respond_to?(attr.to_sym)
-              data = data.send(attr.to_sym)
+            # Must check :[] before attr because spec can include
+            #   `keys` - want the key named `keys`, not a list of
+            #   available keys.
             elsif data.respond_to?(:[])
               data = data[attr]
+            elsif data.respond_to?(attr.to_sym)
+              data = data.send(attr.to_sym)
             else
               data = begin
                 data.send(attr.to_sym)

data/lib/chef/knife/core/object_loader.rb

@@ -105,7 +105,7 @@ class Chef
         end
 
         def file_exists_and_is_readable?(file)
-          File.exists?(file) && File.readable?(file)
+          File.exist?(file) && File.readable?(file)
         end
 
       end

data/lib/chef/knife/core/subcommand_loader.rb

@@ -22,6 +22,9 @@ class Chef
   class Knife
     class SubcommandLoader
 
+      MATCHES_CHEF_GEM = %r{/chef-[\d]+\.[\d]+\.[\d]+}.freeze
+      MATCHES_THIS_CHEF_GEM = %r{/chef-#{Chef::VERSION}/}.freeze
+
       attr_reader :chef_config_dir
       attr_reader :env
 
@@ -122,6 +125,14 @@ class Chef
         subcommand_files = {}
         files.each do |file|
           rel_path = file[/(#{Regexp.escape File.join('chef', 'knife', '')}.*)\.rb/, 1]
+
+          # When not installed as a gem (ChefDK/appbundler in particular), AND
+          # a different version of Chef is installed via gems, `files` will
+          # include some files from the 'other' Chef install. If this contains
+          # a knife command that doesn't exist in this version of Chef, we will
+          # get a LoadError later when we try to require it.
+          next if from_different_chef_version?(file)
+
           subcommand_files[rel_path] = file
         end
 
@@ -185,6 +196,19 @@ class Chef
 
         Dir[glob].map { |f| f.untaint }
       end
+
+      def from_different_chef_version?(path)
+        matches_any_chef_gem?(path) && !matches_this_chef_gem?(path)
+      end
+
+      def matches_any_chef_gem?(path)
+        path =~ MATCHES_CHEF_GEM
+      end
+
+      def matches_this_chef_gem?(path)
+        path =~ MATCHES_THIS_CHEF_GEM
+      end
+
     end
   end
 end

data/lib/chef/knife/core/ui.rb

@@ -163,9 +163,17 @@ class Chef
         end
       end
 
+
+      # Hash -> Hash
+      # Works the same as edit_data but
+      # returns a hash rather than a JSON string/Fully infated object
+      def edit_hash(hash)
+        raw = edit_data(hash, false)
+        Chef::JSONCompat.parse(raw)
+      end
+
       def edit_data(data, parse_output=true)
         output = Chef::JSONCompat.to_json_pretty(data)
-
         if (!config[:disable_editing])
           Tempfile.open([ 'knife-edit-', '.json' ]) do |tf|
             tf.sync = true

data/lib/chef/knife/node_run_list_remove.rb

@@ -27,11 +27,20 @@ class Chef
         require 'chef/json_compat'
       end
 
-      banner "knife node run_list remove [NODE] [ENTRIES] (options)"
+      banner "knife node run_list remove [NODE] [ENTRY[,ENTRY]] (options)"
 
       def run
         node = Chef::Node.load(@name_args[0])
-        entries = @name_args[1].split(',')
+
+        if @name_args.size > 2
+          # Check for nested lists and create a single plain one
+          entries = @name_args[1..-1].map do |entry|
+            entry.split(',').map { |e| e.strip }
+          end.flatten
+        else
+          # Convert to array and remove the extra spaces
+          entries = @name_args[1].split(',').map { |e| e.strip }
+        end
 
         entries.each { |e| node.run_list.remove(e) }
 
@@ -45,4 +54,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/raw.rb

@@ -32,6 +32,12 @@ class Chef
         :short => '-i FILE',
         :description => "Name of file to use for PUT or POST"
 
+      option :proxy_auth,
+        :long => '--proxy-auth',
+        :boolean => true,
+        :default => false,
+        :description => "Use webui proxy authentication.  Client key must be the webui key."
+
       class RawInputServerAPI < Chef::HTTP
         def initialize(options = {})
           options[:client_name] ||= Chef::Config[:node_name]
@@ -64,15 +70,21 @@ class Chef
         begin
           method = config[:method].to_sym
 
+          headers = {'Content-Type' => 'application/json'}
+
+          if config[:proxy_auth]
+            headers['x-ops-request-source'] = 'web'
+          end
+
           if config[:pretty]
             chef_rest = RawInputServerAPI.new
-            result = chef_rest.request(method, name_args[0], {'Content-Type' => 'application/json'}, data)
+            result = chef_rest.request(method, name_args[0], headers, data)
             unless result.is_a?(String)
               result = Chef::JSONCompat.to_json_pretty(result)
             end
           else
             chef_rest = RawInputServerAPI.new(:raw_output => true)
-            result = chef_rest.request(method, name_args[0], {'Content-Type' => 'application/json'}, data)
+            result = chef_rest.request(method, name_args[0], headers, data)
           end
           output result
         rescue Timeout::Error => e
@@ -88,4 +100,3 @@ class Chef
     end # class Raw
   end
 end
-

data/lib/chef/knife/role_env_run_list_add.rb

@@ -0,0 +1,86 @@
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: William Albenzi (<walbenzi@gmail.com>)
+# Copyright:: Copyright (c) 2009 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 'chef/knife'
+
+class Chef
+  class Knife
+    class RoleEnvRunListAdd < Knife
+
+      deps do
+        require 'chef/role'
+        require 'chef/json_compat'
+      end
+
+      banner "knife role env_run_list add [ROLE] [ENVIRONMENT] [ENTRY[,ENTRY]] (options)"
+
+      option :after,
+        :short => "-a ITEM",
+        :long  => "--after ITEM",
+        :description => "Place the ENTRY in the run list after ITEM"
+
+      def add_to_env_run_list(role, environment, entries, after=nil)
+        if after
+          nlist = []
+          unless role.env_run_lists.key?(environment)
+            role.env_run_lists_add(environment => nlist)
+          end
+          role.run_list_for(environment).each do |entry| 
+            nlist << entry
+            if entry == after
+              entries.each { |e| nlist << e }
+            end
+          end
+          role.env_run_lists_add(environment => nlist)
+        else
+          nlist = []
+          unless role.env_run_lists.key?(environment)
+            role.env_run_lists_add(environment => nlist)
+          end
+          role.run_list_for(environment).each do |entry|
+            nlist << entry
+          end
+          entries.each { |e| nlist << e }
+          role.env_run_lists_add(environment => nlist)
+        end
+      end
+
+      def run
+        role = Chef::Role.load(@name_args[0])
+        role.name(@name_args[0])
+        environment = @name_args[1]
+
+        if @name_args.size > 2
+          # Check for nested lists and create a single plain one
+          entries = @name_args[2..-1].map do |entry|
+            entry.split(',').map { |e| e.strip }
+          end.flatten
+        else
+          # Convert to array and remove the extra spaces
+          entries = @name_args[2].split(',').map { |e| e.strip }
+        end
+
+        add_to_env_run_list(role, environment, entries, config[:after])
+        role.save
+        config[:env_run_list] = true
+        output(format_for_display(role))
+      end
+
+    end
+  end
+end

data/lib/chef/knife/role_env_run_list_clear.rb

@@ -0,0 +1,55 @@
+#
+# Author:: Mike Fiedler (<miketheman@gmail.com>)
+# Author:: William Albenzi (<walbenzi@gmail.com>)
+# Copyright:: Copyright (c) 2013 Mike Fiedler
+# 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 'chef/knife'
+
+class Chef
+  class Knife
+    class RoleEnvRunListClear < Knife
+
+      deps do
+        require 'chef/role'
+        require 'chef/json_compat'
+      end
+
+      banner "knife role env_run_list clear [ROLE] [ENVIRONMENT]"
+      def clear_env_run_list(role, environment)
+        nlist = []
+        role.env_run_lists_add(environment => nlist)
+      end
+
+      def run
+        if @name_args.size > 2
+          ui.fatal "You must not supply an environment run list."
+          show_usage
+          exit 1
+        end
+        role = Chef::Role.load(@name_args[0])
+        role.name(@name_args[0])
+        environment = @name_args[1]
+
+        clear_env_run_list(role, environment)
+        role.save
+        config[:env_run_list] = true
+        output(format_for_display(role))
+      end
+
+    end
+  end
+end

data/lib/chef/knife/role_env_run_list_remove.rb

@@ -0,0 +1,57 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2009 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 'chef/knife'
+
+class Chef
+  class Knife
+    class RoleEnvRunListRemove < Knife
+
+      deps do
+        require 'chef/role'
+        require 'chef/json_compat'
+      end
+
+      banner "knife role env_run_list remove [ROLE] [ENVIRONMENT] [ENTRIES]"
+
+      def remove_from_env_run_list(role, environment, item_to_remove)
+          nlist = []
+          role.run_list_for(environment).each do |entry|
+            nlist << entry unless entry == item_to_remove
+            #unless entry == @name_args[2]
+            #  nlist << entry
+            #end
+          end
+          role.env_run_lists_add(environment => nlist)
+      end
+
+      def run
+        role = Chef::Role.load(@name_args[0])
+        role.name(@name_args[0])
+        environment = @name_args[1]
+        item_to_remove = @name_args[2]
+
+        remove_from_env_run_list(role, environment, item_to_remove)
+        role.save
+        config[:env_run_list] = true
+        output(format_for_display(role))
+      end
+
+    end
+  end
+end