cheffish 0.7.1 → 0.8

data/spec/integration/chef_client_spec.rb

@@ -8,67 +8,101 @@ repo_path = Dir.mktmpdir('chef_repo')
 describe Chef::Resource::ChefClient do
   extend SpecSupport
 
-  when_the_chef_server 'is empty' do
-    context 'and we have a private key with a path' do
-      with_recipe do
-        private_key "#{repo_path}/blah.pem"
-      end
+  when_the_chef_server 'is in multi-org mode', :osc_compat => false, :single_org => false do
+    organization 'foo'
+
+    before :each do
+      Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, '/organizations/foo').to_s
+    end
+
+    context 'and is empty' do
+      context 'and we have a private key with a path' do
+        with_recipe do
+          private_key "#{repo_path}/blah.pem"
+        end
+
+        context 'and we run a recipe that creates client "blah"' do
+          with_converge do
+            chef_client 'blah' do
+              source_key_path "#{repo_path}/blah.pem"
+            end
+          end
 
-      context 'and we run a recipe that creates client "blah"' do
-        with_converge do
-          chef_client 'blah' do
-            source_key_path "#{repo_path}/blah.pem"
+          it 'the client gets created' do
+            expect(chef_run).to have_updated 'chef_client[blah]', :create
+            client = get('clients/blah')
+            expect(client['name']).to eq('blah')
+            key, format = Cheffish::KeyFormatter.decode(client['public_key'])
+            expect(key).to be_public_key_for("#{repo_path}/blah.pem")
           end
         end
 
-        it 'the client gets created' do
-          expect(chef_run).to have_updated 'chef_client[blah]', :create
-          client = get('/clients/blah')
-          expect(client['name']).to eq('blah')
-          key, format = Cheffish::KeyFormatter.decode(client['public_key'])
-          expect(key).to be_public_key_for("#{repo_path}/blah.pem")
+        context 'and we run a recipe that creates client "blah" with output_key_path' do
+          with_converge do
+            chef_client 'blah' do
+              source_key_path "#{repo_path}/blah.pem"
+              output_key_path "#{repo_path}/blah.pub"
+            end
+          end
+
+          it 'the output public key gets created' do
+            expect(IO.read("#{repo_path}/blah.pub")).to start_with('ssh-rsa ')
+            expect("#{repo_path}/blah.pub").to be_public_key_for("#{repo_path}/blah.pem")
+          end
         end
       end
 
-      context 'and we run a recipe that creates client "blah" with output_key_path' do
-        with_converge do
-          chef_client 'blah' do
-            source_key_path "#{repo_path}/blah.pem"
-            output_key_path "#{repo_path}/blah.pub"
-          end
+      context "and a private_key 'blah' resource" do
+        before :each do
+          Chef::Config.private_key_paths = [ repo_path ]
         end
 
-        it 'the output public key gets created' do
-          expect(IO.read("#{repo_path}/blah.pub")).to start_with('ssh-rsa ')
-          expect("#{repo_path}/blah.pub").to be_public_key_for("#{repo_path}/blah.pem")
+        with_recipe do
+          private_key 'blah'
         end
-      end
-    end
 
-    context "and a private_key 'blah' resource" do
-      before :each do
-        Chef::Config.private_key_paths = [ repo_path ]
-      end
+        context "and a chef_client 'foobar' resource with source_key_path 'blah'" do
+          with_converge do
+            chef_client 'foobar' do
+              source_key_path 'blah'
+            end
+          end
 
-      with_recipe do
-        private_key 'blah'
-      end
+          it 'the client is accessible via the given private key' do
+            expect(chef_run).to have_updated 'chef_client[foobar]', :create
+            client = get('clients/foobar')
+            key, format = Cheffish::KeyFormatter.decode(client['public_key'])
+            expect(key).to be_public_key_for("#{repo_path}/blah.pem")
 
-      context "and a chef_client 'foobar' resource with source_key_path 'blah'" do
-        with_converge do
-          chef_client 'foobar' do
-            source_key_path 'blah'
+            private_key = Cheffish::KeyFormatter.decode(Cheffish.get_private_key('blah'))
+            expect(key).to be_public_key_for(private_key)
           end
         end
+      end
+    end
+  end
 
-        it 'the client is accessible via the given private key' do
-          expect(chef_run).to have_updated 'chef_client[foobar]', :create
-          client = get('/clients/foobar')
-          key, format = Cheffish::KeyFormatter.decode(client['public_key'])
-          expect(key).to be_public_key_for("#{repo_path}/blah.pem")
+  when_the_chef_server 'is in OSC mode' do
+    context 'and is empty' do
+      context 'and we have a private key with a path' do
+        with_recipe do
+          private_key "#{repo_path}/blah.pem"
+        end
 
-          private_key = Cheffish::KeyFormatter.decode(Cheffish.get_private_key('blah'))
-          expect(key).to be_public_key_for(private_key)
+        context 'and we run a recipe that creates client "blah"' do
+          with_converge do
+            chef_client 'blah' do
+              source_key_path "#{repo_path}/blah.pem"
+            end
+          end
+
+          it 'the client gets created' do
+            expect(chef_run).to have_updated 'chef_client[blah]', :create
+            client = get('clients/blah')
+            expect(client['name']).to eq('blah')
+            key, format = Cheffish::KeyFormatter.decode(client['public_key'])
+            expect(key).to be_public_key_for("#{repo_path}/blah.pem")
+          end
         end
       end
     end

data/spec/integration/chef_container_spec.rb

@@ -0,0 +1,34 @@
+require 'support/spec_support'
+require 'chef/resource/chef_container'
+require 'chef/provider/chef_container'
+
+describe Chef::Resource::ChefContainer do
+  extend SpecSupport
+
+  when_the_chef_server 'is in multi-org mode', :osc_compat => false, :single_org => false do
+    organization 'foo'
+
+    before :each do
+      Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, '/organizations/foo').to_s
+    end
+
+    it 'Converging chef_container "x" creates the container' do
+      run_recipe do
+        chef_container 'x'
+      end
+      expect(chef_run).to have_updated('chef_container[x]', :create)
+      expect { get('containers/x') }.not_to raise_error
+    end
+
+    context 'and already has a container named x' do
+      container 'x', {}
+
+      it 'Converging chef_container "x" changes nothing' do
+        run_recipe do
+          chef_container 'x'
+        end
+        expect(chef_run).not_to have_updated('chef_container[x]', :create)
+      end
+    end
+  end
+end

data/spec/integration/chef_group_spec.rb

@@ -0,0 +1,324 @@
+require 'support/spec_support'
+require 'chef/resource/chef_group'
+require 'chef/provider/chef_group'
+
+describe Chef::Resource::ChefGroup do
+  extend SpecSupport
+
+  when_the_chef_server 'is in multi-org mode', :osc_compat => false, :single_org => false do
+    organization 'foo'
+
+    before :each do
+      Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, '/organizations/foo').to_s
+    end
+
+    context 'and is empty' do
+      group 'g', {}
+      user 'u', {}
+      client 'c', {}
+
+      it 'Converging chef_group "x" creates the group with no members' do
+        run_recipe do
+          chef_group 'x'
+        end
+        expect(chef_run).to have_updated('chef_group[x]', :create)
+        expect(get('groups/x')).to eq({
+          'name' => 'x',
+          'groupname' => 'x',
+          'orgname' => 'foo',
+          'actors'  => [],
+          'groups'  => [],
+          'users'   => [],
+          'clients' => []
+        })
+      end
+
+      it 'chef_group "x" action :delete does nothing' do
+        run_recipe do
+          chef_group 'x' do
+            action :delete
+          end
+        end
+        expect(chef_run).not_to have_updated('chef_group[x]', :delete)
+        expect(chef_run).not_to have_updated('chef_group[x]', :create)
+        expect { get('groups/x') }.to raise_error(Net::HTTPServerException)
+      end
+
+      it 'Converging chef_group "x" creates the group with the given members' do
+        run_recipe do
+          chef_group 'x' do
+            groups 'g'
+            users 'u'
+            clients 'c'
+          end
+        end
+        expect(chef_run).to have_updated('chef_group[x]', :create)
+        expect(get('groups/x')).to eq({
+          'name' => 'x',
+          'groupname' => 'x',
+          'orgname' => 'foo',
+          'actors'  => %w(c u),
+          'groups'  => %w(g),
+          'users'   => %w(u),
+          'clients' => %w(c)
+        })
+      end
+    end
+
+    context 'and has a group named x' do
+      group 'g', {}
+      group 'g2', {}
+      group 'g3', {}
+      group 'g4', {}
+      user 'u', {}
+      user 'u2', {}
+      user 'u3', {}
+      user 'u4', {}
+      client 'c', {}
+      client 'c2', {}
+      client 'c3', {}
+      client 'c4', {}
+
+      group 'x', {
+        'users' => %w(u u2),
+        'clients' => %w(c c2),
+        'groups' => %w(g g2)
+      }
+
+      it 'Converging chef_group "x" changes nothing' do
+        run_recipe do
+          chef_group 'x'
+        end
+        expect(chef_run).not_to have_updated('chef_group[x]', :create)
+        expect(get('groups/x')).to eq({
+          'name' => 'x',
+          'groupname' => 'x',
+          'orgname' => 'foo',
+          'actors'  => %w(c c2 u u2),
+          'groups'  => %w(g g2),
+          'users'   => %w(u u2),
+          'clients' => %w(c c2)
+        })
+      end
+
+      it 'chef_group "x" action :delete deletes the group' do
+        run_recipe do
+          chef_group 'x' do
+            action :delete
+          end
+        end
+        expect(chef_run).to have_updated('chef_group[x]', :delete)
+        expect { get('groups/x') }.to raise_error(Net::HTTPServerException)
+      end
+
+      it 'Converging chef_group "x" with existing users changes nothing' do
+        run_recipe do
+          chef_group 'x' do
+            users 'u'
+            clients 'c'
+            groups 'g'
+          end
+        end
+        expect(chef_run).not_to have_updated('chef_group[x]', :create)
+        expect(get('groups/x')).to eq({
+          'name' => 'x',
+          'groupname' => 'x',
+          'orgname' => 'foo',
+          'actors'  => %w(c c2 u u2),
+          'groups'  => %w(g g2),
+          'users'   => %w(u u2),
+          'clients' => %w(c c2)
+        })
+      end
+
+      it 'Converging chef_group "x" adds new users' do
+        run_recipe do
+          chef_group 'x' do
+            users 'u3'
+            clients 'c3'
+            groups 'g3'
+          end
+        end
+        expect(chef_run).to have_updated('chef_group[x]', :create)
+        expect(get('groups/x')).to eq({
+          'name' => 'x',
+          'groupname' => 'x',
+          'orgname' => 'foo',
+          'actors'  => %w(c c2 c3 u u2 u3),
+          'groups'  => %w(g g2 g3),
+          'users'   => %w(u u2 u3),
+          'clients' => %w(c c2 c3)
+        })
+      end
+
+      it 'Converging chef_group "x" with multiple users adds new users' do
+        run_recipe do
+          chef_group 'x' do
+            users 'u3', 'u4'
+            clients 'c3', 'c4'
+            groups 'g3', 'g4'
+          end
+        end
+        expect(chef_run).to have_updated('chef_group[x]', :create)
+        expect(get('groups/x')).to eq({
+          'name' => 'x',
+          'groupname' => 'x',
+          'orgname' => 'foo',
+          'actors'  => %w(c c2 c3 c4 u u2 u3 u4),
+          'groups'  => %w(g g2 g3 g4),
+          'users'   => %w(u u2 u3 u4),
+          'clients' => %w(c c2 c3 c4)
+        })
+      end
+
+      it 'Converging chef_group "x" with multiple users in an array adds new users' do
+        run_recipe do
+          chef_group 'x' do
+            users [ 'u3', 'u4' ]
+            clients [ 'c3', 'c4' ]
+            groups [ 'g3', 'g4' ]
+          end
+        end
+        expect(chef_run).to have_updated('chef_group[x]', :create)
+        expect(get('groups/x')).to eq({
+          'name' => 'x',
+          'groupname' => 'x',
+          'orgname' => 'foo',
+          'actors'  => %w(c c2 c3 c4 u u2 u3 u4),
+          'groups'  => %w(g g2 g3 g4),
+          'users'   => %w(u u2 u3 u4),
+          'clients' => %w(c c2 c3 c4)
+        })
+      end
+
+      it 'Converging chef_group "x" with multiple users declarations adds new users' do
+        run_recipe do
+          chef_group 'x' do
+            users 'u3'
+            users 'u4'
+            clients 'c3'
+            clients 'c4'
+            groups 'g3'
+            groups 'g4'
+          end
+        end
+        expect(chef_run).to have_updated('chef_group[x]', :create)
+        expect(get('groups/x')).to eq({
+          'name' => 'x',
+          'groupname' => 'x',
+          'orgname' => 'foo',
+          'actors'  => %w(c c2 c3 c4 u u2 u3 u4),
+          'groups'  => %w(g g2 g3 g4),
+          'users'   => %w(u u2 u3 u4),
+          'clients' => %w(c c2 c3 c4)
+        })
+      end
+
+      it 'Converging chef_group "x" removes desired users' do
+        run_recipe do
+          chef_group 'x' do
+            remove_users 'u2'
+            remove_clients 'c2'
+            remove_groups 'g2'
+          end
+        end
+        expect(chef_run).to have_updated('chef_group[x]', :create)
+        expect(get('groups/x')).to eq({
+          'name' => 'x',
+          'groupname' => 'x',
+          'orgname' => 'foo',
+          'actors'  => %w(c u),
+          'groups'  => %w(g),
+          'users'   => %w(u),
+          'clients' => %w(c)
+        })
+      end
+
+      it 'Converging chef_group "x" with multiple users removes desired users' do
+        run_recipe do
+          chef_group 'x' do
+            remove_users 'u', 'u2'
+            remove_clients 'c', 'c2'
+            remove_groups 'g', 'g2'
+          end
+        end
+        expect(chef_run).to have_updated('chef_group[x]', :create)
+        expect(get('groups/x')).to eq({
+          'name' => 'x',
+          'groupname' => 'x',
+          'orgname' => 'foo',
+          'actors'  => [],
+          'groups'  => [],
+          'users'   => [],
+          'clients' => []
+        })
+      end
+
+      it 'Converging chef_group "x" with multiple users in an array removes desired users' do
+        run_recipe do
+          chef_group 'x' do
+            remove_users [ 'u', 'u2' ]
+            remove_clients [ 'c', 'c2' ]
+            remove_groups [ 'g', 'g2' ]
+          end
+        end
+        expect(chef_run).to have_updated('chef_group[x]', :create)
+        expect(get('groups/x')).to eq({
+          'name' => 'x',
+          'groupname' => 'x',
+          'orgname' => 'foo',
+          'actors'  => [],
+          'groups'  => [],
+          'users'   => [],
+          'clients' => []
+        })
+      end
+
+      it 'Converging chef_group "x" with multiple remove_ declarations removes desired users' do
+        run_recipe do
+          chef_group 'x' do
+            remove_users 'u'
+            remove_users 'u2'
+            remove_clients 'c'
+            remove_clients 'c2'
+            remove_groups 'g'
+            remove_groups 'g2'
+          end
+        end
+        expect(chef_run).to have_updated('chef_group[x]', :create)
+        expect(get('groups/x')).to eq({
+          'name' => 'x',
+          'groupname' => 'x',
+          'orgname' => 'foo',
+          'actors'  => [],
+          'groups'  => [],
+          'users'   => [],
+          'clients' => []
+        })
+      end
+
+      it 'Converging chef_group "x" adds and removes desired users' do
+        run_recipe do
+          chef_group 'x' do
+            users 'u3'
+            clients 'c3'
+            groups 'g3'
+            remove_users 'u'
+            remove_clients 'c'
+            remove_groups 'g'
+          end
+        end
+        expect(chef_run).to have_updated('chef_group[x]', :create)
+        expect(get('groups/x')).to eq({
+          'name' => 'x',
+          'groupname' => 'x',
+          'orgname' => 'foo',
+          'actors'  => %w(c2 c3 u2 u3),
+          'groups'  => %w(g2 g3),
+          'users'   => %w(u2 u3),
+          'clients' => %w(c2 c3)
+        })
+      end
+    end
+  end
+end