Read storage-cli config JSON from capi (AzureRM) - #4581
Merged
Conversation
Stop building storage-cli JSON inside CC; instead consume files rendered by capi job templates. StorageCliClient now selects the JSON file by `resource_type`.
kathap
marked this pull request as draft
September 26, 2025 14:07
kathap
force-pushed
the
azure-storage-cli-integration
branch
2 times, most recently
from
September 30, 2025 13:41
05de380 to
dbf843c
Compare
kathap
force-pushed
the
azure-storage-cli-integration
branch
from
September 30, 2025 14:03
dbf843c to
8c8c630
Compare
kathap
marked this pull request as ready for review
October 1, 2025 13:10
kathap
marked this pull request as draft
October 8, 2025 08:06
73 tasks
kathap
force-pushed
the
azure-storage-cli-integration
branch
2 times, most recently
from
October 14, 2025 15:19
e763ccc to
4d069a4
Compare
kathap
force-pushed
the
azure-storage-cli-integration
branch
from
October 14, 2025 15:23
4d069a4 to
4c7d0cc
Compare
kathap
marked this pull request as ready for review
October 15, 2025 07:09
jochenehret
reviewed
Oct 21, 2025
jochenehret
left a comment
jochenehret
left a comment
Contributor
There was a problem hiding this comment.
Looks good, just some minor findings.
| raise BlobstoreError.new("Unknown resource_type: #{resource_type}") | ||
| end | ||
|
|
||
| path = VCAP::CloudController::Config.config.get(key) |
Contributor
There was a problem hiding this comment.
What if config.get(key) returns nil? Maybe include key in the error message?
Contributor
Author
There was a problem hiding this comment.
If resource_type does not match any of the specified cases line 50-54, the else branch will raise a BlobstoreError before key is assigned, so execution will not reach line 59 with a nil value for key.
| json | ||
| end | ||
|
|
||
| def config_path_for!(resource_type) |
Contributor
There was a problem hiding this comment.
Why an exclamation mark in the method name? It doesn't modify the passed object. Same for the other methods in this class.
Contributor
Author
There was a problem hiding this comment.
In cloud controller validation/check functions that raise an error end with an exclamation mark vs validation/check function that raise not an error do not end with an exclamation mark..
…nt is not building the config any more
kathap
force-pushed
the
azure-storage-cli-integration
branch
from
October 22, 2025 13:39
5c884e0 to
2596e92
Compare
jochenehret
approved these changes
Oct 29, 2025
ari-wg-gitbot
added a commit
to cloudfoundry/capi-release
that referenced
this pull request
Oct 29, 2025
Changes in cloud_controller_ng:
- Read storage-cli config JSON from capi (AzureRM)
PR: cloudfoundry/cloud_controller_ng#4581
Author: Katharina Przybill <30441792+kathap@users.noreply.github.com>
5 tasks
sethboyles
pushed a commit
to atanas-attodorov-wq/cloud_controller_ng
that referenced
this pull request
Dec 11, 2025
* Read storage-cli config JSON from capi (AzureRM) Stop building storage-cli JSON inside CC; instead consume files rendered by capi job templates. StorageCliClient now selects the JSON file by `resource_type`.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stop building storage-cli JSON inside CC; instead consume files rendered by capi job templates. StorageCliClient now selects the JSON file by
resource_type.Thanks for contributing to cloud_controller_ng. To speed up the process of reviewing your pull request please provide us with:
A short explanation of the proposed change:
Adopt storage_cli_client to read json configs rendered by capi. Detect correct json file by resource_type.
An explanation of the use cases your change solves
Switch responsibility of JSON generation to capi-release so CC only reads well-formed per-resource configs. This removes duplication of storage cli config file creation.
Links to any other associated PRs
Azure storage-cli integration capi-release#580
I have reviewed the contributing guide
I have viewed, signed, and submitted the Contributor License Agreement
I have made this pull request to the
mainbranchI have run all the unit tests using
bundle exec rakeI have run CF Acceptance Tests