Adjust tests, simplify public_endpoint in config templates for dav

kathap · kathap · commit 8482b4e04298 · 2026-05-11T14:35:38.000+02:00
diff --git a/jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb b/jobs/blobstore_benchmark/templates/storage_cli_config_buildpacks.json.erb
@@ -104,11 +104,7 @@ if provider == "webdav" || provider == "dav"
   private_base = l.p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = l.p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", l.p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", l.p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", l.p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", l.p("#{scope}.retry_attempts", nil))
diff --git a/jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb b/jobs/blobstore_benchmark/templates/storage_cli_config_droplets.json.erb
@@ -104,11 +104,7 @@ if provider == "webdav" || provider == "dav"
   private_base = l.p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = l.p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", l.p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", l.p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", l.p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", l.p("#{scope}.retry_attempts", nil))
diff --git a/jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb b/jobs/blobstore_benchmark/templates/storage_cli_config_packages.json.erb
@@ -104,11 +104,7 @@ if provider == "webdav" || provider == "dav"
   private_base = l.p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = l.p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", l.p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", l.p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", l.p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", l.p("#{scope}.retry_attempts", nil))
diff --git a/jobs/blobstore_benchmark/templates/storage_cli_config_resource_pool.json.erb b/jobs/blobstore_benchmark/templates/storage_cli_config_resource_pool.json.erb
@@ -104,11 +104,7 @@ if provider == "webdav" || provider == "dav"
   private_base = l.p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = l.p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", l.p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", l.p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", l.p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", l.p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cc_deployment_updater/templates/storage_cli_config_buildpacks.json.erb b/jobs/cc_deployment_updater/templates/storage_cli_config_buildpacks.json.erb
@@ -104,11 +104,7 @@ if provider == "webdav" || provider == "dav"
   private_base = l.p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = l.p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", l.p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", l.p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", l.p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", l.p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cc_deployment_updater/templates/storage_cli_config_droplets.json.erb b/jobs/cc_deployment_updater/templates/storage_cli_config_droplets.json.erb
@@ -104,11 +104,7 @@ if provider == "webdav" || provider == "dav"
   private_base = l.p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = l.p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", l.p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", l.p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", l.p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", l.p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cc_deployment_updater/templates/storage_cli_config_packages.json.erb b/jobs/cc_deployment_updater/templates/storage_cli_config_packages.json.erb
@@ -104,11 +104,7 @@ if provider == "webdav" || provider == "dav"
   private_base = l.p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = l.p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", l.p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", l.p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", l.p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", l.p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cc_deployment_updater/templates/storage_cli_config_resource_pool.json.erb b/jobs/cc_deployment_updater/templates/storage_cli_config_resource_pool.json.erb
@@ -104,11 +104,7 @@ if provider == "webdav" || provider == "dav"
   private_base = l.p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = l.p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", l.p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", l.p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", l.p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", l.p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cloud_controller_clock/templates/storage_cli_config_buildpacks.json.erb b/jobs/cloud_controller_clock/templates/storage_cli_config_buildpacks.json.erb
@@ -102,11 +102,7 @@ if provider == "webdav" || provider == "dav"
   private_base = p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cloud_controller_clock/templates/storage_cli_config_droplets.json.erb b/jobs/cloud_controller_clock/templates/storage_cli_config_droplets.json.erb
@@ -102,11 +102,7 @@ if provider == "webdav" || provider == "dav"
   private_base = p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cloud_controller_clock/templates/storage_cli_config_packages.json.erb b/jobs/cloud_controller_clock/templates/storage_cli_config_packages.json.erb
@@ -102,11 +102,7 @@ if provider == "webdav" || provider == "dav"
   private_base = p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cloud_controller_clock/templates/storage_cli_config_resource_pool.json.erb b/jobs/cloud_controller_clock/templates/storage_cli_config_resource_pool.json.erb
@@ -102,11 +102,7 @@ if provider == "webdav" || provider == "dav"
   private_base = p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cloud_controller_ng/templates/storage_cli_config_buildpacks.json.erb b/jobs/cloud_controller_ng/templates/storage_cli_config_buildpacks.json.erb
@@ -102,11 +102,7 @@ if provider == "webdav" || provider == "dav"
   private_base = p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cloud_controller_ng/templates/storage_cli_config_droplets.json.erb b/jobs/cloud_controller_ng/templates/storage_cli_config_droplets.json.erb
@@ -107,10 +107,7 @@ if provider == "dav"
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
   # Public endpoint (optional) for user-facing signed URLs (API downloads via gorouter)
-  public_base = p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
+  add_optional(options, "public_endpoint", p("#{scope}.public_endpoint", nil))
 
   add_optional(options, "secret", p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", p("#{scope}.signed_url_format", nil))
diff --git a/jobs/cloud_controller_ng/templates/storage_cli_config_packages.json.erb b/jobs/cloud_controller_ng/templates/storage_cli_config_packages.json.erb
@@ -102,11 +102,7 @@ if provider == "webdav" || provider == "dav"
   private_base = p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cloud_controller_ng/templates/storage_cli_config_resource_pool.json.erb b/jobs/cloud_controller_ng/templates/storage_cli_config_resource_pool.json.erb
@@ -102,11 +102,7 @@ if provider == "webdav" || provider == "dav"
   private_base = p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  public_base = p("#{scope}.public_endpoint", nil)
-  if public_base && !public_base.empty?
-    options["public_endpoint"] = public_base
-  end
-
+  add_optional(options, "public_endpoint", p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cloud_controller_worker/templates/storage_cli_config_buildpacks.json.erb b/jobs/cloud_controller_worker/templates/storage_cli_config_buildpacks.json.erb
@@ -102,10 +102,7 @@ if provider == "webdav" || provider == "dav"
   private_base = p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  if_p("#{scope}.public_endpoint") do |public_endpoint|
-    options["public_endpoint"] = public_endpoint
-  end
-
+  add_optional(options, "public_endpoint", p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cloud_controller_worker/templates/storage_cli_config_droplets.json.erb b/jobs/cloud_controller_worker/templates/storage_cli_config_droplets.json.erb
@@ -102,10 +102,7 @@ if provider == "webdav" || provider == "dav"
   private_base = p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  if_p("#{scope}.public_endpoint") do |public_endpoint|
-    options["public_endpoint"] = public_endpoint
-  end
-
+  add_optional(options, "public_endpoint", p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cloud_controller_worker/templates/storage_cli_config_packages.json.erb b/jobs/cloud_controller_worker/templates/storage_cli_config_packages.json.erb
@@ -102,10 +102,7 @@ if provider == "webdav" || provider == "dav"
   private_base = p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  if_p("#{scope}.public_endpoint") do |public_endpoint|
-    options["public_endpoint"] = public_endpoint
-  end
-
+  add_optional(options, "public_endpoint", p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", p("#{scope}.retry_attempts", nil))
diff --git a/jobs/cloud_controller_worker/templates/storage_cli_config_resource_pool.json.erb b/jobs/cloud_controller_worker/templates/storage_cli_config_resource_pool.json.erb
@@ -102,10 +102,7 @@ if provider == "webdav" || provider == "dav"
   private_base = p("#{scope}.private_endpoint")
   options["endpoint"] = "#{private_base}/admin/#{resource_dir}"
 
-  if_p("#{scope}.public_endpoint") do |public_endpoint|
-    options["public_endpoint"] = public_endpoint
-  end
-
+  add_optional(options, "public_endpoint", p("#{scope}.public_endpoint", nil))
   add_optional(options, "secret", p("#{scope}.secret", nil))
   add_optional(options, "signed_url_format", p("#{scope}.signed_url_format", nil))
   add_optional(options, "retry_attempts", p("#{scope}.retry_attempts", nil))
diff --git a/spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb b/spec/cc_deployment_updater/storage_cli_config_jsons_spec.rb
@@ -4,18 +4,20 @@
 require 'yaml'
 require 'bosh/template/test'
 
-TEMPLATES = {
-  droplets: ['config/storage_cli_config_droplets.json', %w[cc droplets connection_config]],
-  buildpacks: ['config/storage_cli_config_buildpacks.json', %w[cc buildpacks connection_config]],
-  packages: ['config/storage_cli_config_packages.json', %w[cc packages connection_config]],
-  resource_pool: ['config/storage_cli_config_resource_pool.json', %w[cc resource_pool connection_config]]
-}.freeze
-
 module Bosh
   module Template
     module Test
       RSpec.describe 'storage-cli JSON templates' do
-        let(:release_path) { File.join(File.dirname(__FILE__), '../..') }
+        def self.storage_cli_templates
+          [
+            ['config/storage_cli_config_droplets.json', %w[cc droplets connection_config]],
+            ['config/storage_cli_config_buildpacks.json', %w[cc buildpacks connection_config]],
+            ['config/storage_cli_config_packages.json', %w[cc packages connection_config]],
+            ['config/storage_cli_config_resource_pool.json', %w[cc resource_pool connection_config]]
+          ]
+        end
+
+        let(:release_path) { File.expand_path('../..', __dir__) }
         let(:release)      { ReleaseDir.new(release_path) }
         let(:job)          { release.job('cc_deployment_updater') }
 
@@ -47,7 +49,7 @@ def props_for_provider(provider)
           let(:links) { [cc_link] }
           let(:props) { {} }
 
-          TEMPLATES.each_value do |(template_path, _keypath)|
+          storage_cli_templates.each do |(template_path, _keypath)|
             describe template_path do
               let(:template) { job.template(template_path) }
 
@@ -70,7 +72,7 @@ def props_for_provider(provider)
           let(:links) { [cc_link] }
           let(:props) { {} }
 
-          TEMPLATES.each_value do |(template_path, keypath)|
+          storage_cli_templates.each do |(template_path, keypath)|
             describe template_path do
               let(:template) { job.template(template_path) }
 
@@ -118,7 +120,7 @@ def props_for_provider(provider)
           let(:links) { [cc_link] }
           let(:props) { {} }
 
-          TEMPLATES.each_value do |(template_path, keypath)|
+          storage_cli_templates.each do |(template_path, keypath)|
             describe template_path do
               let(:template) { job.template(template_path) }
 
@@ -230,7 +232,7 @@ def props_for_provider(provider)
           let(:links) { [cc_link] }
           let(:props) { {} }
 
-          TEMPLATES.each_value do |(template_path, keypath)|
+          storage_cli_templates.each do |(template_path, keypath)|
             describe template_path do
               let(:template) { job.template(template_path) }
 
@@ -284,7 +286,7 @@ def props_for_provider(provider)
           let(:links) { [cc_link] }
           let(:props) { {} }
 
-          TEMPLATES.each_value do |(template_path, keypath)|
+          storage_cli_templates.each do |(template_path, keypath)|
             describe template_path do
               let(:template) { job.template(template_path) }
 
@@ -330,7 +332,7 @@ def expected_directory_key(template_path)
             end
           end
 
-          TEMPLATES.each_value do |(template_path, keypath)|
+          storage_cli_templates.each do |(template_path, keypath)|
             describe template_path do
               let(:template) { job.template(template_path) }
               let(:directory_key) { expected_directory_key(template_path) }
diff --git a/spec/cloud_controller_clock/storage_cli_config_jsons_spec.rb b/spec/cloud_controller_clock/storage_cli_config_jsons_spec.rb
diff --git a/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb b/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb
diff --git a/spec/cloud_controller_worker/storage_cli_config_jsons_spec.rb b/spec/cloud_controller_worker/storage_cli_config_jsons_spec.rb
