Check for user and password also in DAV blobstores

[#88572736]

Signed-off-by: Krum Tsvetkov <krum.tsvetkov@sap.com>

bosh_cli/lib/cli/release.rb

@@ -73,6 +73,7 @@ def has_blobstore_secret?
       has_legacy_secret? ||
         has_blobstore_secrets?(bs, "atmos", "secret") ||
         has_blobstore_secrets?(bs, "simple", "user", "password") ||
+        has_blobstore_secrets?(bs, "dav", "user", "password") ||
         has_blobstore_secrets?(bs, "swift", "rackspace") ||
         has_blobstore_secrets?(bs, "swift", "hp") ||
         has_blobstore_secrets?(bs, "swift", "openstack") ||

bosh_cli/spec/assets/config/dav/config/final.yml

@@ -0,0 +1,5 @@
+---
+blobstore:
+  provider: dav
+  options:
+    endpoint: http://bosh-blobstore.some.url.com:8080

bosh_cli/spec/assets/config/dav/config/private.yml

@@ -0,0 +1,6 @@
+---
+blobstore:
+  dav:
+    endpoint: http://bosh-blobstore.some.url.com:8080
+    user: dav-user
+    password: dav-password

bosh_cli/spec/unit/release_spec.rb

@@ -260,6 +260,23 @@ def new_release(dir)
       expect(r.has_blobstore_secret?).to eq(true)
     end
 
+    it "should merge DAV secrets into options" do
+      r = Bosh::Cli::Release.new(spec_asset("config/dav"))
+      opts = {
+          :endpoint => 'http://bosh-blobstore.some.url.com:8080',
+          :user => 'dav-user',
+          :password => 'dav-password'
+      }
+      expect(Bosh::Blobstore::Client).to receive(:safe_create).with("dav", opts)
+      r.blobstore
+    end
+
+    it "should detect blobstore secrets for DAV options" do
+      r = Bosh::Cli::Release.new(spec_asset("config/dav"))
+      expect(r.has_blobstore_secret?).to eq(true)
+    end
+
+
     it 'should not use credentials for a local blobstore' do
       r = Bosh::Cli::Release.new(spec_asset("config/local"))
       expect(r.has_blobstore_secret?).to eq(true)