Skip to content

Commit 6571de4

Browse files
committed
Add Azure Storage CLI connection config to specs and yml.erb files
1 parent ba144c9 commit 6571de4

File tree

6 files changed

+67
-0
lines changed

6 files changed

+67
-0
lines changed

jobs/cloud_controller_clock/spec

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ packages:
3535
- jemalloc
3636
- mariadb_connector_c
3737
- ruby-3.2
38+
- azure-storage-cli
3839

3940
consumes:
4041
- name: database
@@ -216,6 +217,8 @@ properties:
216217
cc.resource_pool.cdn.key_pair_id:
217218
description: "Key pair name for signed download URIs"
218219
default: ""
220+
cc.resource_pool.connection_config:
221+
description: "Azure Storage Cli connection hash"
219222

220223
cc.packages.blobstore_type:
221224
description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
@@ -259,6 +262,8 @@ properties:
259262
cc.packages.cdn.key_pair_id:
260263
description: "Key pair name for signed download URIs"
261264
default: ""
265+
cc.packages.connection_config:
266+
description: "Azure Storage Cli connection hash"
262267

263268
cc.droplets.blobstore_type:
264269
description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
@@ -299,6 +304,8 @@ properties:
299304
cc.droplets.cdn.key_pair_id:
300305
description: "Key pair name for signed download URIs"
301306
default: ""
307+
cc.droplets.connection_config:
308+
description: "Azure Storage Cli connection hash"
302309

303310
cc.buildpacks.blobstore_type:
304311
description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
@@ -339,6 +346,8 @@ properties:
339346
cc.buildpacks.cdn.key_pair_id:
340347
description: "Key pair name for signed download URIs"
341348
default: ""
349+
cc.buildpacks.connection_config:
350+
description: "Azure Storage Cli connection hash"
342351

343352
ccdb.databases:
344353
description: "Contains the name of the database on the database server"

jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@ resource_pool:
211211
private_key: <%= p("cc.resource_pool.cdn.private_key").inspect %>
212212
<% end %>
213213
fog_connection: <%= p("cc.resource_pool.fog_connection", {}).to_json %>
214+
<% if_p("cc.resource_pool.connection_config") do %>
215+
connection_config: <%= p("cc.resource_pool.connection_config", {}).to_json %>
216+
<% end %>
214217
fog_aws_storage_options: <%= p("cc.resource_pool.fog_aws_storage_options", {}).to_json %>
215218
fog_gcp_storage_options: <%= p("cc.resource_pool.fog_gcp_storage_options", {}).to_json %>
216219

@@ -234,6 +237,9 @@ packages:
234237
private_key: <%= p("cc.packages.cdn.private_key").inspect %>
235238
<% end %>
236239
fog_connection: <%= p("cc.packages.fog_connection", {}).to_json %>
240+
<% if_p("cc.packages.connection_config") do %>
241+
connection_config: <%= p("cc.packages.connection_config", {}).to_json %>
242+
<% end %>
237243
fog_aws_storage_options: <%= p("cc.packages.fog_aws_storage_options", {}).to_json %>
238244
fog_gcp_storage_options: <%= p("cc.packages.fog_gcp_storage_options", {}).to_json %>
239245

@@ -256,6 +262,9 @@ droplets:
256262
private_key: <%= p("cc.droplets.cdn.private_key").inspect %>
257263
<% end %>
258264
fog_connection: <%= p("cc.droplets.fog_connection", {}).to_json %>
265+
<% if_p("cc.droplets.connection_config") do %>
266+
connection_config: <%= p("cc.droplets.connection_config", {}).to_json %>
267+
<% end %>
259268
fog_aws_storage_options: <%= p("cc.droplets.fog_aws_storage_options", {}).to_json %>
260269
fog_gcp_storage_options: <%= p("cc.droplets.fog_gcp_storage_options", {}).to_json %>
261270

@@ -278,6 +287,9 @@ buildpacks:
278287
private_key: <%= p("cc.buildpacks.cdn.private_key").inspect %>
279288
<% end %>
280289
fog_connection: <%= p("cc.buildpacks.fog_connection", {}).to_json %>
290+
<% if_p("cc.buildpacks.connection_config") do %>
291+
connection_config: <%= p("cc.buildpacks.connection_config", {}).to_json %>
292+
<% end %>
281293
fog_aws_storage_options: <%= p("cc.buildpacks.fog_aws_storage_options", {}).to_json %>
282294
fog_gcp_storage_options: <%= p("cc.buildpacks.fog_gcp_storage_options", {}).to_json %>
283295

jobs/cloud_controller_ng/spec

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ packages:
7474
- jemalloc
7575
- mariadb_connector_c
7676
- ruby-3.2
77+
- azure-storage-cli
7778

7879
provides:
7980
- name: cloud_controller
@@ -234,6 +235,10 @@ provides:
234235
- cc.temporary_enable_deprecated_thin_webserver
235236
- cc.custom_root_links
236237
- cc.feature_flag_overrides
238+
- cc.resource_pool.connection_config
239+
- cc.packages.connection_config
240+
- cc.droplets.connection_config
241+
- cc.buildpacks.connection_config
237242

238243
consumes:
239244
- name: database
@@ -562,6 +567,8 @@ properties:
562567
cc.resource_pool.cdn.key_pair_id:
563568
description: "Key pair name for signed download URIs"
564569
default: ""
570+
cc.resource_pool.connection_config:
571+
description: "Azure Storage Cli connection hash"
565572

566573
cc.packages.blobstore_type:
567574
description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
@@ -610,6 +617,8 @@ properties:
610617
cc.packages.cdn.key_pair_id:
611618
description: "Key pair name for signed download URIs"
612619
default: ""
620+
cc.packages.connection_config:
621+
description: "Azure Storage Cli connection hash"
613622

614623
cc.droplets.blobstore_type:
615624
description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
@@ -655,6 +664,8 @@ properties:
655664
cc.droplets.cdn.key_pair_id:
656665
description: "Key pair name for signed download URIs"
657666
default: ""
667+
cc.droplets.connection_config:
668+
description: "Azure Storage Cli connection hash"
658669

659670
cc.buildpacks.blobstore_type:
660671
description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
@@ -697,6 +708,8 @@ properties:
697708
cc.buildpacks.cdn.key_pair_id:
698709
description: "Key pair name for signed download URIs"
699710
default: ""
711+
cc.buildpacks.connection_config:
712+
description: "Azure Storage Cli connection hash"
700713

701714
ccdb.databases:
702715
description: "Contains the name of the database on the database server"

jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,9 @@ resource_pool:
339339
private_key: <%= p("cc.resource_pool.cdn.private_key").inspect %>
340340
<% end %>
341341
fog_connection: <%= p("cc.resource_pool.fog_connection", {}).to_json %>
342+
<% if_p("cc.resource_pool.connection_config") do %>
343+
connection_config: <%= p("cc.resource_pool.connection_config", {}).to_json %>
344+
<% end %>
342345
fog_aws_storage_options: <%= p("cc.resource_pool.fog_aws_storage_options", {}).to_json %>
343346
fog_gcp_storage_options: <%= p("cc.resource_pool.fog_gcp_storage_options", {}).to_json %>
344347

@@ -363,6 +366,9 @@ packages:
363366
private_key: <%= p("cc.packages.cdn.private_key").inspect %>
364367
<% end %>
365368
fog_connection: <%= p("cc.packages.fog_connection", {}).to_json %>
369+
<% if_p("cc.packages.connection_config") do %>
370+
connection_config: <%= p("cc.packages.connection_config", {}).to_json %>
371+
<% end %>
366372
fog_aws_storage_options: <%= p("cc.packages.fog_aws_storage_options", {}).to_json %>
367373
fog_gcp_storage_options: <%= p("cc.packages.fog_gcp_storage_options", {}).to_json %>
368374

@@ -385,6 +391,9 @@ droplets:
385391
private_key: <%= p("cc.droplets.cdn.private_key").inspect %>
386392
<% end %>
387393
fog_connection: <%= p("cc.droplets.fog_connection", {}).to_json %>
394+
<% if_p("cc.droplets.connection_config") do %>
395+
connection_config: <%= p("cc.droplets.connection_config", {}).to_json %>
396+
<% end %>
388397
fog_aws_storage_options: <%= p("cc.droplets.fog_aws_storage_options", {}).to_json %>
389398
fog_gcp_storage_options: <%= p("cc.droplets.fog_gcp_storage_options", {}).to_json %>
390399
max_staged_droplets_stored: <%= p("cc.droplets.max_staged_droplets_stored") %>
@@ -408,6 +417,9 @@ buildpacks:
408417
private_key: <%= p("cc.buildpacks.cdn.private_key").inspect %>
409418
<% end %>
410419
fog_connection: <%= p("cc.buildpacks.fog_connection", {}).to_json %>
420+
<% if_p("cc.buildpacks.connection_config") do %>
421+
connection_config: <%= p("cc.buildpacks.connection_config", {}).to_json %>
422+
<% end %>
411423
fog_aws_storage_options: <%= p("cc.buildpacks.fog_aws_storage_options", {}).to_json %>
412424
fog_gcp_storage_options: <%= p("cc.buildpacks.fog_gcp_storage_options", {}).to_json %>
413425

jobs/cloud_controller_worker/spec

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ packages:
4545
- jemalloc
4646
- mariadb_connector_c
4747
- ruby-3.2
48+
- azure-storage-cli
4849

4950
consumes:
5051
- name: database
@@ -183,6 +184,8 @@ properties:
183184
cc.resource_pool.cdn.key_pair_id:
184185
description: "Key pair name for signed download URIs"
185186
default: ""
187+
cc.resource_pool.connection_config:
188+
description: "Azure Storage Cli connection hash"
186189

187190
cc.packages.blobstore_type:
188191
description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
@@ -226,6 +229,8 @@ properties:
226229
cc.packages.cdn.key_pair_id:
227230
description: "Key pair name for signed download URIs"
228231
default: ""
232+
cc.packages.connection_config:
233+
description: "Azure Storage Cli connection hash"
229234

230235
cc.droplets.blobstore_type:
231236
description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
@@ -266,6 +271,8 @@ properties:
266271
cc.droplets.cdn.key_pair_id:
267272
description: "Key pair name for signed download URIs"
268273
default: ""
274+
cc.droplets.connection_config:
275+
description: "Azure Storage Cli connection hash"
269276

270277
cc.buildpacks.blobstore_type:
271278
description: "The type of blobstore backing to use. Valid values: ['fog', 'webdav']"
@@ -306,6 +313,8 @@ properties:
306313
cc.buildpacks.cdn.key_pair_id:
307314
description: "Key pair name for signed download URIs"
308315
default: ""
316+
cc.buildpacks.connection_config:
317+
description: "Azure Storage Cli connection hash"
309318

310319
ccdb.databases:
311320
description: "Contains the name of the database on the database server"

jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,9 @@ resource_pool:
176176
private_key: <%= p("cc.resource_pool.cdn.private_key").inspect %>
177177
<% end %>
178178
fog_connection: <%= p("cc.resource_pool.fog_connection", {}).to_json %>
179+
<% if_p("cc.resource_pool.connection_config") do %>
180+
connection_config: <%= p("cc.resource_pool.connection_config", {}).to_json %>
181+
<% end %>
179182
fog_aws_storage_options: <%= p("cc.resource_pool.fog_aws_storage_options", {}).to_json %>
180183
fog_gcp_storage_options: <%= p("cc.resource_pool.fog_gcp_storage_options", {}).to_json %>
181184

@@ -200,6 +203,9 @@ packages:
200203
private_key: <%= p("cc.packages.cdn.private_key").inspect %>
201204
<% end %>
202205
fog_connection: <%= p("cc.packages.fog_connection", {}).to_json %>
206+
<% if_p("cc.packages.connection_config") do %>
207+
connection_config: <%= p("cc.packages.connection_config", {}).to_json %>
208+
<% end %>
203209
fog_aws_storage_options: <%= p("cc.packages.fog_aws_storage_options", {}).to_json %>
204210
fog_gcp_storage_options: <%= p("cc.packages.fog_gcp_storage_options", {}).to_json %>
205211

@@ -222,6 +228,9 @@ droplets:
222228
private_key: <%= p("cc.droplets.cdn.private_key").inspect %>
223229
<% end %>
224230
fog_connection: <%= p("cc.droplets.fog_connection", {}).to_json %>
231+
<% if_p("cc.droplets.connection_config") do %>
232+
connection_config: <%= p("cc.droplets.connection_config", {}).to_json %>
233+
<% end %>
225234
fog_aws_storage_options: <%= p("cc.droplets.fog_aws_storage_options", {}).to_json %>
226235
fog_gcp_storage_options: <%= p("cc.droplets.fog_gcp_storage_options", {}).to_json %>
227236

@@ -244,6 +253,9 @@ buildpacks:
244253
private_key: <%= p("cc.buildpacks.cdn.private_key").inspect %>
245254
<% end %>
246255
fog_connection: <%= p("cc.buildpacks.fog_connection", {}).to_json %>
256+
<% if_p("cc.buildpacks.connection_config") do %>
257+
connection_config: <%= p("cc.buildpacks.connection_config", {}).to_json %>
258+
<% end %>
247259
fog_aws_storage_options: <%= p("cc.buildpacks.fog_aws_storage_options", {}).to_json %>
248260
fog_gcp_storage_options: <%= p("cc.buildpacks.fog_gcp_storage_options", {}).to_json %>
249261

0 commit comments

Comments
 (0)