chef-dk 1.1.16 → 1.2.20

data/Rakefile

@@ -21,3 +21,12 @@ require_relative "tasks/bundle"
 require_relative "tasks/dependencies"
 require_relative "tasks/github_changelog_generator"
 require_relative "tasks/announce"
+
+desc "Keep the Dockerfile up-to-date"
+task :update_dockerfile do
+  require "mixlib/install"
+  latest_stable_version = Mixlib::Install.available_versions("chefdk", "stable").last
+  text = File.read("Dockerfile")
+  new_text = text.gsub(/^ARG VERSION=[\d\.]+$/, "ARG VERSION=#{latest_stable_version}")
+  File.open("Dockerfile", "w+") { |f| f.write(new_text) }
+end

data/acceptance/Gemfile

@@ -10,6 +10,9 @@ gem "winrm-fs"
 gem "winrm-elevated"
 gem "berkshelf"
 
+# Workaround to address https://github.com/sickill/rainbow/issues/44
+gem "rainbow", ">= 2.1.0", "< 2.2"
+
 # TODO remove this when we update Chef to use the new api exposed in 3.5.1
 gem "rspec-core", "= 3.4.4"
 

data/acceptance/Gemfile.lock

@@ -12,15 +12,15 @@ GEM
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
     artifactory (2.5.1)
-    aws-sdk (2.6.35)
-      aws-sdk-resources (= 2.6.35)
-    aws-sdk-core (2.6.35)
+    aws-sdk (2.7.2)
+      aws-sdk-resources (= 2.7.2)
+    aws-sdk-core (2.7.2)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.35)
-      aws-sdk-core (= 2.6.35)
+    aws-sdk-resources (2.7.2)
+      aws-sdk-core (= 2.7.2)
     aws-sigv4 (1.0.0)
-    berkshelf (5.2.0)
+    berkshelf (5.5.0)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -35,7 +35,7 @@ GEM
       retryable (~> 2.0)
       ridley (~> 5.0)
       solve (> 2.0, < 4.0)
-      thor (~> 0.19)
+      thor (~> 0.19, < 0.19.2)
     berkshelf-api-client (3.0.0)
       faraday (~> 0.9)
       httpclient (~> 2.7)
@@ -48,28 +48,30 @@ GEM
     buff-ruby_engine (1.0.0)
     buff-shell_out (1.1.0)
       buff-ruby_engine (~> 1.0)
-    builder (3.2.2)
+    builder (3.2.3)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.17.44)
+    chef-config (12.18.31)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     cleanroom (1.0.0)
     coderay (1.1.1)
-    diff-lcs (1.2.5)
-    docker-api (1.33.0)
+    diff-lcs (1.3)
+    docker-api (1.33.2)
       excon (>= 0.38.0)
       json
+    domain_name (0.5.20161129)
+      unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     excon (0.54.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
+    ffi (1.9.17)
     fuzzyurl (0.9.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
@@ -77,9 +79,19 @@ GEM
       builder (>= 2.1.2)
     hashie (3.4.6)
     hitimes (1.2.4)
+    http (2.1.0)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 1.0.1)
+      http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (1.0.1)
+    http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    inspec (1.7.2)
+    inspec (1.10.0)
       hashie (~> 3.4)
+      http (~> 2.1.0)
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
       mixlib-log
@@ -94,7 +106,7 @@ GEM
       thor (~> 0.19)
       train (>= 0.22.0, < 1.0)
     jmespath (1.3.1)
-    json (2.0.2)
+    json (2.0.3)
     kitchen-ec2 (1.2.0)
       aws-sdk (~> 2)
       excon
@@ -105,7 +117,7 @@ GEM
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (0.21.1)
+    kitchen-vagrant (1.0.0)
       test-kitchen (~> 1.4)
     little-plugger (1.1.4)
     logging (2.1.0)
@@ -113,7 +125,7 @@ GEM
       multi_json (~> 1.10)
     method_source (0.8.2)
     minitar (0.5.4)
-    mixlib-archive (0.2.0)
+    mixlib-archive (0.3.0)
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
@@ -125,15 +137,15 @@ GEM
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
-    molinillo (0.5.4)
+    molinillo (0.5.5)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.2.0)
+    net-ssh (4.0.1)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    nio4r (1.2.1)
+    nio4r (2.0.0)
     nori (2.6.0)
     octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -142,7 +154,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     rainbow (2.1.0)
     retryable (2.0.4)
     ridley (5.1.0)
@@ -194,31 +206,34 @@ GEM
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
     sslshake (1.0.13)
-    test-kitchen (1.14.2)
+    test-kitchen (1.15.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
-      net-ssh (>= 2.9, < 4.0)
-      net-ssh-gateway (~> 1.2.0)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-gateway (~> 1.2)
       safe_yaml (~> 1.0)
       thor (~> 0.18)
-    thor (0.19.4)
+    thor (0.19.1)
     timers (4.0.4)
       hitimes
-    train (0.22.0)
+    train (0.22.1)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
       net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 4.0)
+      net-ssh (>= 2.9, < 5.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
     varia_model (0.6.0)
       buff-extensions (~> 2.0)
       hashie (>= 2.0.2, < 4.0.0)
     windows_chef_zero (2.0.0)
       test-kitchen (>= 1.2.1)
-    winrm (2.1.0)
+    winrm (2.1.2)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -246,6 +261,7 @@ DEPENDENCIES
   kitchen-inspec
   kitchen-vagrant
   mixlib-install (= 1.2.3)
+  rainbow (>= 2.1.0, < 2.2)
   rspec-core (= 3.4.4)
   test-kitchen
   windows_chef_zero

data/chef-dk.gemspec

@@ -44,8 +44,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
   gem.add_dependency "minitar", "~> 0.5.4"
   gem.add_dependency "chef", "~> 12.5"
-  gem.add_dependency "solve", ">= 2.0.1"
-  gem.add_dependency "cookbook-omnifetch", "~> 0.2", ">= 0.2.2"
+  gem.add_dependency "solve", "< 4.0", "> 2.0"
+  gem.add_dependency "addressable", ">= 2.3.5", "< 2.6"
+  gem.add_dependency "cookbook-omnifetch", "~> 0.5"
   gem.add_dependency "diff-lcs", "~> 1.0"
   gem.add_dependency "paint", "~> 1.0"
   gem.add_dependency "chef-provisioning", "~> 2.0"

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

@@ -83,7 +83,7 @@ E
       end
 
       def installer
-        @installer ||= PolicyfileServices::Install.new(policyfile: policyfile_relative_path, ui: ui, root_dir: Dir.pwd)
+        @installer ||= PolicyfileServices::Install.new(policyfile: policyfile_relative_path, ui: ui, root_dir: Dir.pwd, config: chef_config)
       end
 
       def debug?

data/lib/chef-dk/exceptions.rb

@@ -62,6 +62,16 @@ module ChefDK
   class PolicyfileError < StandardError
   end
 
+  class InvalidPolicyfileSourceURI < StandardError
+    def initialize(url, reason = nil)
+      @url = url
+      @reason = reason
+      msg = "'#{@url}' is not a valid Policy File Source URI"
+      msg << " #{@reason}." unless @reason.nil?
+      super(msg)
+    end
+  end
+
   class MissingCookbookLockData < StandardError
   end
 

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

@@ -15,28 +15,60 @@
 # limitations under the License.
 #
 
+require 'ffi_yajl'
 require 'chef-dk/exceptions'
+require 'chef-dk/policyfile/source_uri'
+require 'chef-dk/authenticated_http'
 
 module ChefDK
   module Policyfile
     class ChefServerCookbookSource
-
       attr_reader :uri
+      attr_reader :preferred_cookbooks
+      attr_reader :chef_config
+
+      def initialize(uri, chef_config: nil)
+        @uri = SourceURI.parse(uri)
+        @http_connections = {}
+        @chef_config = chef_config
+        @preferred_cookbooks = []
+        yield self if block_given?
+      end
 
-      def initialize(uri)
-        @uri = uri
+      def default_source_args
+        [:chef_server, uri]
       end
 
       def ==(other)
-        other.kind_of?(self.class) && other.uri == uri
+        other.kind_of?(self.class) && other.uri == uri && other.preferred_cookbooks == preferred_cookbooks
+      end
+
+      def preferred_for(*cookbook_names)
+        preferred_cookbooks.concat(cookbook_names)
+      end
+
+      def preferred_source_for?(cookbook_name)
+        preferred_cookbooks.include?(cookbook_name)
       end
 
       def universe_graph
-        raise UnsupportedFeature, 'ChefDK does not support chef-server cookbook default sources at this time'
+        @universe_graph ||= begin
+          full_chef_server_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
+            normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
+              deps_by_version[version] = metadata["dependencies"]
+              deps_by_version
+            end
+            normalized_graph
+          end
+        end
       end
 
       def source_options_for(cookbook_name, cookbook_version)
-        raise UnsupportedFeature, 'ChefDK does not support chef-server cookbook default sources at this time'
+        {
+          chef_server: uri.to_s,
+          version: cookbook_version,
+          http_client: http_connection_for(uri.to_s)
+        }
       end
 
       def null?
@@ -47,8 +79,20 @@ module ChefDK
         "chef_server(#{uri})"
       end
 
+      private
+
+      def http_connection_for(base_url)
+        @http_connections[base_url] ||= ChefDK::AuthenticatedHTTP.new(base_url,
+                                                       signing_key_filename: chef_config.client_key,
+                                                       client_name: chef_config.node_name)
+      end
+
+      def full_chef_server_graph
+        @full_chef_server_graph ||=
+          begin
+            http_connection_for(uri.to_s).get('/universe')
+          end
+      end
     end
   end
 end
-
-

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

@@ -94,4 +94,3 @@ module ChefDK
     end
   end
 end
-

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

@@ -29,7 +29,7 @@ module ChefDK
       # API contract
       include StorageConfigDelegation
 
-      SOURCE_TYPES = [:git, :github, :path, :artifactserver]
+      SOURCE_TYPES = [:git, :github, :path, :artifactserver, :chef_server]
 
       #--
       # Required by CookbookOmnifetch API contract
@@ -69,7 +69,7 @@ module ChefDK
       end
 
       def mirrors_canonical_upstream?
-        [:git, :github, :artifactserver].include?(source_type)
+        [:git, :github, :artifactserver, :chef_server].include?(source_type)
       end
 
       def installed?

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

@@ -42,7 +42,8 @@ module ChefDK
 
       attr_reader :storage_config
 
-      def initialize(storage_config)
+      attr_reader :chef_config
+      def initialize(storage_config, chef_config: nil)
         @name = nil
         @errors = []
         @run_list = []
@@ -50,6 +51,7 @@ module ChefDK
         @default_source = [ NullCookbookSource.new ]
         @cookbook_location_specs = {}
         @storage_config = storage_config
+        @chef_config = chef_config
 
         @node_attributes = Chef::Node::Attribute.new({}, {}, {}, {})
       end
@@ -168,7 +170,7 @@ module ChefDK
         if source_uri.nil?
           @errors << "You must specify the server's URI when using a default_source :chef_server"
         else
-          set_default_source(ChefServerCookbookSource.new(source_uri))
+          set_default_source(ChefServerCookbookSource.new(source_uri, chef_config: chef_config, &block))
         end
       end
 

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

@@ -0,0 +1,57 @@
+#
+# Copyright:: Copyright (c) 2016 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 'addressable/uri'
+require 'chef-dk/exceptions'
+
+module ChefDK
+  module Policyfile
+    class SourceURI < Addressable::URI
+      class << self
+        # Returns a URI object based on the parsed string.
+        #
+        # @param [String, Addressable::URI, #to_str] uri The URI
+        # string to parse.  No parsing is performed if the object
+        # is already an <code>Addressable::URI</code>.
+        #
+        # @raise [ChefDK::InvalidPolicyfileSourceURI]
+        #
+        # @return [ChefDK::Policyfile::SourceURI]
+        def parse(uri)
+          parsed_uri = super(uri)
+          parsed_uri.send(:validate)
+          parsed_uri
+        rescue TypeError, ArgumentError => ex
+          raise ChefDK::InvalidPolicyfileSourceURI.new(uri, ex)
+        end
+      end
+
+      VALID_SCHEMES = %w{ https http }.freeze
+
+      # @raise [ChefDK::InvalidPolicyfileSourceURI]
+      def validate
+        super
+
+        unless VALID_SCHEMES.include?(self.scheme)
+          raise InvalidPolicyfileSourceURI.new(self, "invalid URI scheme '#{self.scheme}'. Valid schemes: #{VALID_SCHEMES}")
+        end
+      rescue Addressable::URI::InvalidURIError => ex
+        raise InvalidPolicyfileSourceURI.new(self, ex)
+      end
+    end
+  end
+end