bosh-monitor 1.3232.24.0 → 1.3262.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bace13f4f0158867f1756a547007d19dc69f409c
-  data.tar.gz: e2be31cb7eb1050b4e47eae5dd359cd956dd0644
+  metadata.gz: 7fe63238d8b926e0f0d9291f88d5f0a763fb3b60
+  data.tar.gz: 3315bbc0b38df09f42ab3934d49ae84b2cf9f8c6
 SHA512:
-  metadata.gz: f820fe46d3b4b1ff35e387ecba6dcdbe7ace67d1968d94ed4657d62ec648f594d1b666e3deb9791f06faa1612b683d3614cc82d2265990fff74ea050b2eb9e27
-  data.tar.gz: ac36b507a0bfbe405357d66f0046004a379e6c9cb590ea379c039ad16765c88c47514f89d5b196a95c4259b9c560b9e150e208fda7bf3a259f6fc1a779da189e
+  metadata.gz: c6f80b32457d8401f71804b39d1fb3ad92df25b7c0ba0679ee737839109ac2e4825b39d6dca8b3c282b18276b915bf00e275b83c9b2a087425060a9ea71d8006
+  data.tar.gz: da39607d04923561e89886b5b5717b7f9177e59d7e1758bf2b1a457129fa3fa6004020a6a59a30f88f3d6c5da085af5b2a5eaf34b66111e6c298487a052b659a

data/lib/bosh/monitor/auth_provider.rb

@@ -36,12 +36,22 @@ module Bosh::Monitor
   class UAAToken
     EXPIRATION_DEADLINE_IN_SECONDS = 60
 
-    def initialize(client_id, client_secret, uaa_url, ca_cert, logger)
+    def initialize(client_id, client_secret, uaa_url, ca_cert_file_path, logger)
+      options = {}
+
+      if File.exist?(ca_cert_file_path) && !File.read(ca_cert_file_path).strip.empty?
+        options[:ssl_ca_file] = ca_cert_file_path
+      else
+        cert_store = OpenSSL::X509::Store.new
+        cert_store.set_default_paths
+        options[:ssl_cert_store] = cert_store
+      end
+
       @uaa_token_issuer = CF::UAA::TokenIssuer.new(
         uaa_url,
         client_id,
         client_secret,
-        {ssl_ca_file: ca_cert}
+        options,
       )
       @logger = logger
     end

data/lib/bosh/monitor/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Monitor
-    VERSION = '1.3232.24.0'
+    VERSION = '1.3262.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-monitor
 version: !ruby/object:Gem::Version
-  version: 1.3232.24.0
+  version: 1.3262.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine