conjur-cli 6.2.1 → 6.2.2

data/ci/test.sh

@@ -11,7 +11,7 @@ unset CONJUR_AUTHN_LOGIN
 
 bundle exec rake jenkins || true
 
-env CONJUR_AUTHN_LOGIN=admin CONJUR_AUTHN_API_KEY=secret bundle exec cucumber -r acceptance-features/support \
+env CONJUR_AUTHN_LOGIN=admin CONJUR_AUTHN_API_KEY='ADmin123!!!!' bundle exec cucumber -r acceptance-features/support \
 	-r acceptance-features/step_definitions \
 	-f pretty \
 	-f junit --out acceptance-features/reports \

data/conjur-cli.gemspec

@@ -18,23 +18,26 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Conjur::VERSION
 
+  # Filter out development only executables
+  gem.executables -= %w{parse-changelog.sh}
+
   gem.add_dependency 'activesupport', '>= 4.2', '< 6'
   gem.add_dependency 'conjur-api', '~> 5.3'
+  gem.add_dependency 'deep_merge', '~> 1.0'
   gem.add_dependency 'gli', '>=2.8.0'
   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.3'
   gem.add_dependency 'table_print', '~> 1.5'
+  gem.add_dependency 'xdg', '= 2.2.3'
 
-  gem.add_development_dependency 'rspec', '~> 3.0'
-  gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'addressable'
   gem.add_development_dependency 'aruba', '~> 0.12'
   gem.add_development_dependency 'ci_reporter_rspec', '~> 1.0'
-  gem.add_development_dependency 'rake', '~> 10.0'
+  gem.add_development_dependency 'cucumber-api'
   gem.add_development_dependency 'io-grab', '~> 0.0'
   gem.add_development_dependency 'json_spec'
-  gem.add_development_dependency 'cucumber-api'
-  gem.add_development_dependency 'addressable'
   gem.add_development_dependency 'pry-byebug'
+  gem.add_development_dependency 'rake', '~> 12.3.3'
+  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'simplecov', '~> 0.17', '< 0.18'
 end

data/docker-compose.yml

@@ -6,7 +6,7 @@ services:
   conjur:
     image: cyberark/conjur
     command: server -a cucumber
-    depends_on: 
+    depends_on:
       - pg
     environment:
       - CONJUR_DATA_KEY
@@ -25,6 +25,7 @@ services:
       - CONJUR_ACCOUNT=cucumber
       - CONJUR_AUTHN_LOGIN=admin
       - CONJUR_AUTHN_API_KEY
+      - RUBY_VERSION=${RUBY_VERSION}
     volumes:
       - .:/src
 

data/features/step_definitions/authn_steps.rb

@@ -1,5 +1,5 @@
 Then(/^I(?: can)? type and confirm a new password/) do
-  @password = SecureRandom.hex(12)
+  @password = "SEcret12!!!!"
   step %Q(I type "#{@password}")
   step %Q(I type "#{@password}")
   step "the exit status should be 0"

data/features/support/env.rb

@@ -6,7 +6,9 @@ require 'aruba/cucumber'
 require 'json_spec/cucumber'
 require 'simplecov'
 
-SimpleCov.start
+SimpleCov.start do
+  command_name "#{ENV['RUBY_VERSION']}"
+end
 
 ENV['CONJUR_APPLIANCE_URL'] ||= 'http://localhost/api/v6'
 ENV['CONJUR_ACCOUNT'] ||= 'cucumber'

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

data/push-image

@@ -1,28 +1,38 @@
-#!/bin/bash -eu
-
-# Push the 'cli:5' image to Dockerhub when on the 'master' branch
-
-cd "$(git rev-parse --show-toplevel)"
-
-IMAGE='cyberark/conjur-cli'
-
-function tag_and_push() {
-    local image="$1"
-    local tag="$2"
-    local description="$3"
-
-    echo "TAG = $tag, $description"
-
-    docker tag "$image" "$image:$tag"
-    docker push "$image:$tag"
-}
-
-version_tag="5-$(cat VERSION)"
-
-tag_and_push $IMAGE '5'        'latest image'
-tag_and_push $IMAGE '5-latest'   'same as "5"'
-tag_and_push $IMAGE $version_tag 'version-specific image'
-
-# push to legacy `conjurinc/cli5` tag
-docker tag "$IMAGE" conjurinc/cli5:latest
-docker push conjurinc/cli5:latest
+#!/bin/bash
+
+set -e
+
+readonly REGISTRY="cyberark"
+readonly VERSION="$(cat VERSION)"
+readonly VERSION_TAG="5-${VERSION}"
+readonly image_name="conjur-cli"
+readonly full_image_name="${REGISTRY}/${image_name}:latest"
+
+readonly TAGS=(
+  "5"
+  "5-latest"
+  "$VERSION_TAG"
+)
+
+# fetching tags is required for git_description to work
+git fetch --tags
+git_description=$(git describe)
+
+# if it’s not a tagged commit, VERSION will have extra junk (i.e. -g666c4b2), so we won’t publish that commit
+# only when tag matches the VERSION, push VERSION and latest releases
+# and x and x.y releases
+#Ex: v5-6.2.1
+if [ "$git_description" = "v${VERSION_TAG}" ]; then
+  echo "Revision $git_description matches version $VERSION exactly. Pushing to Dockerhub..."
+
+  for tag in "${TAGS[@]}"; do
+    echo "Tagging and pushing $REGISTRY/$image_name:$tag"
+
+    docker tag $full_image_name "$REGISTRY/$image_name:$tag"
+    docker push "$REGISTRY/$image_name:$tag"
+  done
+
+  # push to legacy `conjurinc/cli5` tag
+  docker tag $full_image_name conjurinc/cli5:latest
+  docker push conjurinc/cli5:latest
+fi

data/spec/authn_spec.rb

@@ -37,11 +37,11 @@ describe Conjur::Authn do
       allow(ENV).to receive(:[]).with("CONJUR_AUTHN_LOGIN").and_return "the-login"
       allow(ENV).to receive(:[]).with("CONJUR_AUTHN_API_KEY").and_return "the-api-key"
     end
-    
+
     context "login and API key" do
       it "are used to authn" do
         expect(Conjur::Authn.get_credentials).to eq([ "the-login", "the-api-key" ])
-          
+
         expect(api.username).to eq('the-login')
         expect(api.api_key).to eq('the-api-key')
       end
@@ -94,7 +94,7 @@ describe Conjur::Authn do
       before do
         allow(Conjur::Config).to receive(:[]).with(:netrc_path).and_return path
       end
-      
+
       context "with specified netrc_path" do
         let(:path) { "/a/dummy/netrc/path" }
         it "consults Conjur::Config for netrc_path" do
@@ -102,7 +102,7 @@ describe Conjur::Authn do
           expect(Conjur::Authn.netrc).to eq(netrc)
         end
       end
-  
+
       context "without specified netrc_path" do
         let(:path) { nil }
         it "uses default netrc path" do

data/spec/command/authn_spec.rb

@@ -10,14 +10,14 @@ describe Conjur::Command::Authn do
         describe_command "#{cmd}" do
           it "prompts for username and password and logs in the user" do
             expect(Conjur::Authn).to receive(:ask_for_credentials).with({}).and_return [ "the-user", "the-api-key" ]
-  
+
             expect { invoke }.to write("Logged in")
           end
         end
         describe_command "#{cmd} -u the-user" do
           it "prompts for password and logs in the user" do
             expect(Conjur::Authn).to receive(:ask_for_credentials).with({username: 'the-user'}).and_return [ "the-user", "the-api-key" ]
-  
+
             expect { invoke }.to write("Logged in")
           end
         end

data/spec/spec_helper.rb

@@ -4,8 +4,11 @@ require 'tempfile'
 require 'ostruct'
 
 require "simplecov"
-SimpleCov.start
-  
+
+SimpleCov.start do
+  command_name "#{ENV['RUBY_VERSION']}"
+end
+
 def post_response(id, attributes = {})
   attributes[:id] = id
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.2.2
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -45,6 +45,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -88,19 +102,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: deep_merge
+  name: table_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: xdg
   requirement: !ruby/object:Gem::Requirement
@@ -116,35 +130,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.3
 - !ruby/object:Gem::Dependency
-  name: table_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -186,19 +172,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: cucumber-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: io-grab
   requirement: !ruby/object:Gem::Requirement
@@ -228,7 +214,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cucumber-api
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -242,33 +228,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.18'
 description: 
 email:
 - rafal@conjur.net
@@ -280,23 +286,28 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".dockerignore"
+- ".github/ISSUE_TEMPLATE/bug.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".gitignore"
+- ".gitleaks.toml"
 - ".kateproject"
 - ".overcommit.yml"
 - ".project"
 - ".rubocop.yml"
 - APPLIANCE_VERSION
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Humanfile.md
 - Jenkinsfile
-- LICENSE.md
+- LICENSE
 - PUBLISH.md
 - README.md
 - Rakefile
 - VERSION
 - bin/_conjur
 - bin/conjur
+- bin/parse-changelog.sh
 - build-deb.sh
 - build-standalone
 - ci/cli-test.sh
@@ -304,6 +315,7 @@ files:
 - ci/package.sh
 - ci/publish.sh
 - ci/secrets/publish.yml
+- ci/submit-coverage
 - ci/test.sh
 - ci/wait_for_server.sh
 - conjur-cli.gemspec