conjur-cli 4.19.0 → 4.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88cb451c93417c3943171c8948b0b8fca26e9faf
-  data.tar.gz: fec1d704173532741c53bfe76b81dd71286fe8d7
+  metadata.gz: 54829e90e9f47497bd87c30bdaa35c6004a91d64
+  data.tar.gz: b468b645050ddf11e00e2c111e87fc32dd9d2945
 SHA512:
-  metadata.gz: bdb26d0ec021d83bcdbcf176a6899584b0db21a010c841b3416ab58e3d105a3f89d3ce6591563d6d3869543cb5c58cb3716a0561277e35a72facfb02ecbac86e
-  data.tar.gz: a99ecb30867ea4090bc660b6836dc7ff19a95ddc2517fe20aafb7502f25c8dc481d8640dc5f0d59f1033b3414ce7b21b2b2a6f49a211da37dc9e702e8872c318
+  metadata.gz: e6750225d94caf197718145f90077f86b3e50dde0c8d8ba49d7e63db7cdb3fa3adf72c72eef3615a722a64486e1ce72aa5669fb820c56be0065abc4adac30d78
+  data.tar.gz: d1758ad2e32ed4a5161435edd98100399c466c85bfcff273c735fef1ec67a0ec889d5156ac184e0f555666d886912714f09171799be5be887ecda4009a1ebde6

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 4.20.1
+
+* Improve the error reporting
+
+# 4.20.0
+
+* GID manipulation commands
+
 # 4.19.0
 
 * Add command `conjur role graph` for batch retrieval of role relationships

data/Rakefile

@@ -16,6 +16,7 @@ task :jenkins => ['ci:setup:rspec', :spec, 'ci:setup:cucumber_report_cleanup'] d
   File.write('build_number', ENV['BUILD_NUMBER']) if ENV['BUILD_NUMBER']
 end
 
+desc "Generate the update completions file"
 task :completions do
   # having 'lib' in the load path, which happens to be the case when running rake,
   # messes up GLIs commands_from

data/bin/_conjur_completions.yaml

@@ -27,6 +27,8 @@
   :create: true
   :list: true
   :show: true
+  :update: true
+  :gidsearch: true
   :retire: true
   :members:
     :list: true
@@ -80,6 +82,7 @@
   :members: true
   :grant_to: true
   :revoke_from: true
+  :graph: true
 :script:
   :execute: true
 :secret:

data/conjur.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
 
   gem.add_dependency 'activesupport'
-  gem.add_dependency 'conjur-api', '~> 4.12.0'
+  gem.add_dependency 'conjur-api', '~> 4.13.0'
   gem.add_dependency 'gli', '>=2.8.0'
   gem.add_dependency 'highline'
   gem.add_dependency 'netrc', '~> 0.10.2'

data/lib/conjur/cli.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Conjur Inc
+# Copyright (C) 2013-2015 Conjur Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -121,19 +121,20 @@ module Conjur
     
     on_error do |exception|
       require 'rest-client'
-      if exception.is_a?(RestClient::Exception)
-        begin
-          body = JSON.parse(exception.response.body)
-          $stderr.puts body['error']
-        rescue
-          $stderr.puts exception.response.body if exception.response
+      require 'patches/conjur/error'
+
+      run_default_handler = true
+      if exception.is_a?(RestClient::Exception) && exception.response
+        err = Conjur::Error.create exception.response.body
+        if err
+          $stderr.puts "error: " + err.message
+          run_default_handler = false # suppress default error message
+        else
+          $stderr.puts exception.response.body
         end
       end
-      require 'conjur/log'
-      if Conjur.log
-        Conjur.log << "error: #{exception}\n#{exception.backtrace.join("\n") rescue 'NO BACKTRACE?'}"
-      end
-      true
+
+      run_default_handler
     end
   end
 end

data/lib/conjur/command/groups.rb

@@ -32,11 +32,16 @@ class Conjur::Command::Groups < Conjur::Command
     group.desc "Create a new group"
     group.arg_name "id"
     group.command :create do |c|
+      c.desc "GID number to be associated with the group (optional)"
+      c.flag [:gidnumber]
+
       acting_as_option(c)
 
       c.action do |global_options,options,args|
         id = require_arg(args, 'id')
 
+        options[:gidnumber] = Integer(options[:gidnumber]) if options[:gidnumber]
+
         group = api.create_group(id, options)
         display(group, options)
       end
@@ -60,6 +65,30 @@ class Conjur::Command::Groups < Conjur::Command
       end
     end
     
+    group.desc "Update group's attributes (eg. gidnumber)"
+    group.arg_name "id"
+    group.command :update do |c|
+      c.desc "GID number to be associated with the group"
+      c.flag [:gidnumber]
+      c.action do |global_options, options, args|
+        id = require_arg(args, 'id')
+
+        options[:gidnumber] = Integer(options[:gidnumber])
+        api.group(id).update(options)
+
+        puts "GID set"
+      end
+    end
+
+    group.desc "Find groups by GID"
+    group.arg_name "gid"
+    group.command :gidsearch do |c|
+      c.action do |global_options, options, args|
+        gidnumber = Integer require_arg args, 'gid'
+        display api.find_groups(gidnumber: gidnumber)
+      end
+    end
+
     group.desc "Decommission a group"
     group.arg_name "id"
     group.command :retire do |c|

data/lib/conjur/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 Conjur Inc
+# Copyright (C) 2014-2015 Conjur Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -19,6 +19,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Conjur
-  VERSION = "4.19.0"
+  VERSION = "4.20.1"
   ::Version=VERSION
 end

data/lib/patches/conjur/error.rb

@@ -0,0 +1,96 @@
+# Copyright (C) 2015 Conjur Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# Conjur::Error is not in the API v4 because it breaks backwards compatibility.
+# Try to load it, and if not there, patch it in.
+begin
+  require 'conjur/error'
+rescue LoadError
+  # old API version
+  module Conjur
+    # Error class lifted from v5 branch of conjur-api.
+
+    # The base Conjur error class. Rescue it to catch errors generated by the Conjur services.
+    class Error < RuntimeError
+      # Create a new instance based on structured error info.
+      # @param [String] body JSON error information
+      # @return [Error, nil] the exception instance or nil if +body+ doesn't
+      #   contain valid error info
+      def self.create body
+        error = JSON.parse(body)['error']
+        kind = error['kind']
+        klass = const_defined?(kind) && const_get(kind) || self
+        klass.new error
+      rescue
+        nil
+      end
+
+      # @!attribute [r] message
+      # @return [String] human-readable error message, as returned by the Conjur service
+      # @see #details
+      def message
+        @error['message']
+      end
+
+      # @!attribute [r] details
+      # @return error details, as returned by the Conjur service
+      # @see #message
+      def details
+        @error['details']
+      end
+
+      # @!attribute [r] kind
+      # @return [String] error kind, as returned by the Conjur service
+      # @note Usually it will equal the class name.
+      def kind
+        @error['kind']
+      end
+
+      # Indicates that the looked up record does not exist.
+      class RecordNotFound < Error
+        # @!attribute [r] details
+        # @return [Hash<String, String>] error details:
+        #   - +'kind'+ of the searched object
+        #   - +'id'+ that is missing
+      end
+
+      # Indicates a missing argument for a method call.
+      class MissingArgument < Error
+        # @!attribute [r] details
+        # @return [String] name of the missing argument
+      end
+
+      # Indicates a name or identifier clash.
+      class UniqueConstraintViolation < Error
+        # @!attribute [r] details
+        # @return [Hash<String, String>] error details:
+        #   - +'value'+ that caused the clash
+        #   - +'field'+ in which the clash occurred
+        #   - +'kind'+ of an object being manipulated
+      end
+
+      private
+
+      def initialize error
+        @error = error
+        super message
+      end
+    end
+  end
+end

data/spec/command/groups_spec.rb

@@ -1,6 +1,33 @@
 require 'spec_helper'
 
 describe Conjur::Command::Groups, logged_in: true do
+  describe_command 'group create --gidnumber 12345 some-group' do
+    it "creates the group with a specified gidnumber" do
+      expect_any_instance_of(Conjur::API).to receive(:create_group).with('some-group', gidnumber: 12345).and_return "something"
+      expect { invoke }.to write "something"
+    end
+  end
+
+  describe_command 'group update --gidnumber 12345 some-group' do
+    it "updates the gid" do
+      expect_any_instance_of(Conjur::API).to \
+          receive(:group).with('some-group').and_return(group = double("group"))
+      expect(group).to receive(:update).with(gidnumber: 12_345)
+      expect { invoke }.to write "GID set"
+    end
+  end
+
+  context "lookup by GID" do
+    let(:search_result) { %w(g1 g2) }
+    describe_command "group gidsearch 12345" do
+      it "finds the groups" do
+        expect_any_instance_of(Conjur::API).to \
+            receive(:find_groups).with(gidnumber: 12_345).and_return search_result
+        expect { invoke }.to write(JSON.pretty_generate(search_result))
+      end
+    end
+  end
+
   describe_command "group:members:add group user:alice" do
     it "adds the role to the group" do
            expect(RestClient::Request).to receive(:execute).with(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 4.19.0
+  version: 4.20.1
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.13.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +318,7 @@ files:
 - lib/conjur/dsl/runner.rb
 - lib/conjur/identifier_manipulation.rb
 - lib/conjur/version.rb
+- lib/patches/conjur/error.rb
 - profile.rb
 - spec/authn_spec.rb
 - spec/command/assets_spec.rb