chef-dk 2.3.4 → 2.4.17

data/README.md

@@ -314,7 +314,7 @@ For information on contributing to this project see <https://github.com/chef/che
 
 # For ChefDK Developers
 
-See the [Development Guide](DEVELOPMENT.md) for how to get started with
+See the [Development Guide](CONTRIBUTING.md) for how to get started with
 development on the ChefDK itself, as well as details on how dependencies,
 packaging, and building works.
 

data/Rakefile

@@ -63,7 +63,7 @@ namespace :style do
     FoodCritic::Rake::LintTask.new(:foodcritic) do |t|
       t.options = {
         fail_tags: ["any"],
-        tags: ["~FC011", "~FC071", "~supermarket"],
+        tags: ["~FC071", "~supermarket"],
         cookbook_paths: ["lib/chef-dk/skeletons/code_generator"],
         progress: true,
       }

data/acceptance/Gemfile.lock

@@ -12,13 +12,13 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     artifactory (2.8.2)
-    aws-sdk (2.10.44)
-      aws-sdk-resources (= 2.10.44)
-    aws-sdk-core (2.10.44)
+    aws-sdk (2.10.90)
+      aws-sdk-resources (= 2.10.90)
+    aws-sdk-core (2.10.90)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.44)
-      aws-sdk-core (= 2.10.44)
+    aws-sdk-resources (2.10.90)
+      aws-sdk-core (= 2.10.90)
     aws-sigv4 (1.0.2)
     berkshelf (6.3.1)
       buff-config (~> 2.0)
@@ -36,7 +36,6 @@ GEM
       ridley (~> 5.0)
       solve (~> 4.0)
       thor (~> 0.19, < 0.19.2)
-    blankslate (2.1.2.4)
     buff-config (2.0.0)
       buff-extensions (~> 2.0)
       varia_model (~> 0.6)
@@ -92,9 +91,9 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
-    docker-api (1.33.6)
-      excon (>= 0.38.0)
-      json
+    docker-api (1.34.0)
+      excon (>= 0.47.0)
+      multi_json
     erubis (2.7.0)
     excon (0.59.0)
     faraday (0.13.1)
@@ -108,12 +107,12 @@ GEM
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashie (3.5.6)
-    highline (1.7.8)
+    highline (1.7.10)
     hitimes (1.2.6)
     htmlentities (4.3.4)
     httpclient (2.8.3)
     iniparse (1.4.4)
-    inspec (1.36.1)
+    inspec (1.45.13)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
@@ -131,8 +130,8 @@ GEM
       semverse
       sslshake (~> 1.2)
       thor (~> 0.19)
-      toml (~> 0.1)
-      train (~> 0.26)
+      tomlrb (~> 1.2)
+      train (~> 0.29, >= 0.29.2)
     ipaddress (0.8.3)
     jmespath (1.3.1)
     json (2.1.0)
@@ -142,7 +141,7 @@ GEM
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-inspec (0.19.0)
+    kitchen-inspec (0.20.0)
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
@@ -153,7 +152,7 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    method_source (0.8.2)
+    method_source (0.9.0)
     minitar (0.6.1)
     mixlib-archive (0.4.1)
       mixlib-log
@@ -167,7 +166,7 @@ GEM
     mixlib-log (1.7.1)
     mixlib-shellout (2.3.2)
     mixlib-versioning (1.2.2)
-    molinillo (0.6.3)
+    molinillo (0.6.4)
     multi_json (1.12.2)
     multipart-post (2.0.0)
     net-scp (1.2.1)
@@ -185,7 +184,7 @@ GEM
     nori (2.6.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (8.24.1)
+    ohai (8.25.1)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -198,15 +197,13 @@ GEM
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
     parallel (1.12.0)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
+    parslet (1.8.1)
     plist (3.3.0)
     proxifier (1.0.3)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (3.0.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.1)
     rack (1.6.8)
     rainbow (2.1.0)
     retryable (2.0.4)
@@ -254,17 +251,16 @@ GEM
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     semverse (2.0.0)
-    serverspec (2.40.0)
+    serverspec (2.41.3)
       multi_json
       rspec (~> 3.0)
       rspec-its
-      specinfra (~> 2.68)
+      specinfra (~> 2.72)
     sfl (2.3)
-    slop (3.6.0)
     solve (4.0.0)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.71.2)
+    specinfra (2.72.1)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
@@ -283,9 +279,8 @@ GEM
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    toml (0.1.2)
-      parslet (~> 1.5.0)
-    train (0.26.2)
+    tomlrb (1.2.6)
+    train (0.29.2)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
@@ -311,7 +306,7 @@ GEM
     winrm-elevated (1.1.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.0.1)
+    winrm-fs (1.1.1)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -336,4 +331,4 @@ DEPENDENCIES
   winrm-fs
 
 BUNDLED WITH
-   1.15.4
+   1.16.0

data/lib/chef-dk/chef_server_api_multi.rb

@@ -0,0 +1,73 @@
+#
+# Copyright:: Copyright (c) 2017 Chef Software 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/server_api"
+
+module ChefDK
+
+  # A wrapper for `Chef::ServerAPI` that supports multi-threading by creating a
+  # `Chef::ServerAPI` object per-thread.
+  #
+  # This is intended to be used for downloading cookbooks from the Chef Server,
+  # where the API of the Chef Server requires each file to be downloaded
+  # individually.
+  #
+  # It also configures `Chef::ServerAPI` to enable keepalives by default. To
+  # disable them, `keepalives: false` must be set in the options to the
+  # constructor.
+  class ChefServerAPIMulti
+
+    KEEPALIVES_TRUE = { keepalives: true }.freeze
+
+    attr_reader :url
+    attr_reader :opts
+
+    def initialize(url, opts)
+      @url = url
+      @opts = KEEPALIVES_TRUE.merge(opts)
+    end
+
+    def head(*args)
+      client_for_thread.head(*args)
+    end
+
+    def get(*args)
+      client_for_thread.get(*args)
+    end
+
+    def put(*args)
+      client_for_thread.put(*args)
+    end
+
+    def post(*args)
+      client_for_thread.post(*args)
+    end
+
+    def delete(*args)
+      client_for_thread.delete(*args)
+    end
+
+    def streaming_request(*args, &block)
+      client_for_thread.streaming_request(*args, &block)
+    end
+
+    def client_for_thread
+      Thread.current[:chef_server_api_multi] ||= Chef::ServerAPI.new(@url, @opts)
+    end
+
+  end
+end

data/lib/chef-dk/command/update.rb

@@ -29,16 +29,16 @@ module ChefDK
       include Configurable
 
       banner(<<-BANNER)
-Usage: chef update [ POLICY_FILE ] [options]
+Usage: chef update [ POLICY_FILE ] [options] [cookbook_1] [...]
 
 `chef update` reads your `Policyfile.rb`, applies any changes, re-solves the
 dependencies and emits an updated `Policyfile.lock.json`. The new locked policy
 will reflect any changes to the `run_list` and pull in any cookbook updates
 that are compatible with the version constraints stated in your `Policyfile.rb`.
 
-NOTE: `chef update` does not yet support granular updates (e.g., just updating
-the `run_list` or a specific cookbook version). Support will be added in a
-future version.
+Individual dependent cookbooks (and their dependencies) may be updated by
+passing their names after the POLICY_FILE. The POLICY_FILE parameter is
+mandatory if you want to update individual cookbooks.
 
 See our detailed README for more information:
 
@@ -83,13 +83,6 @@ BANNER
 
       def run(params = [])
         return 1 unless apply_params!(params)
-
-        # Force config file to be loaded. We don't use the configuration
-        # directly, but the user may have SSL configuration options that they
-        # need to talk to a private supermarket (e.g., trusted_certs or
-        # ssl_verify_mode)
-        chef_config
-
         attributes_updater.run
         installer.run(@cookbooks_to_update) unless update_attributes_only?
         0
@@ -104,7 +97,7 @@ BANNER
 
       def attributes_updater
         @attributes_updater ||=
-          PolicyfileServices::UpdateAttributes.new(policyfile: policyfile_relative_path, ui: ui, root_dir: Dir.pwd)
+          PolicyfileServices::UpdateAttributes.new(policyfile: policyfile_relative_path, ui: ui, root_dir: Dir.pwd, chef_config: chef_config)
       end
 
       def debug?

data/lib/chef-dk/configurable.rb

@@ -18,6 +18,9 @@
 require "chef/config"
 require "chef/workstation_config_loader"
 
+require "chef-dk/cookbook_omnifetch"
+require "chef-dk/chef_server_api_multi"
+
 # Define a config context for ChefDK
 class Chef::Config
 
@@ -48,6 +51,8 @@ module ChefDK
       return @chef_config if @chef_config
       config_loader.load
       @chef_config = Chef::Config
+      CookbookOmnifetch.integration.default_chef_server_http_client = default_chef_server_http_client
+      @chef_config
     end
 
     def chefdk_config
@@ -65,5 +70,19 @@ module ChefDK
     def knife_config
       chef_config.knife
     end
+
+    def reset_config!
+      @chef_config = nil
+      @config_loader = nil
+    end
+
+    def default_chef_server_http_client
+      lambda do
+        ChefServerAPIMulti.new(@chef_config.chef_server_url,
+                               signing_key_filename: @chef_config.client_key,
+                               client_name: @chef_config.node_name)
+      end
+    end
+
   end
 end

data/lib/chef-dk/cookbook_omnifetch.rb

@@ -28,4 +28,5 @@ CookbookOmnifetch.configure do |c|
   c.storage_path = Pathname.new(File.expand_path(File.join(ChefDK::Helpers.chefdk_home, "cache", "cookbooks")))
   c.shell_out_class = ChefDK::ShellOut
   c.cached_cookbook_class = ChefDK::CookbookMetadata
+  c.chef_server_download_concurrency = 10
 end

data/lib/chef-dk/exceptions.rb

@@ -96,6 +96,9 @@ module ChefDK
   class BUG < RuntimeError
   end
 
+  class IncludePolicyCookbookSourceConflict < StandardError
+  end
+
   class CookbookSourceConflict < StandardError
 
     attr_reader :conflicting_cookbooks
@@ -136,4 +139,12 @@ EXAMPLE
 
   end
 
+  class PolicyfileLockDownloadError < StandardError
+  end
+
+  class LocalPolicyfileLockNotFound < StandardError
+  end
+
+  class InvalidPolicyfileLocation < StandardError
+  end
 end

data/lib/chef-dk/generator.rb

@@ -154,7 +154,7 @@ EOH
         end
         if comment
           # Ensure there's no trailing whitespace
-          result.gsub(/^(.+)$/, "#{comment} \\1").gsub(/^$/, "#{comment}")
+          result.gsub(/^(.+)$/, "#{comment} \\1").gsub(/^$/, "#{comment}").strip
         else
           result
         end

data/lib/chef-dk/policyfile/attribute_merge_checker.rb

@@ -0,0 +1,110 @@
+#
+# Copyright:: Copyright (c) 2017 Chef Software 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/mash"
+
+module ChefDK
+  module Policyfile
+    class AttributeMergeChecker
+      # A ConflictError is used to specify a conflict has occurred
+      class ConflictError < StandardError
+        attr_reader :attribute_path
+        attr_reader :provided_by
+
+        def initialize(attribute_path, provided_by)
+          @attribute_path = attribute_path
+          @provided_by = provided_by
+          super("Attribute '#{attribute_path}' provided conflicting values by the following sources #{provided_by}")
+        end
+      end
+
+      # A Leaf is used to mark an individual attribute that has already
+      # been provided, along with its value and by who
+      #
+      # @api private
+      class Leaf
+        attr_reader :provided_by
+        attr_reader :val
+
+        def initialize(provided_by, val)
+          @provided_by = provided_by
+          @val = val
+        end
+      end
+
+      # An AttributeHashInfo holds a set of attributes along with where they came from
+      class AttributeHashInfo
+        attr_reader :source_name
+        attr_reader :hash
+        def initialize(source_name, hash)
+          @source_name = source_name
+          @hash = hash
+        end
+      end
+
+      # @return [Array<AttributeHashInfo>] A list of attributes and who they were provided by
+      attr_reader :attribute_hash_infos
+
+      def initialize
+        @attribute_hash_infos = []
+      end
+
+      # Add a hash of attributes to the set of attributes that will be compared
+      # for conflicts
+      #
+      # @param source_name [String] Where the attributes came from
+      # @param hash [Hash] attributes from source_name
+      def with_attributes(source_name, hash)
+        attribute_hash_infos << AttributeHashInfo.new(source_name, hash)
+      end
+
+      # Check all added attributes for conflicts. Different sources can provide
+      # the same attribute if they have the same value. Otherwise, it is considered
+      # a conflict
+      #
+      # @raise ConflictError if there are conflicting attributes
+      def check!
+        check_struct = Mash.new
+        attribute_hash_infos.each do |attr_hash_info|
+          fill!(check_struct, attr_hash_info.source_name, "", attr_hash_info.hash)
+        end
+      end
+
+      private
+
+      def fill!(acc, source_name, path, hash)
+        hash.each do |(key, val)|
+          new_path = "#{path}[#{key}]"
+          if val.kind_of?(Hash)
+            acc[key] ||= Mash.new
+            fill!(acc[key], source_name, new_path, val)
+          else
+            if acc[key].nil?
+              acc[key] = Leaf.new(source_name, val)
+            else
+              leaf = acc[key]
+              if leaf.val != val
+                raise ConflictError.new(new_path, [leaf.provided_by, source_name])
+              end
+            end
+          end
+        end
+      end
+
+    end
+  end
+end