sts-sponsors team mailing list archive

[Alberto Donato <mp+440927@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas-site-manager:import-data-script-cleanups into maas-site-manager:main.

Commit message:
simplify test data import script, avoid having to copy CSV files

Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~ack/maas-site-manager/+git/site-manager/+merge/440927
-- 
Your team MAAS Committers is requested to review the proposed merge of ~ack/maas-site-manager:import-data-script-cleanups into maas-site-manager:main.

diff --git a/test-data/import.sh b/test-data/import.sh
index 592405c..4309cdb 100755
--- a/test-data/import.sh
+++ b/test-data/import.sh
@@ -1,27 +1,45 @@
-#!/bin/sh
+#!/bin/bash -e
 #
 # This script imports the testdata from this directory into the postgres database
 #
-psql=psql
 envfile="../.env.dev"
 
-if ! command -v psql > /dev/null
-then
-  echo "The ${psql} command was not found. It is need it to import the data. Try:"
-  echo "apt-get install postgresql-client"
-  exit 1
-fi
+basedir="$(dirname "$0")"
+
+copy_cmd() {
+    local filename="$1"
+    local tabledef="$2"
+    cat <<EOF
+COPY $tabledef
+FROM STDIN
+DELIMITER ','
+QUOTE '"'
+CSV HEADER;
+$(< "$basedir/$filename")
+\.
+EOF
+}
 
-if ! test -s ${envfile}
-then
-  echo "Cannot source dev environment. Make sure ../.env.dev exists."
-  exit 1
+
+if ! command -v psql > /dev/null; then
+    cat >&2 <<EOF
+The psql command was not found. It is need it to import the data. Try:
+  apt-get install postgresql-client
+EOF
+    exit 1
 fi
-. ${envfile}
 
-docker compose cp users.csv postgres:/
-docker compose cp sites.csv postgres:/
-docker compose cp tokens.csv postgres:/
-docker compose cp site_data.csv postgres:/
+if [ -e "$envfile" ]; then
+    # shellcheck disable=SC1090
+    . "$envfile"
+else 
+    echo "Cannot source dev environment. Make sure ${envfile} exists." >&2
+    exit 1
+fi
 
-${psql} postgresql://"${POSTGRES_USER}":"${POSTGRES_PASSWORD}"@localhost:"${POSTGRES_PORT}"/"${POSTGRES_DB}" -f import.sql
+(
+    copy_cmd sites.csv 'site(id, city, country, latitude, longitude, name, note, region, street, timezone, url)'
+    copy_cmd tokens.csv 'token(site_id, value, expired, created)'
+    copy_cmd users.csv '"user"(email, full_name, disabled, password)'
+    copy_cmd site_data.csv 'site_data(site_id, allocated_machines, deployed_machines, ready_machines, error_machines, last_seen)'
+) | psql "postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}"
diff --git a/test-data/import.sql b/test-data/import.sql
deleted file mode 100644
index 99745bc..0000000
--- a/test-data/import.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-COPY site(id, city, country, latitude, longitude, name, note, region, street, timezone, url)
-FROM '/sites.csv'
-DELIMITER ','
-QUOTE '"'
-CSV HEADER;
-
-COPY token(site_id, value, expired, created)
-FROM '/tokens.csv'
-DELIMITER ','
-QUOTE '"'
-CSV HEADER;
-
-COPY "user"(email, full_name, disabled, password)
-FROM '/users.csv'
-DELIMITER ','
-QUOTE '"'
-CSV HEADER;
-
-COPY site_data(site_id, allocated_machines, deployed_machines, ready_machines, error_machines, last_seen)
-FROM '/site_data.csv'
-DELIMITER ','
-QUOTE '"'
-CSV HEADER;