conjur-cli 2.4.0 → 2.4.1

data/lib/conjur/cli.rb

@@ -50,7 +50,7 @@ module Conjur
       if as_role = options.delete(:"as-role")
         role = Conjur::Command.api.role(as_role)
         exit_now!("Role '#{as_role}' does not exist, or you don't have permission to use it") unless role.exists?
-        options[:"ownerid"] = role.id
+        options[:"ownerid"] = role.roleid
       end
       
       true

data/lib/conjur/command/resources.rb

@@ -14,6 +14,11 @@ class Conjur::Command::Resources < Conjur::Command
       kind = require_arg(args, "kind")
       id = require_arg(args, "resource-id")
       resource = api.resource([ conjur_account, kind, id ].join(':'))
+
+      if ownerid = options.delete(:ownerid)
+        options[:acting_as] = ownerid
+      end
+
       resource.create(options)
       display resource.attributes
     end

data/lib/conjur/command/roles.rb

@@ -12,6 +12,11 @@ class Conjur::Command::Roles < Conjur::Command
     c.action do |global_options,options,args|
       id = require_arg(args, 'role')
       role = api.role(id)
+      
+      if ownerid = options.delete(:ownerid)
+        options[:acting_as] = ownerid
+      end
+      
       role.create(options)
       puts "Created #{role}"
     end
@@ -41,11 +46,11 @@ class Conjur::Command::Roles < Conjur::Command
   arg_name "role"
   command :members do |c|
     c.desc "Verbose output"
-    c.switch [:v,:verbose]
+    c.switch [:V,:verbose]
     
     c.action do |global_options,options,args|
       role = args.shift || api.user(api.username).roleid
-      result = if options[:v]
+      result = if options[:V]
         api.role(role).members.collect {|member|
           {
             member: member.member.roleid,

data/lib/conjur/version.rb

@@ -1,3 +1,3 @@
 module Conjur
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end

data/spec/command/roles_spec.rb

@@ -1,40 +1,72 @@
 require 'spec_helper'
 
 describe Conjur::Command::Roles, logged_in: true do
-  let(:all_roles) { %w(foo:user:joerandom foo:something:cool foo:something:else foo:group:admins) }
-  let(:role) do
-    double "the role", all: all_roles.map{|r| double r, roleid: r }
-  end
-
-  before do
-    api.stub(:role).with(rolename).and_return role
-  end
 
-  context "when logged in as a user" do
-    let(:username) { "joerandom" }
-    let(:rolename) { "user:joerandom" }
-
-    describe_command "role:memberships" do
-      it "lists all roles" do
-        JSON::parse(expect { invoke }.to write).should == all_roles
+  describe "role:create" do
+    describe_command "role:create test:the-role" do
+      it "creates the role with no options" do
+        Conjur::Role.any_instance.should_receive(:create).with({})
+        
+        invoke
       end
     end
-
-    describe_command "role:memberships foo:bar" do
-      let(:rolename) { 'foo:bar' }
-      it "lists all roles of foo:bar" do
-        JSON::parse(expect { invoke }.to write).should == all_roles
+    describe_command "role:create --as-role test:foo test:the-role" do
+      it "creates the role with acting_as option" do
+        api.should_receive(:role).with("test:foo").and_return double("test:foo", exists?: true, roleid: "test:test:foo")
+        api.should_receive(:role).with("test:the-role").and_return role = double("new-role")
+        role.should_receive(:create).with({acting_as: "test:test:foo"})
+        
+        invoke
+      end
+    end
+    describe_command "role:create --as-group the-group test:the-role" do
+      it "creates the role with with acting_as option" do
+        api.should_receive(:group).with("the-group").and_return group = double("the-group", roleid: "test:group:the-group")
+        api.should_receive(:role).with(group.roleid).and_return double("group:the-group", exists?: true, roleid: "test:group:the-group")
+        api.should_receive(:role).with("test:the-role").and_return role = double("new-role")
+        role.should_receive(:create).with({acting_as: "test:group:the-group"})
+        
+        invoke
       end
     end
   end
 
-  context "when logged in as a host" do
-    let(:username) { "host/foobar" }
-    let(:rolename) { "host:foobar" }
+  describe "role:memberships" do
+    let(:all_roles) { %w(foo:user:joerandom foo:something:cool foo:something:else foo:group:admins) }
+    let(:role) do
+      double "the role", all: all_roles.map{|r| double r, roleid: r }
+    end
+  
+    before do
+      api.stub(:role).with(rolename).and_return role
+    end
 
-    describe_command "role:memberships" do
-      it "lists all roles" do
-        JSON::parse(expect { invoke }.to write).should == all_roles
+    context "when logged in as a user" do
+      let(:username) { "joerandom" }
+      let(:rolename) { "user:joerandom" }
+      
+      describe_command "role:memberships" do
+        it "lists all roles" do
+          JSON::parse(expect { invoke }.to write).should == all_roles
+        end
+      end
+  
+      describe_command "role:memberships foo:bar" do
+        let(:rolename) { 'foo:bar' }
+        it "lists all roles of foo:bar" do
+          JSON::parse(expect { invoke }.to write).should == all_roles
+        end
+      end
+    end
+  
+    context "when logged in as a host" do
+      let(:username) { "host/foobar" }
+      let(:rolename) { "host:foobar" }
+  
+      describe_command "role:memberships" do
+        it "lists all roles" do
+          JSON::parse(expect { invoke }.to write).should == all_roles
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -246,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2076572012475465536
+      hash: -619613034249408123
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2076572012475465536
+      hash: -619613034249408123
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25