add put_timeout_in_seconds into connection_config wen present, add tests

kathap · kathap · commit 5f7266803f60 · 2025-09-30T18:15:50.000+02:00
diff --git a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb
@@ -1,15 +1,6 @@
 <%
   require 'cgi'
 
-  # Ensure Azure CLI connection_config has a default timeout if none is set
-  def cli_cfg_with_default_timeout(connection_cfg, blobstore_type, default_seconds: 41)
-    cfg = (connection_cfg || {}).dup
-    if blobstore_type == 'storage_cli' && !cfg.key?('put_timeout_in_seconds')
-      cfg['put_timeout_in_seconds'] = default_seconds.to_s
-    end
-    cfg
-  end
-
   def discover_external_ip
     networks = spec.networks.marshal_dump
     network = networks.values.detect(&:default) || networks.values.first
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
@@ -31,6 +31,7 @@ else
   options["container_name"] = p("#{scope}.container_name")
   add(options, "account_key",        p("#{scope}.azure_storage_access_key"))
   add(options, "environment",        p("#{scope}.environment", "AzureCloud"))
+  add(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds"))
 
   # optional passthrough for extra storage-cli flags
   begin
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
@@ -31,6 +31,7 @@ else
   options["container_name"] = p("#{scope}.container_name")
   add(options, "account_key",        p("#{scope}.azure_storage_access_key"))
   add(options, "environment",        p("#{scope}.environment", "AzureCloud"))
+  add(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds"))
 
   # optional passthrough for extra storage-cli flags
   begin
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
@@ -31,6 +31,7 @@ else
   options["container_name"] = p("#{scope}.container_name")
   add(options, "account_key",        p("#{scope}.azure_storage_access_key"))
   add(options, "environment",        p("#{scope}.environment", "AzureCloud"))
+  add(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds"))
 
   # optional passthrough for extra storage-cli flags
   begin
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
@@ -31,6 +31,7 @@ else
   options["container_name"] = p("#{scope}.container_name")
   add(options, "account_key",        p("#{scope}.azure_storage_access_key"))
   add(options, "environment",        p("#{scope}.environment", "AzureCloud"))
+  add(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds"))
 
   # optional passthrough for extra storage-cli flags
   begin
diff --git a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb
@@ -1,11 +1,6 @@
 <%
   require 'cgi'
   require "yaml"
-
-  def connection_config_with_context(cfg, context)
-    (cfg || {}).merge('context' => context)
-  end
-
    # Ensure Azure CLI connection_config has a default timeout if none is set
   def cli_cfg_with_default_timeout(connection_cfg, blobstore_type, default_seconds: 41)
     cfg = (connection_cfg || {}).dup
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
@@ -31,6 +31,7 @@ else
   options["container_name"] = p("#{scope}.container_name")
   add(options, "account_key",        p("#{scope}.azure_storage_access_key"))
   add(options, "environment",        p("#{scope}.environment", "AzureCloud"))
+  add(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds"))
 
   # optional passthrough for extra storage-cli flags
   begin
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
@@ -31,6 +31,7 @@ else
   options["container_name"] = p("#{scope}.container_name")
   add(options, "account_key",        p("#{scope}.azure_storage_access_key"))
   add(options, "environment",        p("#{scope}.environment", "AzureCloud"))
+  add(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds"))
 
   # optional passthrough for extra storage-cli flags
   begin
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
@@ -31,6 +31,7 @@ else
   options["container_name"] = p("#{scope}.container_name")
   add(options, "account_key",        p("#{scope}.azure_storage_access_key"))
   add(options, "environment",        p("#{scope}.environment", "AzureCloud"))
+  add(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds"))
 
   # optional passthrough for extra storage-cli flags
   begin
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
@@ -31,6 +31,7 @@ else
   options["container_name"] = p("#{scope}.container_name")
   add(options, "account_key",        p("#{scope}.azure_storage_access_key"))
   add(options, "environment",        p("#{scope}.environment", "AzureCloud"))
+  add(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds"))
 
   # optional passthrough for extra storage-cli flags
   begin
diff --git a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb
@@ -1,18 +1,6 @@
 <%
   require 'cgi'
 
-  # # Ensure Azure CLI connection_config has a default timeout if none is set
-  # def cli_cfg_with_default_timeout(connection_cfg, blobstore_type, default_seconds: 41)
-  #   cfg = (connection_cfg || {}).dup
-  #   if blobstore_type == 'storage_cli' && !cfg.key?('put_timeout_in_seconds')
-  #     cfg['put_timeout_in_seconds'] = default_seconds.to_s
-  #   end
-  #   cfg
-  # end
-  # def connection_config_with_context(cfg, context)
-  #   (cfg || {}).merge('context' => context)
-  # end
-
   def discover_external_ip
     networks = spec.networks.marshal_dump
     network = networks.values.detect(&:default) || networks.values.first
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
@@ -31,6 +31,7 @@ else
   options["container_name"] = p("#{scope}.container_name")
   add(options, "account_key",        p("#{scope}.azure_storage_access_key"))
   add(options, "environment",        p("#{scope}.environment", "AzureCloud"))
+  add(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds"))
 
   # optional passthrough for extra storage-cli flags
   begin
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
@@ -31,6 +31,7 @@ else
   options["container_name"] = p("#{scope}.container_name")
   add(options, "account_key",        p("#{scope}.azure_storage_access_key"))
   add(options, "environment",        p("#{scope}.environment", "AzureCloud"))
+  add(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds"))
 
   # optional passthrough for extra storage-cli flags
   begin
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
@@ -31,6 +31,7 @@ else
   options["container_name"] = p("#{scope}.container_name")
   add(options, "account_key",        p("#{scope}.azure_storage_access_key"))
   add(options, "environment",        p("#{scope}.environment", "AzureCloud"))
+  add(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds"))
 
   # optional passthrough for extra storage-cli flags
   begin
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
@@ -31,6 +31,7 @@ else
   options["container_name"] = p("#{scope}.container_name")
   add(options, "account_key",        p("#{scope}.azure_storage_access_key"))
   add(options, "environment",        p("#{scope}.environment", "AzureCloud"))
+  add(options, "put_timeout_in_seconds", p("#{scope}.put_timeout_in_seconds"))
 
   # optional passthrough for extra storage-cli flags
   begin
diff --git a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb
@@ -971,14 +971,14 @@ module Test
               end
             end
 
-            context 'when it is set to buidpack' do
+            context 'when it is set to buildpack' do
               before do
-                merged_manifest_properties['cc']['default_app_lifecycle'] = 'buidpack'
+                merged_manifest_properties['cc']['default_app_lifecycle'] = 'buildpack'
               end
 
-              it 'renders it as buidpack' do
+              it 'renders it as buildpack' do
                 template_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links))
-                expect(template_hash['default_app_lifecycle']).to eq('buidpack')
+                expect(template_hash['default_app_lifecycle']).to eq('buildpack')
               end
             end
 
@@ -993,6 +993,18 @@ module Test
               end
             end
           end
+
+          describe 'storage_cli_config_file_* paths' do
+            let(:template) { job.template('config/cloud_controller_ng.yml') }
+
+            it 'renders absolute paths for all four scope files' do
+              yaml = YAML.safe_load(template.render(merged_manifest_properties, consumes: links))
+              expect(yaml['storage_cli_config_file_droplets']).to eq('/var/vcap/jobs/cloud_controller_ng/config/storage_cli_config_droplets.json')
+              expect(yaml['storage_cli_config_file_packages']).to eq('/var/vcap/jobs/cloud_controller_ng/config/storage_cli_config_packages.json')
+              expect(yaml['storage_cli_config_file_buildpacks']).to eq('/var/vcap/jobs/cloud_controller_ng/config/storage_cli_config_buildpacks.json')
+              expect(yaml['storage_cli_config_file_resource_pool']).to eq('/var/vcap/jobs/cloud_controller_ng/config/storage_cli_config_resource_pool.json')
+            end
+          end
         end
       end
     end
diff --git a/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb b/spec/cloud_controller_ng/storage_cli_config_jsons_spec.rb
@@ -0,0 +1,80 @@
+# spec/templates/storage_cli_config_jsons_spec.rb
+require 'rspec'
+require 'json'
+require 'bosh/template/test'
+
+module Bosh::Template::Test
+  RSpec.describe 'storage-cli JSON templates' do
+    let(:release_path) { File.join(File.dirname(__FILE__), '../..') }
+    let(:release) { ReleaseDir.new(release_path) }
+    let(:job) { release.job('cloud_controller_ng') }
+    let(:links) { {} }
+    let(:props) do
+      {
+        'cc' => {
+          'droplets'     => { 'connection_config' => {} },
+          'buildpacks'   => { 'connection_config' => {} },
+          'packages'     => { 'connection_config' => {} },
+          'resource_pool'=> { 'connection_config' => {} },
+        }
+      }
+    end
+
+    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
+
+    TEMPLATES.each do |scope, (template_path, keypath)|
+      describe template_path do
+        let(:template) { job.template(template_path) }
+
+        def set(props, keypath, value)
+          h = props
+          keypath[0..-2].each { |k| h = (h[k] ||= {}) }
+          h[keypath.last] = value
+        end
+
+        it 'renders and normalizes put_timeout_in_seconds to "41" when blank' do
+          set(props, keypath, {
+            'provider' => 'AzureRM',
+            'azure_storage_account_name' => 'acc',
+            'azure_storage_access_key'   => 'key',
+            'container_name'             => 'cont',
+            'put_timeout_in_seconds'     => ''
+          })
+
+          json = JSON.parse(template.render(props, consumes: links))
+          expect(json).to include(
+                            'provider'               => 'AzureRM',
+                            'account_name'           => 'acc',
+                            'account_key'            => 'key',
+                            'container_name'         => 'cont',
+                            'put_timeout_in_seconds' => '41'
+                          )
+        end
+
+        it 'keeps existing put_timeout_in_seconds when provided' do
+          set(props, keypath, {
+            'provider' => 'AzureRM',
+            'azure_storage_account_name' => 'acc',
+            'azure_storage_access_key'   => 'key',
+            'container_name'             => 'cont',
+            'put_timeout_in_seconds'     => '7'
+          })
+
+          json = JSON.parse(template.render(props, consumes: links))
+          expect(json['put_timeout_in_seconds']).to eq('7')
+        end
+
+        it 'renders {} for non-Azure providers' do
+          set(props, keypath, { 'provider' => 'S3' })
+          json = JSON.parse(template.render(props, consumes: links))
+          expect(json).to eq({})
+        end
+      end
+    end
+  end
+end
