Fix Jenkins build: error when retrieving API key (#110)

cyberark · May 13, 2022 · 620d5bc · 620d5bc
1 parent f47127b
commit 620d5bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/bin/test.sh b/bin/test.sh
@@ -126,7 +126,7 @@ function runOssTests() {
 
   conjur_client_cid=$(docker-compose ps -q client)
 
-  api_key_admin=$(docker-compose exec -T conjur rails r "print Credentials['cucumber:user:admin'].api_key")
+  api_key_admin=$(docker-compose exec -T conjur conjurctl role retrieve-key cucumber:user:admin)
 
   # Execute OSS tests
   docker-compose run --rm \
@@ -141,9 +141,9 @@ function runOssHttpsTests() {
   echo "Running https tests"
   echo '------------------------------------------------------------'
 
-  api_key_admin=$(docker-compose exec -T conjur rails r "print Credentials['cucumber:user:admin'].api_key")
-  api_key_alice=$(docker-compose exec -T conjur rails r "print Credentials['cucumber:user:alice@test'].api_key")
-  api_key_myapp=$(docker-compose exec -T conjur rails r "print Credentials['cucumber:host:test/myapp'].api_key")
+  api_key_admin=$(docker-compose exec -T conjur conjurctl role retrieve-key cucumber:user:admin)
+  api_key_alice=$(docker-compose exec -T conjur conjurctl role retrieve-key cucumber:user:alice@test)
+  api_key_myapp=$(docker-compose exec -T conjur conjurctl role retrieve-key cucumber:host:test/myapp)
 
   echo 'api keys:'
   echo 'user admin api key = ' ${api_key_admin}

diff --git a/bin/utils.sh b/bin/utils.sh
@@ -23,7 +23,7 @@ function loadOssPolicy() {
 
   conjur_client_cid=$(docker-compose ps -q client)
 
-  api_key=$(docker-compose exec -T conjur rails r "print Credentials['cucumber:user:admin'].api_key")
+  api_key=$(docker-compose exec -T conjur conjurctl role retrieve-key cucumber:user:admin)
 
   # Copy test-policy into a /tmp/test-policy within the possum container
   docker cp test-policy ${conjur_client_cid}:/tmp