Rename '(src|dst)_name' -> '(src|dst)_filepath'

cloudfoundry · Dec 21, 2023 · ce48af2 · ce48af2
1 parent f43d4da
commit ce48af2
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 42 deletions.
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/job_template_loader.rb b/src/bosh-director-core/lib/bosh/director/core/templates/job_template_loader.rb
@@ -41,9 +41,9 @@ def process(instance_job)
 
         source_erbs = []
 
-        instance_job.model.spec.fetch('templates', {}).each_pair do |src_name, dest_name|
-          erb_file = File.read(File.join(template_dir, 'templates', src_name))
-          source_erbs << SourceErb.new(src_name, dest_name, erb_file, instance_job.name)
+        instance_job.model.spec.fetch('templates', {}).each_pair do |src_filepath, dest_filepath|
+          erb_contents = File.read(File.join(template_dir, 'templates', src_filepath))
+          source_erbs << SourceErb.new(src_filepath, dest_filepath, erb_contents, instance_job.name)
         end
 
         JobTemplateRenderer.new(instance_job: instance_job,

diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/job_template_renderer.rb b/src/bosh-director-core/lib/bosh/director/core/templates/job_template_renderer.rb
@@ -57,7 +57,7 @@ def render(spec)
           errors.push e
         end
 
-        RenderedFileTemplate.new(source_erb.src_name, source_erb.dest_name, file_contents)
+        RenderedFileTemplate.new(source_erb.src_filepath, source_erb.dest_filepath, file_contents)
       end
 
       if errors.length > 0

diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/rendered_file_template.rb b/src/bosh-director-core/lib/bosh/director/core/templates/rendered_file_template.rb
@@ -1,5 +1,5 @@
 require 'bosh/director/core/templates'
 
 module Bosh::Director::Core::Templates
-  RenderedFileTemplate = Struct.new(:src_name, :dest_name, :contents)
+  RenderedFileTemplate = Struct.new(:src_filepath, :dest_filepath, :contents)
 end
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/rendered_job_instance.rb b/src/bosh-director-core/lib/bosh/director/core/templates/rendered_job_instance.rb
@@ -20,9 +20,9 @@ def configuration_hash
         bound_templates << rendered_job_template.monit
         bound_templates << rendered_job_template.name
 
-        rendered_job_template.templates.sort { |x, y| x.src_name <=> y.src_name }.each do |template_file|
+        rendered_job_template.templates.sort { |x, y| x.src_filepath <=> y.src_filepath }.each do |template_file|
           bound_templates << template_file.contents
-          bound_templates << template_file.dest_name
+          bound_templates << template_file.dest_filepath
         end
 
         instance_digest << bound_templates

diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/rendered_job_template.rb b/src/bosh-director-core/lib/bosh/director/core/templates/rendered_job_template.rb
@@ -14,7 +14,7 @@ def initialize(name, monit, templates)
     def template_hash
       template_digest = Digest::SHA1.new
       template_digest << monit
-      templates.sort { |x, y| x.src_name <=> y.src_name }.each do |template_file|
+      templates.sort { |x, y| x.src_filepath <=> y.src_filepath }.each do |template_file|
         template_digest << template_file.contents
       end
 

diff --git a/...irector-core/lib/bosh/director/core/templates/rendered_templates_in_memory_tar_gzipper.rb b/...irector-core/lib/bosh/director/core/templates/rendered_templates_in_memory_tar_gzipper.rb
@@ -22,7 +22,7 @@ def self.produce_gzipped_tarball(rendered_job_templates)
           end
 
           rendered_job_template.templates.each do |rendered_file_template|
-            template_path = File.join(job_name, rendered_file_template.dest_name)
+            template_path = File.join(job_name, rendered_file_template.dest_filepath)
 
             tar.add_file template_path, CREATED_FILES_PERMISSIONS do |tf|
               tf.write(rendered_file_template.contents)

diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/rendered_templates_writer.rb b/src/bosh-director-core/lib/bosh/director/core/templates/rendered_templates_writer.rb
@@ -13,7 +13,7 @@ def write(rendered_templates, output_dir)
         end
 
         job_template.templates.each do |file_template|
-          file_template_dest = File.join(job_template_dir, file_template.dest_name)
+          file_template_dest = File.join(job_template_dir, file_template.dest_filepath)
           FileUtils.mkdir_p(File.dirname(file_template_dest))
           File.open(file_template_dest, 'w') do |f|
             f.write(file_template.contents)

diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/source_erb.rb b/src/bosh-director-core/lib/bosh/director/core/templates/source_erb.rb
@@ -5,13 +5,13 @@ module Bosh::Director::Core::Templates
   class SourceErb
     @@mutex = Mutex.new
 
-    attr_reader :src_name, :dest_name, :erb
+    attr_reader :src_filepath, :dest_filepath, :erb
 
-    def initialize(src_name, dest_name, erb_contents, job_name)
-      @src_name = src_name
-      @dest_name = dest_name
+    def initialize(src_filepath, dest_filepath, erb_contents, job_name)
+      @src_filepath = src_filepath
+      @dest_filepath = dest_filepath
       erb = ERB.new(erb_contents, trim_mode: "-")
-      erb.filename = File.join(job_name, src_name)
+      erb.filename = File.join(job_name, src_filepath)
       @erb = erb
     end
 
@@ -28,7 +28,7 @@ def render(context, logger)
       line = line_index ? e.backtrace[line_index] : '(unknown):(unknown)'
       template_name, line = line.split(':')
 
-      message = "Error filling in template '#{File.basename(template_name)}' (line #{line}: #{e})"
+      message = "Error filling in template '#{@src_filepath}' (line #{line}: #{e})"
 
       logger.debug("#{message}\n#{e.backtrace.join("\n")}")
       raise message

diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/job_template_renderer_spec.rb b/src/bosh-director-core/spec/bosh/director/core/templates/job_template_renderer_spec.rb
@@ -16,8 +16,8 @@ module Bosh::Director::Core::Templates
       let(:source_erb) do
         instance_double(
           'Bosh::Director::Core::Templates::SourceErb',
-          src_name: 'fake-template-src-name',
-          dest_name: 'fake-template-dest-name',
+          src_filepath: 'fake-template-src-name',
+          dest_filepath: 'fake-template-dest-name',
           render: 'test template',
         )
       end
@@ -67,8 +67,8 @@ module Bosh::Director::Core::Templates
 
           expect(rendered_templates.monit).to eq('monit file')
           rendered_file_template = rendered_templates.templates.first
-          expect(rendered_file_template.src_name).to eq('fake-template-src-name')
-          expect(rendered_file_template.dest_name).to eq('fake-template-dest-name')
+          expect(rendered_file_template.src_filepath).to eq('fake-template-src-name')
+          expect(rendered_file_template.dest_filepath).to eq('fake-template-dest-name')
           expect(rendered_file_template.contents).to eq('test template')
 
           expect(monit_erb).to have_received(:render).with(context_copy, logger)
@@ -268,8 +268,8 @@ module Bosh::Director::Core::Templates
           expect(dns_encoder).to have_received(:id_for_group_tuple).once
 
           rendered_links_file = rendered_files.pop
-          expect(rendered_links_file.src_name).to(eq('.bosh/links.json'))
-          expect(rendered_links_file.dest_name).to(eq('.bosh/links.json'))
+          expect(rendered_links_file.src_filepath).to(eq('.bosh/links.json'))
+          expect(rendered_links_file.dest_filepath).to(eq('.bosh/links.json'))
 
           expect(JSON.parse(rendered_links_file.contents)).to eq(
             [

diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/rendered_job_instance_spec.rb b/src/bosh-director-core/spec/bosh/director/core/templates/rendered_job_instance_spec.rb
@@ -18,8 +18,8 @@ module Bosh::Director::Core::Templates
             [
               instance_double(
                 'Bosh::Director::Core::Templates::RenderedFileTemplate',
-                src_name: 'template-file1',
-                dest_name: 'template-file1',
+                src_filepath: 'template-file1',
+                dest_filepath: 'template-file1',
                 contents: 'template file contents 1',
               ),
             ],
@@ -30,14 +30,14 @@ module Bosh::Director::Core::Templates
             [
               instance_double(
                 'Bosh::Director::Core::Templates::RenderedFileTemplate',
-                src_name: 'template-file3',
-                dest_name: 'template-file3',
+                src_filepath: 'template-file3',
+                dest_filepath: 'template-file3',
                 contents: 'template file contents 3',
               ),
               instance_double(
                 'Bosh::Director::Core::Templates::RenderedFileTemplate',
-                src_name: 'template-file2',
-                dest_name: 'template-file2',
+                src_filepath: 'template-file2',
+                dest_filepath: 'template-file2',
                 contents: 'template file contents 2',
               ),
             ],
@@ -57,8 +57,8 @@ module Bosh::Director::Core::Templates
               'monit file contents 1',
               [
                 instance_double('Bosh::Director::Core::Templates::RenderedFileTemplate',
-                                src_name: 'template-file1',
-                                dest_name: 'template-file1',
+                                src_filepath: 'template-file1',
+                                dest_filepath: 'template-file1',
                                 contents: 'template file contents 1'),
               ],
             ),
@@ -72,8 +72,8 @@ module Bosh::Director::Core::Templates
               'monit file contents 1',
               [
                 instance_double('Bosh::Director::Core::Templates::RenderedFileTemplate',
-                                src_name: 'template-file1',
-                                dest_name: 'template-file1',
+                                src_filepath: 'template-file1',
+                                dest_filepath: 'template-file1',
                                 contents: 'template file contents 1'),
               ],
             ),
@@ -82,8 +82,8 @@ module Bosh::Director::Core::Templates
               '',
               [
                 instance_double('Bosh::Director::Core::Templates::RenderedFileTemplate',
-                                src_name: 'template-file1',
-                                dest_name: 'template-file1',
+                                src_filepath: 'template-file1',
+                                dest_filepath: 'template-file1',
                                 contents: ''),
               ],
             ),
@@ -103,8 +103,8 @@ module Bosh::Director::Core::Templates
               'monit file contents 1',
               [
                 instance_double('Bosh::Director::Core::Templates::RenderedFileTemplate',
-                                src_name: 'template-file1',
-                                dest_name: 'template-file1',
+                                src_filepath: 'template-file1',
+                                dest_filepath: 'template-file1',
                                 contents: 'template file contents 1'),
               ],
             ),
@@ -118,8 +118,8 @@ module Bosh::Director::Core::Templates
               'monit file contents 1',
               [
                 instance_double('Bosh::Director::Core::Templates::RenderedFileTemplate',
-                                src_name: 'template-file1',
-                                dest_name: 'template-file1',
+                                src_filepath: 'template-file1',
+                                dest_filepath: 'template-file1',
                                 contents: 'template file contents 1'),
               ],
             ),

diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/rendered_job_template_spec.rb b/src/bosh-director-core/spec/bosh/director/core/templates/rendered_job_template_spec.rb
@@ -9,12 +9,12 @@ module Bosh::Director::Core::Templates
         [
           instance_double(
             'Bosh::Director::Core::Templates::RenderedFileTemplate',
-            src_name: 'foo.erb',
+            src_filepath: 'foo.erb',
             contents: 'rendered foo erb',
           ),
           instance_double(
             'Bosh::Director::Core::Templates::RenderedFileTemplate',
-            src_name: 'bar.erb',
+            src_filepath: 'bar.erb',
             contents: 'rendered bar erb',
           ),
         ]

diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/rendered_templates_writer_spec.rb b/src/bosh-director-core/spec/bosh/director/core/templates/rendered_templates_writer_spec.rb
@@ -10,14 +10,14 @@ module Bosh::Director::Core::Templates
 
     let(:rendered_file_template) do
       instance_double('Bosh::Director::Core::Templates::RenderedFileTemplate',
-                      dest_name: 'bin/script-filename',
+                      dest_filepath: 'bin/script-filename',
                       contents: 'script file contents'
       )
     end
 
     let(:rendered_file_template_with_deep_path) do
       instance_double('Bosh::Director::Core::Templates::RenderedFileTemplate',
-                      dest_name: 'config/with/deeper/path/filename.cfg',
+                      dest_filepath: 'config/with/deeper/path/filename.cfg',
                       contents: 'config file contents'
       )
     end