bosh-monitor 1.3232.24.0 → 1.3262.0

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bace13f4f0158867f1756a547007d19dc69f409c
4
- data.tar.gz: e2be31cb7eb1050b4e47eae5dd359cd956dd0644
3
+ metadata.gz: 7fe63238d8b926e0f0d9291f88d5f0a763fb3b60
4
+ data.tar.gz: 3315bbc0b38df09f42ab3934d49ae84b2cf9f8c6
5
5
  SHA512:
6
- metadata.gz: f820fe46d3b4b1ff35e387ecba6dcdbe7ace67d1968d94ed4657d62ec648f594d1b666e3deb9791f06faa1612b683d3614cc82d2265990fff74ea050b2eb9e27
7
- data.tar.gz: ac36b507a0bfbe405357d66f0046004a379e6c9cb590ea379c039ad16765c88c47514f89d5b196a95c4259b9c560b9e150e208fda7bf3a259f6fc1a779da189e
6
+ metadata.gz: c6f80b32457d8401f71804b39d1fb3ad92df25b7c0ba0679ee737839109ac2e4825b39d6dca8b3c282b18276b915bf00e275b83c9b2a087425060a9ea71d8006
7
+ data.tar.gz: da39607d04923561e89886b5b5717b7f9177e59d7e1758bf2b1a457129fa3fa6004020a6a59a30f88f3d6c5da085af5b2a5eaf34b66111e6c298487a052b659a
@@ -36,12 +36,22 @@ module Bosh::Monitor
36
36
  class UAAToken
37
37
  EXPIRATION_DEADLINE_IN_SECONDS = 60
38
38
 
39
- def initialize(client_id, client_secret, uaa_url, ca_cert, logger)
39
+ def initialize(client_id, client_secret, uaa_url, ca_cert_file_path, logger)
40
+ options = {}
41
+
42
+ if File.exist?(ca_cert_file_path) && !File.read(ca_cert_file_path).strip.empty?
43
+ options[:ssl_ca_file] = ca_cert_file_path
44
+ else
45
+ cert_store = OpenSSL::X509::Store.new
46
+ cert_store.set_default_paths
47
+ options[:ssl_cert_store] = cert_store
48
+ end
49
+
40
50
  @uaa_token_issuer = CF::UAA::TokenIssuer.new(
41
51
  uaa_url,
42
52
  client_id,
43
53
  client_secret,
44
- {ssl_ca_file: ca_cert}
54
+ options,
45
55
  )
46
56
  @logger = logger
47
57
  end
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Monitor
3
- VERSION = '1.3232.24.0'
3
+ VERSION = '1.3262.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-monitor
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3232.24.0
4
+ version: 1.3262.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-11-02 00:00:00.000000000 Z
11
+ date: 2016-06-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: eventmachine