chef-zero 2.0.2 → 2.1

data/lib/chef_zero/data_store/v1_to_v2_adapter.rb

@@ -0,0 +1,190 @@
+require 'chef_zero/data_store/interface_v2'
+
+module ChefZero
+  module DataStore
+    class V1ToV2Adapter < ChefZero::DataStore::InterfaceV2
+      def initialize(real_store, single_org)
+        @real_store = real_store
+        @single_org = single_org
+        # Handle defaults per V2 specification
+        @defaults = {
+          'organizations' => {
+            single_org => {
+              'clients' => {
+                'chef-validator' => '{ "validator": true }',
+                'chef-webui' => '{ "admin": true }'
+              },
+              'environments' => {
+                '_default' => '{ "description": "The default Chef environment" }'
+              },
+              'users' => {
+                'admin' => '{ "admin": "true" }'
+              }
+            }
+          }
+        }
+      end
+
+      attr_reader :real_store
+      attr_reader :single_org
+
+      def clear
+        real_store.clear
+      end
+
+      def create_dir(path, name, *options)
+        return nil if skip_organizations?(path, name)
+        if using_default?(path, name)
+          raise DataAlreadyExistsError.new(path + [name])
+        end
+        fix_exceptions do
+          real_store.create_dir(path[2..-1], name, *options)
+        end
+      end
+
+      def create(path, name, data, *options)
+        return nil if skip_organizations?(path, name)
+        if using_default?(path, name)
+          raise DataAlreadyExistsError.new(path + [name])
+        end
+        remove_default(path, name)
+
+        fix_exceptions do
+          real_store.create(path[2..-1], name, data, *options)
+        end
+      end
+
+      def get(path, request=nil)
+        return nil if skip_organizations?(path)
+        if using_default?(path)
+          get_default(path)
+        else
+          fix_exceptions do
+            real_store.get(path[2..-1], request)
+          end
+        end
+      end
+
+      def set(path, data, *options)
+        return nil if skip_organizations?(path)
+        remove_default(path)
+        fix_exceptions do
+          real_store.set(path[2..-1], data, *options)
+        end
+      end
+
+      def delete(path)
+        return nil if skip_organizations?(path)
+        remove_default(path)
+        fix_exceptions do
+          real_store.delete(path[2..-1])
+        end
+      end
+
+      def delete_dir(path, *options)
+        return nil if skip_organizations?(path)
+        fix_exceptions do
+          real_store.delete_dir(path[2..-1], *options)
+        end
+      end
+
+      def list(path)
+        return nil if skip_organizations?(path)
+        fix_exceptions do
+          result = real_store.list(path[2..-1])
+          if using_default?(path)
+            result ||= []
+            get_default(path).keys.each do |value|
+              result << value if !result.include?(value)
+            end
+          end
+          result
+        end
+      end
+
+      def exists?(path)
+        return nil if skip_organizations?(path)
+        if using_default?(path)
+          true
+        else
+          fix_exceptions do
+            real_store.exists?(path[2..-1])
+          end
+        end
+      end
+
+      def exists_dir?(path)
+        return nil if skip_organizations?(path)
+        if using_default?(path)
+          true
+        else
+          fix_exceptions do
+            real_store.exists_dir?(path[2..-1])
+          end
+        end
+      end
+
+      private
+
+      def using_default?(path, name = nil)
+        path = path + [name] if name
+        result = @defaults
+        path.each do |part|
+          return false if !result.has_key?(part)
+          result = result[part]
+        end
+        !result.nil?
+      end
+
+      def get_default(path, name = nil)
+        path = path + [name] if name
+        result = @defaults
+        path.each do |part|
+          return nil if !result.has_key?(part)
+          result = result[part]
+        end
+        result
+      end
+
+      def remove_default(path, name = nil)
+        dir = name ? path[0..-2] : path
+        default = @defaults
+        dir.each do |part|
+          return if !default.has_key?(part)
+          default = default[part]
+        end
+
+        name = name || path.last
+        if name
+          default.delete(name)
+        end
+      end
+
+      def fix_exceptions
+        begin
+          yield
+        rescue DataAlreadyExistsError => e
+          raise DataAlreadyExistsError.new([ 'organizations', single_org ] + e.path, e)
+        rescue DataNotFoundError => e
+          raise DataNotFoundError.new([ 'organizations', single_org ] + e.path, e)
+        end
+      end
+
+      def skip_organizations?(path, name = nil)
+        if path == []
+          raise "" if name == nil || name != 'organizations'
+          true
+        elsif path == ['organizations']
+          raise "" if name == nil || name != single_org
+          true
+        else
+          raise "Path #{path} must start with /organizations/#{single_org}" if path[0..1] != [ 'organizations', single_org ]
+          if !name
+            raise "Path #{path} must start with /organizations/#{single_org}/<something>" if path.size <= 2
+          end
+          false
+        end
+      end
+    end
+  end
+end

data/lib/chef_zero/data_store/v2_to_v1_adapter.rb

@@ -0,0 +1,107 @@
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2014 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef_zero/data_store/interface_v1'
+
+module ChefZero
+  module DataStore
+    class V2ToV1Adapter < ChefZero::DataStore::InterfaceV1
+      def initialize
+        @single_org = 'chef'
+      end
+
+      attr_reader :real_store
+      attr_reader :single_org
+
+      def clear
+        real_store.clear
+        real_store.create_dir([ 'organizations' ], single_org)
+      end
+
+      def create_dir(path, name, *options)
+        fix_exceptions do
+          real_store.create_dir(fix_path(path), name, *options)
+        end
+      end
+
+      def create(path, name, data, *options)
+        fix_exceptions do
+          real_store.create(fix_path(path), name, data, *options)
+        end
+      end
+
+      def get(path, request=nil)
+        fix_exceptions do
+          real_store.get(fix_path(path), request)
+        end
+      end
+
+      def set(path, data, *options)
+        fix_exceptions do
+          real_store.set(fix_path(path), data, *options)
+        end
+      end
+
+      def delete(path)
+        fix_exceptions do
+          real_store.delete(fix_path(path))
+        end
+      end
+
+      def delete_dir(path, *options)
+        fix_exceptions do
+          real_store.delete_dir(fix_path(path), *options)
+        end
+      end
+
+      def list(path)
+        fix_exceptions do
+          real_store.list(fix_path(path))
+        end
+      end
+
+      def exists?(path)
+        fix_exceptions do
+          real_store.exists?(fix_path(path))
+        end
+      end
+
+      def exists_dir?(path)
+        fix_exceptions do
+          real_store.exists_dir?(fix_path(path))
+        end
+      end
+
+      protected
+
+      def fix_exceptions
+        begin
+          yield
+        rescue DataAlreadyExistsError => e
+          raise DataAlreadyExistsError.new(e.path[2..-1], e)
+        rescue DataNotFoundError => e
+          raise DataNotFoundError.new(e.path[2..-1], e)
+        end
+      end
+
+      def fix_path(path)
+        [ 'organizations', single_org ] + path
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/actor_endpoint.rb

@@ -37,17 +37,12 @@ module ChefZero
         result = super(request)
 
         # Inject private_key into response, delete public_key/password if applicable
-        if result[0] == 200
+        if result[0] == 200 || result[0] == 201
           response = JSON.parse(result[2], :create_additions => false)
           response['private_key'] = private_key if private_key
-          response.delete('public_key') if !updating_public_key && request.rest_path[0] == 'users'
+          response.delete('public_key') if !updating_public_key && request.rest_path[2] == 'users'
           response.delete('password')
-          # For PUT /clients, a rename returns 201.
-          if request_body['name'] && request.rest_path[1] != request_body['name']
-            json_response(201, response)
-          else
-            json_response(200, response)
-          end
+          json_response(result[0], response)
         else
           result
         end
@@ -55,14 +50,13 @@ module ChefZero
 
       def populate_defaults(request, response_json)
         response = JSON.parse(response_json, :create_additions => false)
-        if request.rest_path[0] == 'clients'
-          response = DataNormalizer.normalize_client(response, request.rest_path[1])
+        if request.rest_path[2] == 'clients'
+          response = DataNormalizer.normalize_client(response, request.rest_path[3])
         else
-          response = DataNormalizer.normalize_user(response, request.rest_path[1])
+          response = DataNormalizer.normalize_user(response, request.rest_path[3])
         end
         JSON.pretty_generate(response)
       end
     end
   end
 end
-

data/lib/chef_zero/endpoints/authenticate_user_endpoint.rb

@@ -10,7 +10,7 @@ module ChefZero
         name = request_json['name']
         password = request_json['password']
         begin
-          user = data_store.get(['users', name])
+          user = data_store.get(request.rest_path[0..1] + ['users', name])
           verified = JSON.parse(user, :create_additions => false)['password'] == password
         rescue DataStore::DataNotFoundError
           verified = false

data/lib/chef_zero/endpoints/cookbook_endpoint.rb

@@ -5,21 +5,21 @@ module ChefZero
     # /cookbooks/NAME
     class CookbookEndpoint < CookbooksBase
       def get(request)
-        filter = request.rest_path[1]
+        filter = request.rest_path[3]
         case filter
         when '_latest'
           result = {}
-          filter_cookbooks(all_cookbooks_list, {}, 1) do |name, versions|
+          filter_cookbooks(all_cookbooks_list(request), {}, 1) do |name, versions|
             if versions.size > 0
-              result[name] = build_uri(request.base_uri, ['cookbooks', name, versions[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, {}, 1) do |name, versions|
+          filter_cookbooks(all_cookbooks_list(request), {}, 1) do |name, versions|
             if versions.size > 0
-              cookbook = JSON.parse(get_data(request, ['cookbooks', name, versions[0]]), :create_additions => false)
+              cookbook = JSON.parse(get_data(request, request.rest_path[0..1] + ['cookbooks', name, versions[0]]), :create_additions => false)
               result += recipe_names(name, cookbook)
             end
           end

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -9,17 +9,17 @@ module ChefZero
     # /cookbooks/NAME/VERSION
     class CookbookVersionEndpoint < RestObjectEndpoint
       def get(request)
-        if request.rest_path[2] == "_latest" || request.rest_path[2] == "latest"
-          request.rest_path[2] = latest_version(list_data(request, request.rest_path[0..1]))
+        if request.rest_path[4] == "_latest" || request.rest_path[4] == "latest"
+          request.rest_path[4] = latest_version(list_data(request, request.rest_path[0..3]))
         end
         super(request)
       end
 
       def put(request)
-        name = request.rest_path[1]
-        version = request.rest_path[2]
+        name = request.rest_path[3]
+        version = request.rest_path[4]
         existing_cookbook = get_data(request, request.rest_path, :nil)
-        
+
         # Honor frozen
         if existing_cookbook
           existing_cookbook_json = JSON.parse(existing_cookbook, :create_additions => false)
@@ -37,7 +37,7 @@ module ChefZero
         end
 
         # Set the cookbook
-        set_data(request, ['cookbooks', name, version], request.body, :create_dir, :create)
+        set_data(request, request.rest_path[0..1] + ['cookbooks', name, version], request.body, :create_dir, :create)
 
         # If the cookbook was updated, check for deleted files and clean them up
         if existing_cookbook
@@ -51,16 +51,16 @@ module ChefZero
       end
 
       def delete(request)
-        if request.rest_path[2] == "_latest" || request.rest_path[2] == "latest"
-          request.rest_path[2] = latest_version(list_data(request, request.rest_path[0..1]))
+        if request.rest_path[4] == "_latest" || request.rest_path[4] == "latest"
+          request.rest_path[4] = latest_version(list_data(request, request.rest_path[0..3]))
         end
 
         deleted_cookbook = get_data(request)
 
         response = super(request)
-        cookbook_name = request.rest_path[1]
-        if exists_data_dir?(request, [ 'cookbooks', cookbook_name ]) && list_data(request, ['cookbooks', cookbook_name]).size == 0
-          delete_data_dir(request, ['cookbooks', cookbook_name])
+        cookbook_name = request.rest_path[3]
+        if exists_data_dir?(request, request.rest_path[0..1] + [ 'cookbooks', cookbook_name ]) && list_data(request, request.rest_path[0..1] + ['cookbooks', cookbook_name]).size == 0
+          delete_data_dir(request, request.rest_path[0..1] + ['cookbooks', cookbook_name])
         end
 
         # Hoover deleted files, if they exist
@@ -85,9 +85,9 @@ module ChefZero
       private
 
       def hoover_unused_checksums(deleted_checksums, request)
-        data_store.list(['cookbooks']).each do |cookbook_name|
-          data_store.list(['cookbooks', cookbook_name]).each do |version|
-            cookbook = data_store.get(['cookbooks', cookbook_name, version], request)
+        data_store.list(request.rest_path[0..1] + ['cookbooks']).each do |cookbook_name|
+          data_store.list(request.rest_path[0..1] + ['cookbooks', cookbook_name]).each do |version|
+            cookbook = data_store.get(request.rest_path[0..1] + ['cookbooks', cookbook_name, version], request)
             deleted_checksums = deleted_checksums - get_checksums(cookbook)
           end
         end
@@ -96,7 +96,7 @@ module ChefZero
           # This deals with an exception on delete, but things can still get deleted
           # that shouldn't be.
           begin
-            data_store.delete(['file_store', 'checksums', checksum])
+            data_store.delete(request.rest_path[0..1] + ['file_store', 'checksums', checksum])
           rescue ChefZero::DataStore::DataNotFoundError
           end
         end
@@ -105,7 +105,7 @@ module ChefZero
       def populate_defaults(request, response_json)
         # Inject URIs into each cookbook file
         cookbook = JSON.parse(response_json, :create_additions => false)
-        cookbook = DataNormalizer.normalize_cookbook(cookbook, request.rest_path[1], request.rest_path[2], request.base_uri, request.method)
+        cookbook = DataNormalizer.normalize_cookbook(self, request.rest_path[0..1], cookbook, request.rest_path[3], request.rest_path[4], request.base_uri, request.method)
         JSON.pretty_generate(cookbook)
       end