chef-zero 15.0.17 → 15.0.26

data/lib/chef_zero/endpoints/dummy_endpoint.rb

@@ -1,29 +1,29 @@
-
-# pedant makes a couple of Solr-related calls from its search_utils.rb file that we can't work around (e.g.
-# with monkeypatching). the necessary Pedant::Config values are set in run_oc_pedant.rb. --cdoherty
-module ChefZero
-  module Endpoints
-    class DummyEndpoint < RestBase
-      # called by #direct_solr_query, once each for roles, nodes, and data bag items. each RSpec example makes
-      # 3 calls, with the expected sequence of return values [0, 1, 0].
-      def get(request)
-        # this could be made less brittle, but if things change to have more than 3 cycles, we should really
-        # be notified by a spec failure.
-        @mock_values ||= ([0, 1, 0] * 3).map { |val| make_response(val) }
-
-        retval = @mock_values.shift
-        json_response(200, retval)
-      end
-
-      # called by #force_solr_commit in pedant's , which doesn't check the return value.
-      def post(request)
-        # sure thing!
-        json_response(200, { message: "This dummy POST endpoint didn't do anything." })
-      end
-
-      def make_response(value)
-        { "response" => { "numFound" => value } }
-      end
-    end
-  end
-end
+
+# pedant makes a couple of Solr-related calls from its search_utils.rb file that we can't work around (e.g.
+# with monkeypatching). the necessary Pedant::Config values are set in run_oc_pedant.rb. --cdoherty
+module ChefZero
+  module Endpoints
+    class DummyEndpoint < RestBase
+      # called by #direct_solr_query, once each for roles, nodes, and data bag items. each RSpec example makes
+      # 3 calls, with the expected sequence of return values [0, 1, 0].
+      def get(request)
+        # this could be made less brittle, but if things change to have more than 3 cycles, we should really
+        # be notified by a spec failure.
+        @mock_values ||= ([0, 1, 0] * 3).map { |val| make_response(val) }
+
+        retval = @mock_values.shift
+        json_response(200, retval)
+      end
+
+      # called by #force_solr_commit in pedant's , which doesn't check the return value.
+      def post(request)
+        # sure thing!
+        json_response(200, { message: "This dummy POST endpoint didn't do anything." })
+      end
+
+      def make_response(value)
+        { "response" => { "numFound" => value } }
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/environment_cookbook_endpoint.rb

@@ -1,24 +1,24 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "cookbooks_base"
-
-module ChefZero
-  module Endpoints
-    # /environments/NAME/cookbooks/NAME
-    class EnvironmentCookbookEndpoint < CookbooksBase
-      def get(request)
-        cookbook_name = request.rest_path[5]
-        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
-        constraints = environment["cookbook_versions"] || {}
-        cookbook_versions = list_data(request, request.rest_path[0..1] + request.rest_path[4..5])
-        if request.query_params["num_versions"] == "all"
-          num_versions = nil
-        elsif request.query_params["num_versions"]
-          num_versions = request.query_params["num_versions"].to_i
-        else
-          num_versions = nil
-        end
-        json_response(200, format_cookbooks_list(request, { cookbook_name => cookbook_versions }, constraints, num_versions))
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "cookbooks_base"
+
+module ChefZero
+  module Endpoints
+    # /environments/NAME/cookbooks/NAME
+    class EnvironmentCookbookEndpoint < CookbooksBase
+      def get(request)
+        cookbook_name = request.rest_path[5]
+        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
+        constraints = environment["cookbook_versions"] || {}
+        cookbook_versions = list_data(request, request.rest_path[0..1] + request.rest_path[4..5])
+        if request.query_params["num_versions"] == "all"
+          num_versions = nil
+        elsif request.query_params["num_versions"]
+          num_versions = request.query_params["num_versions"].to_i
+        else
+          num_versions = nil
+        end
+        json_response(200, format_cookbooks_list(request, { cookbook_name => cookbook_versions }, constraints, num_versions))
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb

@@ -1,126 +1,136 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-require_relative "../rest_error_response"
-
-module ChefZero
-  module Endpoints
-    # /environments/NAME/cookbook_versions
-    class EnvironmentCookbookVersionsEndpoint < RestBase
-
-      def post(request)
-        cookbook_names = list_data(request, request.rest_path[0..1] + ["cookbooks"])
-
-        # Get the list of cookbooks and versions desired by the runlist
-        desired_versions = {}
-        run_list = FFI_Yajl::Parser.parse(request.body)["run_list"]
-        run_list.each do |run_list_entry|
-          if run_list_entry =~ /(.+)::.+\@(.+)/ || run_list_entry =~ /(.+)\@(.+)/
-            raise RestErrorResponse.new(412, "No such cookbook: #{$1}") unless cookbook_names.include?($1)
-            raise RestErrorResponse.new(412, "No such cookbook version for cookbook #{$1}: #{$2}") unless list_data(request, request.rest_path[0..1] + ["cookbooks", $1]).include?($2)
-
-            desired_versions[$1] = [ $2 ]
-          else
-            desired_cookbook = run_list_entry.split("::")[0]
-            raise RestErrorResponse.new(412, "No such cookbook: #{desired_cookbook}") unless cookbook_names.include?(desired_cookbook)
-
-            desired_versions[desired_cookbook] = list_data(request, request.rest_path[0..1] + ["cookbooks", desired_cookbook])
-          end
-        end
-
-        # Filter by environment constraints
-        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
-        environment_constraints = environment["cookbook_versions"] || {}
-
-        desired_versions.each_key do |name|
-          desired_versions = filter_by_constraint(desired_versions, name, environment_constraints[name])
-        end
-
-        # Depsolve!
-        solved = depsolve(request, desired_versions.keys, desired_versions, environment_constraints)
-        unless solved
-          if @last_missing_dep && !cookbook_names.include?(@last_missing_dep)
-            return raise RestErrorResponse.new(412, "No such cookbook: #{@last_missing_dep}")
-          elsif @last_constraint_failure
-            return raise RestErrorResponse.new(412, "Could not satisfy version constraints for: #{@last_constraint_failure}")
-          else
-
-            return raise RestErrorResponse.new(412, "Unsolvable versions!")
-          end
-        end
-
-        result = {}
-        solved.each_pair do |name, versions|
-          cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", name, versions[0]]))
-          result[name] = ChefData::DataNormalizer.normalize_cookbook(self, request.rest_path[0..1], cookbook, name, versions[0], request.base_uri, "MIN", false, api_version: request.api_version)
-        end
-        json_response(200, result)
-      end
-
-      def depsolve(request, unsolved, desired_versions, environment_constraints)
-        desired_versions.each do |cb, ver|
-          if ver.empty?
-            @last_constraint_failure = cb
-            return nil
-          end
-        end
-
-        # If everything is already
-        solve_for = unsolved[0]
-        return desired_versions unless solve_for
-
-        # Go through each desired version of this cookbook, starting with the latest,
-        # until we find one we can solve successfully with
-        sort_versions(desired_versions[solve_for]).each do |desired_version|
-          new_desired_versions = desired_versions.clone
-          new_desired_versions[solve_for] = [ desired_version ]
-          new_unsolved = unsolved[1..-1]
-
-          # Pick this cookbook, and add dependencies
-          cookbook_obj = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", solve_for, desired_version]))
-          cookbook_metadata = cookbook_obj["metadata"] || {}
-          cookbook_dependencies = cookbook_metadata["dependencies"] || {}
-          dep_not_found = false
-          cookbook_dependencies.each_pair do |dep_name, dep_constraint|
-            # If the dep is not already in the list, add it to the list to solve
-            # and bring in all environment-allowed cookbook versions to desired_versions
-            unless new_desired_versions.key?(dep_name)
-              new_unsolved += [dep_name]
-              # If the dep is missing, we will try other versions of the cookbook that might not have the bad dep.
-              unless exists_data_dir?(request, request.rest_path[0..1] + ["cookbooks", dep_name])
-                @last_missing_dep = dep_name.to_s
-                dep_not_found = true
-                break
-              end
-              new_desired_versions[dep_name] = list_data(request, request.rest_path[0..1] + ["cookbooks", dep_name])
-              new_desired_versions = filter_by_constraint(new_desired_versions, dep_name, environment_constraints[dep_name])
-            end
-            new_desired_versions = filter_by_constraint(new_desired_versions, dep_name, dep_constraint)
-          end
-
-          next if dep_not_found
-
-          # Depsolve children with this desired version!  First solution wins.
-          result = depsolve(request, new_unsolved, new_desired_versions, environment_constraints)
-          return result if result
-        end
-        nil
-      end
-
-      def sort_versions(versions)
-        result = versions.sort_by { |version| Gem::Version.new(version.dup) }
-        result.reverse
-      end
-
-      def filter_by_constraint(versions, cookbook_name, constraint)
-        return versions unless constraint
-
-        constraint = Gem::Requirement.new(constraint)
-        new_versions = versions[cookbook_name]
-        new_versions = new_versions.select { |version| constraint.satisfied_by?(Gem::Version.new(version.dup)) }
-        result = versions.clone
-        result[cookbook_name] = new_versions
-        result
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require_relative "../rest_error_response"
+
+module ChefZero
+  module Endpoints
+    # /environments/NAME/cookbook_versions
+    class EnvironmentCookbookVersionsEndpoint < RestBase
+
+      def post(request)
+        cookbook_names = list_data(request, request.rest_path[0..1] + ["cookbooks"])
+
+        # Get the list of cookbooks and versions desired by the runlist
+        desired_versions = {}
+        run_list = FFI_Yajl::Parser.parse(request.body)["run_list"]
+        run_list.each do |run_list_entry|
+          if run_list_entry =~ /(.+)::.+\@(.+)/ || run_list_entry =~ /(.+)\@(.+)/
+            raise RestErrorResponse.new(412, "No such cookbook: #{$1}") unless cookbook_names.include?($1)
+            raise RestErrorResponse.new(412, "No such cookbook version for cookbook #{$1}: #{$2}") unless list_data(request, request.rest_path[0..1] + ["cookbooks", $1]).include?($2)
+
+            desired_versions[$1] = [ $2 ]
+          else
+            desired_cookbook = run_list_entry.split("::")[0]
+            raise RestErrorResponse.new(412, "No such cookbook: #{desired_cookbook}") unless cookbook_names.include?(desired_cookbook)
+
+            desired_versions[desired_cookbook] = list_data(request, request.rest_path[0..1] + ["cookbooks", desired_cookbook])
+          end
+        end
+
+        # Filter by environment constraints
+        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
+        environment_constraints = environment["cookbook_versions"] || {}
+
+        desired_versions.each_key do |name|
+          desired_versions = filter_by_constraint(desired_versions, name, environment_constraints[name])
+        end
+
+        # Depsolve!
+        solved, cookbook_obj_cache = depsolve(request, desired_versions.keys, desired_versions, environment_constraints)
+        unless solved
+          if @last_missing_dep && !cookbook_names.include?(@last_missing_dep)
+            return raise RestErrorResponse.new(412, "No such cookbook: #{@last_missing_dep}")
+          elsif @last_constraint_failure
+            return raise RestErrorResponse.new(412, "Could not satisfy version constraints for: #{@last_constraint_failure}")
+          else
+
+            return raise RestErrorResponse.new(412, "Unsolvable versions!")
+          end
+        end
+
+        result = {}
+        solved.each_pair do |name, versions|
+          if cookbook_obj_cache.dig(name, versions[0])
+            cookbook = cookbook_obj_cache[name][versions[0]]
+          else
+            cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", name, versions[0]]))
+          end
+          result[name] = ChefData::DataNormalizer.normalize_cookbook(self, request.rest_path[0..1], cookbook, name, versions[0], request.base_uri, "MIN", false, api_version: request.api_version)
+        end
+        json_response(200, result)
+      end
+
+      def depsolve(request, unsolved, desired_versions, environment_constraints, cookbook_obj_cache = nil)
+        desired_versions.each do |cb, ver|
+          if ver.empty?
+            @last_constraint_failure = cb
+            return [nil, nil]
+          end
+        end
+
+        # If everything is already
+        solve_for = unsolved[0]
+        return [desired_versions, cookbook_obj_cache] unless solve_for
+
+        # Cache the get_data calls - this saves the need to run the get_data call a second time in #post
+        # Conceptually: cache[cookbook][version] = cookbook_object
+        cookbook_obj_cache ||= {}
+
+        # Go through each desired version of this cookbook, starting with the latest,
+        # until we find one we can solve successfully with
+        sort_versions(desired_versions[solve_for]).each do |desired_version|
+          new_desired_versions = desired_versions.clone
+          new_desired_versions[solve_for] = [ desired_version ]
+          new_unsolved = unsolved[1..-1]
+
+          # Pick this cookbook, and add dependencies
+          cookbook_obj = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", solve_for, desired_version]))
+          cookbook_obj_cache[solve_for] ||= {}
+          cookbook_obj_cache[solve_for][desired_version] = cookbook_obj
+          cookbook_metadata = cookbook_obj["metadata"] || {}
+          cookbook_dependencies = cookbook_metadata["dependencies"] || {}
+          dep_not_found = false
+          cookbook_dependencies.each_pair do |dep_name, dep_constraint|
+            # If the dep is not already in the list, add it to the list to solve
+            # and bring in all environment-allowed cookbook versions to desired_versions
+            unless new_desired_versions.key?(dep_name)
+              new_unsolved += [dep_name]
+              # If the dep is missing, we will try other versions of the cookbook that might not have the bad dep.
+              unless exists_data_dir?(request, request.rest_path[0..1] + ["cookbooks", dep_name])
+                @last_missing_dep = dep_name.to_s
+                dep_not_found = true
+                break
+              end
+              new_desired_versions[dep_name] = list_data(request, request.rest_path[0..1] + ["cookbooks", dep_name])
+              new_desired_versions = filter_by_constraint(new_desired_versions, dep_name, environment_constraints[dep_name])
+            end
+            new_desired_versions = filter_by_constraint(new_desired_versions, dep_name, dep_constraint)
+          end
+
+          next if dep_not_found
+
+          # Depsolve children with this desired version!  First solution wins.
+          result, cookbook_obj_cache = depsolve(request, new_unsolved, new_desired_versions, environment_constraints, cookbook_obj_cache)
+          return [result, cookbook_obj_cache] if result
+        end
+        [nil, nil]
+      end
+
+      def sort_versions(versions)
+        result = versions.sort_by { |version| Gem::Version.new(version.dup) }
+        result.reverse
+      end
+
+      def filter_by_constraint(versions, cookbook_name, constraint)
+        return versions unless constraint
+
+        constraint = Gem::Requirement.new(constraint)
+        new_versions = versions[cookbook_name]
+        new_versions = new_versions.select { |version| constraint.satisfied_by?(Gem::Version.new(version.dup)) }
+        result = versions.clone
+        result[cookbook_name] = new_versions
+        result
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb

@@ -1,22 +1,22 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "cookbooks_base"
-
-module ChefZero
-  module Endpoints
-    # /environments/NAME/cookbooks
-    class EnvironmentCookbooksEndpoint < CookbooksBase
-      def get(request)
-        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
-        constraints = environment["cookbook_versions"] || {}
-        if request.query_params["num_versions"] == "all"
-          num_versions = nil
-        elsif request.query_params["num_versions"]
-          num_versions = request.query_params["num_versions"].to_i
-        else
-          num_versions = 1
-        end
-        json_response(200, format_cookbooks_list(request, all_cookbooks_list(request), constraints, num_versions))
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "cookbooks_base"
+
+module ChefZero
+  module Endpoints
+    # /environments/NAME/cookbooks
+    class EnvironmentCookbooksEndpoint < CookbooksBase
+      def get(request)
+        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
+        constraints = environment["cookbook_versions"] || {}
+        if request.query_params["num_versions"] == "all"
+          num_versions = nil
+        elsif request.query_params["num_versions"]
+          num_versions = request.query_params["num_versions"].to_i
+        else
+          num_versions = 1
+        end
+        json_response(200, format_cookbooks_list(request, all_cookbooks_list(request), constraints, num_versions))
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/environment_endpoint.rb

@@ -1,33 +1,33 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "rest_object_endpoint"
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    # /environments/NAME
-    class EnvironmentEndpoint < RestObjectEndpoint
-      def delete(request)
-        if request.rest_path[3] == "_default"
-          # 405, really?
-          error(405, "The '_default' environment cannot be modified.")
-        else
-          super(request)
-        end
-      end
-
-      def put(request)
-        if request.rest_path[3] == "_default"
-          error(405, "The '_default' environment cannot be modified.")
-        else
-          super(request)
-        end
-      end
-
-      def populate_defaults(request, response_json)
-        response = FFI_Yajl::Parser.parse(response_json)
-        response = ChefData::DataNormalizer.normalize_environment(response, request.rest_path[3])
-        FFI_Yajl::Encoder.encode(response, pretty: true)
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
+
+module ChefZero
+  module Endpoints
+    # /environments/NAME
+    class EnvironmentEndpoint < RestObjectEndpoint
+      def delete(request)
+        if request.rest_path[3] == "_default"
+          # 405, really?
+          error(405, "The '_default' environment cannot be modified.")
+        else
+          super(request)
+        end
+      end
+
+      def put(request)
+        if request.rest_path[3] == "_default"
+          error(405, "The '_default' environment cannot be modified.")
+        else
+          super(request)
+        end
+      end
+
+      def populate_defaults(request, response_json)
+        response = FFI_Yajl::Parser.parse(response_json)
+        response = ChefData::DataNormalizer.normalize_environment(response, request.rest_path[3])
+        FFI_Yajl::Encoder.encode(response, pretty: true)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/environment_nodes_endpoint.rb

@@ -1,23 +1,23 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    # /environment/NAME/nodes
-    class EnvironmentNodesEndpoint < RestBase
-      def get(request)
-        # 404 if environment does not exist
-        get_data(request, request.rest_path[0..3])
-
-        result = {}
-        list_data(request, request.rest_path[0..1] + ["nodes"]).each do |name|
-          node = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["nodes", name]))
-          if node["chef_environment"] == request.rest_path[3]
-            result[name] = build_uri(request.base_uri, request.rest_path[0..1] + ["nodes", name])
-          end
-        end
-        json_response(200, result)
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    # /environment/NAME/nodes
+    class EnvironmentNodesEndpoint < RestBase
+      def get(request)
+        # 404 if environment does not exist
+        get_data(request, request.rest_path[0..3])
+
+        result = {}
+        list_data(request, request.rest_path[0..1] + ["nodes"]).each do |name|
+          node = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["nodes", name]))
+          if node["chef_environment"] == request.rest_path[3]
+            result[name] = build_uri(request.base_uri, request.rest_path[0..1] + ["nodes", name])
+          end
+        end
+        json_response(200, result)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/environment_recipes_endpoint.rb

@@ -1,22 +1,22 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "cookbooks_base"
-
-module ChefZero
-  module Endpoints
-    # /environment/NAME/recipes
-    class EnvironmentRecipesEndpoint < CookbooksBase
-      def get(request)
-        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
-        constraints = environment["cookbook_versions"] || {}
-        result = []
-        filter_cookbooks(all_cookbooks_list(request), constraints, 1) do |name, versions|
-          if versions.size > 0
-            cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", name, versions[0]]))
-            result += recipe_names(name, cookbook)
-          end
-        end
-        json_response(200, result.sort)
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "cookbooks_base"
+
+module ChefZero
+  module Endpoints
+    # /environment/NAME/recipes
+    class EnvironmentRecipesEndpoint < CookbooksBase
+      def get(request)
+        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
+        constraints = environment["cookbook_versions"] || {}
+        result = []
+        filter_cookbooks(all_cookbooks_list(request), constraints, 1) do |name, versions|
+          if versions.size > 0
+            cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", name, versions[0]]))
+            result += recipe_names(name, cookbook)
+          end
+        end
+        json_response(200, result.sort)
+      end
+    end
+  end
+end