github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: expose attachment readonly and volume_options in storage:list json

Browse Source 
The `storage:list <app> --format json` payload conflated the
attachment's `Readonly` flag and its `VolumeOptions` field into a
single derived `volume_options` string that rendered as `ro`,
`<options>`, or `ro,<options>` depending on which fields were set on
the underlying attachment. That shape is fine for the legacy
`host:container[:options]` text view but it leaves drift-detection
tooling unable to tell whether a `ro` token came from
`Attachment.Readonly == true` or from the operator setting
`Attachment.VolumeOptions = "ro"` directly. The JSON now exposes
`readonly` (boolean) and `volume_options` (string) as separate
omitempty keys populated straight from the attachment, and
`formatStorageListEntry` combines them at format time for the colon-
form text view. `ParseMountPath` was extended in lockstep so callers
of the legacy `host:container:opts` form no longer have to special-
case the `ro` token themselves.
This commit is contained in:
Jose Diaz-Gonzalez
2026-05-30 03:00:21 -04:00
parent f4d27be7a6
commit e9160db769
7 changed files with 118 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/unit/storage.bats
View File

@@ -137,11 +137,11 @@ teardown() {
assert_success
assert_output "/mount"
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '.[].volume_options'"
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r 'map(has(\"volume_options\") or has(\"readonly\")) | any'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_not_exists
assert_output "false"
run /bin/bash -c "dokku storage:mount $TEST_APP /tmp/mount:/mount"
echo "output: $output"
@@ -386,6 +386,28 @@ teardown() {
assert_success
assert_output_contains ":ro,noexec,nosuid"
# The JSON output of storage:list exposes readonly and volume_options
# as separate keys so external drift-detection tooling can compare
# them against the underlying attachment fields one for one.
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '.[] | select(.container_path == \"/ro\") | .readonly'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "true"
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '.[] | select(.container_path == \"/ro\") | .volume_options'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "noexec,nosuid"
# The /data mount has no readonly flag, so the key is absent.
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '.[] | select(.container_path == \"/data\") | has(\"readonly\")'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "false"
# cleanup
run /bin/bash -c "dokku storage:unmount $TEST_APP rdmtest-opts --container-dir /data"
assert_success