chef 12.6.0 → 12.7.2

data/spec/integration/knife/common_options_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,46 +15,46 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'support/shared/integration/integration_helper'
-require 'chef/knife/raw'
+require "support/shared/integration/integration_helper"
+require "chef/knife/raw"
 
-describe 'knife common options', :workstation do
+describe "knife common options", :workstation do
   include IntegrationSupport
   include KnifeSupport
 
   when_the_repository "has a node" do
-    before { file 'nodes/x.json', {} }
+    before { file "nodes/x.json", {} }
 
-    context 'When chef_zero.enabled is true' do
+    context "When chef_zero.enabled is true" do
       before(:each) do
         Chef::Config.chef_zero.enabled = true
       end
 
-      it 'knife raw /nodes/x should retrieve the node' do
-        knife('raw /nodes/x').should_succeed( /"name": "x"/ )
+      it "knife raw /nodes/x should retrieve the node" do
+        knife("raw /nodes/x").should_succeed( /"name": "x"/ )
       end
 
-      context 'And chef_zero.port is 9999' do
+      context "And chef_zero.port is 9999" do
         before(:each) { Chef::Config.chef_zero.port = 9999 }
 
-        it 'knife raw /nodes/x should retrieve the node' do
-          knife('raw /nodes/x').should_succeed( /"name": "x"/ )
-          expect(Chef::Config.chef_server_url).to eq('chefzero://localhost:9999')
+        it "knife raw /nodes/x should retrieve the node" do
+          knife("raw /nodes/x").should_succeed( /"name": "x"/ )
+          expect(Chef::Config.chef_server_url).to eq("chefzero://localhost:9999")
         end
       end
 
       # 0.0.0.0 is not a valid address to bind to on windows.
-      context 'And chef_zero.host is 0.0.0.0', :unix_only do
-        before(:each) { Chef::Config.chef_zero.host = '0.0.0.0' }
+      context "And chef_zero.host is 0.0.0.0", :unix_only do
+        before(:each) { Chef::Config.chef_zero.host = "0.0.0.0" }
 
-        it 'knife raw /nodes/x should retrieve the role' do
-          knife('raw /nodes/x').should_succeed( /"name": "x"/ )
+        it "knife raw /nodes/x should retrieve the role" do
+          knife("raw /nodes/x").should_succeed( /"name": "x"/ )
         end
       end
 
-      context 'and there is a private key' do
+      context "and there is a private key" do
         before do
-          file 'mykey.pem', <<EOM
+          file "mykey.pem", <<EOM
 -----BEGIN RSA PRIVATE KEY-----
 MIIEogIBAAKCAQEApubutqtYYQ5UiA9QhWP7UvSmsfHsAoPKEVVPdVW/e8Svwpyf
 0Xef6OFWVmBE+W442ZjLOe2y6p2nSnaq4y7dg99NFz6X+16mcKiCbj0RCiGqCvCk
@@ -85,29 +85,29 @@ syHLXYFNy0OxMtH/bBAXBGNHd9gf5uOnqh0pYcbe/uRAxumC7Rl0cL509eURiA2T
 EOM
         end
 
-        it 'knife raw /nodes/x should retrieve the node' do
-          knife('raw /nodes/x').should_succeed( /"name": "x"/ )
+        it "knife raw /nodes/x should retrieve the node" do
+          knife("raw /nodes/x").should_succeed( /"name": "x"/ )
         end
       end
     end
 
-    it 'knife raw -z /nodes/x retrieves the node' do
-      knife('raw -z /nodes/x').should_succeed( /"name": "x"/ )
+    it "knife raw -z /nodes/x retrieves the node" do
+      knife("raw -z /nodes/x").should_succeed( /"name": "x"/ )
     end
 
-    it 'knife raw --local-mode /nodes/x retrieves the node' do
-      knife('raw --local-mode /nodes/x').should_succeed( /"name": "x"/ )
+    it "knife raw --local-mode /nodes/x retrieves the node" do
+      knife("raw --local-mode /nodes/x").should_succeed( /"name": "x"/ )
     end
 
-    it 'knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node' do
-      knife('raw -z --chef-zero-port=9999 /nodes/x').should_succeed( /"name": "x"/ )
-      expect(Chef::Config.chef_server_url).to eq('chefzero://localhost:9999')
+    it "knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node" do
+      knife("raw -z --chef-zero-port=9999 /nodes/x").should_succeed( /"name": "x"/ )
+      expect(Chef::Config.chef_server_url).to eq("chefzero://localhost:9999")
     end
 
-    context 'when the default port (8889) is already bound' do
+    context "when the default port (8889) is already bound" do
       before :each do
         begin
-          @server = ChefZero::Server.new(:host => 'localhost', :port => 8889)
+          @server = ChefZero::Server.new(:host => "localhost", :port => 8889)
           @server.start_background
         rescue Errno::EADDRINUSE
           # OK.  Don't care who has it in use, as long as *someone* does.
@@ -117,16 +117,16 @@ EOM
         @server.stop if @server
       end
 
-      it 'knife raw -z /nodes/x retrieves the node' do
-        knife('raw -z /nodes/x').should_succeed( /"name": "x"/ )
+      it "knife raw -z /nodes/x retrieves the node" do
+        knife("raw -z /nodes/x").should_succeed( /"name": "x"/ )
         expect(URI(Chef::Config.chef_server_url).port).to be > 8889
       end
     end
 
-    context 'when port 9999 is already bound' do
+    context "when port 9999 is already bound" do
       before :each do
         begin
-          @server = ChefZero::Server.new(:host => 'localhost', :port => 9999)
+          @server = ChefZero::Server.new(:host => "localhost", :port => 9999)
           @server.start_background
         rescue Errno::EADDRINUSE
           # OK.  Don't care who has it in use, as long as *someone* does.
@@ -136,20 +136,20 @@ EOM
         @server.stop if @server
       end
 
-      it 'knife raw -z --chef-zero-port=9999-20000 /nodes/x' do
-        knife('raw -z --chef-zero-port=9999-20000 /nodes/x').should_succeed( /"name": "x"/ )
+      it "knife raw -z --chef-zero-port=9999-20000 /nodes/x" do
+        knife("raw -z --chef-zero-port=9999-20000 /nodes/x").should_succeed( /"name": "x"/ )
         expect(URI(Chef::Config.chef_server_url).port).to be > 9999
       end
 
-      it 'knife raw -z --chef-zero-port=9999-9999,19423' do
-        knife('raw -z --chef-zero-port=9999-9999,19423 /nodes/x').should_succeed( /"name": "x"/ )
+      it "knife raw -z --chef-zero-port=9999-9999,19423" do
+        knife("raw -z --chef-zero-port=9999-9999,19423 /nodes/x").should_succeed( /"name": "x"/ )
         expect(URI(Chef::Config.chef_server_url).port).to be == 19423
       end
     end
 
-    it 'knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node' do
-      knife('raw -z --chef-zero-port=9999 /nodes/x').should_succeed( /"name": "x"/ )
-      expect(Chef::Config.chef_server_url).to eq('chefzero://localhost:9999')
+    it "knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node" do
+      knife("raw -z --chef-zero-port=9999 /nodes/x").should_succeed( /"name": "x"/ )
+      expect(Chef::Config.chef_server_url).to eq("chefzero://localhost:9999")
     end
   end
 end

data/spec/integration/knife/cookbook_api_ipv6_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +15,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'support/shared/integration/integration_helper'
-require 'chef/mixin/shell_out'
+require "support/shared/integration/integration_helper"
+require "chef/mixin/shell_out"
 
-describe "Knife cookbook API integration with IPv6", :workstation do
+describe "Knife cookbook API integration with IPv6", :workstation, :not_supported_on_gce do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
   when_the_chef_server "is bound to IPv6" do
-    let(:chef_zero_opts) { {:host => "::1"} }
+    let(:chef_zero_opts) { { :host => "::1" } }
 
     let(:client_key) do
       <<-END_VALIDATION_PEM
@@ -84,8 +84,8 @@ END_CLIENT_RB
         end
 
         before do
-          file 'config/knife.rb', knife_rb_content
-          file 'config/knifeuser.pem', client_key
+          file "config/knife.rb", knife_rb_content
+          file "config/knifeuser.pem", client_key
         end
 
         it "successfully uploads a cookbook" do
@@ -102,7 +102,7 @@ END_CLIENT_RB
 
           it "downloads the cookbook" do
             shell_out!("knife cookbook download apache2 #{knife_config_flag} -d #{cache_path}", :cwd => chef_dir)
-            expect(Dir["#{cache_path}/*"].map {|entry| File.basename(entry)}).to include("apache2-0.0.1")
+            expect(Dir["#{cache_path}/*"].map { |entry| File.basename(entry) }).to include("apache2-0.0.1")
           end
         end
 

data/spec/integration/knife/delete_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +15,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'support/shared/integration/integration_helper'
-require 'chef/knife/delete'
-require 'chef/knife/list'
-require 'chef/knife/raw'
+require "support/shared/integration/integration_helper"
+require "chef/knife/delete"
+require "chef/knife/list"
+require "chef/knife/raw"
 
-describe 'knife delete', :workstation do
+describe "knife delete", :workstation do
   include IntegrationSupport
   include KnifeSupport
 
@@ -100,39 +100,39 @@ EOM
 
   when_the_chef_server "has one of each thing" do
     before do
-      client 'x', '{}'
-      cookbook 'x', '1.0.0'
-      data_bag 'x', { 'y' => '{}' }
-      environment 'x', '{}'
-      node 'x', '{}'
-      role 'x', '{}'
-      user 'x', '{}'
+      client "x", "{}"
+      cookbook "x", "1.0.0"
+      data_bag "x", { "y" => "{}" }
+      environment "x", "{}"
+      node "x", "{}"
+      role "x", "{}"
+      user "x", "{}"
     end
 
-    when_the_repository 'also has one of each thing' do
+    when_the_repository "also has one of each thing" do
       before do
-        file 'clients/x.json', {}
-        file 'cookbooks/x/metadata.rb', ''
-        file 'data_bags/x/y.json', {}
-        file 'environments/_default.json', {}
-        file 'environments/x.json', {}
-        file 'nodes/x.json', {}
-        file 'roles/x.json', {}
-        file 'users/x.json', {}
-      end
-
-      it 'knife delete --both /cookbooks/x fails' do
-        knife('delete --both /cookbooks/x').should_fail <<EOM
+        file "clients/x.json", {}
+        file "cookbooks/x/metadata.rb", ""
+        file "data_bags/x/y.json", {}
+        file "environments/_default.json", {}
+        file "environments/x.json", {}
+        file "nodes/x.json", {}
+        file "roles/x.json", {}
+        file "users/x.json", {}
+      end
+
+      it "knife delete --both /cookbooks/x fails" do
+        knife("delete --both /cookbooks/x").should_fail <<EOM
 ERROR: /cookbooks/x (remote) must be deleted recursively!  Pass -r to knife delete.
 ERROR: /cookbooks/x (local) must be deleted recursively!  Pass -r to knife delete.
 EOM
-        knife('list -Rf /').should_succeed server_everything
-        knife('list -Rf --local /').should_succeed everything
+        knife("list -Rf /").should_succeed server_everything
+        knife("list -Rf --local /").should_succeed everything
       end
 
-      it 'knife delete --both -r /cookbooks/x deletes x' do
-        knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
-        knife('list -Rf /').should_succeed <<EOM
+      it "knife delete --both -r /cookbooks/x deletes x" do
+        knife("delete --both -r /cookbooks/x").should_succeed "Deleted /cookbooks/x\n"
+        knife("list -Rf /").should_succeed <<EOM
 /clients
 /clients/chef-validator.json
 /clients/chef-webui.json
@@ -152,7 +152,7 @@ EOM
 /users/admin.json
 /users/x.json
 EOM
-        knife('list -Rf --local /').should_succeed <<EOM
+        knife("list -Rf --local /").should_succeed <<EOM
 /clients
 /clients/x.json
 /cookbooks
@@ -171,10 +171,10 @@ EOM
 EOM
       end
 
-      it 'knife delete -r --local /cookbooks/x deletes x locally but not remotely' do
-        knife('delete -r --local /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
-        knife('list -Rf /').should_succeed server_everything
-        knife('list -Rf --local /').should_succeed <<EOM
+      it "knife delete -r --local /cookbooks/x deletes x locally but not remotely" do
+        knife("delete -r --local /cookbooks/x").should_succeed "Deleted /cookbooks/x\n"
+        knife("list -Rf /").should_succeed server_everything
+        knife("list -Rf --local /").should_succeed <<EOM
 /clients
 /clients/x.json
 /cookbooks
@@ -193,9 +193,9 @@ EOM
 EOM
       end
 
-      it 'knife delete -r /cookbooks/x deletes x remotely but not locally' do
-        knife('delete -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
-        knife('list -Rf /').should_succeed <<EOM
+      it "knife delete -r /cookbooks/x deletes x remotely but not locally" do
+        knife("delete -r /cookbooks/x").should_succeed "Deleted /cookbooks/x\n"
+        knife("list -Rf /").should_succeed <<EOM
 /clients
 /clients/chef-validator.json
 /clients/chef-webui.json
@@ -215,22 +215,22 @@ EOM
 /users/admin.json
 /users/x.json
 EOM
-        knife('list -Rf --local /').should_succeed everything
+        knife("list -Rf --local /").should_succeed everything
       end
 
       # TODO delete empty data bag (particularly different on local side)
-      context 'with an empty data bag on both' do
+      context "with an empty data bag on both" do
         before do
-          data_bag 'empty', {}
-          directory 'data_bags/empty'
+          data_bag "empty", {}
+          directory "data_bags/empty"
         end
 
-        it 'knife delete --both /data_bags/empty fails but deletes local version' do
-          knife('delete --both /data_bags/empty').should_fail <<EOM
+        it "knife delete --both /data_bags/empty fails but deletes local version" do
+          knife("delete --both /data_bags/empty").should_fail <<EOM
 ERROR: /data_bags/empty (remote) must be deleted recursively!  Pass -r to knife delete.
 ERROR: /data_bags/empty (local) must be deleted recursively!  Pass -r to knife delete.
 EOM
-          knife('list -Rf /').should_succeed <<EOM
+          knife("list -Rf /").should_succeed <<EOM
 /clients
 /clients/chef-validator.json
 /clients/chef-webui.json
@@ -253,7 +253,7 @@ EOM
 /users/admin.json
 /users/x.json
 EOM
-          knife('list -Rf --local /').should_succeed <<EOM
+          knife("list -Rf --local /").should_succeed <<EOM
 /clients
 /clients/x.json
 /cookbooks
@@ -276,18 +276,18 @@ EOM
         end
       end
 
-      it 'knife delete --both /data_bags/x fails' do
-        knife('delete --both /data_bags/x').should_fail <<EOM
+      it "knife delete --both /data_bags/x fails" do
+        knife("delete --both /data_bags/x").should_fail <<EOM
 ERROR: /data_bags/x (remote) must be deleted recursively!  Pass -r to knife delete.
 ERROR: /data_bags/x (local) must be deleted recursively!  Pass -r to knife delete.
 EOM
-        knife('list -Rf /').should_succeed server_everything
-        knife('list -Rf --local /').should_succeed everything
+        knife("list -Rf /").should_succeed server_everything
+        knife("list -Rf --local /").should_succeed everything
       end
 
-      it 'knife delete --both -r /data_bags/x deletes x' do
-        knife('delete --both -r /data_bags/x').should_succeed "Deleted /data_bags/x\n"
-        knife('list -Rf /').should_succeed <<EOM
+      it "knife delete --both -r /data_bags/x deletes x" do
+        knife("delete --both -r /data_bags/x").should_succeed "Deleted /data_bags/x\n"
+        knife("list -Rf /").should_succeed <<EOM
 /clients
 /clients/chef-validator.json
 /clients/chef-webui.json
@@ -307,7 +307,7 @@ EOM
 /users/admin.json
 /users/x.json
 EOM
-        knife('list -Rf --local /').should_succeed <<EOM
+        knife("list -Rf --local /").should_succeed <<EOM
 /clients
 /clients/x.json
 /cookbooks
@@ -326,9 +326,9 @@ EOM
 EOM
       end
 
-      it 'knife delete --both /environments/x.json deletes x' do
-        knife('delete --both /environments/x.json').should_succeed "Deleted /environments/x.json\n"
-        knife('list -Rf /').should_succeed <<EOM
+      it "knife delete --both /environments/x.json deletes x" do
+        knife("delete --both /environments/x.json").should_succeed "Deleted /environments/x.json\n"
+        knife("list -Rf /").should_succeed <<EOM
 /clients
 /clients/chef-validator.json
 /clients/chef-webui.json
@@ -349,7 +349,7 @@ EOM
 /users/admin.json
 /users/x.json
 EOM
-        knife('list -Rf --local /').should_succeed <<EOM
+        knife("list -Rf --local /").should_succeed <<EOM
 /clients
 /clients/x.json
 /cookbooks
@@ -369,9 +369,9 @@ EOM
 EOM
       end
 
-      it 'knife delete --both /roles/x.json deletes x' do
-        knife('delete --both /roles/x.json').should_succeed "Deleted /roles/x.json\n"
-        knife('list -Rf /').should_succeed <<EOM
+      it "knife delete --both /roles/x.json deletes x" do
+        knife("delete --both /roles/x.json").should_succeed "Deleted /roles/x.json\n"
+        knife("list -Rf /").should_succeed <<EOM
 /clients
 /clients/chef-validator.json
 /clients/chef-webui.json
@@ -392,7 +392,7 @@ EOM
 /users/admin.json
 /users/x.json
 EOM
-        knife('list -Rf --local /').should_succeed <<EOM
+        knife("list -Rf --local /").should_succeed <<EOM
 /clients
 /clients/x.json
 /cookbooks
@@ -412,10 +412,10 @@ EOM
 EOM
       end
 
-      it 'knife delete --both /environments/_default.json fails but still deletes the local copy' do
-        knife('delete --both /environments/_default.json').should_fail :stderr => "ERROR: /environments/_default.json (remote) cannot be deleted (default environment cannot be modified).\n", :stdout => "Deleted /environments/_default.json\n"
-        knife('list -Rf /').should_succeed server_everything
-        knife('list -Rf --local /').should_succeed <<EOM
+      it "knife delete --both /environments/_default.json fails but still deletes the local copy" do
+        knife("delete --both /environments/_default.json").should_fail :stderr => "ERROR: /environments/_default.json (remote) cannot be deleted (default environment cannot be modified).\n", :stdout => "Deleted /environments/_default.json\n"
+        knife("list -Rf /").should_succeed server_everything
+        knife("list -Rf --local /").should_succeed <<EOM
 /clients
 /clients/x.json
 /cookbooks
@@ -435,23 +435,23 @@ EOM
 EOM
       end
 
-      it 'knife delete --both /environments/nonexistent.json fails' do
-        knife('delete --both /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
-        knife('list -Rf /').should_succeed server_everything
-        knife('list -Rf --local /').should_succeed everything
+      it "knife delete --both /environments/nonexistent.json fails" do
+        knife("delete --both /environments/nonexistent.json").should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
+        knife("list -Rf /").should_succeed server_everything
+        knife("list -Rf --local /").should_succeed everything
       end
 
-      it 'knife delete --both / fails' do
-        knife('delete --both /').should_fail <<EOM
+      it "knife delete --both / fails" do
+        knife("delete --both /").should_fail <<EOM
 ERROR: / (remote) cannot be deleted.
 ERROR: / (local) cannot be deleted.
 EOM
-        knife('list -Rf /').should_succeed server_everything
-        knife('list -Rf --local /').should_succeed everything
+        knife("list -Rf /").should_succeed server_everything
+        knife("list -Rf --local /").should_succeed everything
       end
 
-      it 'knife delete --both -r /* fails' do
-        knife('delete --both -r /*').should_fail <<EOM
+      it "knife delete --both -r /* fails" do
+        knife("delete --both -r /*").should_fail <<EOM
 ERROR: / (remote) cannot be deleted.
 ERROR: / (local) cannot be deleted.
 ERROR: /clients (remote) cannot be deleted.
@@ -469,31 +469,31 @@ ERROR: /roles (local) cannot be deleted.
 ERROR: /users (remote) cannot be deleted.
 ERROR: /users (local) cannot be deleted.
 EOM
-        knife('list -Rf /').should_succeed server_everything
-        knife('list -Rf --local /').should_succeed everything
+        knife("list -Rf /").should_succeed server_everything
+        knife("list -Rf --local /").should_succeed everything
       end
     end
 
-    when_the_repository 'has only top-level directories' do
+    when_the_repository "has only top-level directories" do
       before do
-        directory 'clients'
-        directory 'cookbooks'
-        directory 'data_bags'
-        directory 'environments'
-        directory 'nodes'
-        directory 'roles'
-        directory 'users'
+        directory "clients"
+        directory "cookbooks"
+        directory "data_bags"
+        directory "environments"
+        directory "nodes"
+        directory "roles"
+        directory "users"
       end
 
-      it 'knife delete --both /cookbooks/x fails' do
-        knife('delete --both /cookbooks/x').should_fail "ERROR: /cookbooks/x (remote) must be deleted recursively!  Pass -r to knife delete.\n"
-        knife('list -Rf /').should_succeed server_everything
-        knife('list -Rf --local /').should_succeed nothing
+      it "knife delete --both /cookbooks/x fails" do
+        knife("delete --both /cookbooks/x").should_fail "ERROR: /cookbooks/x (remote) must be deleted recursively!  Pass -r to knife delete.\n"
+        knife("list -Rf /").should_succeed server_everything
+        knife("list -Rf --local /").should_succeed nothing
       end
 
-      it 'knife delete --both -r /cookbooks/x deletes x' do
-        knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
-        knife('list -Rf /').should_succeed <<EOM
+      it "knife delete --both -r /cookbooks/x deletes x" do
+        knife("delete --both -r /cookbooks/x").should_succeed "Deleted /cookbooks/x\n"
+        knife("list -Rf /").should_succeed <<EOM
 /clients
 /clients/chef-validator.json
 /clients/chef-webui.json
@@ -513,18 +513,18 @@ EOM
 /users/admin.json
 /users/x.json
 EOM
-        knife('list -Rf --local /').should_succeed nothing
+        knife("list -Rf --local /").should_succeed nothing
       end
 
-      it 'knife delete --both /data_bags/x fails' do
-        knife('delete --both /data_bags/x').should_fail "ERROR: /data_bags/x (remote) must be deleted recursively!  Pass -r to knife delete.\n"
-        knife('list -Rf /').should_succeed server_everything
-        knife('list -Rf --local /').should_succeed nothing
+      it "knife delete --both /data_bags/x fails" do
+        knife("delete --both /data_bags/x").should_fail "ERROR: /data_bags/x (remote) must be deleted recursively!  Pass -r to knife delete.\n"
+        knife("list -Rf /").should_succeed server_everything
+        knife("list -Rf --local /").should_succeed nothing
       end
 
-      it 'knife delete --both -r /data_bags/x deletes x' do
-        knife('delete --both -r /data_bags/x').should_succeed "Deleted /data_bags/x\n"
-        knife('list -Rf /').should_succeed <<EOM
+      it "knife delete --both -r /data_bags/x deletes x" do
+        knife("delete --both -r /data_bags/x").should_succeed "Deleted /data_bags/x\n"
+        knife("list -Rf /").should_succeed <<EOM
 /clients
 /clients/chef-validator.json
 /clients/chef-webui.json
@@ -544,12 +544,12 @@ EOM
 /users/admin.json
 /users/x.json
 EOM
-        knife('list -Rf --local /').should_succeed nothing
+        knife("list -Rf --local /").should_succeed nothing
       end
 
-      it 'knife delete --both /environments/x.json deletes x' do
-        knife('delete --both /environments/x.json').should_succeed "Deleted /environments/x.json\n"
-        knife('list -Rf /').should_succeed <<EOM
+      it "knife delete --both /environments/x.json deletes x" do
+        knife("delete --both /environments/x.json").should_succeed "Deleted /environments/x.json\n"
+        knife("list -Rf /").should_succeed <<EOM
 /clients
 /clients/chef-validator.json
 /clients/chef-webui.json
@@ -570,12 +570,12 @@ EOM
 /users/admin.json
 /users/x.json
 EOM
-        knife('list -Rf --local /').should_succeed nothing
+        knife("list -Rf --local /").should_succeed nothing
       end
 
-      it 'knife delete --both /roles/x.json deletes x' do
-        knife('delete --both /roles/x.json').should_succeed "Deleted /roles/x.json\n"
-        knife('list -Rf /').should_succeed <<EOM
+      it "knife delete --both /roles/x.json deletes x" do
+        knife("delete --both /roles/x.json").should_succeed "Deleted /roles/x.json\n"
+        knife("list -Rf /").should_succeed <<EOM
 /clients
 /clients/chef-validator.json
 /clients/chef-webui.json
@@ -596,23 +596,23 @@ EOM
 /users/admin.json
 /users/x.json
 EOM
-        knife('list -Rf --local /').should_succeed nothing
+        knife("list -Rf --local /").should_succeed nothing
       end
 
-      it 'knife delete --both /environments/_default.json fails' do
-        knife('delete --both /environments/_default.json').should_fail "", :stderr => "ERROR: /environments/_default.json (remote) cannot be deleted (default environment cannot be modified).\n"
-        knife('list -Rf /').should_succeed server_everything
-        knife('list -Rf --local /').should_succeed nothing
+      it "knife delete --both /environments/_default.json fails" do
+        knife("delete --both /environments/_default.json").should_fail "", :stderr => "ERROR: /environments/_default.json (remote) cannot be deleted (default environment cannot be modified).\n"
+        knife("list -Rf /").should_succeed server_everything
+        knife("list -Rf --local /").should_succeed nothing
       end
 
-      it 'knife delete --both / fails' do
-        knife('delete --both /').should_fail "ERROR: / (remote) cannot be deleted.\nERROR: / (local) cannot be deleted.\n"
-        knife('list -Rf /').should_succeed server_everything
-        knife('list -Rf --local /').should_succeed nothing
+      it "knife delete --both / fails" do
+        knife("delete --both /").should_fail "ERROR: / (remote) cannot be deleted.\nERROR: / (local) cannot be deleted.\n"
+        knife("list -Rf /").should_succeed server_everything
+        knife("list -Rf --local /").should_succeed nothing
       end
 
-      it 'knife delete --both -r /* fails' do
-        knife('delete --both -r /*').should_fail <<EOM
+      it "knife delete --both -r /* fails" do
+        knife("delete --both -r /*").should_fail <<EOM
 ERROR: / (remote) cannot be deleted.
 ERROR: / (local) cannot be deleted.
 ERROR: /clients (remote) cannot be deleted.
@@ -630,21 +630,21 @@ ERROR: /roles (local) cannot be deleted.
 ERROR: /users (remote) cannot be deleted.
 ERROR: /users (local) cannot be deleted.
 EOM
-        knife('list -Rf /').should_succeed server_everything
-        knife('list -Rf --local /').should_succeed nothing
+        knife("list -Rf /").should_succeed server_everything
+        knife("list -Rf --local /").should_succeed nothing
       end
 
-      it 'knife delete --both /environments/nonexistent.json fails' do
-        knife('delete --both /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
-        knife('list -Rf /').should_succeed server_everything
-        knife('list -Rf --local /').should_succeed nothing
+      it "knife delete --both /environments/nonexistent.json fails" do
+        knife("delete --both /environments/nonexistent.json").should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
+        knife("list -Rf /").should_succeed server_everything
+        knife("list -Rf --local /").should_succeed nothing
       end
 
-      context 'and cwd is at the top level' do
-        before { cwd '.' }
-        it 'knife delete fails' do
-          knife('delete').should_fail "FATAL: Must specify at least one argument.  If you want to delete everything in this directory, type \"knife delete --recurse .\"\n", :stdout => /USAGE/
-          knife('list -Rf /').should_succeed <<EOM
+      context "and cwd is at the top level" do
+        before { cwd "." }
+        it "knife delete fails" do
+          knife("delete").should_fail "FATAL: Must specify at least one argument.  If you want to delete everything in this directory, type \"knife delete --recurse .\"\n", :stdout => /USAGE/
+          knife("list -Rf /").should_succeed <<EOM
 clients
 clients/chef-validator.json
 clients/chef-webui.json
@@ -666,7 +666,7 @@ users
 users/admin.json
 users/x.json
 EOM
-          knife('list -Rf --local /').should_succeed <<EOM
+          knife("list -Rf --local /").should_succeed <<EOM
 clients
 cookbooks
 data_bags
@@ -680,29 +680,29 @@ EOM
     end
   end
 
-  when_the_chef_server 'is empty' do
-    when_the_repository 'has one of each thing' do
+  when_the_chef_server "is empty" do
+    when_the_repository "has one of each thing" do
       before do
-        file 'clients/x.json', {}
-        file 'cookbooks/x/metadata.rb', ''
-        file 'data_bags/x/y.json', {}
-        file 'environments/_default.json', {}
-        file 'environments/x.json', {}
-        file 'nodes/x.json', {}
-        file 'roles/x.json', {}
-        file 'users/x.json', {}
-      end
-
-      it 'knife delete --both /cookbooks/x fails' do
-        knife('delete --both /cookbooks/x').should_fail "ERROR: /cookbooks/x (local) must be deleted recursively!  Pass -r to knife delete.\n"
-        knife('list -Rf /').should_succeed server_nothing
-        knife('list -Rf --local /').should_succeed everything
-      end
-
-      it 'knife delete --both -r /cookbooks/x deletes x' do
-        knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
-        knife('list -Rf /').should_succeed server_nothing
-        knife('list -Rf --local /').should_succeed <<EOM
+        file "clients/x.json", {}
+        file "cookbooks/x/metadata.rb", ""
+        file "data_bags/x/y.json", {}
+        file "environments/_default.json", {}
+        file "environments/x.json", {}
+        file "nodes/x.json", {}
+        file "roles/x.json", {}
+        file "users/x.json", {}
+      end
+
+      it "knife delete --both /cookbooks/x fails" do
+        knife("delete --both /cookbooks/x").should_fail "ERROR: /cookbooks/x (local) must be deleted recursively!  Pass -r to knife delete.\n"
+        knife("list -Rf /").should_succeed server_nothing
+        knife("list -Rf --local /").should_succeed everything
+      end
+
+      it "knife delete --both -r /cookbooks/x deletes x" do
+        knife("delete --both -r /cookbooks/x").should_succeed "Deleted /cookbooks/x\n"
+        knife("list -Rf /").should_succeed server_nothing
+        knife("list -Rf --local /").should_succeed <<EOM
 /clients
 /clients/x.json
 /cookbooks
@@ -721,16 +721,16 @@ EOM
 EOM
       end
 
-      it 'knife delete --both /data_bags/x fails' do
-        knife('delete --both /data_bags/x').should_fail "ERROR: /data_bags/x (local) must be deleted recursively!  Pass -r to knife delete.\n"
-        knife('list -Rf /').should_succeed server_nothing
-        knife('list -Rf --local /').should_succeed everything
+      it "knife delete --both /data_bags/x fails" do
+        knife("delete --both /data_bags/x").should_fail "ERROR: /data_bags/x (local) must be deleted recursively!  Pass -r to knife delete.\n"
+        knife("list -Rf /").should_succeed server_nothing
+        knife("list -Rf --local /").should_succeed everything
       end
 
-      it 'knife delete --both -r /data_bags/x deletes x' do
-        knife('delete --both -r /data_bags/x').should_succeed "Deleted /data_bags/x\n"
-        knife('list -Rf /').should_succeed server_nothing
-        knife('list -Rf --local /').should_succeed <<EOM
+      it "knife delete --both -r /data_bags/x deletes x" do
+        knife("delete --both -r /data_bags/x").should_succeed "Deleted /data_bags/x\n"
+        knife("list -Rf /").should_succeed server_nothing
+        knife("list -Rf --local /").should_succeed <<EOM
 /clients
 /clients/x.json
 /cookbooks
@@ -749,10 +749,10 @@ EOM
 EOM
       end
 
-      it 'knife delete --both /environments/x.json deletes x' do
-        knife('delete --both /environments/x.json').should_succeed "Deleted /environments/x.json\n"
-        knife('list -Rf /').should_succeed server_nothing
-        knife('list -Rf --local /').should_succeed <<EOM
+      it "knife delete --both /environments/x.json deletes x" do
+        knife("delete --both /environments/x.json").should_succeed "Deleted /environments/x.json\n"
+        knife("list -Rf /").should_succeed server_nothing
+        knife("list -Rf --local /").should_succeed <<EOM
 /clients
 /clients/x.json
 /cookbooks
@@ -772,10 +772,10 @@ EOM
 EOM
       end
 
-      it 'knife delete --both /roles/x.json deletes x' do
-        knife('delete --both /roles/x.json').should_succeed "Deleted /roles/x.json\n"
-        knife('list -Rf /').should_succeed server_nothing
-        knife('list -Rf --local /').should_succeed <<EOM
+      it "knife delete --both /roles/x.json deletes x" do
+        knife("delete --both /roles/x.json").should_succeed "Deleted /roles/x.json\n"
+        knife("list -Rf /").should_succeed server_nothing
+        knife("list -Rf --local /").should_succeed <<EOM
 /clients
 /clients/x.json
 /cookbooks
@@ -795,10 +795,10 @@ EOM
 EOM
       end
 
-      it 'knife delete --both /environments/_default.json fails but still deletes the local copy' do
-        knife('delete --both /environments/_default.json').should_fail :stderr => "ERROR: /environments/_default.json (remote) cannot be deleted (default environment cannot be modified).\n", :stdout => "Deleted /environments/_default.json\n"
-        knife('list -Rf /').should_succeed server_nothing
-        knife('list -Rf --local /').should_succeed <<EOM
+      it "knife delete --both /environments/_default.json fails but still deletes the local copy" do
+        knife("delete --both /environments/_default.json").should_fail :stderr => "ERROR: /environments/_default.json (remote) cannot be deleted (default environment cannot be modified).\n", :stdout => "Deleted /environments/_default.json\n"
+        knife("list -Rf /").should_succeed server_nothing
+        knife("list -Rf --local /").should_succeed <<EOM
 /clients
 /clients/x.json
 /cookbooks
@@ -818,14 +818,14 @@ EOM
 EOM
       end
 
-      it 'knife delete --both / fails' do
-        knife('delete --both /').should_fail "ERROR: / (remote) cannot be deleted.\nERROR: / (local) cannot be deleted.\n"
-        knife('list -Rf /').should_succeed server_nothing
-        knife('list -Rf --local /').should_succeed everything
+      it "knife delete --both / fails" do
+        knife("delete --both /").should_fail "ERROR: / (remote) cannot be deleted.\nERROR: / (local) cannot be deleted.\n"
+        knife("list -Rf /").should_succeed server_nothing
+        knife("list -Rf --local /").should_succeed everything
       end
 
-      it 'knife delete --both -r /* fails' do
-        knife('delete --both -r /*').should_fail <<EOM
+      it "knife delete --both -r /* fails" do
+        knife("delete --both -r /*").should_fail <<EOM
 ERROR: / (remote) cannot be deleted.
 ERROR: / (local) cannot be deleted.
 ERROR: /clients (remote) cannot be deleted.
@@ -843,21 +843,21 @@ ERROR: /roles (local) cannot be deleted.
 ERROR: /users (remote) cannot be deleted.
 ERROR: /users (local) cannot be deleted.
 EOM
-        knife('list -Rf /').should_succeed server_nothing
-        knife('list -Rf --local /').should_succeed everything
+        knife("list -Rf /").should_succeed server_nothing
+        knife("list -Rf --local /").should_succeed everything
       end
 
-      it 'knife delete --both /environments/nonexistent.json fails' do
-        knife('delete --both /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
-        knife('list -Rf /').should_succeed server_nothing
-        knife('list -Rf --local /').should_succeed everything
+      it "knife delete --both /environments/nonexistent.json fails" do
+        knife("delete --both /environments/nonexistent.json").should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
+        knife("list -Rf /").should_succeed server_nothing
+        knife("list -Rf --local /").should_succeed everything
       end
 
-      context 'and cwd is at the top level' do
-        before { cwd '.' }
-        it 'knife delete fails' do
-          knife('delete').should_fail "FATAL: Must specify at least one argument.  If you want to delete everything in this directory, type \"knife delete --recurse .\"\n", :stdout => /USAGE/
-          knife('list -Rf /').should_succeed <<EOM
+      context "and cwd is at the top level" do
+        before { cwd "." }
+        it "knife delete fails" do
+          knife("delete").should_fail "FATAL: Must specify at least one argument.  If you want to delete everything in this directory, type \"knife delete --recurse .\"\n", :stdout => /USAGE/
+          knife("list -Rf /").should_succeed <<EOM
 clients
 clients/chef-validator.json
 clients/chef-webui.json
@@ -870,7 +870,7 @@ roles
 users
 users/admin.json
 EOM
-          knife('list -Rf --local /').should_succeed <<EOM
+          knife("list -Rf --local /").should_succeed <<EOM
 clients
 clients/x.json
 cookbooks
@@ -894,110 +894,124 @@ EOM
     end
   end
 
-  when_the_repository 'has a cookbook' do
+  when_the_repository "has a cookbook" do
     before do
-      file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
-      file 'cookbooks/x/onlyin1.0.0.rb', 'old_text'
+      file "cookbooks/x/metadata.rb", 'version "1.0.0"'
+      file "cookbooks/x/onlyin1.0.0.rb", "old_text"
     end
 
-    when_the_chef_server 'has a later version for the cookbook' do
+    when_the_chef_server "has a later version for the cookbook" do
       before do
-        cookbook 'x', '1.0.0', { 'onlyin1.0.0.rb' => '' }
-        cookbook 'x', '1.0.1', { 'onlyin1.0.1.rb' => 'hi' }
+        cookbook "x", "1.0.0", { "onlyin1.0.0.rb" => "" }
+        cookbook "x", "1.0.1", { "onlyin1.0.1.rb" => "hi" }
       end
 
       # TODO this seems wrong
-      it 'knife delete --both -r /cookbooks/x deletes the latest version on the server and the local version' do
-        knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
-        knife('raw /cookbooks/x').should_succeed(/1.0.0/)
-        knife('list --local /cookbooks').should_succeed ''
+      it "knife delete --both -r /cookbooks/x deletes the latest version on the server and the local version" do
+        knife("delete --both -r /cookbooks/x").should_succeed "Deleted /cookbooks/x\n"
+        knife("raw /cookbooks/x").should_succeed(/1.0.0/)
+        knife("list --local /cookbooks").should_succeed ""
       end
     end
 
-    when_the_chef_server 'has an earlier version for the cookbook' do
+    when_the_chef_server "has an earlier version for the cookbook" do
       before do
-        cookbook 'x', '1.0.0', { 'onlyin1.0.0.rb' => ''}
-        cookbook 'x', '0.9.9', { 'onlyin0.9.9.rb' => 'hi' }
+        cookbook "x", "1.0.0", { "onlyin1.0.0.rb" => "" }
+        cookbook "x", "0.9.9", { "onlyin0.9.9.rb" => "hi" }
       end
 
-      it 'knife delete --both /cookbooks/x deletes the latest version on the server and the local version' do
-        knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
-        knife('raw /cookbooks/x').should_succeed(/0.9.9/)
-        knife('list --local /cookbooks').should_succeed ''
+      it "knife delete --both /cookbooks/x deletes the latest version on the server and the local version" do
+        knife("delete --both -r /cookbooks/x").should_succeed "Deleted /cookbooks/x\n"
+        knife("raw /cookbooks/x").should_succeed(/0.9.9/)
+        knife("list --local /cookbooks").should_succeed ""
       end
     end
 
-    when_the_chef_server 'has a later version for the cookbook, and no current version' do
-      before { cookbook 'x', '1.0.1', { 'onlyin1.0.1.rb' => 'hi' } }
+    when_the_chef_server "has a later version for the cookbook, and no current version" do
+      before { cookbook "x", "1.0.1", { "onlyin1.0.1.rb" => "hi" } }
 
-      it 'knife delete --both /cookbooks/x deletes the server and client version of the cookbook' do
-        knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
-        knife('raw /cookbooks/x').should_fail(/404/)
-        knife('list --local /cookbooks').should_succeed ''
+      it "knife delete --both /cookbooks/x deletes the server and client version of the cookbook" do
+        knife("delete --both -r /cookbooks/x").should_succeed "Deleted /cookbooks/x\n"
+        knife("raw /cookbooks/x").should_fail(/404/)
+        knife("list --local /cookbooks").should_succeed ""
       end
     end
 
-    when_the_chef_server 'has an earlier version for the cookbook, and no current version' do
-      before { cookbook 'x', '0.9.9', { 'onlyin0.9.9.rb' => 'hi' } }
+    when_the_chef_server "has an earlier version for the cookbook, and no current version" do
+      before { cookbook "x", "0.9.9", { "onlyin0.9.9.rb" => "hi" } }
 
-      it 'knife delete --both /cookbooks/x deletes the server and client version of the cookbook' do
-        knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
-        knife('raw /cookbooks/x').should_fail(/404/)
-        knife('list --local /cookbooks').should_succeed ''
+      it "knife delete --both /cookbooks/x deletes the server and client version of the cookbook" do
+        knife("delete --both -r /cookbooks/x").should_succeed "Deleted /cookbooks/x\n"
+        knife("raw /cookbooks/x").should_fail(/404/)
+        knife("list --local /cookbooks").should_succeed ""
       end
     end
   end
 
-  when_the_repository 'is empty' do
-    when_the_chef_server 'has two versions of a cookbook' do
+  when_the_repository "is empty" do
+    when_the_chef_server "has two versions of a cookbook" do
       before do
-        cookbook 'x', '2.0.11'
-        cookbook 'x', '11.0.0'
+        cookbook "x", "2.0.11"
+        cookbook "x", "11.0.0"
       end
 
-      it 'knife delete deletes the latest version' do
-        knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
-        knife('raw /cookbooks/x').should_succeed( /2.0.11/ )
+      it "knife delete deletes the latest version" do
+        knife("delete --both -r /cookbooks/x").should_succeed "Deleted /cookbooks/x\n"
+        knife("raw /cookbooks/x").should_succeed( /2.0.11/ )
       end
     end
   end
 
   when_the_chef_server "is in Enterprise mode", :osc_compat => false, :single_org => false do
     before do
-      organization 'foo' do
-        container 'x', {}
-        group 'x', {}
+      organization "foo" do
+        container "x", {}
+        group "x", {}
+        policy "x", "1.2.3", {}
+        policy_group "x", { "policies" => { "x" => { "revision_id" => "1.2.3" } } }
       end
     end
 
     before :each do
-      Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, '/organizations/foo')
+      Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, "/organizations/foo")
     end
 
-    it 'knife delete /acls/containers/environments.json fails with a reasonable error' do
-      knife('delete /acls/containers/environments.json').should_fail "ERROR: /acls/containers/environments.json (remote) cannot be deleted.\n"
+    it "knife delete /acls/containers/environments.json fails with a reasonable error" do
+      knife("delete /acls/containers/environments.json").should_fail "ERROR: /acls/containers/environments.json (remote) ACLs cannot be deleted.\n"
     end
 
-    it 'knife delete /containers/x.json succeeds' do
-      knife('delete /containers/x.json').should_succeed "Deleted /containers/x.json\n"
-      knife('raw /containers/x.json').should_fail(/404/)
+    it "knife delete /containers/x.json succeeds" do
+      knife("delete /containers/x.json").should_succeed "Deleted /containers/x.json\n"
+      knife("raw /containers/x.json").should_fail(/404/)
     end
 
-    it 'knife delete /groups/x.json succeeds' do
-      knife('delete /groups/x.json').should_succeed "Deleted /groups/x.json\n"
-      knife('raw /groups/x.json').should_fail(/404/)
+    it "knife delete /groups/x.json succeeds" do
+      knife("delete /groups/x.json").should_succeed "Deleted /groups/x.json\n"
+      knife("raw /groups/x.json").should_fail(/404/)
     end
 
-    it 'knife delete /org.json fails with a reasonable error' do
-      knife('delete /org.json').should_fail "ERROR: /org.json (remote) cannot be deleted.\n"
+    it "knife delete /policies/x-1.2.3.json succeeds" do
+      knife("raw /policies/x/revisions/1.2.3").should_succeed "{\n  \"name\": \"x\",\n  \"revision_id\": \"1.2.3\",\n  \"run_list\": [\n\n  ],\n  \"cookbook_locks\": {\n\n  }\n}\n"
+      knife("delete /policies/x-1.2.3.json").should_succeed "Deleted /policies/x-1.2.3.json\n"
+      knife("raw /policies/x/revisions/1.2.3").should_fail(/404/)
     end
 
-    it 'knife delete /invitations.json fails with a reasonable error' do
-      knife('delete /invitations.json').should_fail "ERROR: /invitations.json (remote) cannot be deleted.\n"
+    it "knife delete /policy_groups/x.json succeeds" do
+      knife("raw /policy_groups/x").should_succeed "{\n  \"uri\": \"http://127.0.0.1:8900/organizations/foo/policy_groups/x\",\n  \"policies\": {\n    \"x\": {\n      \"revision_id\": \"1.2.3\"\n    }\n  }\n}\n"
+      knife("delete /policy_groups/x.json").should_succeed "Deleted /policy_groups/x.json\n"
+      knife("raw /policy_groups/x").should_fail(/404/)
     end
 
-    it 'knife delete /members.json fails with a reasonable error' do
-      knife('delete /members.json').should_fail "ERROR: /members.json (remote) cannot be deleted.\n"
+    it "knife delete /org.json fails with a reasonable error" do
+      knife("delete /org.json").should_fail "ERROR: /org.json (remote) cannot be deleted.\n"
+    end
+
+    it "knife delete /invitations.json fails with a reasonable error" do
+      knife("delete /invitations.json").should_fail "ERROR: /invitations.json (remote) cannot be deleted.\n"
+    end
+
+    it "knife delete /members.json fails with a reasonable error" do
+      knife("delete /members.json").should_fail "ERROR: /members.json (remote) cannot be deleted.\n"
     end
   end
 end