chef-zero 15.0.17 → 15.0.21

data/lib/chef_zero/endpoints/organization_user_default_key_endpoint.rb

@@ -1,16 +1,16 @@
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    # GET /organizations/ORG/users/USER/keys/default
-    class OrganizationUserDefaultKeyEndpoint < RestBase
-      def get(request)
-        # 404 if it doesn't exist
-        get_data(request, request.rest_path[0..3])
-        # Just use the /users/USER/keys/default endpoint
-        request.rest_path = request.rest_path[2..-1]
-        ActorDefaultKeyEndpoint.new(server).get(request)
-      end
-    end
-  end
-end
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    # GET /organizations/ORG/users/USER/keys/default
+    class OrganizationUserDefaultKeyEndpoint < RestBase
+      def get(request)
+        # 404 if it doesn't exist
+        get_data(request, request.rest_path[0..3])
+        # Just use the /users/USER/keys/default endpoint
+        request.rest_path = request.rest_path[2..-1]
+        ActorDefaultKeyEndpoint.new(server).get(request)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_user_endpoint.rb

@@ -1,26 +1,26 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/users/NAME
-    class OrganizationUserEndpoint < RestBase
-      def get(request)
-        username = request.rest_path[3]
-        get_data(request) # 404 if user is not in org
-        user = get_data(request, [ "users", username ])
-        user = FFI_Yajl::Parser.parse(user)
-        json_response(200, ChefData::DataNormalizer.normalize_user(user, username, ["username"], server.options[:osc_compat], request.method))
-      end
-
-      def delete(request)
-        user = get_data(request)
-        delete_data(request)
-        user = FFI_Yajl::Parser.parse(user)
-        json_response(200, ChefData::DataNormalizer.normalize_user(user, request.rest_path[3], ["username"], server.options[:osc_compat]))
-      end
-
-      # Note: post to a named org user is not permitted, alllow invalid method handling (405)
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/users/NAME
+    class OrganizationUserEndpoint < RestBase
+      def get(request)
+        username = request.rest_path[3]
+        get_data(request) # 404 if user is not in org
+        user = get_data(request, [ "users", username ])
+        user = FFI_Yajl::Parser.parse(user)
+        json_response(200, ChefData::DataNormalizer.normalize_user(user, username, ["username"], server.options[:osc_compat], request.method))
+      end
+
+      def delete(request)
+        user = get_data(request)
+        delete_data(request)
+        user = FFI_Yajl::Parser.parse(user)
+        json_response(200, ChefData::DataNormalizer.normalize_user(user, request.rest_path[3], ["username"], server.options[:osc_compat]))
+      end
+
+      # Note: post to a named org user is not permitted, alllow invalid method handling (405)
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_user_key_endpoint.rb

@@ -1,17 +1,17 @@
-require_relative "../rest_base"
-require_relative "actor_keys_endpoint"
-
-module ChefZero
-  module Endpoints
-    # GET /organizations/ORG/users/USER/keys/NAME
-    class OrganizationUserKeyEndpoint < RestBase
-      def get(request)
-        # 404 if not a member of the org
-        get_data(request, request.rest_path[0..3])
-        # Just use the /users/USER/keys endpoint
-        request.rest_path = request.rest_path[2..-1]
-        ActorKeyEndpoint.new(server).get(request)
-      end
-    end
-  end
-end
+require_relative "../rest_base"
+require_relative "actor_keys_endpoint"
+
+module ChefZero
+  module Endpoints
+    # GET /organizations/ORG/users/USER/keys/NAME
+    class OrganizationUserKeyEndpoint < RestBase
+      def get(request)
+        # 404 if not a member of the org
+        get_data(request, request.rest_path[0..3])
+        # Just use the /users/USER/keys endpoint
+        request.rest_path = request.rest_path[2..-1]
+        ActorKeyEndpoint.new(server).get(request)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_user_keys_endpoint.rb

@@ -1,17 +1,17 @@
-require_relative "../rest_base"
-
-module ChefZero
-  module Endpoints
-    # GET /organizations/ORG/users/USER/keys
-    class OrganizationUserKeysEndpoint < RestBase
-      def get(request)
-        # 404 if it doesn't exist
-        get_data(request, request.rest_path[0..3])
-        # Just use the /users/USER/keys/key endpoint
-        original_path = request.rest_path
-        request.rest_path = request.rest_path[2..-1]
-        ActorKeysEndpoint.new(server).get(request, original_path)
-      end
-    end
-  end
-end
+require_relative "../rest_base"
+
+module ChefZero
+  module Endpoints
+    # GET /organizations/ORG/users/USER/keys
+    class OrganizationUserKeysEndpoint < RestBase
+      def get(request)
+        # 404 if it doesn't exist
+        get_data(request, request.rest_path[0..3])
+        # Just use the /users/USER/keys/key endpoint
+        original_path = request.rest_path
+        request.rest_path = request.rest_path[2..-1]
+        ActorKeysEndpoint.new(server).get(request, original_path)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_users_endpoint.rb

@@ -1,43 +1,43 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-require_relative "organization_user_base"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/users
-    class OrganizationUsersEndpoint < RestBase
-      def post(request)
-        orgname = request.rest_path[1]
-        json = FFI_Yajl::Parser.parse(request.body)
-        username = json["username"]
-
-        if exists_data?(request, [ "organizations", orgname, "users", username ])
-          raise RestErrorResponse.new(409, "User #{username} is already in organization #{orgname}")
-        end
-
-        users = get_data(request, [ "organizations", orgname, "groups", "users" ])
-        users = FFI_Yajl::Parser.parse(users)
-
-        create_data(request, request.rest_path, username, "{}")
-
-        # /organizations/ORG/association_requests/USERNAME-ORG
-        begin
-          delete_data(request, [ "organizations", orgname, "association_requests", username], :data_store_exceptions)
-        rescue DataStore::DataNotFoundError
-        end
-
-        # Add the user to the users group if it isn't already there
-        if !users["users"] || !users["users"].include?(username)
-          users["users"] ||= []
-          users["users"] |= [ username ]
-          set_data(request, [ "organizations", orgname, "groups", "users" ], FFI_Yajl::Encoder.encode(users, pretty: true))
-        end
-        json_response(201, { "uri" => build_uri(request.base_uri, request.rest_path + [ username ]) })
-      end
-
-      def get(request)
-        ChefZero::Endpoints::OrganizationUserBase.get(self, request) { |username| { "user" => { "username" => username } } }
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require_relative "organization_user_base"
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/users
+    class OrganizationUsersEndpoint < RestBase
+      def post(request)
+        orgname = request.rest_path[1]
+        json = FFI_Yajl::Parser.parse(request.body)
+        username = json["username"]
+
+        if exists_data?(request, [ "organizations", orgname, "users", username ])
+          raise RestErrorResponse.new(409, "User #{username} is already in organization #{orgname}")
+        end
+
+        users = get_data(request, [ "organizations", orgname, "groups", "users" ])
+        users = FFI_Yajl::Parser.parse(users)
+
+        create_data(request, request.rest_path, username, "{}")
+
+        # /organizations/ORG/association_requests/USERNAME-ORG
+        begin
+          delete_data(request, [ "organizations", orgname, "association_requests", username], :data_store_exceptions)
+        rescue DataStore::DataNotFoundError
+        end
+
+        # Add the user to the users group if it isn't already there
+        if !users["users"] || !users["users"].include?(username)
+          users["users"] ||= []
+          users["users"] |= [ username ]
+          set_data(request, [ "organizations", orgname, "groups", "users" ], FFI_Yajl::Encoder.encode(users, pretty: true))
+        end
+        json_response(201, { "uri" => build_uri(request.base_uri, request.rest_path + [ username ]) })
+      end
+
+      def get(request)
+        ChefZero::Endpoints::OrganizationUserBase.get(self, request) { |username| { "user" => { "username" => username } } }
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_validator_key_endpoint.rb

@@ -1,20 +1,20 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-require "uuidtools"
-
-module ChefZero
-  module Endpoints
-    # /organizations/NAME/_validator_key
-    class OrganizationValidatorKeyEndpoint < RestBase
-      def post(request)
-        org_name = request.rest_path[-2]
-        validator_path = [ "organizations", org_name, "clients", "#{org_name}-validator"]
-        validator = FFI_Yajl::Parser.parse(get_data(request, validator_path))
-        private_key, public_key = server.gen_key_pair
-        validator["public_key"] = public_key
-        set_data(request, validator_path, FFI_Yajl::Encoder.encode(validator, pretty: true))
-        json_response(200, { "private_key" => private_key })
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require "uuidtools"
+
+module ChefZero
+  module Endpoints
+    # /organizations/NAME/_validator_key
+    class OrganizationValidatorKeyEndpoint < RestBase
+      def post(request)
+        org_name = request.rest_path[-2]
+        validator_path = [ "organizations", org_name, "clients", "#{org_name}-validator"]
+        validator = FFI_Yajl::Parser.parse(get_data(request, validator_path))
+        private_key, public_key = server.gen_key_pair
+        validator["public_key"] = public_key
+        set_data(request, validator_path, FFI_Yajl::Encoder.encode(validator, pretty: true))
+        json_response(200, { "private_key" => private_key })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organizations_endpoint.rb

@@ -1,61 +1,61 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-require "uuidtools"
-
-module ChefZero
-  module Endpoints
-    # /organizations
-    class OrganizationsEndpoint < RestBase
-      def get(request)
-        result = {}
-        data_store.list(request.rest_path).each do |name|
-          result[name] = build_uri(request.base_uri, request.rest_path + [name])
-        end
-        json_response(200, result)
-      end
-
-      def post(request)
-        contents = FFI_Yajl::Parser.parse(request.body)
-        name = contents["name"]
-        full_name = contents["full_name"]
-        if name.nil?
-          error(400, "Must specify 'name' in JSON")
-        elsif full_name.nil?
-          error(400, "Must specify 'full_name' in JSON")
-        elsif exists_data_dir?(request, request.rest_path + [ name ])
-          error(409, "Organization already exists")
-        else
-          create_data_dir(request, request.rest_path, name, requestor: request.requestor)
-
-          org = {
-            "guid" => UUIDTools::UUID.random_create.to_s.delete("-"),
-            "assigned_at" => Time.now.to_s,
-          }.merge(contents)
-          org_path = request.rest_path + [ name ]
-          set_data(request, org_path + [ "org" ], FFI_Yajl::Encoder.encode(org, pretty: true))
-
-          if server.generate_real_keys?
-            # Create the validator client
-            validator_name = "#{name}-validator"
-            validator_path = org_path + [ "clients", validator_name ]
-            private_key, public_key = server.gen_key_pair
-            validator = FFI_Yajl::Encoder.encode({
-              "validator" => true,
-              "public_key" => public_key,
-            }, pretty: true)
-            set_data(request, validator_path, validator)
-          end
-
-          json_response(201, {
-            "uri" => (build_uri(request.base_uri, org_path)).to_s,
-            "name" => name,
-            "org_type" => org["org_type"],
-            "full_name" => full_name,
-            "clientname" => validator_name,
-            "private_key" => private_key,
-          })
-        end
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require "uuidtools"
+
+module ChefZero
+  module Endpoints
+    # /organizations
+    class OrganizationsEndpoint < RestBase
+      def get(request)
+        result = {}
+        data_store.list(request.rest_path).each do |name|
+          result[name] = build_uri(request.base_uri, request.rest_path + [name])
+        end
+        json_response(200, result)
+      end
+
+      def post(request)
+        contents = FFI_Yajl::Parser.parse(request.body)
+        name = contents["name"]
+        full_name = contents["full_name"]
+        if name.nil?
+          error(400, "Must specify 'name' in JSON")
+        elsif full_name.nil?
+          error(400, "Must specify 'full_name' in JSON")
+        elsif exists_data_dir?(request, request.rest_path + [ name ])
+          error(409, "Organization already exists")
+        else
+          create_data_dir(request, request.rest_path, name, requestor: request.requestor)
+
+          org = {
+            "guid" => UUIDTools::UUID.random_create.to_s.delete("-"),
+            "assigned_at" => Time.now.to_s,
+          }.merge(contents)
+          org_path = request.rest_path + [ name ]
+          set_data(request, org_path + [ "org" ], FFI_Yajl::Encoder.encode(org, pretty: true))
+
+          if server.generate_real_keys?
+            # Create the validator client
+            validator_name = "#{name}-validator"
+            validator_path = org_path + [ "clients", validator_name ]
+            private_key, public_key = server.gen_key_pair
+            validator = FFI_Yajl::Encoder.encode({
+              "validator" => true,
+              "public_key" => public_key,
+            }, pretty: true)
+            set_data(request, validator_path, validator)
+          end
+
+          json_response(201, {
+            "uri" => (build_uri(request.base_uri, org_path)).to_s,
+            "name" => name,
+            "org_type" => org["org_type"],
+            "full_name" => full_name,
+            "clientname" => validator_name,
+            "private_key" => private_key,
+          })
+        end
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/policies_endpoint.rb

@@ -1,26 +1,26 @@
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/policies
-    class PoliciesEndpoint < RestBase
-      # GET /organizations/ORG/policies
-      def get(request)
-        response_data = {}
-        policy_names = list_data(request)
-        policy_names.each do |policy_name|
-          policy_path = request.rest_path + [policy_name]
-          policy_uri = build_uri(request.base_uri, policy_path)
-          revisions = list_data(request, policy_path + ["revisions"])
-
-          response_data[policy_name] = {
-            uri: policy_uri,
-            revisions: hashify_list(revisions),
-          }
-        end
-
-        json_response(200, response_data)
-      end
-    end
-  end
-end
+require_relative "../chef_data/data_normalizer"
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/policies
+    class PoliciesEndpoint < RestBase
+      # GET /organizations/ORG/policies
+      def get(request)
+        response_data = {}
+        policy_names = list_data(request)
+        policy_names.each do |policy_name|
+          policy_path = request.rest_path + [policy_name]
+          policy_uri = build_uri(request.base_uri, policy_path)
+          revisions = list_data(request, policy_path + ["revisions"])
+
+          response_data[policy_name] = {
+            uri: policy_uri,
+            revisions: hashify_list(revisions),
+          }
+        end
+
+        json_response(200, response_data)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/policy_endpoint.rb

@@ -1,24 +1,24 @@
-require_relative "../chef_data/data_normalizer"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/policies/NAME
-    class PolicyEndpoint < RestBase
-      # GET /organizations/ORG/policies/NAME
-      def get(request)
-        revisions = list_data(request, request.rest_path + ["revisions"])
-        data = { revisions: hashify_list(revisions) }
-        json_response(200, data)
-      end
-
-      # DELETE /organizations/ORG/policies/NAME
-      def delete(request)
-        revisions = list_data(request, request.rest_path + ["revisions"])
-        data = { revisions: hashify_list(revisions) }
-
-        delete_data_dir(request, nil, :recursive)
-        json_response(200, data)
-      end
-    end
-  end
-end
+require_relative "../chef_data/data_normalizer"
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/policies/NAME
+    class PolicyEndpoint < RestBase
+      # GET /organizations/ORG/policies/NAME
+      def get(request)
+        revisions = list_data(request, request.rest_path + ["revisions"])
+        data = { revisions: hashify_list(revisions) }
+        json_response(200, data)
+      end
+
+      # DELETE /organizations/ORG/policies/NAME
+      def delete(request)
+        revisions = list_data(request, request.rest_path + ["revisions"])
+        data = { revisions: hashify_list(revisions) }
+
+        delete_data_dir(request, nil, :recursive)
+        json_response(200, data)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/policy_group_endpoint.rb

@@ -1,46 +1,46 @@
-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/NAME
-    class PolicyGroupEndpoint < RestBase
-
-      # GET /organizations/ORG/policy_groups/NAME
-      def get(request)
-        data = {
-          uri: build_uri(request.base_uri, request.rest_path),
-          policies: get_policy_group_policies(request),
-        }
-        json_response(200, data)
-      end
-
-      # build a hash of {"some_policy_name"=>{"revision_id"=>"909c26701e291510eacdc6c06d626b9fa5350d25"}}
-      def get_policy_group_policies(request)
-        policies_revisions = {}
-
-        policies_path = request.rest_path + ["policies"]
-        policy_names = list_data(request, policies_path)
-        policy_names.each do |policy_name|
-          revision = parse_json(get_data(request, policies_path + [policy_name]))
-          policies_revisions[policy_name] = { revision_id: revision }
-        end
-
-        policies_revisions
-      end
-
-      # DELETE /organizations/ORG/policy_groups/NAME
-      def delete(request)
-        policy_group_policies = get_policy_group_policies(request)
-        delete_data_dir(request, nil, :recursive)
-
-        data = {
-          uri: build_uri(request.base_uri, request.rest_path),
-          policies: policy_group_policies,
-        }
-        json_response(200, 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/NAME
+    class PolicyGroupEndpoint < RestBase
+
+      # GET /organizations/ORG/policy_groups/NAME
+      def get(request)
+        data = {
+          uri: build_uri(request.base_uri, request.rest_path),
+          policies: get_policy_group_policies(request),
+        }
+        json_response(200, data)
+      end
+
+      # build a hash of {"some_policy_name"=>{"revision_id"=>"909c26701e291510eacdc6c06d626b9fa5350d25"}}
+      def get_policy_group_policies(request)
+        policies_revisions = {}
+
+        policies_path = request.rest_path + ["policies"]
+        policy_names = list_data(request, policies_path)
+        policy_names.each do |policy_name|
+          revision = parse_json(get_data(request, policies_path + [policy_name]))
+          policies_revisions[policy_name] = { revision_id: revision }
+        end
+
+        policies_revisions
+      end
+
+      # DELETE /organizations/ORG/policy_groups/NAME
+      def delete(request)
+        policy_group_policies = get_policy_group_policies(request)
+        delete_data_dir(request, nil, :recursive)
+
+        data = {
+          uri: build_uri(request.base_uri, request.rest_path),
+          policies: policy_group_policies,
+        }
+        json_response(200, data)
+      end
+    end
+  end
+end