Bump conjur api 4957 (#214)

* Fix bug in start script and echo API key

* Update README

* Bump conjur-api to 5.1

* Bump VERSION number

Author: jonahx

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.

VERSION

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

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'

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