Differentiate blobstore clients from wrappers

Signed-off-by: Brian Upton <brian.upton@broadcom.com>

Author: aramprice

src/bosh-director/lib/bosh/director.rb

@@ -42,8 +42,8 @@ module Director
 
 require 'bosh/director/blobstore/errors'
 require 'bosh/director/blobstore/client'
-require 'bosh/director/blobstore/retryable_blobstore_client'
-require 'bosh/director/blobstore/sha1_verifiable_blobstore_client'
+require 'bosh/director/blobstore/retryable_client_wrapper'
+require 'bosh/director/blobstore/sha1_verifying_client_wrapper'
 Bosh::Director::Blobstore.autoload(:LocalClient, 'bosh/director/blobstore/local_client')
 Bosh::Director::Blobstore.autoload(:DavcliBlobstoreClient, 'bosh/director/blobstore/davcli_blobstore_client')
 Bosh::Director::Blobstore.autoload(:S3cliBlobstoreClient, 'bosh/director/blobstore/s3cli_blobstore_client')

…/blobstore/retryable_blobstore_client.rb …or/blobstore/retryable_client_wrapper.rbsrc/bosh-director/lib/bosh/director/blobstore/retryable_blobstore_client.rb renamed to src/bosh-director/lib/bosh/director/blobstore/retryable_client_wrapper.rb src/bosh-director/lib/bosh/director/blobstore/retryable_blobstore_client.rb renamed to src/bosh-director/lib/bosh/director/blobstore/retryable_client_wrapper.rb

@@ -2,7 +2,7 @@
 
 module Bosh::Director
   module Blobstore
-    class RetryableBlobstoreClient < Client
+    class RetryableClientWrapper
       extend Forwardable
 
       def initialize(client, retryable)

…tore/sha1_verifiable_blobstore_client.rb …obstore/sha1_verifying_client_wrapper.rbsrc/bosh-director/lib/bosh/director/blobstore/sha1_verifiable_blobstore_client.rb renamed to src/bosh-director/lib/bosh/director/blobstore/sha1_verifying_client_wrapper.rb src/bosh-director/lib/bosh/director/blobstore/sha1_verifiable_blobstore_client.rb renamed to src/bosh-director/lib/bosh/director/blobstore/sha1_verifying_client_wrapper.rb

@@ -4,7 +4,7 @@
 
 module Bosh::Director
   module Blobstore
-    class Sha1VerifiableBlobstoreClient < Client
+    class Sha1VerifyingClientWrapper
       extend Forwardable
 
       def initialize(client, logger)

src/bosh-director/lib/bosh/director/blobstores.rb

@@ -16,9 +16,9 @@ def create_client(hash)
 
       bare_client = create(provider_string, options)
 
-      sha1_client = Blobstore::Sha1VerifiableBlobstoreClient.new(bare_client, Bosh::Director::Config.logger)
+      sha1_client = Blobstore::Sha1VerifyingClientWrapper.new(bare_client, Bosh::Director::Config.logger)
       retry_config = Bosh::Retryable.new(tries: 6, sleep: 2.0, on: [Blobstore::BlobstoreError])
-      Blobstore::RetryableBlobstoreClient.new(sha1_client, retry_config)
+      Blobstore::RetryableClientWrapper.new(sha1_client, retry_config)
     end
 
     def create(provider_string, options = {})

…store/retryable_blobstore_client_spec.rb …obstore/retryable_client_wrapper_spec.rbsrc/bosh-director/spec/unit/blobstore/retryable_blobstore_client_spec.rb renamed to src/bosh-director/spec/unit/blobstore/retryable_client_wrapper_spec.rb src/bosh-director/spec/unit/blobstore/retryable_blobstore_client_spec.rb renamed to src/bosh-director/spec/unit/blobstore/retryable_client_wrapper_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Bosh::Director::Blobstore
-  describe RetryableBlobstoreClient do
+  describe RetryableClientWrapper do
     subject { described_class.new(wrapped_client, retryable) }
     let(:wrapped_client) { instance_double('Bosh::Director::Blobstore::Client') }
     let(:retryable)      { Bosh::Retryable.new(tries: 2, sleep: 0, on: [BlobstoreError]) }

…sha1_verifiable_blobstore_client_spec.rb …re/sha1_verifying_client_wrapper_spec.rbsrc/bosh-director/spec/unit/blobstore/sha1_verifiable_blobstore_client_spec.rb renamed to src/bosh-director/spec/unit/blobstore/sha1_verifying_client_wrapper_spec.rb src/bosh-director/spec/unit/blobstore/sha1_verifiable_blobstore_client_spec.rb renamed to src/bosh-director/spec/unit/blobstore/sha1_verifying_client_wrapper_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Bosh::Director::Blobstore
-  describe Sha1VerifiableBlobstoreClient do
+  describe Sha1VerifyingClientWrapper do
     subject { described_class.new(wrapped_client, per_spec_logger) }
     let(:wrapped_client) { instance_double('Bosh::Director::Blobstore::Client') }
     let(:multidigest_path) { 'some/path/to/binary' }

src/bosh-director/spec/unit/blobstores_spec.rb

@@ -19,7 +19,7 @@ module Bosh::Director
           it 'builds a local client' do
             expect(Blobstore::LocalClient).to receive(:new).with(blobstore_config['options'])
 
-            expect(Blobstores.new(config).blobstore).to be_a(Blobstore::Client)
+            Blobstores.new(config)
           end
         end
 
@@ -37,7 +37,7 @@ module Bosh::Director
           it 'returns s3cli client' do
             expect(Blobstore::S3cliBlobstoreClient).to receive(:new).with(blobstore_config['options'])
 
-            expect(Blobstores.new(config).blobstore).to be_a(Blobstore::Client)
+            Blobstores.new(config)
           end
         end
 
@@ -53,7 +53,7 @@ module Bosh::Director
           it 'returns gcscli client' do
             expect(Blobstore::GcscliBlobstoreClient).to receive(:new).with(blobstore_config['options'])
 
-            expect(Blobstores.new(config).blobstore).to be_a(Blobstore::Client)
+            Blobstores.new(config)
           end
         end
 
@@ -73,7 +73,7 @@ module Bosh::Director
           it 'returns davcli client' do
             expect(Blobstore::DavcliBlobstoreClient).to receive(:new).with(blobstore_config['options'])
 
-            expect(Blobstores.new(config).blobstore).to be_a(Blobstore::Client)
+            Blobstores.new(config)
           end
         end
       end

src/bosh-director/spec/unit/deployment_plan/job_spec.rb

@@ -162,7 +162,7 @@ module DeploymentPlan
             FactoryBot.create(:models_template, name: 'foo', blobstore_id: 'blobstore-id-1', sha1: file_content_sha1)
           end
           let(:instance) { instance_double(Bosh::Director::App, blobstores: blobstores) }
-          let(:blobstore) { instance_double(Bosh::Director::Blobstore::RetryableBlobstoreClient) }
+          let(:blobstore) { instance_double(Bosh::Director::Blobstore::Client) }
           let(:blobstores) do
             instance_double(Bosh::Director::Blobstores, blobstore: blobstore)
           end

src/bosh-director/spec/unit/deployment_plan/stages/update_stage_functional_spec.rb

@@ -35,7 +35,7 @@ module Bosh::Director::DeploymentPlan::Stages
     let(:task) { FactoryBot.create(:models_task, id: 42, username: 'user') }
     let(:task_writer) { Bosh::Director::TaskDBWriter.new(:event_output, task.id) }
     let(:event_log) { Bosh::Director::EventLog::Log.new(task_writer) }
-    let(:blobstore) { instance_double(Bosh::Director::Blobstore::Sha1VerifiableBlobstoreClient) }
+    let(:blobstore) { instance_double(Bosh::Director::Blobstore::Client) }
 
     before do
       release = FactoryBot.create(:models_release, name: 'bosh-release')
@@ -82,9 +82,10 @@ module Bosh::Director::DeploymentPlan::Stages
 
       allow(Bosh::Director::App).to receive_message_chain(:instance, :blobstores, :blobstore).and_return(blobstore)
       allow(blobstore).to receive(:get)
-      allow(Bosh::Director::JobRenderer).to receive(:render_job_instances_with_cache)
       allow(blobstore).to receive(:can_sign_urls?).and_return(false)
       allow(blobstore).to receive(:validate!)
+
+      allow(Bosh::Director::JobRenderer).to receive(:render_job_instances_with_cache)
     end
 
     context 'the director database contains an instance with a static ip but no vm assigned (due to deploy failure)' do