add to manifest: blobstore_provider, jsons read provider from manifest, CCNG reads provider from JSON

Author: kathap

jobs/cloud_controller_clock/spec

@@ -40,7 +40,6 @@ packages:
   - jemalloc
   - mariadb_connector_c
   - ruby-3.2
-  - azure-storage-cli
 
 consumes:
 - name: database
@@ -177,6 +176,8 @@ properties:
   cc.staging_upload_password:
     description: "User's password used to access internal endpoints of Cloud Controller to upload files when staging"
 
+  cc.resource_pool.blobstore_provider:
+    description: "The provider of blobstore storage cli to use. Valid values: ['AzureRM']"
   cc.resource_pool.blobstore_type:
     description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
     default: "fog"
@@ -225,6 +226,8 @@ properties:
   cc.resource_pool.connection_config:
     description: "Azure Storage Cli connection hash"
 
+  cc.packages.blobstore_provider:
+    description: "The provider of blobstore storage cli to use. Valid values: ['AzureRM']"
   cc.packages.blobstore_type:
     description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
     default: "fog"
@@ -270,6 +273,8 @@ properties:
   cc.packages.connection_config:
     description: "Azure Storage Cli connection hash"
 
+  cc.droplets.blobstore_provider:
+    description: "The provider of blobstore storage cli to use. Valid values: ['AzureRM']"
   cc.droplets.blobstore_type:
     description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
     default: "fog"
@@ -312,6 +317,8 @@ properties:
   cc.droplets.connection_config:
     description: "Azure Storage Cli connection hash"
 
+  cc.buildpacks.blobstore_provider:
+    description: "The provider of blobstore storage cli to use. Valid values: ['AzureRM']"
   cc.buildpacks.blobstore_type:
     description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
     default: "fog"

jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb

@@ -217,9 +217,6 @@ resource_pool:
     private_key: <%= p("cc.resource_pool.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= p("cc.resource_pool.fog_connection", {}).to_json %>
-  <% if_p("cc.resource_pool.connection_config") do |cfg| %>
-  connection_config: <%= cfg.to_json %>
-  <% end %>
   fog_aws_storage_options: <%= p("cc.resource_pool.fog_aws_storage_options", {}).to_json %>
   fog_gcp_storage_options: <%= p("cc.resource_pool.fog_gcp_storage_options", {}).to_json %>
 
@@ -243,9 +240,6 @@ packages:
     private_key: <%= p("cc.packages.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= p("cc.packages.fog_connection", {}).to_json %>
-  <% if_p("cc.packages.connection_config") do |cfg| %>
-  connection_config: <%= cfg.to_json %>
-  <% end %>
   fog_aws_storage_options: <%= p("cc.packages.fog_aws_storage_options", {}).to_json %>
   fog_gcp_storage_options: <%= p("cc.packages.fog_gcp_storage_options", {}).to_json %>
 
@@ -268,9 +262,6 @@ droplets:
     private_key: <%= p("cc.droplets.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= p("cc.droplets.fog_connection", {}).to_json %>
-  <% if_p("cc.droplets.connection_config") do |cfg| %>
-  connection_config: <%= cfg.to_json %>
-  <% end %>
   fog_aws_storage_options: <%= p("cc.droplets.fog_aws_storage_options", {}).to_json %>
   fog_gcp_storage_options: <%= p("cc.droplets.fog_gcp_storage_options", {}).to_json %>
 
@@ -293,9 +284,6 @@ buildpacks:
     private_key: <%= p("cc.buildpacks.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= p("cc.buildpacks.fog_connection", {}).to_json %>
-  <% if_p("cc.buildpacks.connection_config") do |cfg| %>
-  connection_config: <%= cfg.to_json %>
-  <% end %>
   fog_aws_storage_options: <%= p("cc.buildpacks.fog_aws_storage_options", {}).to_json %>
   fog_gcp_storage_options: <%= p("cc.buildpacks.fog_gcp_storage_options", {}).to_json %>
 

jobs/cloud_controller_clock/templates/storage_cli_config_buildpacks.json.erb

@@ -20,7 +20,7 @@ def add(h, key, val)
 end
 
 scope = "cc.buildpacks.connection_config"
-provider = p("#{scope}.provider")
+provider = p("cc.buildpacks.blobstore_provider")
 
 if provider != "AzureRM"
   options = {} # for now: all non-azure providers output an empty JSON object

jobs/cloud_controller_clock/templates/storage_cli_config_droplets.json.erb

@@ -20,7 +20,7 @@ def add(h, key, val)
 end
 
 scope = "cc.droplets.connection_config"
-provider = p("#{scope}.provider")
+provider = p("cc.droplets.blobstore_provider")
 
 if provider != "AzureRM"
   options = {} # for now: all non-azure providers output an empty JSON object

jobs/cloud_controller_clock/templates/storage_cli_config_packages.json.erb

@@ -20,7 +20,7 @@ def add(h, key, val)
 end
 
 scope = "cc.packages.connection_config"
-provider = p("#{scope}.provider")
+provider = p("cc.packages.blobstore_provider")
 
 if provider != "AzureRM"
   options = {} # for now: all non-azure providers output an empty JSON object

jobs/cloud_controller_clock/templates/storage_cli_config_resource_pool.json.erb

@@ -20,7 +20,7 @@ def add(h, key, val)
 end
 
 scope = "cc.resource_pool.connection_config"
-provider = p("#{scope}.provider")
+provider = p("cc.resource_pool.blobstore_provider")
 
 if provider != "AzureRM"
   options = {} # for now: all non-azure providers output an empty JSON object

jobs/cloud_controller_ng/spec

@@ -79,7 +79,6 @@ packages:
   - jemalloc
   - mariadb_connector_c
   - ruby-3.2
-  - azure-storage-cli
 
 provides:
 - name: cloud_controller
@@ -124,6 +123,7 @@ provides:
 - name: cloud_controller_internal
   type: cloud_controller_internal
   properties:
+  - cc.buildpacks.blobstore_provider
   - cc.buildpacks.blobstore_type
   - cc.buildpacks.buildpack_directory_key
   - cc.buildpacks.cdn.key_pair_id
@@ -152,6 +152,7 @@ provides:
   - cc.default_stack
   - cc.default_app_lifecycle
   - cc.disable_private_domain_cross_space_context_path_route_sharing
+  - cc.droplets.blobstore_provider
   - cc.droplets.blobstore_type
   - cc.droplets.cdn.key_pair_id
   - cc.droplets.cdn.private_key
@@ -180,6 +181,7 @@ provides:
   - cc.max_annotations_per_resource
   - cc.maximum_health_check_timeout
   - cc.packages.app_package_directory_key
+  - cc.packages.blobstore_provider
   - cc.packages.blobstore_type
   - cc.packages.cdn.key_pair_id
   - cc.packages.cdn.private_key
@@ -195,6 +197,7 @@ provides:
   - cc.packages.webdav_config.private_endpoint
   - cc.packages.webdav_config.public_endpoint
   - cc.packages.webdav_config.username
+  - cc.resource_pool.blobstore_provider
   - cc.resource_pool.blobstore_type
   - cc.resource_pool.cdn.key_pair_id
   - cc.resource_pool.cdn.private_key
@@ -525,6 +528,8 @@ properties:
     default: default
     description: "The name of the quota definition CC will fallback on for org and space limits from the list of quota definitions."
 
+  cc.resource_pool.blobstore_provider:
+    description: "The provider of blobstore storage cli to use. Valid values: ['AzureRM']"
   cc.resource_pool.blobstore_type:
     description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
     default: "fog"
@@ -575,6 +580,8 @@ properties:
   cc.resource_pool.connection_config:
     description: "Azure Storage Cli connection hash"
 
+  cc.packages.blobstore_provider:
+    description: "The provider of blobstore storage cli to use. Valid values: ['AzureRM']"
   cc.packages.blobstore_type:
     description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
     default: "fog"
@@ -625,6 +632,8 @@ properties:
   cc.packages.connection_config:
     description: "Azure Storage Cli connection hash"
 
+  cc.droplets.blobstore_provider:
+    description: "The provider of blobstore storage cli to use. Valid values: ['AzureRM']"
   cc.droplets.blobstore_type:
     description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
     default: "fog"
@@ -672,6 +681,8 @@ properties:
   cc.droplets.connection_config:
     description: "Azure Storage Cli connection hash"
 
+  cc.buildpacks.blobstore_provider:
+    description: "The provider of blobstore storage cli to use. Valid values: ['AzureRM']"
   cc.buildpacks.blobstore_type:
     description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
     default: "fog"

jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb

@@ -1,14 +1,6 @@
 <%
   require 'cgi'
   require "yaml"
-   # 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
@@ -353,9 +345,6 @@ resource_pool:
     private_key: <%= p("cc.resource_pool.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= p("cc.resource_pool.fog_connection", {}).to_json %>
-  <% if_p("cc.resource_pool.connection_config") do |cfg| %>
-  connection_config: <%= cfg.to_json %>
-  <% end %>
   fog_aws_storage_options: <%= p("cc.resource_pool.fog_aws_storage_options", {}).to_json %>
   fog_gcp_storage_options: <%= p("cc.resource_pool.fog_gcp_storage_options", {}).to_json %>
 
@@ -380,9 +369,6 @@ packages:
     private_key: <%= p("cc.packages.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= p("cc.packages.fog_connection", {}).to_json %>
-  <% if_p("cc.packages.connection_config") do |cfg| %>
-  connection_config: <%= cfg.to_json %>
-  <% end %>
   fog_aws_storage_options: <%= p("cc.packages.fog_aws_storage_options", {}).to_json %>
   fog_gcp_storage_options: <%= p("cc.packages.fog_gcp_storage_options", {}).to_json %>
 
@@ -405,9 +391,6 @@ droplets:
     private_key: <%= p("cc.droplets.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= p("cc.droplets.fog_connection", {}).to_json %>
-  <% if_p("cc.droplets.connection_config") do |cfg| %>
-  connection_config: <%= cfg.to_json %>
-  <% end %>
   fog_aws_storage_options: <%= p("cc.droplets.fog_aws_storage_options", {}).to_json %>
   fog_gcp_storage_options: <%= p("cc.droplets.fog_gcp_storage_options", {}).to_json %>
   max_staged_droplets_stored: <%= p("cc.droplets.max_staged_droplets_stored") %>
@@ -431,9 +414,6 @@ buildpacks:
     private_key: <%= p("cc.buildpacks.cdn.private_key").inspect %>
   <% end %>
   fog_connection: <%= p("cc.buildpacks.fog_connection", {}).to_json %>
-  <% if_p("cc.buildpacks.connection_config") do |cfg| %>
-  connection_config: <%= cfg.to_json %>
-  <% end %>
   fog_aws_storage_options: <%= p("cc.buildpacks.fog_aws_storage_options", {}).to_json %>
   fog_gcp_storage_options: <%= p("cc.buildpacks.fog_gcp_storage_options", {}).to_json %>
 

jobs/cloud_controller_ng/templates/storage_cli_config_buildpacks.json.erb

@@ -20,7 +20,7 @@ def add(h, key, val)
 end
 
 scope = "cc.buildpacks.connection_config"
-provider = p("#{scope}.provider")
+provider = p("cc.buildpacks.blobstore_provider")
 
 if provider != "AzureRM"
   options = {} # for now: all non-azure providers output an empty JSON object

jobs/cloud_controller_ng/templates/storage_cli_config_droplets.json.erb

@@ -20,7 +20,7 @@ def add(h, key, val)
 end
 
 scope = "cc.droplets.connection_config"
-provider = p("#{scope}.provider")
+provider = p("cc.droplets.blobstore_provider", "AzureRM")
 
 if provider != "AzureRM"
   options = {} # for now: all non-azure providers output an empty JSON object