chef-zero 15.0.17 → 15.0.21

data/lib/chef_zero/endpoints/file_store_file_endpoint.rb

@@ -1,22 +1,22 @@
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    # The minimum amount of S3 necessary to support cookbook upload/download
-    # /organizations/NAME/file_store/FILE
-    class FileStoreFileEndpoint < RestBase
-      def json_only
-        false
-      end
-
-      def get(request)
-        [200, { "Content-Type" => "application/x-binary" }, get_data(request) ]
-      end
-
-      def put(request)
-        data_store.set(request.rest_path, request.body, :create, :create_dir, requestor: request.requestor)
-        json_response(200, {})
-      end
-    end
-  end
-end
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    # The minimum amount of S3 necessary to support cookbook upload/download
+    # /organizations/NAME/file_store/FILE
+    class FileStoreFileEndpoint < RestBase
+      def json_only
+        false
+      end
+
+      def get(request)
+        [200, { "Content-Type" => "application/x-binary" }, get_data(request) ]
+      end
+
+      def put(request)
+        data_store.set(request.rest_path, request.body, :create, :create_dir, requestor: request.requestor)
+        json_response(200, {})
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/group_endpoint.rb

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

data/lib/chef_zero/endpoints/groups_endpoint.rb

@@ -1,13 +1,13 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "rest_list_endpoint"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/groups/NAME
-    class GroupsEndpoint < RestListEndpoint
-      def initialize(server)
-        super(server, %w{id groupname})
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_list_endpoint"
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/groups/NAME
+    class GroupsEndpoint < RestListEndpoint
+      def initialize(server)
+        super(server, %w{id groupname})
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/license_endpoint.rb

@@ -1,25 +1,25 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    # /license
-    class LicenseEndpoint < RestBase
-      MAX_NODE_COUNT = 25
-
-      def get(request)
-        node_count = 0
-        list_data(request, [ "organizations" ]).each do |orgname|
-          node_count += list_data(request, [ "organizations", orgname, "nodes" ]).size
-        end
-
-        json_response(200, {
-          "limit_exceeded" => (node_count > MAX_NODE_COUNT) ? true : false,
-          "node_license" => MAX_NODE_COUNT,
-          "node_count" => node_count,
-          "upgrade_url" => "https://blah.com",
-        })
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    # /license
+    class LicenseEndpoint < RestBase
+      MAX_NODE_COUNT = 25
+
+      def get(request)
+        node_count = 0
+        list_data(request, [ "organizations" ]).each do |orgname|
+          node_count += list_data(request, [ "organizations", orgname, "nodes" ]).size
+        end
+
+        json_response(200, {
+          "limit_exceeded" => (node_count > MAX_NODE_COUNT) ? true : false,
+          "node_license" => MAX_NODE_COUNT,
+          "node_count" => node_count,
+          "upgrade_url" => "https://blah.com",
+        })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/node_endpoint.rb

@@ -1,34 +1,34 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "rest_object_endpoint"
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    # /nodes/ID
-    class NodeEndpoint < RestObjectEndpoint
-      def put(request)
-        data = parse_json(request.body)
-
-        if data.key?("policy_name") && policy_name_invalid?(data["policy_name"])
-          return error(400, "Field 'policy_name' invalid", pretty: false)
-        end
-
-        if data.key?("policy_group") && policy_name_invalid?(data["policy_group"])
-          return error(400, "Field 'policy_group' invalid", pretty: false)
-        end
-
-        super(request)
-      end
-
-      def head(request)
-        head_request(request)
-      end
-
-      def populate_defaults(request, response_json)
-        node = FFI_Yajl::Parser.parse(response_json)
-        node = ChefData::DataNormalizer.normalize_node(node, request.rest_path[3])
-        FFI_Yajl::Encoder.encode(node, 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
+    # /nodes/ID
+    class NodeEndpoint < RestObjectEndpoint
+      def put(request)
+        data = parse_json(request.body)
+
+        if data.key?("policy_name") && policy_name_invalid?(data["policy_name"])
+          return error(400, "Field 'policy_name' invalid", pretty: false)
+        end
+
+        if data.key?("policy_group") && policy_name_invalid?(data["policy_group"])
+          return error(400, "Field 'policy_group' invalid", pretty: false)
+        end
+
+        super(request)
+      end
+
+      def head(request)
+        head_request(request)
+      end
+
+      def populate_defaults(request, response_json)
+        node = FFI_Yajl::Parser.parse(response_json)
+        node = ChefData::DataNormalizer.normalize_node(node, request.rest_path[3])
+        FFI_Yajl::Encoder.encode(node, pretty: true)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/node_identifiers_endpoint.rb

@@ -1,22 +1,22 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-require "uuidtools"
-
-module ChefZero
-  module Endpoints
-    # /organizations/NAME/nodes/NAME/_identifiers
-    class NodeIdentifiersEndpoint < RestBase
-      def get(request)
-        if get_data(request, request.rest_path[0..3])
-          result = {
-            id: UUIDTools::UUID.parse_raw(request.rest_path[0..4].to_s).to_s.delete("-"),
-            authz_id: "0" * 32,
-            org_id: UUIDTools::UUID.parse_raw(request.rest_path[0..1].to_s).to_s.delete("-") }
-          json_response(200, result)
-        else
-          raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
-        end
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require "uuidtools"
+
+module ChefZero
+  module Endpoints
+    # /organizations/NAME/nodes/NAME/_identifiers
+    class NodeIdentifiersEndpoint < RestBase
+      def get(request)
+        if get_data(request, request.rest_path[0..3])
+          result = {
+            id: UUIDTools::UUID.parse_raw(request.rest_path[0..4].to_s).to_s.delete("-"),
+            authz_id: "0" * 32,
+            org_id: UUIDTools::UUID.parse_raw(request.rest_path[0..1].to_s).to_s.delete("-") }
+          json_response(200, result)
+        else
+          raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
+        end
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/nodes_endpoint.rb

@@ -1,34 +1,34 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "rest_object_endpoint"
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    # /nodes
-    class NodesEndpoint < RestListEndpoint
-
-      def post(request)
-        # /nodes validation
-        if request.rest_path.last == "nodes"
-          data = parse_json(request.body)
-
-          if data.key?("policy_name") && policy_name_invalid?(data["policy_name"])
-            return error(400, "Field 'policy_name' invalid", pretty: false)
-          end
-
-          if data.key?("policy_group") && policy_name_invalid?(data["policy_group"])
-            return error(400, "Field 'policy_group' invalid", pretty: false)
-          end
-        end
-
-        super(request)
-      end
-
-      def populate_defaults(request, response_json)
-        node = FFI_Yajl::Parser.parse(response_json)
-        node = ChefData::DataNormalizer.normalize_node(node, request.rest_path[3])
-        FFI_Yajl::Encoder.encode(node, 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
+    # /nodes
+    class NodesEndpoint < RestListEndpoint
+
+      def post(request)
+        # /nodes validation
+        if request.rest_path.last == "nodes"
+          data = parse_json(request.body)
+
+          if data.key?("policy_name") && policy_name_invalid?(data["policy_name"])
+            return error(400, "Field 'policy_name' invalid", pretty: false)
+          end
+
+          if data.key?("policy_group") && policy_name_invalid?(data["policy_group"])
+            return error(400, "Field 'policy_group' invalid", pretty: false)
+          end
+        end
+
+        super(request)
+      end
+
+      def populate_defaults(request, response_json)
+        node = FFI_Yajl::Parser.parse(response_json)
+        node = ChefData::DataNormalizer.normalize_node(node, request.rest_path[3])
+        FFI_Yajl::Encoder.encode(node, pretty: true)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/not_found_endpoint.rb

@@ -1,11 +1,11 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-
-module ChefZero
-  module Endpoints
-    class NotFoundEndpoint
-      def call(request)
-        [404, { "Content-Type" => "application/json" }, FFI_Yajl::Encoder.encode({ "error" => ["Object not found: #{request.env["REQUEST_PATH"]}"] }, pretty: true)]
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+
+module ChefZero
+  module Endpoints
+    class NotFoundEndpoint
+      def call(request)
+        [404, { "Content-Type" => "application/json" }, FFI_Yajl::Encoder.encode({ "error" => ["Object not found: #{request.env["REQUEST_PATH"]}"] }, pretty: true)]
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_association_request_endpoint.rb

@@ -1,22 +1,22 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/association_requests/ID
-    class OrganizationAssociationRequestEndpoint < RestBase
-      def delete(request)
-        orgname = request.rest_path[1]
-        id = request.rest_path[3]
-        if id !~ /(.+)-#{orgname}$/
-          raise HttpErrorResponse.new(404, "Invalid ID #{id}.  Must be of the form username-#{orgname}")
-        end
-
-        username = $1
-        path = request.rest_path[0..-2] + [username]
-        delete_data(request, path)
-        json_response(200, { "id" => id, "username" => username })
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/association_requests/ID
+    class OrganizationAssociationRequestEndpoint < RestBase
+      def delete(request)
+        orgname = request.rest_path[1]
+        id = request.rest_path[3]
+        if id !~ /(.+)-#{orgname}$/
+          raise HttpErrorResponse.new(404, "Invalid ID #{id}.  Must be of the form username-#{orgname}")
+        end
+
+        username = $1
+        path = request.rest_path[0..-2] + [username]
+        delete_data(request, path)
+        json_response(200, { "id" => id, "username" => username })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_association_requests_endpoint.rb

@@ -1,30 +1,30 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/association_requests
-    class OrganizationAssociationRequestsEndpoint < RestBase
-      def post(request)
-        json = FFI_Yajl::Parser.parse(request.body)
-        username = json["user"]
-        orgname = request.rest_path[1]
-        id = "#{username}-#{orgname}"
-
-        if exists_data?(request, [ "organizations", orgname, "users", username ])
-          raise RestErrorResponse.new(409, "User #{username} is already in organization #{orgname}")
-        end
-
-        create_data(request, request.rest_path, username, "{}")
-        json_response(201, { "uri" => build_uri(request.base_uri, request.rest_path + [ id ]) })
-      end
-
-      def get(request)
-        orgname = request.rest_path[1]
-        ChefZero::Endpoints::OrganizationUserBase.get(self, request) do |username|
-          { "id" => "#{username}-#{orgname}", "username" => username }
-        end
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/association_requests
+    class OrganizationAssociationRequestsEndpoint < RestBase
+      def post(request)
+        json = FFI_Yajl::Parser.parse(request.body)
+        username = json["user"]
+        orgname = request.rest_path[1]
+        id = "#{username}-#{orgname}"
+
+        if exists_data?(request, [ "organizations", orgname, "users", username ])
+          raise RestErrorResponse.new(409, "User #{username} is already in organization #{orgname}")
+        end
+
+        create_data(request, request.rest_path, username, "{}")
+        json_response(201, { "uri" => build_uri(request.base_uri, request.rest_path + [ id ]) })
+      end
+
+      def get(request)
+        orgname = request.rest_path[1]
+        ChefZero::Endpoints::OrganizationUserBase.get(self, request) do |username|
+          { "id" => "#{username}-#{orgname}", "username" => username }
+        end
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_authenticate_user_endpoint.rb

@@ -1,26 +1,26 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    # /organizations/NAME/authenticate_user
-    class OrganizationAuthenticateUserEndpoint < RestBase
-      def post(request)
-        request_json = FFI_Yajl::Parser.parse(request.body)
-        name = request_json["name"]
-        password = request_json["password"]
-        begin
-          user = data_store.get(request.rest_path[0..-2] + ["users", name])
-          user = FFI_Yajl::Parser.parse(user)
-          verified = user["password"] == password
-        rescue DataStore::DataNotFoundError
-          verified = false
-        end
-        json_response(200, {
-          "name" => name,
-          "verified" => !!verified,
-        })
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    # /organizations/NAME/authenticate_user
+    class OrganizationAuthenticateUserEndpoint < RestBase
+      def post(request)
+        request_json = FFI_Yajl::Parser.parse(request.body)
+        name = request_json["name"]
+        password = request_json["password"]
+        begin
+          user = data_store.get(request.rest_path[0..-2] + ["users", name])
+          user = FFI_Yajl::Parser.parse(user)
+          verified = user["password"] == password
+        rescue DataStore::DataNotFoundError
+          verified = false
+        end
+        json_response(200, {
+          "name" => name,
+          "verified" => !!verified,
+        })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_endpoint.rb

@@ -1,47 +1,47 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    # /organizations/NAME
-    class OrganizationEndpoint < RestBase
-      def get(request)
-        org = get_data(request, request.rest_path + [ "org" ])
-        already_json_response(200, populate_defaults(request, org))
-      end
-
-      def put(request)
-        org = FFI_Yajl::Parser.parse(get_data(request, request.rest_path + [ "org" ]))
-        new_org = FFI_Yajl::Parser.parse(request.body)
-        new_org.each do |key, value|
-          org[key] = value
-        end
-        save_org = FFI_Yajl::Encoder.encode(org, pretty: true)
-        if new_org["name"] != request.rest_path[-1]
-          # This is a rename
-          return error(400, "Cannot rename org #{request.rest_path[-1]} to #{new_org["name"]}: rename not supported for orgs")
-        end
-
-        set_data(request, request.rest_path + [ "org" ], save_org)
-        json_response(200, {
-          "uri" => (build_uri(request.base_uri, request.rest_path)).to_s,
-          "name" => org["name"],
-          "org_type" => org["org_type"],
-          "full_name" => org["full_name"],
-        })
-      end
-
-      def delete(request)
-        org = get_data(request, request.rest_path + [ "org" ])
-        delete_data_dir(request, request.rest_path, :recursive)
-        already_json_response(200, populate_defaults(request, org))
-      end
-
-      def populate_defaults(request, response_json)
-        org = FFI_Yajl::Parser.parse(response_json)
-        org = ChefData::DataNormalizer.normalize_organization(org, request.rest_path[1])
-        FFI_Yajl::Encoder.encode(org, pretty: true)
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    # /organizations/NAME
+    class OrganizationEndpoint < RestBase
+      def get(request)
+        org = get_data(request, request.rest_path + [ "org" ])
+        already_json_response(200, populate_defaults(request, org))
+      end
+
+      def put(request)
+        org = FFI_Yajl::Parser.parse(get_data(request, request.rest_path + [ "org" ]))
+        new_org = FFI_Yajl::Parser.parse(request.body)
+        new_org.each do |key, value|
+          org[key] = value
+        end
+        save_org = FFI_Yajl::Encoder.encode(org, pretty: true)
+        if new_org["name"] != request.rest_path[-1]
+          # This is a rename
+          return error(400, "Cannot rename org #{request.rest_path[-1]} to #{new_org["name"]}: rename not supported for orgs")
+        end
+
+        set_data(request, request.rest_path + [ "org" ], save_org)
+        json_response(200, {
+          "uri" => (build_uri(request.base_uri, request.rest_path)).to_s,
+          "name" => org["name"],
+          "org_type" => org["org_type"],
+          "full_name" => org["full_name"],
+        })
+      end
+
+      def delete(request)
+        org = get_data(request, request.rest_path + [ "org" ])
+        delete_data_dir(request, request.rest_path, :recursive)
+        already_json_response(200, populate_defaults(request, org))
+      end
+
+      def populate_defaults(request, response_json)
+        org = FFI_Yajl::Parser.parse(response_json)
+        org = ChefData::DataNormalizer.normalize_organization(org, request.rest_path[1])
+        FFI_Yajl::Encoder.encode(org, pretty: true)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_user_base.rb

@@ -1,15 +1,15 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    module OrganizationUserBase
-
-      def self.get(obj, request, &block)
-        result = obj.list_data(request).map(&block)
-        obj.json_response(200, result)
-      end
-
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    module OrganizationUserBase
+
+      def self.get(obj, request, &block)
+        result = obj.list_data(request).map(&block)
+        obj.json_response(200, result)
+      end
+
+    end
+  end
+end