conjur-cli 6.2.0 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f36460d10d570d5ff2a54a398d29306fe1219fafb7ba2840ae6ddf58c49371ba
-  data.tar.gz: ea60423bdea6801c241156bc4a286f198fdc1540aa3688b127ce5ead8e7c293b
+  metadata.gz: d0520b947529d571863374704ce0b613a07b6e63fa1e9cb37932e0d254e17353
+  data.tar.gz: 490b04289eb77fdbb1c7d56fc317ac6266111af4cde3fb6a655c92e48cf50cf3
 SHA512:
-  metadata.gz: 5461e4818f8b51ec34099e488e58b37722e592b1238ab7ce275935710b25890fd4ba1cbe5a464b74e7fedafdbc21320ab4fa206871cfbad124473c74ed3c79a0
-  data.tar.gz: 6691b092ec9669c544234ac0f47449d915b0cbcae2562b5133b32378ea591c3987a716fa22daa8370b71e0e3988b9eda7a621f8062e9b32068f25c45acb05b31
+  metadata.gz: 726d627c741a1a7ae611316dd482e6b2d6633e8d193fef1879f1acd5d8a86e68f8f5a0e5f0d6679085b7f15a86930a2a747c6a43c307ebedcd31494d52b1714e
+  data.tar.gz: 0424f34f72f7b625270eb42cbfe432160ab4a063a2600d82b7a8efe51d07df5e95a42d85b5dc3138d4074e63d2e28b8fc2a448d6c6ffe61f1715cd477269b2a2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 6.2.1
+
+* Pin to xdg gem v2.2.3 due to a [crashing CLI](https://github.com/cyberark/conjur-cli/issues/243).
+
 # 6.2.0
 
 * Add `ldap-sync` subcommand.

data/Jenkinsfile

@@ -1,3 +1,5 @@
+#!/usr/bin/env groovy
+
 pipeline {
   agent { label 'executor-v2' }
 
@@ -6,10 +8,14 @@ pipeline {
     buildDiscarder(logRotator(daysToKeepStr: '30'))
   }
 
+  triggers {
+    cron(getDailyCronString())
+  }
+
   stages {
-    stage('Test 2.2') {
+    stage('Test 2.4') {
       environment {
-        RUBY_VERSION = '2.2.8'
+        RUBY_VERSION = '2.4'
       }
       steps {
         sh './test.sh'
@@ -17,9 +23,9 @@ pipeline {
       }
     }
 
-    stage('Test 2.3') {
+    stage('Test 2.5') {
       environment {
-        RUBY_VERSION = '2.3.5'
+        RUBY_VERSION = '2.5'
       }
       steps {
         sh './test.sh'
@@ -27,9 +33,9 @@ pipeline {
       }
     }
 
-    stage('Test 2.4') {
+    stage('Test 2.6') {
       environment {
-        RUBY_VERSION = '2.4.2'
+        RUBY_VERSION = '2.6'
       }
       steps {
         sh './test.sh'
@@ -37,12 +43,18 @@ pipeline {
       }
     }
 
-    stage('Build standalone image & push to DockerHub') {
+    stage('Build standalone image') {
+      steps {
+        sh './build-standalone'
+      }
+    }
+
+    stage('Push standalone image to DockerHub') {
       when {
         branch 'master'
       }
+
       steps {
-        sh './build-standalone'
         sh './push-image'
       }
     }
@@ -56,32 +68,11 @@ pipeline {
         expression { currentBuild.resultIsBetterOrEqualTo('SUCCESS') }
         branch "master"
         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"
-          '''
+          def exitCode = sh returnStatus: true, script: './needs-publishing'
           return exitCode == 0
         }
       }
+
       steps {
         // Clean up first
         sh 'docker run -i --rm -v $PWD:/src -w /src alpine/git clean -fxd'

data/Rakefile

@@ -3,7 +3,6 @@ require "bundler/gem_tasks"
 
 begin
   require 'ci/reporter/rake/rspec'
-  require 'ci/reporter/rake/cucumber'
   require 'cucumber'
   require 'cucumber/rake/task'
   require 'rspec/core/rake_task'

data/VERSION

@@ -1 +1 @@
-6.1.1
+6.2.1

data/bin/conjur

@@ -22,5 +22,7 @@
 
 require 'active_support'
 require 'conjur/cli'
-
+if ENV['RAILS_ENV'] == 'development'
+  require 'pry'
+end
 exit Conjur::CLI.run(ARGV)

data/ci/cli-test.sh

@@ -1,6 +1,10 @@
 #!/bin/bash -ex
 
+# This can run with mounted source directory which is used in different Ruby versions.
+# Since library support is different for different versions, clear out the lock to
+# make sure full gem resolution runs each time.
+rm -f Gemfile.lock
 bundle install
 
 # If we got passed arguments, run that as the test command. Otherwise, run the full suite of tests.
-${@-bundle exec rake jenkins}
+exec ${@-bundle exec rake jenkins}

data/conjur-cli.gemspec

@@ -24,14 +24,13 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'highline', '~> 1.7'
   gem.add_dependency 'netrc', '~> 0.10'
   gem.add_dependency 'deep_merge', '~> 1.0'
-  gem.add_dependency 'xdg', '~> 2.2'
+  gem.add_dependency 'xdg', '= 2.2.3'
   gem.add_dependency 'table_print', '~> 1.5'
 
   gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'aruba', '~> 0.12'
   gem.add_development_dependency 'ci_reporter_rspec', '~> 1.0'
-  gem.add_development_dependency 'ci_reporter_cucumber', '~> 1.0'
   gem.add_development_dependency 'rake', '~> 10.0'
   gem.add_development_dependency 'io-grab', '~> 0.0'
   gem.add_development_dependency 'json_spec'

data/dev/docker-compose.yml

@@ -17,6 +17,7 @@ services:
     entrypoint: sleep
     command: infinity
     environment:
+      RAILS_ENV: development
       CONJUR_APPLIANCE_URL: http://conjur
       CONJUR_ACCOUNT: cucumber
     working_dir: /src/conjur-cli

data/dev/start.sh

@@ -6,9 +6,9 @@ export COMPOSE_PROJECT_NAME=clirubydev
 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
+  echo "Generating data key"
+  docker-compose pull
+  docker-compose run --no-deps --rm conjur data-key generate > data_key
 fi
 
 export CONJUR_DATA_KEY="$(cat data_key)"

data/features/hostfactory/tokens.feature

@@ -18,5 +18,5 @@ Feature: Host factory tokens
   Scenario: create a host using a token
     When I successfully run `conjur hostfactory tokens create myapp`
     And I keep the JSON response at "0/token" as "TOKEN"
-    Then I successfully run `conjur hostfactory hosts create %{TOKEN} host-01`
+    Then I use it to successfully run `conjur hostfactory hosts create %{TOKEN} host-01`
     And the JSON should have "api_key"

data/features/pubkeys/show.feature

@@ -12,7 +12,3 @@ Feature: Show public keys for a user
   Scenario: After adding a key, the key is shown
     When I run `conjur pubkeys show alice`
     And the output should match /^ssh-rsa .* laptop$/
-
-  Scenario: Public keys can be listed using cURL, without authentication
-    When I successfully run `curl -k $conjur_url/public_keys/cucumber/user/alice`
-    Then the output should match /^ssh-rsa .* laptop$/

data/features/step_definitions/cli_steps.rb

@@ -1,22 +1,3 @@
-Transform /\$ns/ do |s|
-  s.gsub('$ns', namespace)
-end
-
-Transform /\$user_role/ do |s|
-  s.gsub('$user_role', test_user.role_id)
-end
-
-Transform /^table:/ do |table|
-  table.tap do |t|
-    t.hashes.each do |row|
-      row.each do |_,v|
-        v.gsub!('$ns', namespace)
-        v.gsub!('$user_role', test_user.role_id)
-      end
-    end
-  end
-end
-
 When /^the command completes successfully/ do
   last_command_started.wait
   last_command_started.terminate

data/features/step_definitions/overrides.rb

@@ -1,9 +1,7 @@
 # Use a json_spec style memorized value as an environment variable
-When /I set the environment variable "(.*)" to memorized value "(.*)"/ do |key, value|
+When /I use it to (.*)/ do |statement|
   JsonSpec.memory.each do |k,v|
-    # JSON parser doesn't function properly on a JSON encoded string
-    v = v[1...-1] if v[0] == '"'
-    value.gsub! "%{#{k}}", v
+    statement = statement.gsub("%{#{k}}", v)
   end
-  set_environment_variable key, value
+  step "I #{statement}"
 end

data/features/support/hooks.rb

@@ -4,17 +4,6 @@ Aruba.configure do |config|
   config.io_wait_timeout = 2
 end
 
-Transform /\$conjur_url/ do |statement|
-  statement.gsub "$conjur_url", Conjur.configuration.appliance_url
-end
-
-Transform /\%\{\w+\}/ do |statement|
-  JsonSpec.memory.each do |k,v|
-    statement = statement.gsub("%{#{k}}", v)
-  end
-  statement
-end
-
 Before('@conjurapi-log') do
   set_env 'CONJURAPI_LOG', 'stderr'
 end

data/lib/conjur/cli.rb

@@ -25,9 +25,7 @@ require 'active_support/deprecation'
 require 'xdg'
 require 'fileutils'
 
-# this makes mime/types gem load much faster by lazy loading
-# mime types and caching them in binary form
-ENV['RUBY_MIME_TYPES_LAZY_LOAD'] ||= 'true'
+# this makes mime/types gem load much faster by caching them in binary form
 ENV['RUBY_MIME_TYPES_CACHE'] ||= (
   XDG['CACHE'].to_path.tap(&FileUtils.method(:mkdir_p)) + 'ruby-mime-types.cache'
 ).to_s

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

data/needs-publishing

@@ -0,0 +1,28 @@
+#!/bin/bash -ex
+
+echo "Determining if publishing is requested..."
+
+VERSION=$(ruby -I lib -r conjur/version -e 'puts Conjur::VERSION')
+echo Declared version: $VERSION
+
+if curl -s https://rubygems.org/api/v1/versions/conjur-cli.json | jq -e ".[] | select(.number == \"$VERSION\")" >/dev/null; then
+   echo "Found $VERSION on rubygems, not republishing"
+   exit 1
+fi
+   
+# 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"

data/test.sh

@@ -6,6 +6,11 @@
 RUBY_VERSION=$(cut -d '-' -f 2 <<< $RUBY_VERSION)
 
 main() {
+
+  # set up the containers to run in their own namespace
+  COMPOSE_PROJECT_NAME="$(basename "$PWD")_$(openssl rand -hex 3)"
+  export COMPOSE_PROJECT_NAME
+
   build
 
   start_conjur

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.1
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -105,16 +105,16 @@ dependencies:
   name: xdg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: table_print
   requirement: !ruby/object:Gem::Requirement
@@ -185,20 +185,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: ci_reporter_cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -392,6 +378,7 @@ files:
 - lib/conjur/version.rb
 - lib/patches/conjur/error.rb
 - lib/patches/gli.rb
+- needs-publishing
 - profile.rb
 - publish.sh
 - push-image
@@ -430,8 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Conjur command line interface