conjur-cli 6.2.3 → 6.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f9205266f63971061682c1413768e43adcaef56cb4c26e644182cdb005d4e77
-  data.tar.gz: a186291efd20d3b04d4ff670b490879a9c8839ac0a1d24672cc924286878137e
+  metadata.gz: a430b83a83643bf129f213a63931ff989ec59a28dbb8391f9e3ee6a616d756fa
+  data.tar.gz: 844a47f03073f23efdcbfb53fcf03c673cfaa6bbe65a806148b386870ff1aa85
 SHA512:
-  metadata.gz: a8cc5db1bd5c26343ea8cdce5c17f945a6ce27fb13e2acec3234461e6d5abe4a5e22ab990e4162dbf768a8ce738753b5e3131a3d5d4dc4f00eb693451a2cbea8
-  data.tar.gz: 6eadbec2ee56021b5f84d1a4f0e47352034f7a70295d75dff6cbde8dbe879d80283f856fc6792f6d3080311647b845ac53ae02e5b9c15be824eb7f3c8a29b3d7
+  metadata.gz: 38d0b11e66da5052391604861b7b402e2313c0d80d880f9f03698cc751dd0ac216a518c30fdd9d145b3002ce0f89ea14bb8e1f226470827f1c6e57a4609f1033
+  data.tar.gz: 26bd3810c8c343b2f9f414418b6980c6cbc02fd354e86cc2aa27f855200f4474dd7f812e0a124aab70be04c3d4d2b57b7c34d8cc69dea8e9c450e6fdc7d6cf37

data/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [6.2.4] - 2021-07-01
+### Changed
+- Upgraded `conjur-api` dependency to 5.3.5.
+  [cyberark/conjur-cli#310](https://github.com/cyberark/conjur-cli/issues/310)
+
 ## [6.2.3] - 2020-12-22
 ### Fixed
 - The Conjur CLI now raises a proper error when trying to rotate a non-existing
@@ -54,7 +59,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - **Codebase forked: for changes to the 5.x (API [v4](https://github.com/cyberark/conjur-cli/tree/v4)) series, see
   [CHANGELOG in `v4` branch][v4-changelog](https://github.com/cyberark/conjur-cli/blob/v4/CHANGELOG.md)**
 
-[Unreleased]: https://github.com/cyberark/conjur-cli/compare/v6.2.3...HEAD
+[Unreleased]: https://github.com/cyberark/conjur-cli/compare/v6.2.4...HEAD
+[6.2.4]: https://github.com/cyberark/conjur-cli/compare/v6.2.3...v6.2.4
 [6.2.3]: https://github.com/cyberark/conjur-cli/compare/v6.2.2...v6.2.3
 [6.2.2]: https://github.com/cyberark/conjur-cli/compare/v6.2.1...v6.2.2
 [6.2.1]: https://github.com/cyberark/conjur-cli/compare/v6.2.0...v6.2.1

data/CONTRIBUTING.md

@@ -72,7 +72,7 @@ root@2b5f618dfdcb:/usr/src/cli-ruby# cucumber
 ## Releasing
 
 To create a new release, follow the instructions in our general release
-guidelines [here](https://github.com/cyberark/community/blob/master/Conjur/CONTRIBUTING.md#release-process).
+guidelines [here](https://github.com/cyberark/community/blob/main/Conjur/CONTRIBUTING.md#release-process).
 
 Note: this project documents the version in two places:
 - The [VERSION](./VERSION) file

data/Jenkinsfile

@@ -26,9 +26,9 @@ pipeline {
       }
     }
 
-    stage('Test 2.4') {
+    stage('Test 2.5') {
       environment {
-        RUBY_VERSION = '2.4'
+        RUBY_VERSION = '2.5'
       }
 
       steps {
@@ -42,9 +42,9 @@ pipeline {
       }
     }
 
-    stage('Test 2.5') {
+    stage('Test 2.6') {
       environment {
-        RUBY_VERSION = '2.5'
+        RUBY_VERSION = '2.6'
       }
 
       steps {
@@ -58,9 +58,9 @@ pipeline {
       }
     }
 
-    stage('Test 2.6') {
+    stage('Test 2.7') {
       environment {
-        RUBY_VERSION = '2.6'
+        RUBY_VERSION = '2.7'
       }
 
       steps {

data/README.md

@@ -9,7 +9,7 @@ A complete reference guide is available at [conjur.org](https://www.conjur.org).
 ## Table of Contents
 - [Getting Started](#getting-started)
     - [Quick Start](#quick-start)
-    - [Using This Project With Conjur OSS](#Using-conjur-cli-with-Conjur-OSS)
+    - [Using This Project With Conjur Open Source](#Using-conjur-cli-with-Conjur-Open-Source)
 - [Using Docker](#using-docker)
 - [Usage](#usage)
 - [Contributing](#contributing)
@@ -26,9 +26,9 @@ $ conjur -v
 conjur version 6.0.0
 ```
 
-### Using conjur-cli with Conjur OSS 
+### Using conjur-cli with Conjur Open Source 
 
-Are you using this project with [Conjur OSS](https://github.com/cyberark/conjur)? Then we 
+Are you using this project with [Conjur Open Source](https://github.com/cyberark/conjur)? Then we 
 **strongly** recommend choosing the version of this project to use from the latest [Conjur OSS 
 suite release](https://docs.conjur.org/Latest/en/Content/Overview/Conjur-OSS-Suite-Overview.html). 
 Conjur maintainers perform additional testing on the suite release versions to ensure 
@@ -361,7 +361,7 @@ COMMANDS
 We welcome contributions of all kinds to this repository. For instructions on how to get started and descriptions of our development workflows, please see our [contributing
 guide][contrib].
 
-[contrib]: https://github.com/cyberark/conjur/blob/master/CONTRIBUTING.md
+[contrib]: https://github.com/cyberark/conjur-cli/blob/main/CONTRIBUTING.md
 
 ## License
 

data/VERSION

@@ -1 +1 @@
-6.2.3
+6.2.4

data/jenkins.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 # Constants
-RUBY_VERSION_DEFAULT="2.2.4"
+RUBY_VERSION_DEFAULT="2.7"
 
 # Arguments
 RUBY_VERSION=${1-${RUBY_VERSION_DEFAULT}}

data/lib/conjur/command/rspec/describe_command.rb

@@ -5,15 +5,34 @@ RSpec::Core::DSL.change_global_dsl do
         
       before do
         allow(cert_store).to receive(:add_file)
+        # Stub the constant OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE which is
+        # implicitly used in many places in the CLI and in conjur-api-ruby as the de facto
+        # cert store.
         stub_const 'OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE', cert_store
+
+        # Reset the rest_client_options defaults to avoid using expired rspec doubles.
+        #
+        # Conjur.configuration is a lazy-loaded singleton. There is single CLI instance
+        # shared across this test suite. When Conjur.configuration is loaded for the first
+        # time it assumes the defaults value for Conjur.configuration.rest_client_options
+        # of:
+        # {
+        #  :ssl_cert_store => OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE
+        # }
+        #
+        # Notice above that each test case stubs the constant
+        # OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE with a double. Without further
+        # modification this means the first time the CLI is run and Conjur.configuration
+        # is loaded Conjur.configuration.rest_client_options[:ssl_cert_store] it is set to
+        # the double associated with the test case at that point in time. Since
+        # Conjur.configuration is only loaded once, without modification, that double will
+        # be retained and its usage will result in a RSpec::Mocks::ExpiredTestDoubleError.
+        # To avoid this for each test case we must reset
+        # Conjur.configuration.rest_client_options[:ssl_cert_store] with the double for
+        # the current test case.
+        Conjur.configuration.rest_client_options[:ssl_cert_store] = cert_store
       end
-      
-      let(:cert_store_options) do
-        {
-          ssl_cert_store: cert_store
-        }
-      end
-      
+
       let(:invoke) do
         Conjur::CLI.error_device = $stderr
         # TODO: allow proper handling of description like "audit:send 'hello world'"

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.2.3'
+  VERSION = '6.2.4'
   ::Version=VERSION
 end

data/spec/command/hosts_spec.rb

@@ -13,6 +13,7 @@ describe Conjur::Command::Hosts, logged_in: true do
             authorization: "fakeauth",
           },
           username: "dknuth",
+          ssl_cert_store: cert_store
         }).and_return true
         expect(RestClient::Request).to receive(:execute).with({
             method: :put,
@@ -22,6 +23,7 @@ describe Conjur::Command::Hosts, logged_in: true do
             },
             payload: '',
             username: "dknuth",
+            ssl_cert_store: cert_store
         }).and_return double(:response, body: 'new api key')
       end
 
@@ -37,6 +39,7 @@ describe Conjur::Command::Hosts, logged_in: true do
                   url: "https://core.example.com/api/resources/#{account}/host/non-existing",
                   headers: {authorization: "fakeauth"},
                   username: username,
+                  ssl_cert_store: cert_store
               }).and_raise RestClient::ResourceNotFound
       end
       it 'rotate_api_key with non-existing --host option' do

data/spec/command/init_spec.rb

@@ -1,46 +1,36 @@
 require 'spec_helper'
 require 'highline'
 
-GITHUB_FP = "SHA1 Fingerprint=5F:3F:7A:C2:56:9F:50:A4:66:76:47:C6:A1:8C:A0:07:AA:ED:BB:8E"
+GITHUB_FP = "SHA1 Fingerprint=84:63:B3:A9:29:12:CC:FD:1D:31:47:05:98:9B:EC:13:99:37:D0:D7"
 GITHUB_CERT = <<EOF
 -----BEGIN CERTIFICATE-----
-MIIG1TCCBb2gAwIBAgIQBVfICygmg6F7ChFEkylreTANBgkqhkiG9w0BAQsFADBw
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMS8wLQYDVQQDEyZEaWdpQ2VydCBTSEEyIEhpZ2ggQXNz
-dXJhbmNlIFNlcnZlciBDQTAeFw0yMDA1MDUwMDAwMDBaFw0yMjA1MTAxMjAwMDBa
-MGYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
-YW4gRnJhbmNpc2NvMRUwEwYDVQQKEwxHaXRIdWIsIEluYy4xEzARBgNVBAMTCmdp
-dGh1Yi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7MrTQ2J6a
-nox5KUwrqO9cQ9STO5R4/zBUxxvI5S8bmc0QjWfIVAwHWuT0Bn/H1oS0LM0tTkQm
-ARrqN77v9McVB8MWTGsmGQnS/1kQRFuKiYGUHf7iX5pfijbYsOkfb4AiVKysKUNV
-UtgVvpJoe5RWURjQp9XDWkeo2DzGHXLcBDadrM8VLC6H1/D9SXdVruxKqduLKR41
-Z/6dlSDdeY1gCnhz3Ch1pYbfMfsTCTamw+AtRtwlK3b2rfTHffhowjuzM15UKt+b
-rr/cEBlAjQTva8rutYU9K9ONgl+pG2u7Bv516DwmNy8xz9wOjTeOpeh0M9N/ewq8
-cgbR87LFaxi1AgMBAAGjggNzMIIDbzAfBgNVHSMEGDAWgBRRaP+QrwIHdTzM2WVk
-YqISuFlyOzAdBgNVHQ4EFgQUYwLSXQJf943VWhKedhE2loYsikgwJQYDVR0RBB4w
-HIIKZ2l0aHViLmNvbYIOd3d3LmdpdGh1Yi5jb20wDgYDVR0PAQH/BAQDAgWgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB1BgNVHR8EbjBsMDSgMqAwhi5o
-dHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc2hhMi1oYS1zZXJ2ZXItZzYuY3JsMDSg
-MqAwhi5odHRwOi8vY3JsNC5kaWdpY2VydC5jb20vc2hhMi1oYS1zZXJ2ZXItZzYu
-Y3JsMEwGA1UdIARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUHAgEWHGh0dHBz
-Oi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMIGDBggrBgEFBQcBAQR3
-MHUwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBNBggrBgEF
-BQcwAoZBaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMkhp
-Z2hBc3N1cmFuY2VTZXJ2ZXJDQS5jcnQwDAYDVR0TAQH/BAIwADCCAXwGCisGAQQB
-1nkCBAIEggFsBIIBaAFmAHUAKXm+8J45OSHwVnOfY6V35b5XfZxgCvj5TV0mXCVd
-x4QAAAFx5ltprwAABAMARjBEAiAuWGCWxN/M0Ms3KOsqFjDMHT8Aq0SlHfQ68KDg
-rVU6AAIgDA+2EB0D5W5r0i4Nhljx6ABlIByzrEdfcxiOD/o6//EAdQAiRUUHWVUk
-VpY/oS/x922G4CMmY63AS39dxoNcbuIPAgAAAXHmW2nTAAAEAwBGMEQCIBp+XQKa
-UDiPHwjBxdv5qvgyALKaysKqMF60gqem8iPRAiAk9Dp5+VBUXfSHqyW+tVShUigh
-ndopccf8Gs21KJ4jXgB2AFGjsPX9AXmcVm24N3iPDKR6zBsny/eeiEKaDf7UiwXl
-AAABceZbahsAAAQDAEcwRQIgd/5HcxT4wfNV8zavwxjYkw2TYBAuRCcqp1SjWKFn
-4EoCIQDHSTHxnbpxWFbP6v5Y6nGFZCDjaHgd9HrzUv2J/DaacDANBgkqhkiG9w0B
-AQsFAAOCAQEAhjKPnBW4r+jR3gg6RA5xICTW/A5YMcyqtK0c1QzFr8S7/l+skGpC
-yCHrJfFrLDeyKqgabvLRT6YvvM862MGfMMDsk+sKWtzLbDIcYG7sbviGpU+gtG1q
-B0ohWNApfWWKyNpquqvwdSEzAEBvhcUT5idzbK7q45bQU9vBIWgQz+PYULAU7KmY
-z7jOYV09o22TNMQT+hFmo92+EBlwSeIETYEsHy5ZxixTRTvu9hP00CyEbiht5OTK
-5EiJG6vsIh/uEtRsdenMCxV06W2f20Af4iSFo0uk6c1ryHefh08FcwA4pSNUaPyi
-Pb8YGQ6o/blejFzo/OSiUnDueafSJ0p6SQ==
+MIIFBjCCBK2gAwIBAgIQDovzdw2S0Zbwu2H5PEFmvjAKBggqhkjOPQQDAjBnMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xPzA9BgNVBAMTNkRp
+Z2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIFRMUyBIeWJyaWQgRUNDIFNIQTI1NiAyMDIw
+IENBMTAeFw0yMTAzMjUwMDAwMDBaFw0yMjAzMzAyMzU5NTlaMGYxCzAJBgNVBAYT
+AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv
+MRUwEwYDVQQKEwxHaXRIdWIsIEluYy4xEzARBgNVBAMTCmdpdGh1Yi5jb20wWTAT
+BgcqhkjOPQIBBggqhkjOPQMBBwNCAASt9vd1sdNJVApdEHG93CUGSyIcoiNOn6H+
+udCMvTm8DCPHz5GmkFrYRasDE77BI3q5xMidR/aW4Ll2a1A2ZvcNo4IDOjCCAzYw
+HwYDVR0jBBgwFoAUUGGmoNI1xBEqII0fD6xC8M0pz0swHQYDVR0OBBYEFCexfp+7
+JplQ2PPDU1v+MRawux5yMCUGA1UdEQQeMByCCmdpdGh1Yi5jb22CDnd3dy5naXRo
+dWIuY29tMA4GA1UdDwEB/wQEAwIHgDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+BQUHAwIwgbEGA1UdHwSBqTCBpjBRoE+gTYZLaHR0cDovL2NybDMuZGlnaWNlcnQu
+Y29tL0RpZ2lDZXJ0SGlnaEFzc3VyYW5jZVRMU0h5YnJpZEVDQ1NIQTI1NjIwMjBD
+QTEuY3JsMFGgT6BNhktodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vRGlnaUNlcnRI
+aWdoQXNzdXJhbmNlVExTSHlicmlkRUNDU0hBMjU2MjAyMENBMS5jcmwwPgYDVR0g
+BDcwNTAzBgZngQwBAgIwKTAnBggrBgEFBQcCARYbaHR0cDovL3d3dy5kaWdpY2Vy
+dC5jb20vQ1BTMIGSBggrBgEFBQcBAQSBhTCBgjAkBggrBgEFBQcwAYYYaHR0cDov
+L29jc3AuZGlnaWNlcnQuY29tMFoGCCsGAQUFBzAChk5odHRwOi8vY2FjZXJ0cy5k
+aWdpY2VydC5jb20vRGlnaUNlcnRIaWdoQXNzdXJhbmNlVExTSHlicmlkRUNDU0hB
+MjU2MjAyMENBMS5jcnQwDAYDVR0TAQH/BAIwADCCAQUGCisGAQQB1nkCBAIEgfYE
+gfMA8QB2ACl5vvCeOTkh8FZzn2Old+W+V32cYAr4+U1dJlwlXceEAAABeGq/vRoA
+AAQDAEcwRQIhAJ7miER//DRFnDJNn6uUhgau3WMt4vVfY5dGigulOdjXAiBIVCfR
+xjK1v4F31+sVaKzyyO7JAa0fzDQM7skQckSYWQB3ACJFRQdZVSRWlj+hL/H3bYbg
+IyZjrcBLf13Gg1xu4g8CAAABeGq/vTkAAAQDAEgwRgIhAJgAEkoJQRivBlwo7x67
+3oVsf1ip096WshZqmRCuL/JpAiEA3cX4rb3waLDLq4C48NSoUmcw56PwO/m2uwnQ
+prb+yh0wCgYIKoZIzj0EAwIDRwAwRAIgK+Kv7G+/KkWkNZg3PcQFp866Z7G6soxo
+a4etSZ+SRlYCIBSiXS20Wc+yjD111nPzvQUCfsP4+DKZ3K+2GKsERD6d
 EOF
 
 describe Conjur::Command::Init do

data/spec/command/users_spec.rb

@@ -12,7 +12,8 @@ describe Conjur::Command::Users, logged_in: true do
         user: username, 
         password: api_key,
         headers: { },
-        payload: "new-password"
+        payload: "new-password",
+        ssl_cert_store: cert_store
        })
     end
     
@@ -40,7 +41,8 @@ describe Conjur::Command::Users, logged_in: true do
                     user: username,
                     password: api_key,
                     headers: {},
-                    payload: ''
+                    payload: '',
+                    ssl_cert_store: cert_store
                 }).and_return double(:response, body: 'new api key')
         expect(Conjur::Authn).to receive(:save_credentials).with({
                     username: username,
@@ -59,6 +61,7 @@ describe Conjur::Command::Users, logged_in: true do
             url: "https://core.example.com/api/resources/#{account}/user/non-existing",
             headers: {authorization: "fakeauth"},
             username: username,
+            ssl_cert_store: cert_store
         }).and_raise RestClient::ResourceNotFound
       end
       it 'rotate_api_key with non-existing --user option' do

data/test.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-: ${RUBY_VERSION=2.2.5}
+: ${RUBY_VERSION=2.7}
 
 # My local RUBY_VERSION is set to ruby-#.#.# so this allows running locally.
 RUBY_VERSION=$(cut -d '-' -f 2 <<< $RUBY_VERSION)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 6.2.3
+  version: 6.2.4
 platform: ruby
 authors:
 - Conjur Maintainers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -431,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Conjur command line interface