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

data/lib/chef/knife/bootstrap/client_builder.rb

@@ -0,0 +1,190 @@
+#
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright (c) 2015 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/node'
+require 'chef/rest'
+require 'chef/api_client/registration'
+require 'chef/api_client'
+require 'tmpdir'
+
+class Chef
+  class Knife
+    class Bootstrap < Knife
+      class ClientBuilder
+
+        # @return [Hash] knife merged config, typically @config
+        attr_accessor :knife_config
+        # @return [Hash] chef config object
+        attr_accessor :chef_config
+        # @return [Chef::Knife::UI] ui object for output
+        attr_accessor :ui
+
+        # @param knife_config [Hash] Hash of knife config settings
+        # @param chef_config [Hash] Hash of chef config settings
+        # @param ui [Chef::Knife::UI] UI object for output
+        def initialize(knife_config: {}, chef_config: {}, ui: nil)
+          @knife_config = knife_config
+          @chef_config  = chef_config
+          @ui           = ui
+        end
+
+        # Main entry.  Prompt the user to clean up any old client or node objects.  Then create
+        # the new client, then create the new node.
+        def run
+          sanity_check
+
+          ui.info("Creating new client for #{node_name}")
+
+          create_client!
+
+          ui.info("Creating new node for #{node_name}")
+
+          create_node!
+        end
+
+        # Tempfile to use to write newly created client credentials to.
+        #
+        # This method is public so that the knife bootstrapper can read then and pass the value into
+        # the handler for chef vault which needs the client cert we create here.
+        #
+        # We hang onto the tmpdir as an ivar as well so that it will not get GC'd and removed
+        #
+        # @return [String] path to the generated client.pem
+        def client_path
+          @client_path ||=
+            begin
+              @tmpdir = Dir.mktmpdir
+              File.join(@tmpdir, "#{node_name}.pem")
+            end
+        end
+
+        private
+
+        # @return [String] node name from the knife_config
+        def node_name
+          knife_config[:chef_node_name]
+        end
+
+        # @return [String] enviroment from the knife_config
+        def environment
+          knife_config[:environment]
+        end
+
+        # @return [String] run_list from the knife_config
+        def run_list
+          knife_config[:run_list]
+        end
+
+        # @return [Hash,Array] Object representation of json first-boot attributes from the knife_config
+        def first_boot_attributes
+          knife_config[:first_boot_attributes]
+        end
+
+        # @return [String] chef server url from the Chef::Config
+        def chef_server_url
+          chef_config[:chef_server_url]
+        end
+
+        # Accesses the run_list and coerces it into an Array, changing nils into
+        # the empty Array, and splitting strings representations of run_lists into
+        # Arrays.
+        #
+        # @return [Array] run_list coerced into an array
+        def normalized_run_list
+          case run_list
+          when nil
+            []
+          when String
+            run_list.split(/\s*,\s*/)
+          when Array
+            run_list
+          end
+        end
+
+        # Create the client object and save it to the Chef API
+        def create_client!
+          Chef::ApiClient::Registration.new(node_name, client_path, http_api: rest).run
+        end
+
+        # Create the node object (via the lazy accessor) and save it to the Chef API
+        def create_node!
+          node.save
+        end
+
+        # Create a new Chef::Node.  Supports creating the node with its name, run_list, attributes
+        # and environment.  This injects a rest object into the Chef::Node which uses the client key
+        # for authentication so that the client creates the node and therefore we get the acls setup
+        # correctly.
+        #
+        # @return [Chef::Node] new chef node to create
+        def node
+          @node ||=
+            begin
+              node = Chef::Node.new(chef_server_rest: client_rest)
+              node.name(node_name)
+              node.run_list(normalized_run_list)
+              node.normal_attrs = first_boot_attributes if first_boot_attributes
+              node.environment(environment) if environment
+              node
+            end
+        end
+
+        # Check for the existence of a node and/or client already on the server.  If the node
+        # already exists, we must delete it in order to proceed so that we can create a new node
+        # object with the permissions of the new client.  There is a use case for creating a new
+        # client and wiring it up to a precreated node object, but we do currently support that.
+        #
+        # We prompt the user about what to do and will fail hard if we do not get confirmation to
+        # delete any prior node/client objects.
+        def sanity_check
+          if resource_exists?("nodes/#{node_name}")
+            ui.confirm("Node #{node_name} exists, overwrite it")
+            rest.delete("nodes/#{node_name}")
+          end
+          if resource_exists?("clients/#{node_name}")
+            ui.confirm("Client #{node_name} exists, overwrite it")
+            rest.delete("clients/#{node_name}")
+          end
+        end
+
+        # Check if an relative path exists on the chef server
+        #
+        # @param relative_path [String] URI path relative to the chef organization
+        # @return [Boolean] if the relative path exists or returns a 404
+        def resource_exists?(relative_path)
+          rest.get_rest(relative_path)
+          true
+        rescue Net::HTTPServerException => e
+          raise unless e.response.code == "404"
+          false
+        end
+
+        # @return [Chef::REST] REST client using the client credentials
+        def client_rest
+          @client_rest ||= Chef::REST.new(chef_server_url, node_name, client_path)
+        end
+
+        # @return [Chef::REST] REST client using the cli user's knife credentials
+        # this uses the users's credentials
+        def rest
+          @rest ||= Chef::REST.new(chef_server_url)
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/bootstrap/{archlinux-gems.erb → templates/archlinux-gems.erb}

@@ -11,10 +11,12 @@ fi
 
 mkdir -p /etc/chef
 
+<% if validation_key -%>
 cat > /etc/chef/validation.pem <<'EOP'
 <%= validation_key %>
 EOP
 chmod 0600 /etc/chef/validation.pem
+<% end -%>
 
 <% if encrypted_data_bag_secret -%>
 cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
@@ -39,6 +41,13 @@ EOP
 <% end -%>
 <% end -%>
 
+<% if client_pem -%>
+cat > /etc/chef/client.pem <<'EOP'
+<%= ::File.read(::File.expand_path(client_pem)) %>
+EOP
+chmod 0600 /etc/chef/client.pem
+<% end -%>
+
 cat > /etc/chef/client.rb <<'EOP'
 log_level        :info
 log_location     STDOUT

data/lib/chef/knife/bootstrap/{chef-aix.erb → templates/chef-aix.erb}

@@ -24,10 +24,19 @@ fi
 
 mkdir -p /etc/chef
 
+<% if client_pem -%>
+cat > /etc/chef/client.pem <<'EOP'
+<%= ::File.read(::File.expand_path(client_pem)) %>
+EOP
+chmod 0600 /etc/chef/client.pem
+<% end -%>
+
+<% if validation_key -%>
 cat > /etc/chef/validation.pem <<'EOP'
 <%= validation_key %>
 EOP
 chmod 0600 /etc/chef/validation.pem
+<% end -%>
 
 <% if encrypted_data_bag_secret -%>
 cat > /etc/chef/encrypted_data_bag_secret <<'EOP'

data/lib/chef/knife/bootstrap/{chef-full.erb → templates/chef-full.erb}

@@ -22,7 +22,7 @@ exists() {
 <% if knife_config[:bootstrap_install_command] %>
   <%= knife_config[:bootstrap_install_command] %>
 <% else %>
-  install_sh="<%= knife_config[:bootstrap_url] ? knife_config[:bootstrap_url] : "https://www.opscode.com/chef/install.sh" %>"
+  install_sh="<%= knife_config[:bootstrap_url] ? knife_config[:bootstrap_url] : "https://www.chef.io/chef/install.sh" %>"
   if ! exists /usr/bin/chef-client; then
     echo "Installing Chef Client..."
     if exists wget; then
@@ -38,10 +38,19 @@ exists() {
 
 mkdir -p /etc/chef
 
+<% if client_pem -%>
+cat > /etc/chef/client.pem <<'EOP'
+<%= ::File.read(::File.expand_path(client_pem)) %>
+EOP
+chmod 0600 /etc/chef/client.pem
+<% end -%>
+
+<% if validation_key -%>
 cat > /etc/chef/validation.pem <<'EOP'
 <%= validation_key %>
 EOP
 chmod 0600 /etc/chef/validation.pem
+<% end -%>
 
 <% if encrypted_data_bag_secret -%>
 cat > /etc/chef/encrypted_data_bag_secret <<'EOP'

data/lib/chef/knife/client_create.rb

@@ -54,14 +54,16 @@ class Chef
           exit 1
         end
 
-        client = Chef::ApiClient.new
-        client.name(@client_name)
-        client.admin(config[:admin])
-        client.validator(config[:validator])
+        client_hash = {
+          "name" => @client_name,
+          "admin" => !!config[:admin],
+          "validator" => !!config[:validator]
+        }
 
-        output = edit_data(client)
+        output = Chef::ApiClient.from_hash(edit_hash(client_hash))
 
-        # Chef::ApiClient.save will try to create a client and if it exists will update it instead silently
+        # Chef::ApiClient.save will try to create a client and if it
+        # exists will update it instead silently.
         client = output.save
 
         # We only get a private_key on client creation, not on client update.
@@ -83,4 +85,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/cookbook_site_download.rb

@@ -58,7 +58,7 @@ class Chef
 
       private
       def cookbooks_api_url
-        'https://supermarket.getchef.com/api/v1/cookbooks'
+        'https://supermarket.chef.io/api/v1/cookbooks'
       end
 
       def current_cookbook_data

data/lib/chef/knife/cookbook_site_install.rb

@@ -181,7 +181,7 @@ class Chef
           return md
         end
 
-        raise Chef::Exceptions::MetadataNotFound
+        raise Chef::Exceptions::MetadataNotFound.new(@install_path, @cookbook_name)
       end
     end
   end

data/lib/chef/knife/cookbook_site_list.rb

@@ -41,7 +41,7 @@ class Chef
       end
 
       def get_cookbook_list(items=10, start=0, cookbook_collection={})
-        cookbooks_url = "https://supermarket.getchef.com/api/v1/cookbooks?items=#{items}&start=#{start}"
+        cookbooks_url = "https://supermarket.chef.io/api/v1/cookbooks?items=#{items}&start=#{start}"
         cr = noauth_rest.get_rest(cookbooks_url)
         cr["items"].each do |cookbook|
           cookbook_collection[cookbook["cookbook_name"]] = cookbook

data/lib/chef/knife/cookbook_site_search.rb

@@ -29,7 +29,7 @@ class Chef
       end
 
       def search_cookbook(query, items=10, start=0, cookbook_collection={})
-        cookbooks_url = "https://supermarket.getchef.com/api/v1/search?q=#{query}&items=#{items}&start=#{start}"
+        cookbooks_url = "https://supermarket.chef.io/api/v1/search?q=#{query}&items=#{items}&start=#{start}"
         cr = noauth_rest.get_rest(cookbooks_url)
         cr["items"].each do |cookbook|
           cookbook_collection[cookbook["cookbook_name"]] = cookbook

data/lib/chef/knife/cookbook_site_share.rb

@@ -29,8 +29,11 @@ class Chef
         require 'chef/cookbook_loader'
         require 'chef/cookbook_uploader'
         require 'chef/cookbook_site_streaming_uploader'
+        require 'mixlib/shellout'
       end
 
+      include Chef::Mixin::ShellOut
+
       banner "knife cookbook site share COOKBOOK [CATEGORY] (options)"
       category "cookbook site"
 
@@ -70,7 +73,15 @@ class Chef
           begin
             Chef::Log.debug("Temp cookbook directory is #{tmp_cookbook_dir.inspect}")
             ui.info("Making tarball #{cookbook_name}.tgz")
-            shell_out!("tar -czf #{cookbook_name}.tgz #{cookbook_name}", :cwd => tmp_cookbook_dir)
+            tar_cmd = "tar"
+            begin
+              # Unix and Mac only - prefer gnutar
+              if shell_out("which gnutar").exitstatus.equal?(0)
+                tar_cmd = "gnutar"
+              end
+            rescue Errno::ENOENT
+            end
+            shell_out!("#{tar_cmd} -czf #{cookbook_name}.tgz #{cookbook_name}", :cwd => tmp_cookbook_dir)
           rescue => e
             ui.error("Error making tarball #{cookbook_name}.tgz: #{e.message}. Increase log verbosity (-VV) for more information.")
             Chef::Log.debug("\n#{e.backtrace.join("\n")}")
@@ -120,33 +131,33 @@ class Chef
       end
 
       def do_upload(cookbook_filename, cookbook_category, user_id, user_secret_filename)
-         uri = "https://supermarket.getchef.com/api/v1/cookbooks"
-
-         category_string = Chef::JSONCompat.to_json({ 'category'=>cookbook_category })
-
-         http_resp = Chef::CookbookSiteStreamingUploader.post(uri, user_id, user_secret_filename, {
-           :tarball => File.open(cookbook_filename),
-           :cookbook => category_string
-         })
-
-         res = Chef::JSONCompat.from_json(http_resp.body)
-         if http_resp.code.to_i != 201
-           if res['error_messages']
-             if res['error_messages'][0] =~ /Version already exists/
-               ui.error "The same version of this cookbook already exists on the Opscode Cookbook Site."
-               exit(1)
-             else
-               ui.error "#{res['error_messages'][0]}"
-               exit(1)
-             end
-           else
-             ui.error "Unknown error while sharing cookbook"
-             ui.error "Server response: #{http_resp.body}"
-             exit(1)
-           end
-         end
-         res
-       end
+        uri = "https://supermarket.chef.io/api/v1/cookbooks"
+
+        category_string = Chef::JSONCompat.to_json({ 'category'=>cookbook_category })
+
+        http_resp = Chef::CookbookSiteStreamingUploader.post(uri, user_id, user_secret_filename, {
+          :tarball => File.open(cookbook_filename),
+          :cookbook => category_string
+        })
+
+        res = Chef::JSONCompat.from_json(http_resp.body)
+        if http_resp.code.to_i != 201
+          if res['error_messages']
+            if res['error_messages'][0] =~ /Version already exists/
+              ui.error "The same version of this cookbook already exists on the Opscode Cookbook Site."
+              exit(1)
+            else
+              ui.error "#{res['error_messages'][0]}"
+              exit(1)
+            end
+          else
+            ui.error "Unknown error while sharing cookbook"
+            ui.error "Server response: #{http_resp.body}"
+            exit(1)
+          end
+        end
+        res
+      end
     end
 
   end

data/lib/chef/knife/cookbook_site_show.rb

@@ -31,14 +31,14 @@ class Chef
       def get_cookbook_data
         case @name_args.length
         when 1
-          noauth_rest.get_rest("https://supermarket.getchef.com/api/v1/cookbooks/#{@name_args[0]}")
+          noauth_rest.get_rest("https://supermarket.chef.io/api/v1/cookbooks/#{@name_args[0]}")
         when 2
-          noauth_rest.get_rest("https://supermarket.getchef.com/api/v1/cookbooks/#{@name_args[0]}/versions/#{name_args[1].gsub('.', '_')}")
+          noauth_rest.get_rest("https://supermarket.chef.io/api/v1/cookbooks/#{@name_args[0]}/versions/#{name_args[1].gsub('.', '_')}")
         end
       end
 
       def get_cookbook_list(items=10, start=0, cookbook_collection={})
-        cookbooks_url = "https://supermarket.getchef.com/api/v1/cookbooks?items=#{items}&start=#{start}"
+        cookbooks_url = "https://supermarket.chef.io/api/v1/cookbooks?items=#{items}&start=#{start}"
         cr = noauth_rest.get_rest(cookbooks_url)
         cr["items"].each do |cookbook|
           cookbook_collection[cookbook["cookbook_name"]] = cookbook

data/lib/chef/knife/cookbook_site_unshare.rb

@@ -41,7 +41,7 @@ class Chef
         confirm "Do you really want to unshare the cookbook #{@cookbook_name}"
 
         begin
-          rest.delete_rest "https://supermarket.getchef.com/api/v1/cookbooks/#{@name_args[0]}"
+          rest.delete_rest "https://supermarket.chef.io/api/v1/cookbooks/#{@name_args[0]}"
         rescue Net::HTTPServerException => e
           raise e unless e.message =~ /Forbidden/
           ui.error "Forbidden: You must be the maintainer of #{@cookbook_name} to unshare it."