chef-zero 15.0.17 → 15.0.21

data/lib/chef_zero/endpoints/policy_group_policy_endpoint.rb

@@ -1,83 +1,83 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/policy_groups/GROUP/policies/NAME
-    #
-    # in the data store, this REST path actually stores the revision ID of ${policy_name} that's currently
-    # associated with ${policy_group}.
-    class PolicyGroupPolicyEndpoint < RestBase
-
-      # GET /organizations/ORG/policy_groups/GROUP/policies/NAME
-      def get(request)
-        policy_name = request.rest_path[5]
-
-        # fetch /organizations/{organization}/policies/{policy_name}/revisions/{revision_id}
-        revision_id = parse_json(get_data(request))
-        result = get_data(request, request.rest_path[0..1] +
-                                   ["policies", policy_name, "revisions", revision_id])
-        result = ChefData::DataNormalizer.normalize_policy(parse_json(result), policy_name, revision_id)
-        json_response(200, result)
-      end
-
-      # Create or update the policy document for the given policy group and policy name. If no policy group
-      # with the given name exists, it will be created. If no policy with the given revision_id exists, it
-      # will be created from the document in the request body. If a policy with that revision_id exists, the
-      # Chef Server simply associates that revision id with the given policy group. When successful, the
-      # document that was created or updated is returned.
-
-      ## MANDATORY FIELDS AND FORMATS
-      # * `revision_id`: String; Must be < 255 chars, matches /^[\-[:alnum:]_\.\:]+$/
-      # * `name`: String; Must match name in URI; Must be <= 255 chars, matches /^[\-[:alnum:]_\.\:]+$/
-      # * `run_list`: Array
-      # * `run_list[i]`: Fully Qualified Recipe Run List Item
-      # * `cookbook_locks`: JSON Object
-      # * `cookbook_locks(key)`: CookbookName
-      # * `cookbook_locks[item]`: JSON Object, mandatory keys: "identifier", "dotted_decimal_identifier"
-      # * `cookbook_locks[item]["identifier"]`: varchar(255) ?
-      # * `cookbook_locks[item]["dotted_decimal_identifier"]` ChefCompatibleVersionNumber
-
-      # PUT /organizations/ORG/policy_groups/GROUP/policies/NAME
-      def put(request)
-        policyfile_data = parse_json(request.body)
-        policy_name = request.rest_path[5]
-        revision_id = policyfile_data["revision_id"]
-
-        # If the policy revision being submitted does not exist, create it.
-        # Storage: /organizations/ORG/policies/POLICY/revisions/REVISION
-        policyfile_path = request.rest_path[0..1] + ["policies", policy_name, "revisions", revision_id]
-        unless exists_data?(request, policyfile_path)
-          create_data(request, policyfile_path[0..-2], revision_id, request.body, :create_dir)
-        end
-
-        # if named policy exists and the given revision ID exists, associate the revision ID with the policy
-        # group.
-        # Storage: /organizations/ORG/policies/POLICY/revisions/REVISION
-        response_code = exists_data?(request) ? 200 : 201
-        set_data(request, nil, to_json(revision_id), :create, :create_dir)
-
-        already_json_response(response_code, request.body)
-      end
-
-      # DELETE /organizations/ORG/policy_groups/GROUP/policies/NAME
-      def delete(request)
-        # Save the existing association.
-        current_revision_id = parse_json(get_data(request))
-
-        # delete the association.
-        delete_data(request)
-
-        # return the full policy document at the no-longer-associated revision.
-        policy_name = request.rest_path[5]
-        policy_path = request.rest_path[0..1] + ["policies", policy_name,
-                                                 "revisions", current_revision_id]
-
-        full_policy_doc = parse_json(get_data(request, policy_path))
-        full_policy_doc = ChefData::DataNormalizer.normalize_policy(full_policy_doc, policy_name, current_revision_id)
-        json_response(200, full_policy_doc)
-      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
+    # /organizations/ORG/policy_groups/GROUP/policies/NAME
+    #
+    # in the data store, this REST path actually stores the revision ID of ${policy_name} that's currently
+    # associated with ${policy_group}.
+    class PolicyGroupPolicyEndpoint < RestBase
+
+      # GET /organizations/ORG/policy_groups/GROUP/policies/NAME
+      def get(request)
+        policy_name = request.rest_path[5]
+
+        # fetch /organizations/{organization}/policies/{policy_name}/revisions/{revision_id}
+        revision_id = parse_json(get_data(request))
+        result = get_data(request, request.rest_path[0..1] +
+                                   ["policies", policy_name, "revisions", revision_id])
+        result = ChefData::DataNormalizer.normalize_policy(parse_json(result), policy_name, revision_id)
+        json_response(200, result)
+      end
+
+      # Create or update the policy document for the given policy group and policy name. If no policy group
+      # with the given name exists, it will be created. If no policy with the given revision_id exists, it
+      # will be created from the document in the request body. If a policy with that revision_id exists, the
+      # Chef Server simply associates that revision id with the given policy group. When successful, the
+      # document that was created or updated is returned.
+
+      ## MANDATORY FIELDS AND FORMATS
+      # * `revision_id`: String; Must be < 255 chars, matches /^[\-[:alnum:]_\.\:]+$/
+      # * `name`: String; Must match name in URI; Must be <= 255 chars, matches /^[\-[:alnum:]_\.\:]+$/
+      # * `run_list`: Array
+      # * `run_list[i]`: Fully Qualified Recipe Run List Item
+      # * `cookbook_locks`: JSON Object
+      # * `cookbook_locks(key)`: CookbookName
+      # * `cookbook_locks[item]`: JSON Object, mandatory keys: "identifier", "dotted_decimal_identifier"
+      # * `cookbook_locks[item]["identifier"]`: varchar(255) ?
+      # * `cookbook_locks[item]["dotted_decimal_identifier"]` ChefCompatibleVersionNumber
+
+      # PUT /organizations/ORG/policy_groups/GROUP/policies/NAME
+      def put(request)
+        policyfile_data = parse_json(request.body)
+        policy_name = request.rest_path[5]
+        revision_id = policyfile_data["revision_id"]
+
+        # If the policy revision being submitted does not exist, create it.
+        # Storage: /organizations/ORG/policies/POLICY/revisions/REVISION
+        policyfile_path = request.rest_path[0..1] + ["policies", policy_name, "revisions", revision_id]
+        unless exists_data?(request, policyfile_path)
+          create_data(request, policyfile_path[0..-2], revision_id, request.body, :create_dir)
+        end
+
+        # if named policy exists and the given revision ID exists, associate the revision ID with the policy
+        # group.
+        # Storage: /organizations/ORG/policies/POLICY/revisions/REVISION
+        response_code = exists_data?(request) ? 200 : 201
+        set_data(request, nil, to_json(revision_id), :create, :create_dir)
+
+        already_json_response(response_code, request.body)
+      end
+
+      # DELETE /organizations/ORG/policy_groups/GROUP/policies/NAME
+      def delete(request)
+        # Save the existing association.
+        current_revision_id = parse_json(get_data(request))
+
+        # delete the association.
+        delete_data(request)
+
+        # return the full policy document at the no-longer-associated revision.
+        policy_name = request.rest_path[5]
+        policy_path = request.rest_path[0..1] + ["policies", policy_name,
+                                                 "revisions", current_revision_id]
+
+        full_policy_doc = parse_json(get_data(request, policy_path))
+        full_policy_doc = ChefData::DataNormalizer.normalize_policy(full_policy_doc, policy_name, current_revision_id)
+        json_response(200, full_policy_doc)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/policy_groups_endpoint.rb

@@ -1,38 +1,38 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/policy_groups
-    #
-    # in the data store, this REST path actually stores the revision ID of ${policy_name} that's currently
-    # associated with ${policy_group}.
-    class PolicyGroupsEndpoint < RestBase
-      # GET /organizations/ORG/policy_groups
-      def get(request)
-        # each policy group has policies and associated revisions under
-        # /policy_groups/{group name}/policies/{policy name}.
-        response_data = {}
-        list_data(request).each do |group_name|
-          group_path = request.rest_path + [group_name]
-          policy_list = list_data(request, group_path + ["policies"])
-
-          # build the list of policies with their revision ID associated with this policy group.
-          policies = {}
-          policy_list.each do |policy_name|
-            revision_id = parse_json(get_data(request, group_path + ["policies", policy_name]))
-            policies[policy_name] = { revision_id: revision_id }
-          end
-
-          response_data[group_name] = {
-            uri: build_uri(request.base_uri, group_path),
-          }
-          response_data[group_name][:policies] = policies unless policies.empty?
-        end
-
-        json_response(200, response_data)
-      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
+    # /organizations/ORG/policy_groups
+    #
+    # in the data store, this REST path actually stores the revision ID of ${policy_name} that's currently
+    # associated with ${policy_group}.
+    class PolicyGroupsEndpoint < RestBase
+      # GET /organizations/ORG/policy_groups
+      def get(request)
+        # each policy group has policies and associated revisions under
+        # /policy_groups/{group name}/policies/{policy name}.
+        response_data = {}
+        list_data(request).each do |group_name|
+          group_path = request.rest_path + [group_name]
+          policy_list = list_data(request, group_path + ["policies"])
+
+          # build the list of policies with their revision ID associated with this policy group.
+          policies = {}
+          policy_list.each do |policy_name|
+            revision_id = parse_json(get_data(request, group_path + ["policies", policy_name]))
+            policies[policy_name] = { revision_id: revision_id }
+          end
+
+          response_data[group_name] = {
+            uri: build_uri(request.base_uri, group_path),
+          }
+          response_data[group_name][:policies] = policies unless policies.empty?
+        end
+
+        json_response(200, response_data)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/policy_revision_endpoint.rb

@@ -1,66 +1,66 @@
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/policies/NAME/revisions/REVISION
-    class PolicyRevisionEndpoint < RestBase
-      # GET /organizations/ORG/policies/NAME/revisions/REVISION
-      def get(request)
-        data = parse_json(get_data(request))
-        
-        # need to add another field in the response called 'policy_group_list'
-        # example response
-        #     {
-        #       "revision_id": "909c26701e291510eacdc6c06d626b9fa5350d25",
-        #       "name": "some_policy_name",
-        #       "run_list": [
-        #         "recipe[policyfile_demo::default]"
-        #       ],
-        #       "cookbook_locks": {
-        #         "policyfile_demo": {
-        #           "identifier": "f04cc40faf628253fe7d9566d66a1733fb1afbe9",
-        #           "version": "1.2.3"
-        #         }
-        #       },
-        #       "policy_group_list": ["some_policy_group"]
-        #     }
-        data[:policy_group_list] = Array.new
-
-        # extracting policy name and revision
-        request_policy_name = request.rest_path[3]
-        request_policy_revision = request.rest_path[5]
-
-        # updating the request to fetch the policy group list
-        request.rest_path[2] = "policy_groups"
-        request.rest_path = request.rest_path.slice(0,3)
-
-        list_data(request).each do |group_name|
-          group_path = request.rest_path + [group_name]
-
-          # fetching all the policies associated with each group
-          policy_list = list_data(request, group_path + ["policies"])
-          policy_list.each do |policy_name|
-            revision_id = parse_json(get_data(request, group_path + ["policies", policy_name]))
-
-            # if the name and revision matchs, we add the group to the response
-            if (policy_name == request_policy_name) && (revision_id == request_policy_revision)
-              policy_group_list = data[:policy_group_list]
-              data[:policy_group_list] = [group_name] + policy_group_list
-            end
-          end
-        end
-        
-        data = ChefData::DataNormalizer.normalize_policy(data, request_policy_name, request_policy_revision)
-        json_response(200, data)
-      end
-
-      # DELETE /organizations/ORG/policies/NAME/revisions/REVISION
-      def delete(request)
-        policyfile_data = parse_json(get_data(request))
-        policyfile_data = ChefData::DataNormalizer.normalize_policy(policyfile_data, request.rest_path[3], request.rest_path[5])
-        delete_data(request)
-        json_response(200, policyfile_data)
-      end
-    end
-  end
-end
+require_relative "../chef_data/data_normalizer"
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/policies/NAME/revisions/REVISION
+    class PolicyRevisionEndpoint < RestBase
+      # GET /organizations/ORG/policies/NAME/revisions/REVISION
+      def get(request)
+        data = parse_json(get_data(request))
+
+        # need to add another field in the response called 'policy_group_list'
+        # example response
+        #     {
+        #       "revision_id": "909c26701e291510eacdc6c06d626b9fa5350d25",
+        #       "name": "some_policy_name",
+        #       "run_list": [
+        #         "recipe[policyfile_demo::default]"
+        #       ],
+        #       "cookbook_locks": {
+        #         "policyfile_demo": {
+        #           "identifier": "f04cc40faf628253fe7d9566d66a1733fb1afbe9",
+        #           "version": "1.2.3"
+        #         }
+        #       },
+        #       "policy_group_list": ["some_policy_group"]
+        #     }
+        data[:policy_group_list] = []
+
+        # extracting policy name and revision
+        request_policy_name = request.rest_path[3]
+        request_policy_revision = request.rest_path[5]
+
+        # updating the request to fetch the policy group list
+        request.rest_path[2] = "policy_groups"
+        request.rest_path = request.rest_path.slice(0, 3)
+
+        list_data(request).each do |group_name|
+          group_path = request.rest_path + [group_name]
+
+          # fetching all the policies associated with each group
+          policy_list = list_data(request, group_path + ["policies"])
+          policy_list.each do |policy_name|
+            revision_id = parse_json(get_data(request, group_path + ["policies", policy_name]))
+
+            # if the name and revision matchs, we add the group to the response
+            if (policy_name == request_policy_name) && (revision_id == request_policy_revision)
+              policy_group_list = data[:policy_group_list]
+              data[:policy_group_list] = [group_name] + policy_group_list
+            end
+          end
+        end
+
+        data = ChefData::DataNormalizer.normalize_policy(data, request_policy_name, request_policy_revision)
+        json_response(200, data)
+      end
+
+      # DELETE /organizations/ORG/policies/NAME/revisions/REVISION
+      def delete(request)
+        policyfile_data = parse_json(get_data(request))
+        policyfile_data = ChefData::DataNormalizer.normalize_policy(policyfile_data, request.rest_path[3], request.rest_path[5])
+        delete_data(request)
+        json_response(200, policyfile_data)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/policy_revisions_endpoint.rb

@@ -1,15 +1,15 @@
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/policies/NAME/revisions
-    class PolicyRevisionsEndpoint < RestBase
-      # POST /organizations/ORG/policies/NAME/revisions
-      def post(request)
-        policyfile_data = parse_json(request.body)
-        create_data(request, request.rest_path, policyfile_data["revision_id"], request.body, :create_dir)
-        already_json_response(201, request.body)
-      end
-    end
-  end
-end
+require_relative "../chef_data/data_normalizer"
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/policies/NAME/revisions
+    class PolicyRevisionsEndpoint < RestBase
+      # POST /organizations/ORG/policies/NAME/revisions
+      def post(request)
+        policyfile_data = parse_json(request.body)
+        create_data(request, request.rest_path, policyfile_data["revision_id"], request.body, :create_dir)
+        already_json_response(201, request.body)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/principal_endpoint.rb

@@ -1,55 +1,55 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../../chef_zero"
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    # /principals/NAME
-    class PrincipalEndpoint < RestBase
-      def get(request)
-        name = request.rest_path[-1]
-        # If /organizations/ORG/users/NAME exists, use this user (only org members have precedence over clients).        hey are an org member.
-        json = get_data(request, request.rest_path[0..1] + [ "users", name ], :nil)
-        if json
-          type = "user"
-          org_member = true
-        else
-          # If /organizations/ORG/clients/NAME exists, use the client.
-          json = get_data(request, request.rest_path[0..1] + [ "clients", name ], :nil)
-          if json
-            type = "client"
-            org_member = true
-          else
-            # If there is no client with that name, check for a user (/users/NAME) and return that with
-            # org_member = false.
-            json = get_data(request, [ "users", name ], :nil)
-            if json
-              type = "user"
-              org_member = false
-            end
-          end
-        end
-        if json
-          principal_data = {
-            "name" => name,
-            "type" => type,
-            "public_key" => FFI_Yajl::Parser.parse(json)["public_key"] || PUBLIC_KEY,
-            "authz_id" => "0" * 32,
-            "org_member" => org_member,
-          }
-
-          response_data =
-            if request.api_v0?
-              principal_data
-            else
-              { "principals" => [ principal_data ] }
-            end
-
-          json_response(200, response_data)
-        else
-          error(404, "Principal not found")
-        end
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../../chef_zero"
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    # /principals/NAME
+    class PrincipalEndpoint < RestBase
+      def get(request)
+        name = request.rest_path[-1]
+        # If /organizations/ORG/users/NAME exists, use this user (only org members have precedence over clients).        hey are an org member.
+        json = get_data(request, request.rest_path[0..1] + [ "users", name ], :nil)
+        if json
+          type = "user"
+          org_member = true
+        else
+          # If /organizations/ORG/clients/NAME exists, use the client.
+          json = get_data(request, request.rest_path[0..1] + [ "clients", name ], :nil)
+          if json
+            type = "client"
+            org_member = true
+          else
+            # If there is no client with that name, check for a user (/users/NAME) and return that with
+            # org_member = false.
+            json = get_data(request, [ "users", name ], :nil)
+            if json
+              type = "user"
+              org_member = false
+            end
+          end
+        end
+        if json
+          principal_data = {
+            "name" => name,
+            "type" => type,
+            "public_key" => FFI_Yajl::Parser.parse(json)["public_key"] || PUBLIC_KEY,
+            "authz_id" => "0" * 32,
+            "org_member" => org_member,
+          }
+
+          response_data =
+            if request.api_v0?
+              principal_data
+            else
+              { "principals" => [ principal_data ] }
+            end
+
+          json_response(200, response_data)
+        else
+          error(404, "Principal not found")
+        end
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/rest_list_endpoint.rb

@@ -1,42 +1,42 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    # Typical REST list endpoint (/roles or /data/BAG)
-    class RestListEndpoint < 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)
-        # Get the result
-        result_hash = {}
-        list_data(request).sort.each do |name|
-          result_hash[name] = (build_uri(request.base_uri, request.rest_path + [name])).to_s
-        end
-        json_response(200, result_hash)
-      end
-
-      def post(request)
-        contents = request.body
-        key = get_key(contents)
-        if key.nil?
-          error(400, "Must specify #{identity_keys.map(&:inspect).join(" or ")} in JSON")
-        else
-          create_data(request, request.rest_path, key, contents)
-          json_response(201, { "uri" => (build_uri(request.base_uri, request.rest_path + [key])).to_s })
-        end
-      end
-
-      def get_key(contents)
-        json = FFI_Yajl::Parser.parse(contents)
-        identity_keys.map { |k| json[k] }.select { |v| v }.first
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    # Typical REST list endpoint (/roles or /data/BAG)
+    class RestListEndpoint < 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)
+        # Get the result
+        result_hash = {}
+        list_data(request).sort.each do |name|
+          result_hash[name] = (build_uri(request.base_uri, request.rest_path + [name])).to_s
+        end
+        json_response(200, result_hash)
+      end
+
+      def post(request)
+        contents = request.body
+        key = get_key(contents)
+        if key.nil?
+          error(400, "Must specify #{identity_keys.map(&:inspect).join(" or ")} in JSON")
+        else
+          create_data(request, request.rest_path, key, contents)
+          json_response(201, { "uri" => (build_uri(request.base_uri, request.rest_path + [key])).to_s })
+        end
+      end
+
+      def get_key(contents)
+        json = FFI_Yajl::Parser.parse(contents)
+        identity_keys.map { |k| json[k] }.select { |v| v }.first
+      end
+    end
+  end
+end