chef-zero 15.0.17 → 15.0.21

data/lib/chef_zero/endpoints/rest_object_endpoint.rb

@@ -1,78 +1,78 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-require_relative "../rest_error_response"
-
-module ChefZero
-  module Endpoints
-    # Typical REST leaf endpoint (/roles/NAME or /data/BAG/NAME)
-    class RestObjectEndpoint < RestBase
-      def initialize(server, identity_keys = [ "name" ])
-        super(server)
-        identity_keys = [ identity_keys ] if identity_keys.is_a?(String)
-        @identity_keys = identity_keys
-      end
-
-      attr_reader :identity_keys
-
-      def get(request)
-        already_json_response(200, populate_defaults(request, get_data(request)))
-      end
-
-      def put(request)
-        # We grab the old body to trigger a 404 if it doesn't exist
-        get_data(request)
-
-        # If it's a rename, check for conflict and delete the old value
-        if is_rename?(request)
-          key = identity_key_value(request)
-
-          begin
-            create_data(request, request.rest_path[0..-2], key, request.body, :data_store_exceptions)
-          rescue DataStore::DataAlreadyExistsError
-            return error(409, "Cannot rename '#{request.rest_path[-1]}' to '#{key}': '#{key}' already exists")
-          end
-          delete_data(request)
-          already_json_response(201, populate_defaults(request, request.body))
-        else
-          set_data(request, request.rest_path, request.body)
-          already_json_response(200, populate_defaults(request, request.body))
-        end
-      end
-
-      def delete(request)
-        result = get_data(request)
-        delete_data(request)
-        already_json_response(200, populate_defaults(request, result))
-      end
-
-      def patch_request_body(request)
-        existing_value = get_data(request, nil, :nil)
-        if existing_value
-          request_json = FFI_Yajl::Parser.parse(request.body)
-          existing_json = FFI_Yajl::Parser.parse(existing_value)
-          merged_json = existing_json.merge(request_json)
-          if merged_json.size > request_json.size
-            return FFI_Yajl::Encoder.encode(merged_json, pretty: true)
-          end
-        end
-
-        request.body
-      end
-
-      private
-
-      # Get the value of the (first existing) identity key from the request body or nil
-      def identity_key_value(request)
-        request_json = parse_json(request.body)
-        identity_keys.map { |k| request_json[k] }.compact.first
-      end
-
-      # Does this request change the value of the identity key?
-      def is_rename?(request)
-        return false unless (key = identity_key_value(request))
-
-        key != request.rest_path[-1]
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require_relative "../rest_error_response"
+
+module ChefZero
+  module Endpoints
+    # Typical REST leaf endpoint (/roles/NAME or /data/BAG/NAME)
+    class RestObjectEndpoint < RestBase
+      def initialize(server, identity_keys = [ "name" ])
+        super(server)
+        identity_keys = [ identity_keys ] if identity_keys.is_a?(String)
+        @identity_keys = identity_keys
+      end
+
+      attr_reader :identity_keys
+
+      def get(request)
+        already_json_response(200, populate_defaults(request, get_data(request)))
+      end
+
+      def put(request)
+        # We grab the old body to trigger a 404 if it doesn't exist
+        get_data(request)
+
+        # If it's a rename, check for conflict and delete the old value
+        if is_rename?(request)
+          key = identity_key_value(request)
+
+          begin
+            create_data(request, request.rest_path[0..-2], key, request.body, :data_store_exceptions)
+          rescue DataStore::DataAlreadyExistsError
+            return error(409, "Cannot rename '#{request.rest_path[-1]}' to '#{key}': '#{key}' already exists")
+          end
+          delete_data(request)
+          already_json_response(201, populate_defaults(request, request.body))
+        else
+          set_data(request, request.rest_path, request.body)
+          already_json_response(200, populate_defaults(request, request.body))
+        end
+      end
+
+      def delete(request)
+        result = get_data(request)
+        delete_data(request)
+        already_json_response(200, populate_defaults(request, result))
+      end
+
+      def patch_request_body(request)
+        existing_value = get_data(request, nil, :nil)
+        if existing_value
+          request_json = FFI_Yajl::Parser.parse(request.body)
+          existing_json = FFI_Yajl::Parser.parse(existing_value)
+          merged_json = existing_json.merge(request_json)
+          if merged_json.size > request_json.size
+            return FFI_Yajl::Encoder.encode(merged_json, pretty: true)
+          end
+        end
+
+        request.body
+      end
+
+      private
+
+      # Get the value of the (first existing) identity key from the request body or nil
+      def identity_key_value(request)
+        request_json = parse_json(request.body)
+        identity_keys.map { |k| request_json[k] }.compact.first
+      end
+
+      # Does this request change the value of the identity key?
+      def is_rename?(request)
+        return false unless (key = identity_key_value(request))
+
+        key != request.rest_path[-1]
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/role_endpoint.rb

@@ -1,16 +1,16 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "rest_object_endpoint"
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    # /roles/NAME
-    class RoleEndpoint < RestObjectEndpoint
-      def populate_defaults(request, response_json)
-        role = FFI_Yajl::Parser.parse(response_json)
-        role = ChefData::DataNormalizer.normalize_role(role, request.rest_path[3])
-        FFI_Yajl::Encoder.encode(role, 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
+    # /roles/NAME
+    class RoleEndpoint < RestObjectEndpoint
+      def populate_defaults(request, response_json)
+        role = FFI_Yajl::Parser.parse(response_json)
+        role = ChefData::DataNormalizer.normalize_role(role, request.rest_path[3])
+        FFI_Yajl::Encoder.encode(role, pretty: true)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/role_environments_endpoint.rb

@@ -1,14 +1,14 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    # /roles/NAME/environments
-    class RoleEnvironmentsEndpoint < RestBase
-      def get(request)
-        role = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
-        json_response(200, [ "_default" ] + (role["env_run_lists"].keys || []))
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    # /roles/NAME/environments
+    class RoleEnvironmentsEndpoint < RestBase
+      def get(request)
+        role = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
+        json_response(200, [ "_default" ] + (role["env_run_lists"].keys || []))
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/sandbox_endpoint.rb

@@ -1,27 +1,27 @@
-require_relative "../rest_base"
-require_relative "../rest_error_response"
-require "ffi_yajl" unless defined?(FFI_Yajl)
-
-module ChefZero
-  module Endpoints
-    # /sandboxes/ID
-    class SandboxEndpoint < RestBase
-      def put(request)
-        existing_sandbox = FFI_Yajl::Parser.parse(get_data(request))
-        existing_sandbox["checksums"].each do |checksum|
-          unless exists_data?(request, request.rest_path[0..1] + ["file_store", "checksums", checksum])
-            raise RestErrorResponse.new(503, "Checksum not uploaded: #{checksum}")
-          end
-        end
-        delete_data(request)
-        json_response(200, {
-          guid: request.rest_path[3],
-          name: request.rest_path[3],
-          checksums: existing_sandbox["checksums"],
-          create_time: existing_sandbox["create_time"],
-          is_completed: true,
-        })
-      end
-    end
-  end
-end
+require_relative "../rest_base"
+require_relative "../rest_error_response"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+
+module ChefZero
+  module Endpoints
+    # /sandboxes/ID
+    class SandboxEndpoint < RestBase
+      def put(request)
+        existing_sandbox = FFI_Yajl::Parser.parse(get_data(request))
+        existing_sandbox["checksums"].each do |checksum|
+          unless exists_data?(request, request.rest_path[0..1] + ["file_store", "checksums", checksum])
+            raise RestErrorResponse.new(503, "Checksum not uploaded: #{checksum}")
+          end
+        end
+        delete_data(request)
+        json_response(200, {
+          guid: request.rest_path[3],
+          name: request.rest_path[3],
+          checksums: existing_sandbox["checksums"],
+          create_time: existing_sandbox["create_time"],
+          is_completed: true,
+        })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/sandboxes_endpoint.rb

@@ -1,51 +1,51 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    # /sandboxes
-    class SandboxesEndpoint < RestBase
-      def initialize(server)
-        super(server)
-        @next_id = 1
-      end
-
-      def post(request)
-        sandbox_checksums = []
-
-        needed_checksums = FFI_Yajl::Parser.parse(request.body)["checksums"]
-        result_checksums = {}
-        available_checksums = list_data(request, request.rest_path[0..1] + %w{file_store checksums})
-        needed_checksums.keys.each do |needed_checksum|
-          if available_checksums.include?(needed_checksum)
-            result_checksums[needed_checksum] = { needs_upload: false }
-          else
-            result_checksums[needed_checksum] = {
-              needs_upload: true,
-              url: build_uri(request.base_uri, request.rest_path[0..1] + ["file_store", "checksums", needed_checksum]),
-            }
-            sandbox_checksums << needed_checksum
-          end
-        end
-
-        # There is an obvious race condition here.
-        id = @next_id.to_s
-        @next_id += 1
-
-        time_str = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S%z")
-        time_str = "#{time_str[0..21]}:#{time_str[22..23]}"
-
-        create_data(request, request.rest_path, id, FFI_Yajl::Encoder.encode({
-          create_time: time_str,
-          checksums: sandbox_checksums,
-        }, pretty: true))
-
-        json_response(201, {
-          uri: build_uri(request.base_uri, request.rest_path + [id]),
-          checksums: result_checksums,
-          sandbox_id: id,
-        })
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    # /sandboxes
+    class SandboxesEndpoint < RestBase
+      def initialize(server)
+        super(server)
+        @next_id = 1
+      end
+
+      def post(request)
+        sandbox_checksums = []
+
+        needed_checksums = FFI_Yajl::Parser.parse(request.body)["checksums"]
+        result_checksums = {}
+        available_checksums = list_data(request, request.rest_path[0..1] + %w{file_store checksums})
+        needed_checksums.keys.each do |needed_checksum|
+          if available_checksums.include?(needed_checksum)
+            result_checksums[needed_checksum] = { needs_upload: false }
+          else
+            result_checksums[needed_checksum] = {
+              needs_upload: true,
+              url: build_uri(request.base_uri, request.rest_path[0..1] + ["file_store", "checksums", needed_checksum]),
+            }
+            sandbox_checksums << needed_checksum
+          end
+        end
+
+        # There is an obvious race condition here.
+        id = @next_id.to_s
+        @next_id += 1
+
+        time_str = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S%z")
+        time_str = "#{time_str[0..21]}:#{time_str[22..23]}"
+
+        create_data(request, request.rest_path, id, FFI_Yajl::Encoder.encode({
+          create_time: time_str,
+          checksums: sandbox_checksums,
+        }, pretty: true))
+
+        json_response(201, {
+          uri: build_uri(request.base_uri, request.rest_path + [id]),
+          checksums: result_checksums,
+          sandbox_id: id,
+        })
+      end
+    end
+  end
+end