chef-zero 15.0.17 → 15.0.21

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -1,136 +1,136 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "rest_object_endpoint"
-require_relative "../rest_error_response"
-require_relative "../chef_data/data_normalizer"
-require_relative "../data_store/data_not_found_error"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/cookbooks/NAME/VERSION
-    class CookbookVersionEndpoint < RestObjectEndpoint
-      def get(request)
-        if request.rest_path[4] == "_latest" || request.rest_path[4] == "latest"
-          request.rest_path[4] = latest_version(list_data(request, request.rest_path[0..3]))
-        end
-        super(request)
-      end
-
-      def put(request)
-        name = request.rest_path[3]
-        version = request.rest_path[4]
-        existing_cookbook = get_data(request, request.rest_path, :nil)
-
-        # Honor frozen
-        if existing_cookbook
-          existing_cookbook_json = FFI_Yajl::Parser.parse(existing_cookbook)
-          if existing_cookbook_json["frozen?"]
-            if request.query_params["force"] != "true"
-              raise RestErrorResponse.new(409, "The cookbook #{name} at version #{version} is frozen. Use the 'force' option to override.")
-            end
-
-            # For some reason, you are forever unable to modify "frozen?" on a frozen cookbook.
-            request_body = FFI_Yajl::Parser.parse(request.body)
-            unless request_body["frozen?"]
-              request_body["frozen?"] = true
-              request.body = FFI_Yajl::Encoder.encode(request_body, pretty: true)
-            end
-          end
-        end
-
-        # Set the cookbook
-        set_data(request, request.rest_path, populate_defaults(request, request.body), :create_dir, :create)
-
-        # If the cookbook was updated, check for deleted files and clean them up
-        if existing_cookbook
-          missing_checksums = get_checksums(existing_cookbook) - get_checksums(request.body)
-          if missing_checksums.size > 0
-            hoover_unused_checksums(missing_checksums, request)
-          end
-        end
-
-        already_json_response(existing_cookbook ? 200 : 201, populate_defaults(request, request.body, normalize: false))
-      end
-
-      def delete(request)
-        if request.rest_path[4] == "_latest" || request.rest_path[4] == "latest"
-          request.rest_path[4] = latest_version(list_data(request, request.rest_path[0..3]))
-        end
-
-        deleted_cookbook = get_data(request)
-
-        response = super(request)
-        # Last one out turns out the lights: delete /organizations/ORG/cookbooks/NAME if it no longer has versions
-        cookbook_path = request.rest_path[0..3]
-        if exists_data_dir?(request, cookbook_path) && list_data(request, cookbook_path).size == 0
-          delete_data_dir(request, cookbook_path)
-        end
-
-        # Hoover deleted files, if they exist
-        hoover_unused_checksums(get_checksums(deleted_cookbook), request)
-        response
-      end
-
-      def get_checksums(cookbook)
-        result = []
-        FFI_Yajl::Parser.parse(cookbook).each_pair do |key, value|
-          if value.is_a?(Array)
-            value.each do |file|
-              if file.is_a?(Hash) && file.key?("checksum")
-                result << file["checksum"]
-              end
-            end
-          end
-        end
-        result.uniq
-      end
-
-      private
-
-      def hoover_unused_checksums(deleted_checksums, request)
-        %w{cookbooks cookbook_artifacts}.each do |cookbook_type|
-          begin
-            cookbooks = data_store.list(request.rest_path[0..1] + [cookbook_type])
-          rescue ChefZero::DataStore::DataNotFoundError
-            # Not all chef versions support cookbook_artifacts
-            raise unless cookbook_type == "cookbook_artifacts"
-
-            cookbooks = []
-          end
-          cookbooks.each do |cookbook_name|
-            # as below, this can be racy.
-            begin
-              data_store.list(request.rest_path[0..1] + [cookbook_type, cookbook_name]).each do |version|
-                cookbook = data_store.get(request.rest_path[0..1] + [cookbook_type, cookbook_name, version], request)
-                deleted_checksums -= get_checksums(cookbook)
-              end
-            rescue ChefZero::DataStore::DataNotFoundError
-            end
-          end
-        end
-        deleted_checksums.each do |checksum|
-          # There can be a race here if multiple cookbooks are uploading.
-          # This deals with an exception on delete, but things can still get deleted
-          # that shouldn't be.
-          begin
-            delete_data(request, request.rest_path[0..1] + ["file_store", "checksums", checksum], :data_store_exceptions)
-          rescue ChefZero::DataStore::DataNotFoundError
-          end
-        end
-      end
-
-      def populate_defaults(request, response_json, normalize: true)
-        # Inject URIs into each cookbook file
-        cookbook = FFI_Yajl::Parser.parse(response_json)
-        cookbook["chef_type"] ||= "cookbook_version"
-        cookbook["json_class"] ||= "Chef::CookbookVersion"
-        cookbook = ChefData::DataNormalizer.normalize_cookbook(self, request.rest_path[0..1], cookbook, request.rest_path[3], request.rest_path[4], request.base_uri, request.method, false, api_version: request.api_version) if normalize
-        FFI_Yajl::Encoder.encode(cookbook, pretty: true)
-      end
-
-      def latest_version(versions)
-        sorted = versions.sort_by { |version| Gem::Version.new(version.dup) }
-        sorted[-1]
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_object_endpoint"
+require_relative "../rest_error_response"
+require_relative "../chef_data/data_normalizer"
+require_relative "../data_store/data_not_found_error"
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/cookbooks/NAME/VERSION
+    class CookbookVersionEndpoint < RestObjectEndpoint
+      def get(request)
+        if request.rest_path[4] == "_latest" || request.rest_path[4] == "latest"
+          request.rest_path[4] = latest_version(list_data(request, request.rest_path[0..3]))
+        end
+        super(request)
+      end
+
+      def put(request)
+        name = request.rest_path[3]
+        version = request.rest_path[4]
+        existing_cookbook = get_data(request, request.rest_path, :nil)
+
+        # Honor frozen
+        if existing_cookbook
+          existing_cookbook_json = FFI_Yajl::Parser.parse(existing_cookbook)
+          if existing_cookbook_json["frozen?"]
+            if request.query_params["force"] != "true"
+              raise RestErrorResponse.new(409, "The cookbook #{name} at version #{version} is frozen. Use the 'force' option to override.")
+            end
+
+            # For some reason, you are forever unable to modify "frozen?" on a frozen cookbook.
+            request_body = FFI_Yajl::Parser.parse(request.body)
+            unless request_body["frozen?"]
+              request_body["frozen?"] = true
+              request.body = FFI_Yajl::Encoder.encode(request_body, pretty: true)
+            end
+          end
+        end
+
+        # Set the cookbook
+        set_data(request, request.rest_path, populate_defaults(request, request.body), :create_dir, :create)
+
+        # If the cookbook was updated, check for deleted files and clean them up
+        if existing_cookbook
+          missing_checksums = get_checksums(existing_cookbook) - get_checksums(request.body)
+          if missing_checksums.size > 0
+            hoover_unused_checksums(missing_checksums, request)
+          end
+        end
+
+        already_json_response(existing_cookbook ? 200 : 201, populate_defaults(request, request.body, normalize: false))
+      end
+
+      def delete(request)
+        if request.rest_path[4] == "_latest" || request.rest_path[4] == "latest"
+          request.rest_path[4] = latest_version(list_data(request, request.rest_path[0..3]))
+        end
+
+        deleted_cookbook = get_data(request)
+
+        response = super(request)
+        # Last one out turns out the lights: delete /organizations/ORG/cookbooks/NAME if it no longer has versions
+        cookbook_path = request.rest_path[0..3]
+        if exists_data_dir?(request, cookbook_path) && list_data(request, cookbook_path).size == 0
+          delete_data_dir(request, cookbook_path)
+        end
+
+        # Hoover deleted files, if they exist
+        hoover_unused_checksums(get_checksums(deleted_cookbook), request)
+        response
+      end
+
+      def get_checksums(cookbook)
+        result = []
+        FFI_Yajl::Parser.parse(cookbook).each_pair do |key, value|
+          if value.is_a?(Array)
+            value.each do |file|
+              if file.is_a?(Hash) && file.key?("checksum")
+                result << file["checksum"]
+              end
+            end
+          end
+        end
+        result.uniq
+      end
+
+      private
+
+      def hoover_unused_checksums(deleted_checksums, request)
+        %w{cookbooks cookbook_artifacts}.each do |cookbook_type|
+          begin
+            cookbooks = data_store.list(request.rest_path[0..1] + [cookbook_type])
+          rescue ChefZero::DataStore::DataNotFoundError
+            # Not all chef versions support cookbook_artifacts
+            raise unless cookbook_type == "cookbook_artifacts"
+
+            cookbooks = []
+          end
+          cookbooks.each do |cookbook_name|
+            # as below, this can be racy.
+
+            data_store.list(request.rest_path[0..1] + [cookbook_type, cookbook_name]).each do |version|
+              cookbook = data_store.get(request.rest_path[0..1] + [cookbook_type, cookbook_name, version], request)
+              deleted_checksums -= get_checksums(cookbook)
+            end
+          rescue ChefZero::DataStore::DataNotFoundError
+
+          end
+        end
+        deleted_checksums.each do |checksum|
+          # There can be a race here if multiple cookbooks are uploading.
+          # This deals with an exception on delete, but things can still get deleted
+          # that shouldn't be.
+
+          delete_data(request, request.rest_path[0..1] + ["file_store", "checksums", checksum], :data_store_exceptions)
+        rescue ChefZero::DataStore::DataNotFoundError
+
+        end
+      end
+
+      def populate_defaults(request, response_json, normalize: true)
+        # Inject URIs into each cookbook file
+        cookbook = FFI_Yajl::Parser.parse(response_json)
+        cookbook["chef_type"] ||= "cookbook_version"
+        cookbook["json_class"] ||= "Chef::CookbookVersion"
+        cookbook = ChefData::DataNormalizer.normalize_cookbook(self, request.rest_path[0..1], cookbook, request.rest_path[3], request.rest_path[4], request.base_uri, request.method, false, api_version: request.api_version) if normalize
+        FFI_Yajl::Encoder.encode(cookbook, pretty: true)
+      end
+
+      def latest_version(versions)
+        sorted = versions.sort_by { |version| Gem::Version.new(version.dup) }
+        sorted[-1]
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/cookbooks_base.rb

@@ -1,80 +1,80 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    # Common code for endpoints that return cookbook lists
-    class CookbooksBase < RestBase
-      def format_cookbooks_list(request, cookbooks_list, constraints = {}, num_versions = nil)
-        results = {}
-        filter_cookbooks(cookbooks_list, constraints, num_versions) do |name, versions|
-          versions_list = versions.map do |version|
-            {
-              "url" => build_uri(request.base_uri, request.rest_path[0..1] + ["cookbooks", name, version]),
-              "version" => version,
-            }
-          end
-          results[name] = {
-            "url" => build_uri(request.base_uri, request.rest_path[0..1] + ["cookbooks", name]),
-            "versions" => versions_list,
-          }
-        end
-        results
-      end
-
-      def format_universe_list(request, cookbooks_list)
-        results = {}
-        cookbooks_list.each do |name, versions|
-          results[name] ||= {}
-          versions.each do |version|
-            cookbook_data = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + [ "cookbooks", name, version ], :nil))
-            results[name][version] ||= {
-              "dependencies" => cookbook_data["metadata"]["dependencies"],
-              "location_path" => build_uri(request.base_uri, request.rest_path[0..1] + ["cookbooks", name, version]),
-              "location_type" => "chef_server",
-            }
-          end
-        end
-        results
-      end
-
-      def all_cookbooks_list(request)
-        result = {}
-        # Race conditions exist here (if someone deletes while listing).  I don't care.
-        data_store.list(request.rest_path[0..1] + ["cookbooks"]).each do |name|
-          result[name] = data_store.list(request.rest_path[0..1] + ["cookbooks", name])
-        end
-        result
-      end
-
-      def filter_cookbooks(cookbooks_list, constraints = {}, num_versions = nil)
-        cookbooks_list.keys.sort.each do |name|
-          constraint = Gem::Requirement.new(constraints[name])
-          versions = []
-          cookbooks_list[name].sort_by { |version| Gem::Version.new(version.dup) }.reverse_each do |version|
-            break if num_versions && versions.size >= num_versions
-
-            if constraint.satisfied_by?(Gem::Version.new(version.dup))
-              versions << version
-            end
-          end
-          yield [name, versions]
-        end
-      end
-
-      def recipe_names(cookbook_name, cookbook)
-        cookbook["all_files"].inject([]) do |acc, file|
-          part, name = file["name"].split("/")
-          next acc unless part == "recipes" || File.extname(name) != ".rb"
-
-          if name == "default.rb"
-            acc << cookbook_name
-          else
-            acc << "#{cookbook_name}::#{File.basename(name, ".rb")}"
-          end
-        end
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require_relative "../chef_data/data_normalizer"
+
+module ChefZero
+  module Endpoints
+    # Common code for endpoints that return cookbook lists
+    class CookbooksBase < RestBase
+      def format_cookbooks_list(request, cookbooks_list, constraints = {}, num_versions = nil)
+        results = {}
+        filter_cookbooks(cookbooks_list, constraints, num_versions) do |name, versions|
+          versions_list = versions.map do |version|
+            {
+              "url" => build_uri(request.base_uri, request.rest_path[0..1] + ["cookbooks", name, version]),
+              "version" => version,
+            }
+          end
+          results[name] = {
+            "url" => build_uri(request.base_uri, request.rest_path[0..1] + ["cookbooks", name]),
+            "versions" => versions_list,
+          }
+        end
+        results
+      end
+
+      def format_universe_list(request, cookbooks_list)
+        results = {}
+        cookbooks_list.each do |name, versions|
+          results[name] ||= {}
+          versions.each do |version|
+            cookbook_data = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + [ "cookbooks", name, version ], :nil))
+            results[name][version] ||= {
+              "dependencies" => cookbook_data["metadata"]["dependencies"],
+              "location_path" => build_uri(request.base_uri, request.rest_path[0..1] + ["cookbooks", name, version]),
+              "location_type" => "chef_server",
+            }
+          end
+        end
+        results
+      end
+
+      def all_cookbooks_list(request)
+        result = {}
+        # Race conditions exist here (if someone deletes while listing).  I don't care.
+        data_store.list(request.rest_path[0..1] + ["cookbooks"]).each do |name|
+          result[name] = data_store.list(request.rest_path[0..1] + ["cookbooks", name])
+        end
+        result
+      end
+
+      def filter_cookbooks(cookbooks_list, constraints = {}, num_versions = nil)
+        cookbooks_list.keys.sort.each do |name|
+          constraint = Gem::Requirement.new(constraints[name])
+          versions = []
+          cookbooks_list[name].sort_by { |version| Gem::Version.new(version.dup) }.reverse_each do |version|
+            break if num_versions && versions.size >= num_versions
+
+            if constraint.satisfied_by?(Gem::Version.new(version.dup))
+              versions << version
+            end
+          end
+          yield [name, versions]
+        end
+      end
+
+      def recipe_names(cookbook_name, cookbook)
+        cookbook["all_files"].inject([]) do |acc, file|
+          part, name = file["name"].split("/")
+          next acc unless part == "recipes" || File.extname(name) != ".rb"
+
+          if name == "default.rb"
+            acc << cookbook_name
+          else
+            acc << "#{cookbook_name}::#{File.basename(name, ".rb")}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/cookbooks_endpoint.rb

@@ -1,19 +1,19 @@
-require_relative "cookbooks_base"
-
-module ChefZero
-  module Endpoints
-    # /cookbooks
-    class CookbooksEndpoint < CookbooksBase
-      def get(request)
-        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), {}, num_versions))
-      end
-    end
-  end
-end
+require_relative "cookbooks_base"
+
+module ChefZero
+  module Endpoints
+    # /cookbooks
+    class CookbooksEndpoint < CookbooksBase
+      def get(request)
+        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), {}, num_versions))
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/data_bag_endpoint.rb

@@ -1,45 +1,45 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "rest_list_endpoint"
-require_relative "data_bag_item_endpoint"
-require_relative "../rest_error_response"
-
-module ChefZero
-  module Endpoints
-    # /data/NAME
-    class DataBagEndpoint < RestListEndpoint
-      def initialize(server)
-        super(server, "id")
-      end
-
-      def post(request)
-        json = FFI_Yajl::Parser.parse(request.body)
-        key = identity_keys.map { |k| json[k] }.select { |v| v }.first
-        response = super(request)
-        if response[0] == 201
-          already_json_response(201, DataBagItemEndpoint.populate_defaults(request, request.body, request.rest_path[3], key))
-        else
-          response
-        end
-      end
-
-      def get_key(contents)
-        data_bag_item = FFI_Yajl::Parser.parse(contents)
-        if data_bag_item["json_class"] == "Chef::DataBagItem" && data_bag_item["raw_data"]
-          data_bag_item["raw_data"]["id"]
-        else
-          data_bag_item["id"]
-        end
-      end
-
-      def delete(request)
-        key = request.rest_path[3]
-        delete_data_dir(request, request.rest_path, :recursive)
-        json_response(200, {
-          "chef_type" => "data_bag",
-          "json_class" => "Chef::DataBag",
-          "name" => key,
-        })
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_list_endpoint"
+require_relative "data_bag_item_endpoint"
+require_relative "../rest_error_response"
+
+module ChefZero
+  module Endpoints
+    # /data/NAME
+    class DataBagEndpoint < RestListEndpoint
+      def initialize(server)
+        super(server, "id")
+      end
+
+      def post(request)
+        json = FFI_Yajl::Parser.parse(request.body)
+        key = identity_keys.map { |k| json[k] }.select { |v| v }.first
+        response = super(request)
+        if response[0] == 201
+          already_json_response(201, DataBagItemEndpoint.populate_defaults(request, request.body, request.rest_path[3], key))
+        else
+          response
+        end
+      end
+
+      def get_key(contents)
+        data_bag_item = FFI_Yajl::Parser.parse(contents)
+        if data_bag_item["json_class"] == "Chef::DataBagItem" && data_bag_item["raw_data"]
+          data_bag_item["raw_data"]["id"]
+        else
+          data_bag_item["id"]
+        end
+      end
+
+      def delete(request)
+        key = request.rest_path[3]
+        delete_data_dir(request, request.rest_path, :recursive)
+        json_response(200, {
+          "chef_type" => "data_bag",
+          "json_class" => "Chef::DataBag",
+          "name" => key,
+        })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/data_bag_item_endpoint.rb

@@ -1,25 +1,25 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "rest_object_endpoint"
-require_relative "data_bag_item_endpoint"
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    # /data/NAME/NAME
-    class DataBagItemEndpoint < RestObjectEndpoint
-      def initialize(server)
-        super(server, "id")
-      end
-
-      def populate_defaults(request, response_json)
-        DataBagItemEndpoint.populate_defaults(request, response_json, request.rest_path[3], request.rest_path[4])
-      end
-
-      def self.populate_defaults(request, response_json, data_bag, data_bag_item)
-        response = FFI_Yajl::Parser.parse(response_json)
-        response = ChefData::DataNormalizer.normalize_data_bag_item(response, data_bag, data_bag_item, request.method)
-        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 "data_bag_item_endpoint"
+require_relative "../chef_data/data_normalizer"
+
+module ChefZero
+  module Endpoints
+    # /data/NAME/NAME
+    class DataBagItemEndpoint < RestObjectEndpoint
+      def initialize(server)
+        super(server, "id")
+      end
+
+      def populate_defaults(request, response_json)
+        DataBagItemEndpoint.populate_defaults(request, response_json, request.rest_path[3], request.rest_path[4])
+      end
+
+      def self.populate_defaults(request, response_json, data_bag, data_bag_item)
+        response = FFI_Yajl::Parser.parse(response_json)
+        response = ChefData::DataNormalizer.normalize_data_bag_item(response, data_bag, data_bag_item, request.method)
+        FFI_Yajl::Encoder.encode(response, pretty: true)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/data_bags_endpoint.rb

@@ -1,23 +1,23 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "rest_list_endpoint"
-
-module ChefZero
-  module Endpoints
-    # /data
-    class DataBagsEndpoint < RestListEndpoint
-      def post(request)
-        contents = request.body
-        json = FFI_Yajl::Parser.parse(contents)
-        name = identity_keys.map { |k| json[k] }.select { |v| v }.first
-        if name.nil?
-          error(400, "Must specify #{identity_keys.map(&:inspect).join(" or ")} in JSON")
-        elsif exists_data_dir?(request, request.rest_path[0..1] + ["data", name])
-          error(409, "Object already exists")
-        else
-          create_data_dir(request, request.rest_path[0..1] + ["data"], name, :recursive)
-          json_response(201, { "uri" => (build_uri(request.base_uri, request.rest_path + [name])).to_s })
-        end
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_list_endpoint"
+
+module ChefZero
+  module Endpoints
+    # /data
+    class DataBagsEndpoint < RestListEndpoint
+      def post(request)
+        contents = request.body
+        json = FFI_Yajl::Parser.parse(contents)
+        name = identity_keys.map { |k| json[k] }.select { |v| v }.first
+        if name.nil?
+          error(400, "Must specify #{identity_keys.map(&:inspect).join(" or ")} in JSON")
+        elsif exists_data_dir?(request, request.rest_path[0..1] + ["data", name])
+          error(409, "Object already exists")
+        else
+          create_data_dir(request, request.rest_path[0..1] + ["data"], name, :recursive)
+          json_response(201, { "uri" => (build_uri(request.base_uri, request.rest_path + [name])).to_s })
+        end
+      end
+    end
+  end
+end