From d8b13298b78bf266a41dd04c8c0312304c8f2256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= Date: Mon, 14 Sep 2015 17:09:08 +0200 Subject: [PATCH] Add `import`, `clone` commands Fix dump and connect commands --- commands | 25 +++++++++++++++-------- tests/service_clone.bats | 42 ++++++++++++++++++++++++++++++++++++++ tests/service_connect.bats | 2 +- tests/service_export.bats | 2 +- tests/service_import.bats | 37 +++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+), 10 deletions(-) create mode 100755 tests/service_clone.bats create mode 100755 tests/service_import.bats diff --git a/commands b/commands index 6c4fcac..2dcadaf 100755 --- a/commands +++ b/commands @@ -115,15 +115,20 @@ case "$1" in SERVICE_NAME="$(get_service_name "$SERVICE")" PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD") - docker exec "$SERVICE_NAME" mysqldump --host=localhost --user=mysql --password="$PASSWORD" --databases "$SERVICE" + docker exec "$SERVICE_NAME" mysqldump --user=mysql --password="$PASSWORD" "$SERVICE" ;; $PLUGIN_COMMAND_PREFIX:import) [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service" verify_service_name "$2" - SERVICE="$2" + SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" + SERVICE_NAME="$(get_service_name "$SERVICE")" + PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD") - dokku_log_fail "Not yet implemented" + if [[ -t 0 ]]; then + dokku_log_fail "No data provided on stdin." + fi + docker exec -i "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" "$SERVICE" ;; $PLUGIN_COMMAND_PREFIX:logs) @@ -159,7 +164,7 @@ case "$1" in SERVICE_NAME="$(get_service_name "$SERVICE")" PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD") - docker exec -it "$SERVICE_NAME" mysql --host=localhost --user=mysql --password="$PASSWORD" --database="$SERVICE" + docker exec -it "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" --database="$SERVICE" ;; $PLUGIN_COMMAND_PREFIX:info) @@ -174,10 +179,14 @@ case "$1" in $PLUGIN_COMMAND_PREFIX:clone) [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service" + [[ -z $3 ]] && dokku_log_fail "Please specify a name for the new service" verify_service_name "$2" SERVICE="$2" - - dokku_log_fail "Not yet implemented" + NEW_SERVICE="$3" + dokku "$PLUGIN_COMMAND_PREFIX:create" "$NEW_SERVICE" + dokku_log_info1 "Copying data from $SERVICE to $NEW_SERVICE" + dokku "$PLUGIN_COMMAND_PREFIX:export" "$SERVICE" | dokku "$PLUGIN_COMMAND_PREFIX:import" "$NEW_SERVICE" > /dev/null 2>&1 || true + dokku_log_info1 "Done" ;; $PLUGIN_COMMAND_PREFIX:expose) @@ -200,13 +209,13 @@ case "$1" in $PLUGIN_COMMAND_PREFIX:link , Link the $PLUGIN_SERVICE service to the app $PLUGIN_COMMAND_PREFIX:unlink , Unlink the $PLUGIN_SERVICE service from the app $PLUGIN_COMMAND_PREFIX:export , Export a dump of the $PLUGIN_SERVICE service database - $PLUGIN_COMMAND_PREFIX:import , NOT IMPLEMENTED + $PLUGIN_COMMAND_PREFIX:import < , Import a dump into the $PLUGIN_SERVICE service database $PLUGIN_COMMAND_PREFIX:connect , Connect via mysql to a $PLUGIN_SERVICE service $PLUGIN_COMMAND_PREFIX:logs [-t], Print the most recent log(s) for this service $PLUGIN_COMMAND_PREFIX:restart , Graceful shutdown and restart of the $PLUGIN_SERVICE service container $PLUGIN_COMMAND_PREFIX:info , Print the connection information $PLUGIN_COMMAND_PREFIX:list, List all $PLUGIN_SERVICE services - $PLUGIN_COMMAND_PREFIX:clone , NOT IMPLEMENTED + $PLUGIN_COMMAND_PREFIX:clone , Create container then copy data from into $PLUGIN_COMMAND_PREFIX:expose [port], Expose a $PLUGIN_SERVICE service on custom port if provided (random port otherwise) $PLUGIN_COMMAND_PREFIX:unexpose , Unexpose a previously exposed $PLUGIN_SERVICE service $PLUGIN_COMMAND_PREFIX:start , Start a previously stopped $PLUGIN_SERVICE service diff --git a/tests/service_clone.bats b/tests/service_clone.bats new file mode 100755 index 0000000..658eb24 --- /dev/null +++ b/tests/service_clone.bats @@ -0,0 +1,42 @@ +#!/usr/bin/env bats +load test_helper + +setup() { + export ECHO_DOCKER_COMMAND="false" + dokku "$PLUGIN_COMMAND_PREFIX:create" l >&2 +} + +teardown() { + export ECHO_DOCKER_COMMAND="false" + dokku --force "$PLUGIN_COMMAND_PREFIX:destroy" l >&2 +} + +@test "($PLUGIN_COMMAND_PREFIX:clone) error when there are no arguments" { + run dokku "$PLUGIN_COMMAND_PREFIX:clone" + assert_contains "${lines[*]}" "Please specify a name for the service" +} + +@test "($PLUGIN_COMMAND_PREFIX:clone) error when service does not exist" { + run dokku "$PLUGIN_COMMAND_PREFIX:clone" not_existing_service new_service + assert_contains "${lines[*]}" "service not_existing_service does not exist" +} + +@test "($PLUGIN_COMMAND_PREFIX:clone) error when new service isn't provided" { + run dokku "$PLUGIN_COMMAND_PREFIX:clone" l + assert_contains "${lines[*]}" "Please specify a name for the new service" +} + +@test "($PLUGIN_COMMAND_PREFIX:clone) error when new service already exists" { + dokku "$PLUGIN_COMMAND_PREFIX:create" new_service + run dokku "$PLUGIN_COMMAND_PREFIX:clone" l new_service + assert_contains "${lines[*]}" "service new_service already exists" + dokku --force "$PLUGIN_COMMAND_PREFIX:destroy" new_service +} + +@test "($PLUGIN_COMMAND_PREFIX:clone) success" { + run dokku "$PLUGIN_COMMAND_PREFIX:clone" l new_service + [[ -f $PLUGIN_DATA_ROOT/new_service/ID ]] + assert_contains "${lines[*]}" "Copying data from l to new_service" + assert_contains "${lines[*]}" "Done" +} + diff --git a/tests/service_connect.bats b/tests/service_connect.bats index 52db916..d57f5b1 100755 --- a/tests/service_connect.bats +++ b/tests/service_connect.bats @@ -25,6 +25,6 @@ teardown() { export ECHO_DOCKER_COMMAND="true" run dokku "$PLUGIN_COMMAND_PREFIX:connect" l password="$(cat "$PLUGIN_DATA_ROOT/l/PASSWORD")" - assert_output "docker exec -it dokku.mysql.l mysql --host=localhost --user=mysql --password=$password --database=l" + assert_output "docker exec -it dokku.mysql.l mysql --user=mysql --password=$password --database=l" } diff --git a/tests/service_export.bats b/tests/service_export.bats index 21e1193..e55184a 100755 --- a/tests/service_export.bats +++ b/tests/service_export.bats @@ -25,6 +25,6 @@ teardown() { export ECHO_DOCKER_COMMAND="true" run dokku "$PLUGIN_COMMAND_PREFIX:export" l password="$(cat "$PLUGIN_DATA_ROOT/l/PASSWORD")" - assert_output "docker exec dokku.mysql.l mysqldump --host=localhost --user=mysql --password=$password --databases l" + assert_output "docker exec dokku.mysql.l mysqldump --user=mysql --password=$password l" } diff --git a/tests/service_import.bats b/tests/service_import.bats new file mode 100755 index 0000000..a65da5d --- /dev/null +++ b/tests/service_import.bats @@ -0,0 +1,37 @@ +#!/usr/bin/env bats +load test_helper + +setup() { + export ECHO_DOCKER_COMMAND="false" + dokku "$PLUGIN_COMMAND_PREFIX:create" l >&2 + echo "data" > "$PLUGIN_DATA_ROOT/fake.sql" +} + +teardown() { + export ECHO_DOCKER_COMMAND="false" + dokku --force "$PLUGIN_COMMAND_PREFIX:destroy" l >&2 + rm -f "$PLUGIN_DATA_ROOT/fake.sql" +} + +@test "($PLUGIN_COMMAND_PREFIX:import) error when there are no arguments" { + run dokku "$PLUGIN_COMMAND_PREFIX:import" + assert_contains "${lines[*]}" "Please specify a name for the service" +} + +@test "($PLUGIN_COMMAND_PREFIX:import) error when service does not exist" { + run dokku "$PLUGIN_COMMAND_PREFIX:import" not_existing_service + assert_contains "${lines[*]}" "service not_existing_service does not exist" +} + +@test "($PLUGIN_COMMAND_PREFIX:import) error when data is not provided" { + run dokku "$PLUGIN_COMMAND_PREFIX:import" l + assert_contains "${lines[*]}" "No data provided on stdin" +} + +@test "($PLUGIN_COMMAND_PREFIX:import) success" { + export ECHO_DOCKER_COMMAND="true" + run dokku "$PLUGIN_COMMAND_PREFIX:import" l < "$PLUGIN_DATA_ROOT/fake.sql" + password="$(cat "$PLUGIN_DATA_ROOT/l/PASSWORD")" + assert_output "docker exec -i dokku.mysql.l mysql --user=mysql --password=$password l" +} +