From 3df1989f68db40df90ee9e3b9675a1225312d9d5 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Wed, 9 Jun 2021 08:16:27 +0000 Subject: [PATCH] Remove the database information as an argument. #576 --- utils/load_warranty_serial/load_serials.php | 24 ++++++++++++++++++--- utils/warranty_motiv_local.sh | 2 +- utils/warranty_motiv_local_bulk.sh | 2 +- utils/warranty_motiv_prod.sh | 2 +- utils/warranty_motiv_prod_bulk.sh | 2 +- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/utils/load_warranty_serial/load_serials.php b/utils/load_warranty_serial/load_serials.php index d5369aac..b0c3081e 100644 --- a/utils/load_warranty_serial/load_serials.php +++ b/utils/load_warranty_serial/load_serials.php @@ -4,10 +4,11 @@ require_once(__DIR__ . '/../../vendor/autoload.php'); use Symfony\Component\Dotenv\Dotenv; +// TODO: this whole thing needs to be refactored + // load csv $csv = fopen($argv[1], 'r'); -$dsn = $argv[2]; -$output_file = $argv[3]; +$output_file = $argv[2]; $output_fh = fopen($output_file, "w"); @@ -25,6 +26,24 @@ $dotenv->loadEnv(__DIR__.'/../../.env'); $user = $_ENV['DB_USER']; $pass = $_ENV['DB_PASSWORD']; +$db_info = $_ENV['DATABASE_URL']; + +// sample format of db_info: mysql://db_user:db_password@127.0.0.1:3306/resq +// dsn for PDO needs to be: mysql:host=127.0.0.1:3306;dbname=resq;charset=UTF8 + +$result = preg_split("/[\/:@]/", $db_info); +$db_type = 'mysql:host='; +$user = $result[3]; +$pass = $result[4]; +$ip_port = $result[5] . ':' . $result[6] . ';'; +$db_name = 'dbname=' . $result[7] . ';'; +$charset = 'charset=UTF8'; + +$dsn = $db_type . $ip_port . $db_name . $charset; + +//error_log($dsn); +//error_log($user); +//error_log($pass); // connect to db $db = new PDO($dsn, $user, $pass); @@ -157,4 +176,3 @@ while (($row = fgetcsv($csv)) !== false) fclose($csv); fclose($output_fh); - diff --git a/utils/warranty_motiv_local.sh b/utils/warranty_motiv_local.sh index ddfcd6f5..e99c7f64 100755 --- a/utils/warranty_motiv_local.sh +++ b/utils/warranty_motiv_local.sh @@ -6,4 +6,4 @@ load_status_file="/tmp/warranty_load_status_$proc_date.txt" echo $download_file echo $load_status_file /usr/bin/php /var/www/resq/utils/get_warranty_serial/new_get_serials.php $proc_date $download_file 1 -/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php $download_file "mysql:host=localhost;dbname=resq;charset=UTF8" $load_status_file +/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php $download_file $load_status_file diff --git a/utils/warranty_motiv_local_bulk.sh b/utils/warranty_motiv_local_bulk.sh index 14a5e636..c4f2a551 100755 --- a/utils/warranty_motiv_local_bulk.sh +++ b/utils/warranty_motiv_local_bulk.sh @@ -37,4 +37,4 @@ touch /tmp/warranty_download_serial.csv /usr/bin/php /var/www/resq/utils/get_warranty_serial/new_get_serials.php 06-06-21 /tmp/warranty_download_serial.csv 0 /usr/bin/php /var/www/resq/utils/get_warranty_serial/new_get_serials.php 06-07-21 /tmp/warranty_download_serial.csv 0 touch /tmp/warranty_load_status.txt -/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php /tmp/warranty_download_serial.csv "mysql:host=localhost;dbname=resq;charset=UTF8" /tmp/warranty_load_status.txt +/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php /tmp/warranty_download_serial.csv /tmp/warranty_load_status.txt diff --git a/utils/warranty_motiv_prod.sh b/utils/warranty_motiv_prod.sh index 798158ef..124f6e96 100755 --- a/utils/warranty_motiv_prod.sh +++ b/utils/warranty_motiv_prod.sh @@ -5,5 +5,5 @@ load_status_file="/tmp/warranty_load_status_$proc_date.txt" #echo $download_file #echo $load_status_file /usr/bin/php /var/www/resq/utils/get_warranty_serial/new_get_serials.php $proc_date $download_file 1 -/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php $download_file "mysql:host=172.18.203.191:3306;dbname=resq;charset=UTF8" $load_status_file +/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php $download_file $load_status_file diff --git a/utils/warranty_motiv_prod_bulk.sh b/utils/warranty_motiv_prod_bulk.sh index 446e68f1..c4f2a551 100755 --- a/utils/warranty_motiv_prod_bulk.sh +++ b/utils/warranty_motiv_prod_bulk.sh @@ -37,4 +37,4 @@ touch /tmp/warranty_download_serial.csv /usr/bin/php /var/www/resq/utils/get_warranty_serial/new_get_serials.php 06-06-21 /tmp/warranty_download_serial.csv 0 /usr/bin/php /var/www/resq/utils/get_warranty_serial/new_get_serials.php 06-07-21 /tmp/warranty_download_serial.csv 0 touch /tmp/warranty_load_status.txt -/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php /tmp/warranty_download_serial.csv "mysql:host=172.18.203.191:3306;dbname=resq;charset=UTF8" /tmp/warranty_load_status.txt +/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php /tmp/warranty_download_serial.csv /tmp/warranty_load_status.txt