Skip to content

Commit dc500a1

Browse files
szhGitHub Enterprise
authored andcommitted
Merge pull request #22 from Conjur-Enterprise/CNJR-12082-version-issue
CNJR-12082: fix missing VERSION
2 parents 676e150 + 0240965 commit dc500a1

4 files changed

Lines changed: 11 additions & 2 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@ tmp
3030

3131
# Script to connect to jon's lxc appliances
3232
lxcsh.rb
33-
3433
VERSION

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
99
- Nothing should go in this section, please add to the latest unreleased version
1010
(and update the corresponding date), or add a new version.
1111

12-
## [6.1.0] - 2025-09-05
12+
## [6.1.0] - 2025-12-10
13+
14+
### Fixed
15+
- Fixed problem with missing Conjur::API package (CNJR-12082).
16+
[cyberark/conjur-api-ruby#224](https://github.com/cyberark/conjur-api-ruby/issues/224)
1317

1418
### Added
1519
- Added Config code and tests to repository (CNJR-10552).

lib/conjur/configuration.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
require 'set'
2424
require 'conjur/cert_utils'
2525
require 'base64'
26+
require 'conjur-api/version'
2627

2728
module Conjur
2829
class << self

spec/configuration_spec.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939
expect(configuration.rest_client_options[:headers]).to include(:'x-cybr-telemetry')
4040
end
4141

42+
it "API version check" do
43+
VERSION = File.read(File.expand_path('../VERSION', __dir__))
44+
expect(configuration.integration_version).to eq VERSION
45+
end
46+
4247
it "rest_client_options propagate to RestClient::Resource" do
4348
expected = {
4449
ssl_ca_file: "ca_certificate.pem",

0 commit comments

Comments
 (0)