chef-zero 15.0.17 → 15.0.21

data/lib/chef_zero/endpoints/container_endpoint.rb

@@ -1,22 +1,22 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "rest_object_endpoint"
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/containers/NAME
-    class ContainerEndpoint < RestObjectEndpoint
-      def initialize(server)
-        super(server, %w{id containername})
-      end
-
-      undef_method(:put)
-
-      def populate_defaults(request, response_json)
-        container = FFI_Yajl::Parser.parse(response_json)
-        container = ChefData::DataNormalizer.normalize_container(container, request.rest_path[3])
-        FFI_Yajl::Encoder.encode(container, 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
+    # /organizations/ORG/containers/NAME
+    class ContainerEndpoint < RestObjectEndpoint
+      def initialize(server)
+        super(server, %w{id containername})
+      end
+
+      undef_method(:put)
+
+      def populate_defaults(request, response_json)
+        container = FFI_Yajl::Parser.parse(response_json)
+        container = ChefData::DataNormalizer.normalize_container(container, request.rest_path[3])
+        FFI_Yajl::Encoder.encode(container, pretty: true)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/containers_endpoint.rb

@@ -1,25 +1,25 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "rest_list_endpoint"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/containers
-    class ContainersEndpoint < RestListEndpoint
-      def initialize(server)
-        super(server, %w{id containername})
-      end
-
-      # create a container.
-      # input: {"containername"=>"new-container", "containerpath"=>"/"}
-      def post(request)
-        data = parse_json(request.body)
-        # if they don't match, id wins.
-        container_name = data["id"] || data["containername"]
-        container_path_suffix = data["containerpath"].split("/").reject(&:empty?)
-        create_data(request, request.rest_path, container_name, to_json({}), :create_dir)
-
-        json_response(201, { uri: build_uri(request.base_uri, request.rest_path + container_path_suffix + [container_name]) })
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_list_endpoint"
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/containers
+    class ContainersEndpoint < RestListEndpoint
+      def initialize(server)
+        super(server, %w{id containername})
+      end
+
+      # create a container.
+      # input: {"containername"=>"new-container", "containerpath"=>"/"}
+      def post(request)
+        data = parse_json(request.body)
+        # if they don't match, id wins.
+        container_name = data["id"] || data["containername"]
+        container_path_suffix = data["containerpath"].split("/").reject(&:empty?)
+        create_data(request, request.rest_path, container_name, to_json({}), :create_dir)
+
+        json_response(201, { uri: build_uri(request.base_uri, request.rest_path + container_path_suffix + [container_name]) })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/controls_endpoint.rb

@@ -1,16 +1,16 @@
-require_relative "../dist"
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/controls
-    class ControlsEndpoint < RestBase
-      # ours is not to wonder why; ours is but to make the pedant specs pass.
-      def get(request)
-        error(410, "Server says 410, #{ChefZero::Dist::CLIENT} says 410.")
-      end
-
-      def post(request)
-        error(410, "Server says 410, #{ChefZero::Dist::CLIENT} says 410.")
-      end
-    end
-  end
-end
+require_relative "../dist"
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/controls
+    class ControlsEndpoint < RestBase
+      # ours is not to wonder why; ours is but to make the pedant specs pass.
+      def get(request)
+        error(410, "Server says 410, #{ChefZero::Dist::CLIENT} says 410.")
+      end
+
+      def post(request)
+        error(410, "Server says 410, #{ChefZero::Dist::CLIENT} says 410.")
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/cookbook_artifact_endpoint.rb

@@ -1,24 +1,24 @@
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    class CookbookArtifactEndpoint < RestBase
-      # GET /organizations/ORG/cookbook_artifacts/COOKBOOK
-      def get(request)
-        cookbook_name = request.rest_path.last
-        cookbook_url = build_uri(request.base_uri, request.rest_path)
-        response_data = {}
-        versions = []
-
-        list_data(request).each do |identifier|
-          artifact_url = build_uri(request.base_uri, request.rest_path + [cookbook_name, identifier])
-          versions << { url: artifact_url, identifier: identifier }
-        end
-
-        response_data[cookbook_name] = { url: cookbook_url, versions: versions }
-
-        json_response(200, response_data)
-      end
-    end
-  end
-end
+require_relative "../chef_data/data_normalizer"
+
+module ChefZero
+  module Endpoints
+    class CookbookArtifactEndpoint < RestBase
+      # GET /organizations/ORG/cookbook_artifacts/COOKBOOK
+      def get(request)
+        cookbook_name = request.rest_path.last
+        cookbook_url = build_uri(request.base_uri, request.rest_path)
+        response_data = {}
+        versions = []
+
+        list_data(request).each do |identifier|
+          artifact_url = build_uri(request.base_uri, request.rest_path + [cookbook_name, identifier])
+          versions << { url: artifact_url, identifier: identifier }
+        end
+
+        response_data[cookbook_name] = { url: cookbook_url, versions: versions }
+
+        json_response(200, response_data)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/cookbook_artifact_identifier_endpoint.rb

@@ -1,68 +1,68 @@
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    class CookbookArtifactIdentifierEndpoint < ChefZero::Endpoints::CookbookVersionEndpoint
-      # these endpoints are almost, but not quite, not entirely unlike the corresponding /cookbooks endpoints.
-      # it could all be refactored for maximum reuse, but they're short REST methods with well-defined
-      # behavioral specs (pedant), so there's not a huge benefit.
-
-      # GET /organizations/ORG/cookbook_artifacts/NAME/IDENTIFIER
-      def get(request)
-        cookbook_data = normalize(request, get_data(request))
-        json_response(200, cookbook_data)
-      end
-
-      # PUT /organizations/ORG/cookbook_artifacts/COOKBOOK/IDENTIFIER
-      def put(request)
-        if exists_data?(request)
-          return error(409, "Cookbooks cannot be modified, and a cookbook with this identifier already exists.")
-        end
-
-        cb_data = normalize(request, request.body)
-        set_data(request, nil, to_json(cb_data), :create_dir, :create)
-
-        already_json_response(201, request.body)
-      end
-
-      # DELETE /organizations/ORG/cookbook_artifacts/COOKBOOK/IDENTIFIER
-      def delete(request)
-        doomed_cookbook_json = get_data(request)
-        identified_cookbook_data = normalize(request, doomed_cookbook_json)
-        delete_data(request)
-
-        # go through the recipes and delete stuff in the file store.
-        hoover_unused_checksums(get_checksums(doomed_cookbook_json), request)
-
-        # if this was the last revision, delete the directory so future requests will 404, instead of
-        # returning 200 with an empty list.
-        # Last one out turns out the lights: delete /organizations/ORG/cookbooks/COOKBOOK 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
-
-        json_response(200, identified_cookbook_data)
-      rescue RestErrorResponse => ex
-        if ex.response_code == 404
-          error(404, "not_found")
-        else
-          raise
-        end
-      end
-
-      private
-
-      def make_file_store_path(rest_path, recipe)
-        rest_path.first(2) + ["file_store", "checksums", recipe["checksum"]]
-      end
-
-      def normalize(request, cookbook_artifact_data)
-        cookbook = parse_json(cookbook_artifact_data)
-        ChefData::DataNormalizer.normalize_cookbook(self, request.rest_path[0..1],
-          cookbook, request.rest_path[3], request.rest_path[4],
-          request.base_uri, request.method, true, api_version: request.api_version)
-      end
-    end
-  end
-end
+require_relative "../chef_data/data_normalizer"
+
+module ChefZero
+  module Endpoints
+    class CookbookArtifactIdentifierEndpoint < ChefZero::Endpoints::CookbookVersionEndpoint
+      # these endpoints are almost, but not quite, not entirely unlike the corresponding /cookbooks endpoints.
+      # it could all be refactored for maximum reuse, but they're short REST methods with well-defined
+      # behavioral specs (pedant), so there's not a huge benefit.
+
+      # GET /organizations/ORG/cookbook_artifacts/NAME/IDENTIFIER
+      def get(request)
+        cookbook_data = normalize(request, get_data(request))
+        json_response(200, cookbook_data)
+      end
+
+      # PUT /organizations/ORG/cookbook_artifacts/COOKBOOK/IDENTIFIER
+      def put(request)
+        if exists_data?(request)
+          return error(409, "Cookbooks cannot be modified, and a cookbook with this identifier already exists.")
+        end
+
+        cb_data = normalize(request, request.body)
+        set_data(request, nil, to_json(cb_data), :create_dir, :create)
+
+        already_json_response(201, request.body)
+      end
+
+      # DELETE /organizations/ORG/cookbook_artifacts/COOKBOOK/IDENTIFIER
+      def delete(request)
+        doomed_cookbook_json = get_data(request)
+        identified_cookbook_data = normalize(request, doomed_cookbook_json)
+        delete_data(request)
+
+        # go through the recipes and delete stuff in the file store.
+        hoover_unused_checksums(get_checksums(doomed_cookbook_json), request)
+
+        # if this was the last revision, delete the directory so future requests will 404, instead of
+        # returning 200 with an empty list.
+        # Last one out turns out the lights: delete /organizations/ORG/cookbooks/COOKBOOK 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
+
+        json_response(200, identified_cookbook_data)
+      rescue RestErrorResponse => ex
+        if ex.response_code == 404
+          error(404, "not_found")
+        else
+          raise
+        end
+      end
+
+      private
+
+      def make_file_store_path(rest_path, recipe)
+        rest_path.first(2) + ["file_store", "checksums", recipe["checksum"]]
+      end
+
+      def normalize(request, cookbook_artifact_data)
+        cookbook = parse_json(cookbook_artifact_data)
+        ChefData::DataNormalizer.normalize_cookbook(self, request.rest_path[0..1],
+          cookbook, request.rest_path[3], request.rest_path[4],
+          request.base_uri, request.method, true, api_version: request.api_version)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb

@@ -1,34 +1,34 @@
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    class CookbookArtifactsEndpoint < RestBase
-      # GET /organizations/ORG/cookbook_artifacts
-      def get(request)
-        data = {}
-
-        artifacts = begin
-                      list_data(request)
-                    rescue Exception => e
-                      if e.response_code == 404
-                        return already_json_response(200, "{}")
-                      end
-                    end
-
-        artifacts.each do |cookbook_artifact|
-          cookbook_url = build_uri(request.base_uri, request.rest_path + [cookbook_artifact])
-
-          versions = []
-          list_data(request, request.rest_path + [cookbook_artifact]).each do |identifier|
-            artifact_url = build_uri(request.base_uri, request.rest_path + [cookbook_artifact, identifier])
-            versions << { url: artifact_url, identifier: identifier }
-          end
-
-          data[cookbook_artifact] = { url: cookbook_url, versions: versions }
-        end
-
-        json_response(200, data)
-      end
-    end
-  end
-end
+require_relative "../chef_data/data_normalizer"
+
+module ChefZero
+  module Endpoints
+    class CookbookArtifactsEndpoint < RestBase
+      # GET /organizations/ORG/cookbook_artifacts
+      def get(request)
+        data = {}
+
+        artifacts = begin
+                      list_data(request)
+                    rescue Exception => e
+                      if e.response_code == 404
+                        return already_json_response(200, "{}")
+                      end
+                    end
+
+        artifacts.each do |cookbook_artifact|
+          cookbook_url = build_uri(request.base_uri, request.rest_path + [cookbook_artifact])
+
+          versions = []
+          list_data(request, request.rest_path + [cookbook_artifact]).each do |identifier|
+            artifact_url = build_uri(request.base_uri, request.rest_path + [cookbook_artifact, identifier])
+            versions << { url: artifact_url, identifier: identifier }
+          end
+
+          data[cookbook_artifact] = { url: cookbook_url, versions: versions }
+        end
+
+        json_response(200, data)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/cookbook_endpoint.rb

@@ -1,39 +1,39 @@
-require_relative "cookbooks_base"
-
-module ChefZero
-  module Endpoints
-    # /cookbooks/NAME
-    class CookbookEndpoint < CookbooksBase
-      def get(request)
-        filter = request.rest_path[3]
-        case filter
-        when "_latest"
-          result = {}
-          filter_cookbooks(all_cookbooks_list(request), {}, 1) do |name, versions|
-            if versions.size > 0
-              result[name] = build_uri(request.base_uri, request.rest_path[0..1] + ["cookbooks", name, versions[0]])
-            end
-          end
-          json_response(200, result)
-        when "_recipes"
-          result = []
-          filter_cookbooks(all_cookbooks_list(request), {}, 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)
-        else
-          cookbook_list = { filter => list_data(request, request.rest_path) }
-          json_response(200, format_cookbooks_list(request, cookbook_list))
-        end
-      end
-
-      def latest_version(versions)
-        sorted = versions.sort_by { |version| Gem::Version.new(version.dup) }
-        sorted[-1]
-      end
-    end
-  end
-end
+require_relative "cookbooks_base"
+
+module ChefZero
+  module Endpoints
+    # /cookbooks/NAME
+    class CookbookEndpoint < CookbooksBase
+      def get(request)
+        filter = request.rest_path[3]
+        case filter
+        when "_latest"
+          result = {}
+          filter_cookbooks(all_cookbooks_list(request), {}, 1) do |name, versions|
+            if versions.size > 0
+              result[name] = build_uri(request.base_uri, request.rest_path[0..1] + ["cookbooks", name, versions[0]])
+            end
+          end
+          json_response(200, result)
+        when "_recipes"
+          result = []
+          filter_cookbooks(all_cookbooks_list(request), {}, 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)
+        else
+          cookbook_list = { filter => list_data(request, request.rest_path) }
+          json_response(200, format_cookbooks_list(request, cookbook_list))
+        end
+      end
+
+      def latest_version(versions)
+        sorted = versions.sort_by { |version| Gem::Version.new(version.dup) }
+        sorted[-1]
+      end
+    end
+  end
+end