Fix blobstore benchmark errand

- Decouple blobstore benchmark logging from cc logging
- Add cc_overrides to ccng yml, with that fog properties are really
  merged into ccng yml and fog is used for blobstore coomunication

Author: kathap

jobs/blobstore_benchmark/spec

@@ -39,6 +39,12 @@ properties:
   blobstore_benchmark.cc_overrides:
     description: "Hash merged into cc config for this errand."
     default: {}
+  blobstore_benchmark.logging_level:
+    default: "info"
+    description: "Steno log level for the benchmark process (info|warn|error)."
+  blobstore_benchmark.stdout_sink_enabled:
+    default: false
+
   cc:
     description: "Full Cloud Controller 'cc' config subtree."
     default: {}

jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb

@@ -28,11 +28,31 @@
   end
 
   cc_cfg = (link("cloud_controller_internal").p("cc") rescue {})
-
   unless cc_cfg.is_a?(Hash)
     raise "cc link did not return a Hash, got: #{cc_cfg.class}"
   end
 
+  overrides = p("blobstore_benchmark.cc_overrides", {})
+  unless overrides.is_a?(Hash)
+    raise "blobstore_benchmark.cc_overrides must be a Hash, got: #{overrides.class}"
+  end
+
+  if cc_cfg.respond_to?(:deep_merge)
+    cc_cfg = cc_cfg.deep_merge(overrides)
+  else
+    merge_overwrite = lambda do |base, extra|
+      extra.each do |k, v|
+        if base[k].is_a?(Hash) && v.is_a?(Hash)
+          merge_overwrite.call(base[k], v)
+        else
+          base[k] = v
+        end
+      end
+      base
+    end
+    cc_cfg = merge_overwrite.call(cc_cfg, overrides)
+  end
+
   %w[resource_pool buildpacks packages droplets].each do |k|
     section = cc_cfg[k]
     next unless section.is_a?(Hash)
@@ -72,7 +92,8 @@
     db_hash['ca_cert_path'] = '/var/vcap/jobs/blobstore_benchmark/config/certs/db_ca.crt'
   end
 
-  logging_level = p("cc.logging_level", cc_cfg["logging_level"] || cc_cfg.dig("logging", "level") || "error")
+  benchmark_logging_level = p("blobstore_benchmark.logging_level", "info")
+  benchmark_stdout_sink   = p("blobstore_benchmark.stdout_sink_enabled", false)
 
   final = {
     'pid_filename' => '/var/vcap/sys/run/blobstore_benchmark/blobstore_benchmark.pid',
@@ -82,23 +103,31 @@
     'logging' => {
       'file' => '/var/vcap/sys/log/blobstore_benchmark/blobstore_benchmark.log',
       'syslog' => 'vcap.cloud_controller_ng',
-      'level' => logging_level.to_s,
+      'level' => benchmark_logging_level.to_s,
+
       'max_retries' => p("cc.logging_max_retries", cc_cfg["logging_max_retries"] || 0),
       'format' => {
         'timestamp' => (cc_cfg.dig("logging", "format", "timestamp") ||
                         link("cloud_controller_internal").p("cc.logging.format.timestamp", "rfc3339"))
       },
-      'stdout_sink_enabled' => p('cc.stdout_logging_enabled', false)
+      'stdout_sink_enabled' => benchmark_stdout_sink
     },
 
     'db' => db_hash,
-
-    'storage_cli_config_file_resource_pool' => '/var/vcap/jobs/blobstore_benchmark/config/storage_cli_config_resource_pool.json',
-    'storage_cli_config_file_buildpacks' => '/var/vcap/jobs/blobstore_benchmark/config/storage_cli_config_buildpacks.json',
-    'storage_cli_config_file_packages' => '/var/vcap/jobs/blobstore_benchmark/config/storage_cli_config_packages.json',
-    'storage_cli_config_file_droplets' => '/var/vcap/jobs/blobstore_benchmark/config/storage_cli_config_droplets.json',
   }
 
+  mode = p("blobstore_benchmark.mode")
+
+  # Only configure storage-cli JSON config paths when running storage-cli mode
+  if mode == "storage-cli"
+    final.merge!(
+      'storage_cli_config_file_resource_pool' => '/var/vcap/jobs/blobstore_benchmark/config/storage_cli_config_resource_pool.json',
+      'storage_cli_config_file_buildpacks' => '/var/vcap/jobs/blobstore_benchmark/config/storage_cli_config_buildpacks.json',
+      'storage_cli_config_file_packages' => '/var/vcap/jobs/blobstore_benchmark/config/storage_cli_config_packages.json',
+      'storage_cli_config_file_droplets' => '/var/vcap/jobs/blobstore_benchmark/config/storage_cli_config_droplets.json',
+    )
+  end
+
   deep_merge_without_overwrite(final, cc_cfg)
 %>
 ---