conjur-cli 6.2.1 → 6.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/ci/test.sh CHANGED
@@ -11,7 +11,7 @@ unset CONJUR_AUTHN_LOGIN
11
11
 
12
12
  bundle exec rake jenkins || true
13
13
 
14
- env CONJUR_AUTHN_LOGIN=admin CONJUR_AUTHN_API_KEY=secret bundle exec cucumber -r acceptance-features/support \
14
+ env CONJUR_AUTHN_LOGIN=admin CONJUR_AUTHN_API_KEY='ADmin123!!!!' bundle exec cucumber -r acceptance-features/support \
15
15
  -r acceptance-features/step_definitions \
16
16
  -f pretty \
17
17
  -f junit --out acceptance-features/reports \
@@ -18,23 +18,26 @@ Gem::Specification.new do |gem|
18
18
  gem.require_paths = ["lib"]
19
19
  gem.version = Conjur::VERSION
20
20
 
21
+ # Filter out development only executables
22
+ gem.executables -= %w{parse-changelog.sh}
23
+
21
24
  gem.add_dependency 'activesupport', '>= 4.2', '< 6'
22
25
  gem.add_dependency 'conjur-api', '~> 5.3'
26
+ gem.add_dependency 'deep_merge', '~> 1.0'
23
27
  gem.add_dependency 'gli', '>=2.8.0'
24
28
  gem.add_dependency 'highline', '~> 1.7'
25
29
  gem.add_dependency 'netrc', '~> 0.10'
26
- gem.add_dependency 'deep_merge', '~> 1.0'
27
- gem.add_dependency 'xdg', '= 2.2.3'
28
30
  gem.add_dependency 'table_print', '~> 1.5'
31
+ gem.add_dependency 'xdg', '= 2.2.3'
29
32
 
30
- gem.add_development_dependency 'rspec', '~> 3.0'
31
- gem.add_development_dependency 'simplecov'
33
+ gem.add_development_dependency 'addressable'
32
34
  gem.add_development_dependency 'aruba', '~> 0.12'
33
35
  gem.add_development_dependency 'ci_reporter_rspec', '~> 1.0'
34
- gem.add_development_dependency 'rake', '~> 10.0'
36
+ gem.add_development_dependency 'cucumber-api'
35
37
  gem.add_development_dependency 'io-grab', '~> 0.0'
36
38
  gem.add_development_dependency 'json_spec'
37
- gem.add_development_dependency 'cucumber-api'
38
- gem.add_development_dependency 'addressable'
39
39
  gem.add_development_dependency 'pry-byebug'
40
+ gem.add_development_dependency 'rake', '~> 12.3.3'
41
+ gem.add_development_dependency 'rspec', '~> 3.0'
42
+ gem.add_development_dependency 'simplecov', '~> 0.17', '< 0.18'
40
43
  end
@@ -6,7 +6,7 @@ services:
6
6
  conjur:
7
7
  image: cyberark/conjur
8
8
  command: server -a cucumber
9
- depends_on:
9
+ depends_on:
10
10
  - pg
11
11
  environment:
12
12
  - CONJUR_DATA_KEY
@@ -25,6 +25,7 @@ services:
25
25
  - CONJUR_ACCOUNT=cucumber
26
26
  - CONJUR_AUTHN_LOGIN=admin
27
27
  - CONJUR_AUTHN_API_KEY
28
+ - RUBY_VERSION=${RUBY_VERSION}
28
29
  volumes:
29
30
  - .:/src
30
31
 
@@ -1,5 +1,5 @@
1
1
  Then(/^I(?: can)? type and confirm a new password/) do
2
- @password = SecureRandom.hex(12)
2
+ @password = "SEcret12!!!!"
3
3
  step %Q(I type "#{@password}")
4
4
  step %Q(I type "#{@password}")
5
5
  step "the exit status should be 0"
@@ -6,7 +6,9 @@ require 'aruba/cucumber'
6
6
  require 'json_spec/cucumber'
7
7
  require 'simplecov'
8
8
 
9
- SimpleCov.start
9
+ SimpleCov.start do
10
+ command_name "#{ENV['RUBY_VERSION']}"
11
+ end
10
12
 
11
13
  ENV['CONJUR_APPLIANCE_URL'] ||= 'http://localhost/api/v6'
12
14
  ENV['CONJUR_ACCOUNT'] ||= 'cucumber'
@@ -19,6 +19,6 @@
19
19
  # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
20
20
  #
21
21
  module Conjur
22
- VERSION = '6.2.1'
22
+ VERSION = '6.2.2'
23
23
  ::Version=VERSION
24
24
  end
data/push-image CHANGED
@@ -1,28 +1,38 @@
1
- #!/bin/bash -eu
2
-
3
- # Push the 'cli:5' image to Dockerhub when on the 'master' branch
4
-
5
- cd "$(git rev-parse --show-toplevel)"
6
-
7
- IMAGE='cyberark/conjur-cli'
8
-
9
- function tag_and_push() {
10
- local image="$1"
11
- local tag="$2"
12
- local description="$3"
13
-
14
- echo "TAG = $tag, $description"
15
-
16
- docker tag "$image" "$image:$tag"
17
- docker push "$image:$tag"
18
- }
19
-
20
- version_tag="5-$(cat VERSION)"
21
-
22
- tag_and_push $IMAGE '5' 'latest image'
23
- tag_and_push $IMAGE '5-latest' 'same as "5"'
24
- tag_and_push $IMAGE $version_tag 'version-specific image'
25
-
26
- # push to legacy `conjurinc/cli5` tag
27
- docker tag "$IMAGE" conjurinc/cli5:latest
28
- docker push conjurinc/cli5:latest
1
+ #!/bin/bash
2
+
3
+ set -e
4
+
5
+ readonly REGISTRY="cyberark"
6
+ readonly VERSION="$(cat VERSION)"
7
+ readonly VERSION_TAG="5-${VERSION}"
8
+ readonly image_name="conjur-cli"
9
+ readonly full_image_name="${REGISTRY}/${image_name}:latest"
10
+
11
+ readonly TAGS=(
12
+ "5"
13
+ "5-latest"
14
+ "$VERSION_TAG"
15
+ )
16
+
17
+ # fetching tags is required for git_description to work
18
+ git fetch --tags
19
+ git_description=$(git describe)
20
+
21
+ # if it’s not a tagged commit, VERSION will have extra junk (i.e. -g666c4b2), so we won’t publish that commit
22
+ # only when tag matches the VERSION, push VERSION and latest releases
23
+ # and x and x.y releases
24
+ #Ex: v5-6.2.1
25
+ if [ "$git_description" = "v${VERSION_TAG}" ]; then
26
+ echo "Revision $git_description matches version $VERSION exactly. Pushing to Dockerhub..."
27
+
28
+ for tag in "${TAGS[@]}"; do
29
+ echo "Tagging and pushing $REGISTRY/$image_name:$tag"
30
+
31
+ docker tag $full_image_name "$REGISTRY/$image_name:$tag"
32
+ docker push "$REGISTRY/$image_name:$tag"
33
+ done
34
+
35
+ # push to legacy `conjurinc/cli5` tag
36
+ docker tag $full_image_name conjurinc/cli5:latest
37
+ docker push conjurinc/cli5:latest
38
+ fi
@@ -37,11 +37,11 @@ describe Conjur::Authn do
37
37
  allow(ENV).to receive(:[]).with("CONJUR_AUTHN_LOGIN").and_return "the-login"
38
38
  allow(ENV).to receive(:[]).with("CONJUR_AUTHN_API_KEY").and_return "the-api-key"
39
39
  end
40
-
40
+
41
41
  context "login and API key" do
42
42
  it "are used to authn" do
43
43
  expect(Conjur::Authn.get_credentials).to eq([ "the-login", "the-api-key" ])
44
-
44
+
45
45
  expect(api.username).to eq('the-login')
46
46
  expect(api.api_key).to eq('the-api-key')
47
47
  end
@@ -94,7 +94,7 @@ describe Conjur::Authn do
94
94
  before do
95
95
  allow(Conjur::Config).to receive(:[]).with(:netrc_path).and_return path
96
96
  end
97
-
97
+
98
98
  context "with specified netrc_path" do
99
99
  let(:path) { "/a/dummy/netrc/path" }
100
100
  it "consults Conjur::Config for netrc_path" do
@@ -102,7 +102,7 @@ describe Conjur::Authn do
102
102
  expect(Conjur::Authn.netrc).to eq(netrc)
103
103
  end
104
104
  end
105
-
105
+
106
106
  context "without specified netrc_path" do
107
107
  let(:path) { nil }
108
108
  it "uses default netrc path" do
@@ -10,14 +10,14 @@ describe Conjur::Command::Authn do
10
10
  describe_command "#{cmd}" do
11
11
  it "prompts for username and password and logs in the user" do
12
12
  expect(Conjur::Authn).to receive(:ask_for_credentials).with({}).and_return [ "the-user", "the-api-key" ]
13
-
13
+
14
14
  expect { invoke }.to write("Logged in")
15
15
  end
16
16
  end
17
17
  describe_command "#{cmd} -u the-user" do
18
18
  it "prompts for password and logs in the user" do
19
19
  expect(Conjur::Authn).to receive(:ask_for_credentials).with({username: 'the-user'}).and_return [ "the-user", "the-api-key" ]
20
-
20
+
21
21
  expect { invoke }.to write("Logged in")
22
22
  end
23
23
  end
@@ -4,8 +4,11 @@ require 'tempfile'
4
4
  require 'ostruct'
5
5
 
6
6
  require "simplecov"
7
- SimpleCov.start
8
-
7
+
8
+ SimpleCov.start do
9
+ command_name "#{ENV['RUBY_VERSION']}"
10
+ end
11
+
9
12
  def post_response(id, attributes = {})
10
13
  attributes[:id] = id
11
14
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conjur-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.2.1
4
+ version: 6.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2019-05-22 00:00:00.000000000 Z
12
+ date: 2020-04-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
@@ -45,6 +45,20 @@ dependencies:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '5.3'
48
+ - !ruby/object:Gem::Dependency
49
+ name: deep_merge
50
+ requirement: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - "~>"
53
+ - !ruby/object:Gem::Version
54
+ version: '1.0'
55
+ type: :runtime
56
+ prerelease: false
57
+ version_requirements: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - "~>"
60
+ - !ruby/object:Gem::Version
61
+ version: '1.0'
48
62
  - !ruby/object:Gem::Dependency
49
63
  name: gli
50
64
  requirement: !ruby/object:Gem::Requirement
@@ -88,19 +102,19 @@ dependencies:
88
102
  - !ruby/object:Gem::Version
89
103
  version: '0.10'
90
104
  - !ruby/object:Gem::Dependency
91
- name: deep_merge
105
+ name: table_print
92
106
  requirement: !ruby/object:Gem::Requirement
93
107
  requirements:
94
108
  - - "~>"
95
109
  - !ruby/object:Gem::Version
96
- version: '1.0'
110
+ version: '1.5'
97
111
  type: :runtime
98
112
  prerelease: false
99
113
  version_requirements: !ruby/object:Gem::Requirement
100
114
  requirements:
101
115
  - - "~>"
102
116
  - !ruby/object:Gem::Version
103
- version: '1.0'
117
+ version: '1.5'
104
118
  - !ruby/object:Gem::Dependency
105
119
  name: xdg
106
120
  requirement: !ruby/object:Gem::Requirement
@@ -116,35 +130,7 @@ dependencies:
116
130
  - !ruby/object:Gem::Version
117
131
  version: 2.2.3
118
132
  - !ruby/object:Gem::Dependency
119
- name: table_print
120
- requirement: !ruby/object:Gem::Requirement
121
- requirements:
122
- - - "~>"
123
- - !ruby/object:Gem::Version
124
- version: '1.5'
125
- type: :runtime
126
- prerelease: false
127
- version_requirements: !ruby/object:Gem::Requirement
128
- requirements:
129
- - - "~>"
130
- - !ruby/object:Gem::Version
131
- version: '1.5'
132
- - !ruby/object:Gem::Dependency
133
- name: rspec
134
- requirement: !ruby/object:Gem::Requirement
135
- requirements:
136
- - - "~>"
137
- - !ruby/object:Gem::Version
138
- version: '3.0'
139
- type: :development
140
- prerelease: false
141
- version_requirements: !ruby/object:Gem::Requirement
142
- requirements:
143
- - - "~>"
144
- - !ruby/object:Gem::Version
145
- version: '3.0'
146
- - !ruby/object:Gem::Dependency
147
- name: simplecov
133
+ name: addressable
148
134
  requirement: !ruby/object:Gem::Requirement
149
135
  requirements:
150
136
  - - ">="
@@ -186,19 +172,19 @@ dependencies:
186
172
  - !ruby/object:Gem::Version
187
173
  version: '1.0'
188
174
  - !ruby/object:Gem::Dependency
189
- name: rake
175
+ name: cucumber-api
190
176
  requirement: !ruby/object:Gem::Requirement
191
177
  requirements:
192
- - - "~>"
178
+ - - ">="
193
179
  - !ruby/object:Gem::Version
194
- version: '10.0'
180
+ version: '0'
195
181
  type: :development
196
182
  prerelease: false
197
183
  version_requirements: !ruby/object:Gem::Requirement
198
184
  requirements:
199
- - - "~>"
185
+ - - ">="
200
186
  - !ruby/object:Gem::Version
201
- version: '10.0'
187
+ version: '0'
202
188
  - !ruby/object:Gem::Dependency
203
189
  name: io-grab
204
190
  requirement: !ruby/object:Gem::Requirement
@@ -228,7 +214,7 @@ dependencies:
228
214
  - !ruby/object:Gem::Version
229
215
  version: '0'
230
216
  - !ruby/object:Gem::Dependency
231
- name: cucumber-api
217
+ name: pry-byebug
232
218
  requirement: !ruby/object:Gem::Requirement
233
219
  requirements:
234
220
  - - ">="
@@ -242,33 +228,53 @@ dependencies:
242
228
  - !ruby/object:Gem::Version
243
229
  version: '0'
244
230
  - !ruby/object:Gem::Dependency
245
- name: addressable
231
+ name: rake
246
232
  requirement: !ruby/object:Gem::Requirement
247
233
  requirements:
248
- - - ">="
234
+ - - "~>"
249
235
  - !ruby/object:Gem::Version
250
- version: '0'
236
+ version: 12.3.3
251
237
  type: :development
252
238
  prerelease: false
253
239
  version_requirements: !ruby/object:Gem::Requirement
254
240
  requirements:
255
- - - ">="
241
+ - - "~>"
256
242
  - !ruby/object:Gem::Version
257
- version: '0'
243
+ version: 12.3.3
258
244
  - !ruby/object:Gem::Dependency
259
- name: pry-byebug
245
+ name: rspec
260
246
  requirement: !ruby/object:Gem::Requirement
261
247
  requirements:
262
- - - ">="
248
+ - - "~>"
263
249
  - !ruby/object:Gem::Version
264
- version: '0'
250
+ version: '3.0'
265
251
  type: :development
266
252
  prerelease: false
267
253
  version_requirements: !ruby/object:Gem::Requirement
268
254
  requirements:
269
- - - ">="
255
+ - - "~>"
270
256
  - !ruby/object:Gem::Version
271
- version: '0'
257
+ version: '3.0'
258
+ - !ruby/object:Gem::Dependency
259
+ name: simplecov
260
+ requirement: !ruby/object:Gem::Requirement
261
+ requirements:
262
+ - - "~>"
263
+ - !ruby/object:Gem::Version
264
+ version: '0.17'
265
+ - - "<"
266
+ - !ruby/object:Gem::Version
267
+ version: '0.18'
268
+ type: :development
269
+ prerelease: false
270
+ version_requirements: !ruby/object:Gem::Requirement
271
+ requirements:
272
+ - - "~>"
273
+ - !ruby/object:Gem::Version
274
+ version: '0.17'
275
+ - - "<"
276
+ - !ruby/object:Gem::Version
277
+ version: '0.18'
272
278
  description:
273
279
  email:
274
280
  - rafal@conjur.net
@@ -280,23 +286,28 @@ extensions: []
280
286
  extra_rdoc_files: []
281
287
  files:
282
288
  - ".dockerignore"
289
+ - ".github/ISSUE_TEMPLATE/bug.md"
290
+ - ".github/ISSUE_TEMPLATE/feature_request.md"
283
291
  - ".gitignore"
292
+ - ".gitleaks.toml"
284
293
  - ".kateproject"
285
294
  - ".overcommit.yml"
286
295
  - ".project"
287
296
  - ".rubocop.yml"
288
297
  - APPLIANCE_VERSION
289
298
  - CHANGELOG.md
299
+ - CONTRIBUTING.md
290
300
  - Gemfile
291
301
  - Humanfile.md
292
302
  - Jenkinsfile
293
- - LICENSE.md
303
+ - LICENSE
294
304
  - PUBLISH.md
295
305
  - README.md
296
306
  - Rakefile
297
307
  - VERSION
298
308
  - bin/_conjur
299
309
  - bin/conjur
310
+ - bin/parse-changelog.sh
300
311
  - build-deb.sh
301
312
  - build-standalone
302
313
  - ci/cli-test.sh
@@ -304,6 +315,7 @@ files:
304
315
  - ci/package.sh
305
316
  - ci/publish.sh
306
317
  - ci/secrets/publish.yml
318
+ - ci/submit-coverage
307
319
  - ci/test.sh
308
320
  - ci/wait_for_server.sh
309
321
  - conjur-cli.gemspec