From 3c0fa839a6926f19300dd0c842971c6a96061856 Mon Sep 17 00:00:00 2001 From: Thomas Lobjoie Date: Tue, 9 Mar 2021 14:53:11 +0000 Subject: [PATCH 1/7] Add mtk dump config to D8 skeleton. --- .../skeleton/tools/database/mtk.config.yml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/drupal8/application/skeleton/tools/database/mtk.config.yml diff --git a/src/drupal8/application/skeleton/tools/database/mtk.config.yml b/src/drupal8/application/skeleton/tools/database/mtk.config.yml new file mode 100644 index 000000000..34962ffd7 --- /dev/null +++ b/src/drupal8/application/skeleton/tools/database/mtk.config.yml @@ -0,0 +1,22 @@ +--- +rewrite: + users_field_data: + mail: concat(uid, "@localhost") + pass: '"password"' + +nodata: + - cache* + - captcha_sessions + - history + - flood + - batch + - queue + - sessions + - semaphore + - search_api_task + - search_dataset + - search_index + - search_total + +ignore: + - __ACQUIA_MONITORING__ \ No newline at end of file From efd6a8bc0215b8053bbf15ad1a864142aff4862f Mon Sep 17 00:00:00 2001 From: Thomas Lobjoie Date: Tue, 9 Mar 2021 14:55:00 +0000 Subject: [PATCH 2/7] Add dump sanitised dump bash script to D8 skeleton. --- .../skeleton/tools/database/dump_sanitised.sh | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/drupal8/application/skeleton/tools/database/dump_sanitised.sh diff --git a/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh b/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh new file mode 100644 index 000000000..1417be7b3 --- /dev/null +++ b/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +set -e -o pipefail + +curl --fail --silent --show-error --location --output /tmp/mtk-dump https://github.com/skpr/mtk/releases/download/v0.0.1/mtk-dump_linux_amd64 +chmod +x /tmp/mtk-dump + +if [ -L "$0" ] ; then + DIR="$(dirname "$(readlink -f "$0")")" ; +else + DIR="$(dirname "$0")" ; +fi + +BACKUP_TIME=$(date +"%Y-%m-%d--%H-%M-%S") +BACKUP_FILE="/app/tools/assets/development/dump_sanitised.sql" + +/tmp/mtk-dump \ +--config=$DIR/mtk.config.yml \ +--host=$DB_HOST \ +--user=$DB_USER \ +--password=$DB_PASS \ +$DB_NAME > $BACKUP_FILE \ No newline at end of file From 751c81a725e85a71d36657fa4a26da85c3d5d19f Mon Sep 17 00:00:00 2001 From: Thomas Lobjoie Date: Tue, 9 Mar 2021 14:55:31 +0000 Subject: [PATCH 3/7] Add 'db dump sanitised' command. --- src/_base/harness/config/commands.yml | 7 +++++++ test | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/_base/harness/config/commands.yml b/src/_base/harness/config/commands.yml index a8f56e506..53cb09887 100644 --- a/src/_base/harness/config/commands.yml +++ b/src/_base/harness/config/commands.yml @@ -315,3 +315,10 @@ command('lighthouse [--with-results]'): exec: | #!bash(workspace:/)|@ passthru docker-compose run --rm lighthouse bash -i /app/run.sh + +command('db dump sanitised'): + env: + COMPOSE_PROJECT_NAME: = @('namespace') + exec: | + #!bash(workspace:/) + passthru docker-compose exec -u build console /app/tools/database/dump_sanitised.sh \ No newline at end of file diff --git a/test b/test index ee7e4ae03..7f95f893d 100755 --- a/test +++ b/test @@ -41,7 +41,7 @@ function test() if [[ "$sync" != "" ]]; then wait_for_vendor_directory fi - teardown +# teardown ) function setup() @@ -194,5 +194,5 @@ function clean() fi } -trap 'clean' EXIT +#trap 'clean' EXIT main "$@" From 3142897db94bf139f18a2b2f9abb96fc93f986e3 Mon Sep 17 00:00:00 2001 From: Thomas Lobjoie Date: Tue, 9 Mar 2021 14:57:55 +0000 Subject: [PATCH 4/7] Revert unwanted committed changes. --- test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test b/test index 7f95f893d..ee7e4ae03 100755 --- a/test +++ b/test @@ -41,7 +41,7 @@ function test() if [[ "$sync" != "" ]]; then wait_for_vendor_directory fi -# teardown + teardown ) function setup() @@ -194,5 +194,5 @@ function clean() fi } -#trap 'clean' EXIT +trap 'clean' EXIT main "$@" From 6ac2e507db5c357194cc0ab6719e6417129f282d Mon Sep 17 00:00:00 2001 From: Thomas Lobjoie Date: Tue, 9 Mar 2021 15:03:49 +0000 Subject: [PATCH 5/7] Remove date and time from dump name. --- .../application/skeleton/tools/database/dump_sanitised.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh b/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh index 1417be7b3..69d848215 100644 --- a/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh +++ b/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh @@ -11,7 +11,6 @@ else DIR="$(dirname "$0")" ; fi -BACKUP_TIME=$(date +"%Y-%m-%d--%H-%M-%S") BACKUP_FILE="/app/tools/assets/development/dump_sanitised.sql" /tmp/mtk-dump \ From ae4cdf11ff4cfaf0cceabd3bb803ec830542840d Mon Sep 17 00:00:00 2001 From: Thomas Lobjoie Date: Fri, 12 Mar 2021 16:21:06 +0000 Subject: [PATCH 6/7] Specific sanitised dump folder for different hosts. --- .../skeleton/tools/database/dump_sanitised.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh b/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh index 69d848215..3f4b5e2aa 100644 --- a/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh +++ b/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh @@ -11,7 +11,20 @@ else DIR="$(dirname "$0")" ; fi -BACKUP_FILE="/app/tools/assets/development/dump_sanitised.sql" +# Workspace (default). +BACKUP_DIR="/app/tools/assets/development" + +# Acquia. +if [[ -z "$AH_SITE_ENVIRONMENT" ]]; then + BACKUP_DIR="/mnt/files/$AH_SITE_NAME.$AH_SITE_ENVIRONMENT/backups/sanitised" +fi + +# Platform.sh. +if [[ -z "$PLATFORM_BRANCH" ]]; then + BACKUP_DIR="~/drush-backups/sanitised" +fi + +BACKUP_FILE="$BACKUP_DIR/dump_sanitised.sql" /tmp/mtk-dump \ --config=$DIR/mtk.config.yml \ From 388ada3c96e22315af34cbf5d53946a74ba78c3b Mon Sep 17 00:00:00 2001 From: Thomas Lobjoie Date: Thu, 13 May 2021 16:20:55 +0100 Subject: [PATCH 7/7] Modify if statement. --- .../application/skeleton/tools/database/dump_sanitised.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh b/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh index 3f4b5e2aa..e829f2a9e 100644 --- a/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh +++ b/src/drupal8/application/skeleton/tools/database/dump_sanitised.sh @@ -15,12 +15,12 @@ fi BACKUP_DIR="/app/tools/assets/development" # Acquia. -if [[ -z "$AH_SITE_ENVIRONMENT" ]]; then +if [[ -n "$AH_SITE_ENVIRONMENT" ]]; then BACKUP_DIR="/mnt/files/$AH_SITE_NAME.$AH_SITE_ENVIRONMENT/backups/sanitised" fi # Platform.sh. -if [[ -z "$PLATFORM_BRANCH" ]]; then +if [[ -n "$PLATFORM_BRANCH" ]]; then BACKUP_DIR="~/drush-backups/sanitised" fi