fix: backup-unset-public-key-encryption command #336
Conversation
| local SERVICE_ROOT="${PLUGIN_DATA_ROOT}/${SERVICE}" | ||
| local SERVICE_BACKUP_ENCRYPTION_ROOT="${SERVICE_ROOT}/backup-encryption/" | ||
|
|
||
| mkdir "$SERVICE_BACKUP_ENCRYPTION_ROOT" |
There was a problem hiding this comment.
Added '-p' flag to prevent this command from failing if the encryption directory already exists. This will occur after an encryption type was set and then removed.
| rm "$SERVICE_BACKUP_ENCRYPTION_ROOT/ENCRYPTION_KEY" | ||
| } | ||
|
|
||
| service_backup_unset_encryption() { |
There was a problem hiding this comment.
This was a duplicate of the above function prior to this change.
| [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service" | ||
| verify_service_name "$SERVICE" | ||
| service_backup_unset_public_key_encryption "$SERVICE" # TODO: [22.03.2024 by Mykola] | ||
| service_backup_unset_public_key_encryption "$SERVICE" |
There was a problem hiding this comment.
This wasn't pointing to an actual function and would blow up at this point prior to the above change in common-functions.
| [[ ${argv[0]} == "$cmd" ]] && shift 1 | ||
| declare SERVICE="$1" | ||
| is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented" # TODO: [22.03.2024 by Mykola] | ||
| is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented" |
hoelter
changed the title
|
Anything I can do to help get this merged? |
| If both passphrase and public key forms of encryption are set, the public key encryption will take precedence. | ||
|
|
||
| The underlying core backup script is present [here](https://github.com/dokku/docker-s3backup/blob/main/backup.sh). | ||
|
|
There was a problem hiding this comment.
The readme is autogenerated, so you'll need to update the doc generation to get this into place as it will be wiped on next generation.
You can use the bin/generate script to regenerate the readme to test your changes.
There was a problem hiding this comment.
I updated the generation script and moved a couple of the comments into the description variables so they'd appear with the specific method info. Thee desc lines are a bit longer now, so let me know if you'd like me to make any stylistic changes or shift the location of the info -- maybe putting it all at the top level where I made the generation script edits.
There was a problem hiding this comment.
Yeah the longer descriptions should either be part of an example or just in errata that gets injected into the generated docs.
There was a problem hiding this comment.
I shortened the descriptions and moved the second info part to a #E line
hoelter
force-pushed
the
public-key-encryption-unset-fix
branch
from
dbf99bf to
c9f2e6e
Compare
|
@josegonzalez anything else I can do to help get this merged upstream? |
2 participants
The "backup-unset-public-key-encryption" is not currently functioning. These changes resolve that.
I updated the set / unset functions to enable removing either the public-key-encryption or the encryption-passphrase in isolation without removing the other and added some notes to the readme.