dokku/dokku-mysql
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: correct the validation message

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2019-03-09 16:39:34 -05:00
parent 1551ec61e7
commit fc3f6a8a52
44 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common-functions
View File

@@ -735,7 +735,7 @@ verify_service_name() {
is_valid_service_name() { is_valid_service_name() {
declare desc="Validates a service name" declare desc="Validates a service name"
declare SERVICE="$1" declare SERVICE="$1"
[[ -z "$SERVICE" ]] && dokku_log_fail "SERVICE must not be null" [[ -z "$SERVICE" ]] && return 1
if [[ "$SERVICE" =~ ^[A-Za-z0-9_]+$ ]]; then if [[ "$SERVICE" =~ ^[A-Za-z0-9_]+$ ]]; then
return 0 return 0

2
functions
View File

@@ -22,7 +22,7 @@ service_connect() {
service_create() { service_create() {
local SERVICE="$1" local SERVICE="$1"
is_valid_service_name "$SERVICE" || dokku_log_fail "Please specify a valid name for the service. Valid characters are: [A-Za-z0-9_]+" is_valid_service_name "$SERVICE" || dokku_log_fail "Please specify a valid name for the service. Valid characters are: [A-Za-z0-9_]+"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
[[ ! -d "$PLUGIN_DATA_ROOT/$SERVICE" ]] || dokku_log_fail "$PLUGIN_SERVICE service $SERVICE already exists" [[ ! -d "$PLUGIN_DATA_ROOT/$SERVICE" ]] || dokku_log_fail "$PLUGIN_SERVICE service $SERVICE already exists"
SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS" SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS"

2
subcommands/backup
View File

@@ -15,7 +15,7 @@ service-backup-cmd() {
declare SERVICE="$1" BUCKET_NAME="$2" USE_IAM_OPTIONAL_FLAG="$3" declare SERVICE="$1" BUCKET_NAME="$2" USE_IAM_OPTIONAL_FLAG="$3"
is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented" is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
[[ -z "$BUCKET_NAME" ]] && dokku_log_fail "Please specify an aws bucket for the backup" [[ -z "$BUCKET_NAME" ]] && dokku_log_fail "Please specify an aws bucket for the backup"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_backup "$SERVICE" "$BUCKET_NAME" "$USE_IAM_OPTIONAL_FLAG" service_backup "$SERVICE" "$BUCKET_NAME" "$USE_IAM_OPTIONAL_FLAG"

2
subcommands/backup-auth
View File

@@ -24,7 +24,7 @@ service-backup-auth-cmd() {
declare SERVICE="$1" AWS_ACCESS_KEY_ID="$2" AWS_SECRET_ACCESS_KEY="$3" AWS_DEFAULT_REGION="$4" AWS_SIGNATURE_VERSION="$5" ENDPOINT_URL="$6" declare SERVICE="$1" AWS_ACCESS_KEY_ID="$2" AWS_SECRET_ACCESS_KEY="$3" AWS_DEFAULT_REGION="$4" AWS_SIGNATURE_VERSION="$5" ENDPOINT_URL="$6"
is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented" is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
[[ -z "$AWS_ACCESS_KEY_ID" ]] && dokku_log_fail "Please specify an aws access key id" [[ -z "$AWS_ACCESS_KEY_ID" ]] && dokku_log_fail "Please specify an aws access key id"
[[ -z "$AWS_SECRET_ACCESS_KEY" ]] && dokku_log_fail "Please specify an aws secret access key" [[ -z "$AWS_SECRET_ACCESS_KEY" ]] && dokku_log_fail "Please specify an aws secret access key"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"

2
subcommands/backup-deauth
View File

@@ -13,7 +13,7 @@ service-backup-deauth-cmd() {
declare SERVICE="$1" declare SERVICE="$1"
is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented" is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_backup_deauth "$SERVICE" service_backup_deauth "$SERVICE"
} }

2
subcommands/backup-schedule
View File

@@ -19,7 +19,7 @@ service-backup-schedule-cmd() {
declare SERVICE="$1" SCHEDULE="$2" BUCKET_NAME="$3" USE_IAM_OPTIONAL_FLAG="$4" declare SERVICE="$1" SCHEDULE="$2" BUCKET_NAME="$3" USE_IAM_OPTIONAL_FLAG="$4"
is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented" is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
[[ -z "$SCHEDULE" ]] && dokku_log_fail "Please specify a schedule for the backup" [[ -z "$SCHEDULE" ]] && dokku_log_fail "Please specify a schedule for the backup"
[[ -z "$BUCKET_NAME" ]] && dokku_log_fail "Please specify an aws bucket for the backup" [[ -z "$BUCKET_NAME" ]] && dokku_log_fail "Please specify an aws bucket for the backup"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"

2
subcommands/backup-schedule-cat
View File

@@ -12,7 +12,7 @@ service-backup-schedule-cat-cmd() {
local cmd="$PLUGIN_COMMAND_PREFIX:backup-schedule-cat" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1 local cmd="$PLUGIN_COMMAND_PREFIX:backup-schedule-cat" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
declare SERVICE="$1" declare SERVICE="$1"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_backup_schedule_cat "$SERVICE" service_backup_schedule_cat "$SERVICE"
} }

2
subcommands/backup-set-encryption
View File

@@ -14,7 +14,7 @@ service-backup-set-encryption-cmd() {
declare SERVICE="$1" PASSPHRASE="$2" declare SERVICE="$1" PASSPHRASE="$2"
is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented" is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
[[ -z "$PASSPHRASE" ]] && dokku_log_fail "Please specify a GPG backup passphrase" [[ -z "$PASSPHRASE" ]] && dokku_log_fail "Please specify a GPG backup passphrase"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_backup_set_encryption "$SERVICE" "$PASSPHRASE" service_backup_set_encryption "$SERVICE" "$PASSPHRASE"

2
subcommands/backup-unschedule
View File

@@ -13,7 +13,7 @@ service-backup-unschedule-cmd() {
declare SERVICE="$1" declare SERVICE="$1"
is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented" is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_backup_unschedule "$SERVICE" service_backup_unschedule "$SERVICE"
} }

2
subcommands/backup-unset-encryption
View File

@@ -13,7 +13,7 @@ service-backup-unset-encryption-cmd() {
declare SERVICE="$1" declare SERVICE="$1"
is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented" is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_backup_unset_encryption "$SERVICE" service_backup_unset_encryption "$SERVICE"
} }

2
subcommands/clone
View File

@@ -19,7 +19,7 @@ service-clone-cmd() {
declare SERVICE="$1" NEW_SERVICE="$2" CLONE_FLAGS_LIST="${@:3}" declare SERVICE="$1" NEW_SERVICE="$2" CLONE_FLAGS_LIST="${@:3}"
is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented" is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
[[ -z "$NEW_SERVICE" ]] && dokku_log_fail "Please specify a name for the new service" [[ -z "$NEW_SERVICE" ]] && dokku_log_fail "Please specify a name for the new service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"

2
subcommands/connect
View File

@@ -13,7 +13,7 @@ service-connect-cmd() {
declare SERVICE="$1" declare SERVICE="$1"
is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented" is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_connect "$SERVICE" service_connect "$SERVICE"
} }

2
subcommands/destroy
View File

@@ -13,7 +13,7 @@ service-destroy-cmd() {
local cmd="$PLUGIN_COMMAND_PREFIX:destroy" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1 local cmd="$PLUGIN_COMMAND_PREFIX:destroy" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
declare SERVICE="$1" FORCE_FLAG="$2" declare SERVICE="$1" FORCE_FLAG="$2"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS" SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS"
SERVICE_HOST_ROOT="$PLUGIN_DATA_HOST_ROOT/$SERVICE" SERVICE_HOST_ROOT="$PLUGIN_DATA_HOST_ROOT/$SERVICE"

2
subcommands/exists
View File

@@ -12,7 +12,7 @@ service-exists-cmd() {
local cmd="$PLUGIN_COMMAND_PREFIX:exists" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1 local cmd="$PLUGIN_COMMAND_PREFIX:exists" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
declare SERVICE="$1" declare SERVICE="$1"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
dokku_log_info1 "Service $SERVICE exists" dokku_log_info1 "Service $SERVICE exists"
} }

2
subcommands/export
View File

@@ -15,7 +15,7 @@ service-export-cmd() {
declare SERVICE="$1" declare SERVICE="$1"
is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented" is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_export "$SERVICE" service_export "$SERVICE"
} }

2
subcommands/expose
View File

@@ -13,7 +13,7 @@ service-expose-cmd() {
local cmd="$PLUGIN_COMMAND_PREFIX:expose" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1 local cmd="$PLUGIN_COMMAND_PREFIX:expose" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
declare SERVICE="$1" PORTS_LIST="${@:2}" declare SERVICE="$1" PORTS_LIST="${@:2}"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_port_expose "$SERVICE" "${@:2}" service_port_expose "$SERVICE" "${@:2}"
} }

2
subcommands/import
View File

@@ -13,7 +13,7 @@ service-import-cmd() {
declare SERVICE="$1" declare SERVICE="$1"
is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented" is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_import "$SERVICE" service_import "$SERVICE"
} }

2
subcommands/info
View File

@@ -33,7 +33,7 @@ service-info-cmd() {
local cmd="$PLUGIN_COMMAND_PREFIX:info" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1 local cmd="$PLUGIN_COMMAND_PREFIX:info" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
declare SERVICE="$1" INFO_FLAG="$2" declare SERVICE="$1" INFO_FLAG="$2"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_info "$SERVICE" "$INFO_FLAG" service_info "$SERVICE" "$INFO_FLAG"
} }

2
subcommands/link
View File

@@ -46,7 +46,7 @@ service-link-cmd() {
declare SERVICE="$1" APP="$2" LINK_FLAGS_LIST="${@:3}" declare SERVICE="$1" APP="$2" LINK_FLAGS_LIST="${@:3}"
APP=${APP:="$DOKKU_APP_NAME"} APP=${APP:="$DOKKU_APP_NAME"}
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
[[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on" [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
verify_app_name "$APP" verify_app_name "$APP"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"

2
subcommands/linked
View File

@@ -14,7 +14,7 @@ service-linked-cmd() {
declare SERVICE="$1" APP="$2" declare SERVICE="$1" APP="$2"
APP=${APP:="$DOKKU_APP_NAME"} APP=${APP:="$DOKKU_APP_NAME"}
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
[[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on" [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
verify_app_name "$APP" verify_app_name "$APP"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"

2
subcommands/logs
View File

@@ -15,7 +15,7 @@ service-logs-cmd() {
local cmd="$PLUGIN_COMMAND_PREFIX:logs" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1 local cmd="$PLUGIN_COMMAND_PREFIX:logs" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
declare SERVICE="$1" TAIL_FLAG="$2" declare SERVICE="$1" TAIL_FLAG="$2"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_logs "$SERVICE" "$TAIL_FLAG" service_logs "$SERVICE" "$TAIL_FLAG"
} }

2
subcommands/promote
View File

@@ -27,7 +27,7 @@ service-promote-cmd() {
declare SERVICE="$1" APP="$2" declare SERVICE="$1" APP="$2"
APP=${APP:="$DOKKU_APP_NAME"} APP=${APP:="$DOKKU_APP_NAME"}
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
[[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on" [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
verify_app_name "$APP" verify_app_name "$APP"

2
subcommands/restart
View File

@@ -12,7 +12,7 @@ service-restart-cmd() {
local cmd="$PLUGIN_COMMAND_PREFIX:restart" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1 local cmd="$PLUGIN_COMMAND_PREFIX:restart" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
declare SERVICE="$1" declare SERVICE="$1"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_stop "$SERVICE" service_stop "$SERVICE"
service_start "$SERVICE" service_start "$SERVICE"

2
subcommands/start
View File

@@ -12,7 +12,7 @@ service-start-cmd() {
local cmd="$PLUGIN_COMMAND_PREFIX:start" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1 local cmd="$PLUGIN_COMMAND_PREFIX:start" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
declare SERVICE="$1" declare SERVICE="$1"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_start "$SERVICE" service_start "$SERVICE"
} }

2
subcommands/stop
View File

@@ -12,7 +12,7 @@ service-stop-cmd() {
local cmd="$PLUGIN_COMMAND_PREFIX:stop" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1 local cmd="$PLUGIN_COMMAND_PREFIX:stop" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
declare SERVICE="$1" declare SERVICE="$1"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_stop "$SERVICE" service_stop "$SERVICE"
} }

2
subcommands/unexpose
View File

@@ -12,7 +12,7 @@ service-unexpose-cmd() {
local cmd="$PLUGIN_COMMAND_PREFIX:unexpose" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1 local cmd="$PLUGIN_COMMAND_PREFIX:unexpose" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
declare SERVICE="$1" declare SERVICE="$1"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
service_port_unexpose "$SERVICE" service_port_unexpose "$SERVICE"
} }

2
subcommands/unlink
View File

@@ -15,7 +15,7 @@ service-unlink-cmd() {
declare SERVICE="$1" APP="$2" declare SERVICE="$1" APP="$2"
APP=${APP:="$DOKKU_APP_NAME"} APP=${APP:="$DOKKU_APP_NAME"}
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
[[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on" [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
verify_app_name "$APP" verify_app_name "$APP"

2
subcommands/upgrade
View File

@@ -17,7 +17,7 @@ service-upgrade-cmd() {
local cmd="$PLUGIN_COMMAND_PREFIX:upgrade" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1 local cmd="$PLUGIN_COMMAND_PREFIX:upgrade" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
declare SERVICE="$1" UPGRADE_FLAGS_LIST="${@:2}" declare SERVICE="$1" UPGRADE_FLAGS_LIST="${@:2}"
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
verify_service_name "$SERVICE" verify_service_name "$SERVICE"
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"

2
tests/service_clone.bats
View File

@@ -13,7 +13,7 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:clone) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:clone) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:clone" run dokku "$PLUGIN_COMMAND_PREFIX:clone"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:clone) error when service does not exist" { @test "($PLUGIN_COMMAND_PREFIX:clone) error when service does not exist" {

2
tests/service_connect.bats
View File

@@ -13,7 +13,7 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:connect) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:connect) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:connect" run dokku "$PLUGIN_COMMAND_PREFIX:connect"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:connect) error when service does not exist" { @test "($PLUGIN_COMMAND_PREFIX:connect) error when service does not exist" {

2
tests/service_create.bats
View File

@@ -8,7 +8,7 @@ load test_helper
@test "($PLUGIN_COMMAND_PREFIX:create) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:create) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:create" run dokku "$PLUGIN_COMMAND_PREFIX:create"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:create) error when there is an invalid name specified" { @test "($PLUGIN_COMMAND_PREFIX:create) error when there is an invalid name specified" {

2
tests/service_destroy.bats
View File

@@ -9,7 +9,7 @@ load test_helper
@test "($PLUGIN_COMMAND_PREFIX:destroy) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:destroy) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:destroy" run dokku "$PLUGIN_COMMAND_PREFIX:destroy"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:destroy) error when container does not exist" { @test "($PLUGIN_COMMAND_PREFIX:destroy) error when container does not exist" {

2
tests/service_export.bats
View File

@@ -13,7 +13,7 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:export) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:export) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:export" run dokku "$PLUGIN_COMMAND_PREFIX:export"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:export) error when service does not exist" { @test "($PLUGIN_COMMAND_PREFIX:export) error when service does not exist" {

2
tests/service_expose.bats
View File

@@ -11,7 +11,7 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:expose) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:expose) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:expose" run dokku "$PLUGIN_COMMAND_PREFIX:expose"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:expose) error when service does not exist" { @test "($PLUGIN_COMMAND_PREFIX:expose) error when service does not exist" {

2
tests/service_import.bats
View File

@@ -15,7 +15,7 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:import) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:import) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:import" run dokku "$PLUGIN_COMMAND_PREFIX:import"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:import) error when service does not exist" { @test "($PLUGIN_COMMAND_PREFIX:import) error when service does not exist" {

2
tests/service_info.bats
View File

@@ -11,7 +11,7 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:info) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:info) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:info" run dokku "$PLUGIN_COMMAND_PREFIX:info"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:info) error when service does not exist" { @test "($PLUGIN_COMMAND_PREFIX:info) error when service does not exist" {

2
tests/service_link.bats
View File

@@ -13,7 +13,7 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:link) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:link) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:link" run dokku "$PLUGIN_COMMAND_PREFIX:link"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:link) error when the app argument is missing" { @test "($PLUGIN_COMMAND_PREFIX:link) error when the app argument is missing" {

2
tests/service_logs.bats
View File

@@ -13,7 +13,7 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:logs) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:logs) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:logs" run dokku "$PLUGIN_COMMAND_PREFIX:logs"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:logs) error when service does not exist" { @test "($PLUGIN_COMMAND_PREFIX:logs) error when service does not exist" {

2
tests/service_promote.bats
View File

@@ -15,7 +15,7 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:promote) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:promote) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:promote" run dokku "$PLUGIN_COMMAND_PREFIX:promote"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:promote) error when the app argument is missing" { @test "($PLUGIN_COMMAND_PREFIX:promote) error when the app argument is missing" {

2
tests/service_restart.bats
View File

@@ -11,7 +11,7 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:restart) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:restart) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:restart" run dokku "$PLUGIN_COMMAND_PREFIX:restart"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:restart) error when service does not exist" { @test "($PLUGIN_COMMAND_PREFIX:restart) error when service does not exist" {

2
tests/service_start.bats
View File

@@ -11,7 +11,7 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:start) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:start) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:start" run dokku "$PLUGIN_COMMAND_PREFIX:start"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:start) error when service does not exist" { @test "($PLUGIN_COMMAND_PREFIX:start) error when service does not exist" {

2
tests/service_stop.bats
View File

@@ -11,7 +11,7 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:stop) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:stop) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:stop" run dokku "$PLUGIN_COMMAND_PREFIX:stop"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:stop) error when service does not exist" { @test "($PLUGIN_COMMAND_PREFIX:stop) error when service does not exist" {

2
tests/service_unexpose.bats
View File

@@ -11,7 +11,7 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:unexpose) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:unexpose) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:unexpose" run dokku "$PLUGIN_COMMAND_PREFIX:unexpose"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:unexpose) error when service does not exist" { @test "($PLUGIN_COMMAND_PREFIX:unexpose) error when service does not exist" {

2
tests/service_unlink.bats
View File

@@ -13,7 +13,7 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:unlink) error when there are no arguments" { @test "($PLUGIN_COMMAND_PREFIX:unlink) error when there are no arguments" {
run dokku "$PLUGIN_COMMAND_PREFIX:unlink" run dokku "$PLUGIN_COMMAND_PREFIX:unlink"
assert_contains "${lines[*]}" "Please specify a name for the service" assert_contains "${lines[*]}" "Please specify a valid name for the service"
} }
@test "($PLUGIN_COMMAND_PREFIX:unlink) error when the app argument is missing" { @test "($PLUGIN_COMMAND_PREFIX:unlink) error when the app argument is missing" {