Add /organizations, /organizations/NAME, /organizations/NAME/_validator_key

2 files changed, 19 insertions, 15 deletions

diff --git a/lib/chef_zero/data_store/memory_store_v2.rb b/lib/chef_zero/data_store/memory_store_v2.rb
index fd93506..2314ae8 100644
--- a/lib/chef_zero/data_store/memory_store_v2.rb
+++ b/lib/chef_zero/data_store/memory_store_v2.rb
@@ -35,11 +35,11 @@ module ChefZero
         create_dir([], 'organizations')
       end
 
-      def create_org
+      def create_org(name)
         org = {
           'clients' => {
-            'chef-validator' => '{ "validator": true }',
-            'chef-webui' => '{ "admin": true }'
+            "#{name}-validator" => '{ "validator": true }',
+            "#{name}-webui" => '{ "admin": true }'
           },
           'cookbooks' => {},
           'data' => {},
@@ -178,7 +178,7 @@ module ChefZero
 
       def _create_dir(parent_path, parent, name)
         if parent_path == [ 'organizations' ]
-          parent[name] = create_org
+          parent[name] = create_org(name)
         else
           parent[name] = {}
         end
diff --git a/lib/chef_zero/data_store/v1_to_v2_adapter.rb b/lib/chef_zero/data_store/v1_to_v2_adapter.rb
index 3b2fc8d..b01941b 100644
--- a/lib/chef_zero/data_store/v1_to_v2_adapter.rb
+++ b/lib/chef_zero/data_store/v1_to_v2_adapter.rb
@@ -10,18 +10,22 @@ module ChefZero
         clear
       end
 
-      ORG_DEFAULTS = {
-        'clients' => {
-          'chef-validator' => '{ "validator": true }',
-          'chef-webui' => '{ "admin": true }'
-        },
-        'environments' => {
-          '_default' => '{ "description": "The default Chef environment" }'
-        },
-        'users' => {
-          'admin' => '{ "admin": "true" }'
+      def self.org_defaults(name)
+        {
+          'clients' => {
+            "#{name}-validator" => '{ "validator": true }',
+            "#{name}-webui" => '{ "admin": true }'
+          },
+          'environments' => {
+            '_default' => '{ "description": "The default Chef environment" }'
+          },
+          'users' => {
+            'admin' => '{ "admin": "true" }'
+          }
         }
-      }
+      end
+
+      ORG_DEFAULTS = org_defaults('chef')
 
       attr_reader :real_store
       attr_reader :single_org