Merge pull request #7587 from turicas/fix/docs-paketo

Correctly name paketo chown option

docs/advanced-usage/persistent-storage.md

@@ -74,8 +74,8 @@ By default, permissions are set for usage with Herokuish buildpacks. These permi
     - This is used for apps deployed with Buildpacks via Herokuish.
 - `--chown heroku`: Use `1000:1000` as the folder permissions.
     - This is used for apps deployed with Cloud Native Buildpacks using the `heroku/builder` builder.
-- `--chown packeto`: Use `2000:2000` as the folder permissions.
-    - This is used for apps deployed with Cloud Native Buildpacks using the `cloudfoundry/cnb` or `packeto` builders.
+- `--chown paketo`: Use `2000:2000` as the folder permissions.
+    - This is used for apps deployed with Cloud Native Buildpacks using the `cloudfoundry/cnb` or `paketo` builders.
 - `--chown root`: Use `0:0` as the folder permissions.
     - This is used for containers that run their processes as root, as is typical for most Dockerfile or Docker image deploys.
 - `--chown false`: Skips the `chown` call.

plugins/storage/internal-functions

@@ -44,6 +44,9 @@ cmd-storage-ensure-directory() {
     CHOWN_FLAG="1000"
   elif [[ "$CHOWN_FLAG" == "packeto" ]]; then
     CHOWN_FLAG="2000"
+    dokku_log_verbose "Detected deprecated chown flag 'packeto'. Using 'paketo' instead. Please update your configuration."
+  elif [[ "$CHOWN_FLAG" == "paketo" ]]; then
+    CHOWN_FLAG="2000"
   elif [[ "$CHOWN_FLAG" == "root" ]]; then
     CHOWN_FLAG="0"
   elif [[ "$CHOWN_FLAG" == "false" ]]; then

tests/unit/storage.bats

@@ -90,7 +90,7 @@ teardown() {
   assert_output_contains "Setting directory ownership to 2000:2000" 0
   assert_output_contains "Setting directory ownership to 32767:32767" 0
 
-  run /bin/bash -c "dokku storage:ensure-directory --chown packeto $TEST_APP"
+  run /bin/bash -c "dokku storage:ensure-directory --chown paketo $TEST_APP"
   echo "output: $output"
   echo "status: $status"
   assert_success