conjur-cli 6.0.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8e1fcb9f16178d7df4bb379b2040f8823399db19540754d87d61b81c8190e24
-  data.tar.gz: 3a36b197de69c0c3e0882eec341e407e0062df0e381e89e5579437344df0e3f6
+  metadata.gz: 0533b1c7e9164260ba4a86d41004a71811d24b034230909cbcb6967cc8ac71e5
+  data.tar.gz: 305ee4fc8b00b049b65eb7bd8742bd69d4bf41716c926291f21801b2139ce8f5
 SHA512:
-  metadata.gz: 23a42edf43a99b23b34389ec85333c6198b28790c31d24a8ef9edd83b627af3c3e0a83d5351797e89e4b3b1a0e2d4f5b678491b865533c33a7377c59f17f585f
-  data.tar.gz: 60c0c4ca64efae0bac433aaabe8f19a55245557d847e0d0172bd240acea07e2bb8ae7a5be8f7633fe37fad06bb2c26163ce6cb0f6c5d3992e1f5ca06e1013e1e
+  metadata.gz: f4bdae507abdcb0032bb312bbdba75fb5e6f94bc5292cfe773ee2ca691951ca3fe3616018b54bd9993e2d1f45bcb7ce5c7d87f9884f1d16e0d73e4dc238bddb3
+  data.tar.gz: 4a2d081ada6358818ec5b1607600e5b841e8d85bb3299da4fc9107a13bfc25700ebe72a1fbb3ac05b7b3dbf09834ec76b38df50def439292f958c5025bd4346a

data/Jenkinsfile

@@ -54,38 +54,39 @@ pipeline {
 
       when {
         expression { currentBuild.resultIsBetterOrEqualTo('SUCCESS') }
-        expression {
-          def exitCode = sh returnStatus: true, script: ''' set +x
-            echo "Determining if publishing is requested..."
-
-            VERSION=`cat lib/conjur/version.rb | grep \'VERSION\\s*=\' | sed -e "s/.*\'\\(.*\\)\'.*/\\1/"`
-            echo Declared version: $VERSION
-
-            # Jenkins git plugin is broken and always fetches with `--no-tags`
-            # (or `--tags`, neither of which is what you want), so tags end up
-            # not being fetched. Try to fix that.
-            # (Unfortunately this fetches all remote heads, so we may have to find
-            # another solution for bigger repos.)
-            git fetch -q
-
-            # note when tag not found git rev-parse will just print its name
-            TAG=`git rev-parse tags/v$VERSION 2>/dev/null || :`
-            echo Tag v$VERSION: $TAG
-
-            HEAD=`git rev-parse HEAD`
-            echo HEAD: $HEAD
-
-            test "$HEAD" = "$TAG"
-          '''
-          return exitCode == 0
-        }
+        // expression {
+        //   def exitCode = sh returnStatus: true, script: ''' set +x
+        //     echo "Determining if publishing is requested..."
+        //
+        //     VERSION=`cat lib/conjur/version.rb | grep \'VERSION\\s*=\' | sed -e "s/.*\'\\(.*\\)\'.*/\\1/"`
+        //     echo Declared version: $VERSION
+        //
+        //     # Jenkins git plugin is broken and always fetches with `--no-tags`
+        //     # (or `--tags`, neither of which is what you want), so tags end up
+        //     # not being fetched. Try to fix that.
+        //     # (Unfortunately this fetches all remote heads, so we may have to find
+        //     # another solution for bigger repos.)
+        //     git fetch -q
+        //
+        //     # note when tag not found git rev-parse will just print its name
+        //     # TAG=`git rev-parse tags/v$VERSION 2>/dev/null || :`
+        //     TAG=`git rev-list -n 1 "v$VERSION 2>/dev/null || :`
+        //     echo Tag v$VERSION: $TAG
+        //
+        //     HEAD=`git rev-parse HEAD`
+        //     echo HEAD: $HEAD
+        //
+        //     test "$HEAD" = "$TAG"
+        //   '''
+        //   return exitCode == 0
+        // }
       }
       steps {
         // Clean up first
         sh 'docker run -i --rm -v $PWD:/src -w /src alpine/git clean -fxd'
 
         sh './publish.sh'
-        
+
         // Clean up again...
         sh 'docker run -i --rm -v $PWD:/src -w /src alpine/git clean -fxd'
         deleteDir()

data/README.md

@@ -68,17 +68,31 @@ $ cd dev
 dev $ ./start.sh
 ```
 
-This will drop you into a bash shell in a container called `cli`. The sandbox also includes a Postgres container and Conjur server container. The environment is already setup to connect the CLI to the server:
+This will drop you into a bash shell in a container called `cli`.
+
+The sandbox also includes a Postgres container and Conjur server container. The
+environment is already setup to connect the CLI to the server:
 
 * **CONJUR_APPLIANCE_URL** `http://conjur`
 * **CONJUR_ACCOUNT** `cucumber`
 
-You can obtain the API key for the role `cucumber:user:admin` from the Docker logs of the Conjur container. Use it to login:
+To login to conjur, type the following and you'll be prompted for a password:
 
 ```sh-session
 root@2b5f618dfdcb:/# conjur authn login admin
 Please enter admin's password (it will not be echoed):
-Logged in
+```
+
+The required password is the API key at the end of the output from the
+`start.sh` script.  It looks like this:
+
+```
+=============== LOGIN WITH THESE CREDENTIALS ===============
+
+username: admin
+api key : 9j113d35wag023rq7tnv201rsym1jg4pev1t1nb4419767ms1cnq00n
+
+============================================================
 ```
 
 At this point, you can use any CLI command you like.

data/VERSION

@@ -1 +1 @@
-6.0.1
+6.1.0

data/conjur-cli.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.version       = Conjur::VERSION
 
   gem.add_dependency 'activesupport', '>= 4.2', '< 6'
-  gem.add_dependency 'conjur-api', '~> 5.0'
+  gem.add_dependency 'conjur-api', '~> 5.1'
   gem.add_dependency 'gli', '>=2.8.0'
   gem.add_dependency 'highline', '~> 1.7'
   gem.add_dependency 'netrc', '~> 0.10'

data/dev/start.sh

@@ -1,4 +1,5 @@
-#!/bin/bash -ex
+#!/bin/bash
+set -ex
 
 export COMPOSE_PROJECT_NAME=clirubydev
 
@@ -7,9 +8,28 @@ docker-compose build
 if [ ! -f data_key ]; then
 	echo "Generating data key"
 	docker-compose run --no-deps --rm conjur data-key generate > data_key
+	docker-compose run --no-deps --rm conjurctl role retrieve-key cucumber:user:admin
 fi
 
-export POSSUM_DATA_KEY="$(cat data_key)"
+export CONJUR_DATA_KEY="$(cat data_key)"
 
 docker-compose up -d
+docker-compose exec conjur conjurctl wait
+
+apikey=$(docker-compose exec conjur \
+  conjurctl role retrieve-key cucumber:user:admin)
+
+set +x
+echo ''
+echo ''
+echo '=============== LOGIN WITH THESE CREDENTIALS ==============='
+echo ''
+echo 'username: admin'
+echo "api key : ${apikey}"
+echo ''
+echo '============================================================'
+echo ''
+echo ''
+set -x
+
 docker-compose exec cli bash

data/lib/conjur/version.rb

@@ -19,6 +19,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Conjur
-  VERSION = '6.0.1'
+  VERSION = '6.1.0'
   ::Version=VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.1.0
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement