Dockerfile refactoring changes

ubccr · Jul 29, 2024 · 16e723d · 16e723d
1 parent 3305981
commit 16e723d
Show file tree

Hide file tree

Showing 22 changed files with 157 additions and 112 deletions.
diff --git a/classes/CCR/DB/MySQLHelper.php b/classes/CCR/DB/MySQLHelper.php
@@ -342,6 +342,47 @@ public static function databaseExists(
             throw new Exception($msg);
         }
     }
+    /*
+    * Checks for existence of user
+    */
+    /**
+     * @throws Exception
+     */
+    public static function userExists(
+        $host,
+        $port,
+        $dbusername,
+        $dbpassword,
+        $userName,
+        $xdmod_host
+    ) {
+        $stmt = "SELECT User, Host FROM mysql.user WHERE User = '$userName' AND Host = '$xdmod_host'";
+        $output = static::staticExecuteStatement(
+            $host,
+            $port,
+            $dbusername,
+            $dbpassword,
+            null,
+            $stmt
+        );
+
+        $output = preg_replace('/\s+/', ' ', $output);
+        if (!isset($output[0])) {
+            return false;
+        }
+        $output = explode(' ', $output[0]);
+        if (count($output) == 0 || (count($output) == 1 && $output[0] == '')) {
+            return false;
+        } elseif (count($output) == 2 && $output[0] == $userName && $output[1]== $xdmod_host) {
+            return true;
+        } else {
+            $msg = 'Failed to check for existence of user: '
+                . implode("\n", array_map(function($row) {
+                    return $row[0] . ' ' . $row[1];
+                }, $output));
+            throw new Exception($msg);
+        }
+    }
 
     /**
      * Create a database.
@@ -415,7 +456,7 @@ public static function grantAllPrivileges(
         $port,
         $username,
         $password,
-        $localHost,
+        $xdmodHost,
         $dbUsername,
         $dbPassword
     ) {
@@ -429,8 +470,8 @@ public static function grantAllPrivileges(
             . " CREATE ROUTINE, ALTER ROUTINE, EVENT, RELOAD, FILE,"
             . " CREATE TABLESPACE, PROCESS, REFERENCES,"
             . " LOCK TABLES"
-            . " ON *.* TO '$dbUsername'@'$localHost'"
-            . " IDENTIFIED BY '$dbPassword';FLUSH PRIVILEGES;";
+            . " ON *.* TO '$dbUsername'@'$xdmodHost';"
+            . " FLUSH PRIVILEGES;";
 
         static::staticExecuteStatement(
             $host,
@@ -460,11 +501,11 @@ public static function grantAllPrivilegesOnDatabase(
         $username,
         $password,
         $dbName,
-        $localHost,
+        $xdmodHost,
         $dbUsername,
         $dbPassword
     ) {
-        $stmt = "GRANT ALL ON $dbName.* TO '$dbUsername'@'$localHost'"
+        $stmt = "GRANT ALL ON $dbName.* TO '$dbUsername'@'$xdmodHost'"
             . " IDENTIFIED BY '$dbPassword'";
 
         static::staticExecuteStatement(

diff --git a/classes/OpenXdmod/Setup/DatabaseSetup.php b/classes/OpenXdmod/Setup/DatabaseSetup.php
@@ -58,7 +58,10 @@ public function handle()
             'DB Username:',
             $settings['database_user']
         );
-
+        $settings['xdmod_host'] = $this->console->prompt(
+            'XDMoD Server name:',
+            $settings['database_host']
+        );
         $settings['db_pass'] = $this->console->silentPrompt(
             'DB Password:'
         );

diff --git a/classes/OpenXdmod/Shared/DatabaseHelper.php b/classes/OpenXdmod/Shared/DatabaseHelper.php
@@ -2,6 +2,7 @@
 
 namespace OpenXdmod\Shared;
 
+use CCR\DB;
 use CCR\DB\MySQLHelper;
 use OpenXdmod\Setup\Console;
 
@@ -24,6 +25,7 @@ class DatabaseHelper
      * @param Console $console (Optional) The console to use to prompt the user.
      *                         If not provided, one will be obtained.
      */
+
     public static function createDatabases(
         $username,
         $password,
@@ -35,23 +37,50 @@ public static function createDatabases(
             $console = Console::factory();
         }
 
+        $rows = MySQLHelper::userExists(
+            $settings['db_host'],
+            $settings['db_port'],
+            $username,
+            $password,
+            $settings['db_user'],
+            $settings['xdmod_host']
+        );
         $console->displayMessage(
-            'Creating User ' . $settings['db_user']
+                'rows retuned' . $rows
         );
-        // TODO: If db_host is not localhost, need to set $localHost to
-        // the correct hostname or IP address.
-        $localHost = $settings['db_host'];
-
+        if ($rows == false) {
+            $console->displayMessage(
+                'Creating User ' . $settings['db_user']
+            );
+            $console->displayMessage(
+                'Creating User with ' . $settings['db_user'] . ' on host ' . $settings['xdmod_host'] . ' with password ' . $settings['db_pass']
+            );
+            MySQLHelper::staticExecuteStatement(
+                $settings['db_host'],
+                $settings['db_port'],
+                $username,
+                $password,
+                null,
+                sprintf(
+                    "CREATE USER '%s'@'%s' IDENTIFIED BY '%s';",
+                    $settings['db_user'],
+                    $settings['xdmod_host'],
+                    $settings['db_pass'],
+                )
+            );
+            $console->displayMessage(
+                'Created User'
+            );
+        }
         MySQLHelper::grantAllPrivileges(
             $settings['db_host'],
             $settings['db_port'],
             $username,
             $password,
-            $localHost,
+            $settings['xdmod_host'],
             $settings['db_user'],
             $settings['db_pass']
         );
-
         foreach ($databases as $database) {
             $console->displayBlankLine();
 
@@ -97,10 +126,6 @@ public static function createDatabases(
                 $database
             );
 
-            // TODO: If db_host is not localhost, need to set $localHost to
-            // the correct hostname or IP address.
-            $localHost = $settings['db_host'];
-
             $console->displayMessage(
                 "Granting privileges on database `$database`."
             );
@@ -110,7 +135,7 @@ public static function createDatabases(
                 $username,
                 $password,
                 $database,
-                $localHost,
+                $settings['xdmod_host'],
                 $settings['db_user'],
                 $settings['db_pass']
             );

diff --git a/configuration/etl/etl_tables.d/cloud_common/domains.json b/configuration/etl/etl_tables.d/cloud_common/domains.json
@@ -4,6 +4,7 @@
     "name": "domains",
     "engine": "InnoDB",
     "charset": "utf8",
+    "collation": "utf8_unicode_ci",
     "comment": "Which domains are currently being tracked by the Cloud realm",
     "columns": [
       {

diff --git a/configuration/etl/etl_tables.d/gateways/enduser.json b/configuration/etl/etl_tables.d/gateways/enduser.json
@@ -3,8 +3,8 @@
     "name": "enduser",
     "comment": "Associate local gateway enduser names with the gateway on which they are registered",
     "engine": "myisam",
-    "charset": "utf8mb4",
-    "collation": "utf8mb4_general_ci",
+    "charset": "utf8",
+    "collation": "utf8_unicode_ci",
     "columns": [
       {
         "type": "int(11)",

diff --git a/configuration/etl/etl_tables.d/gateways/gateway.json b/configuration/etl/etl_tables.d/gateways/gateway.json
@@ -3,8 +3,8 @@
     "name": "gateway",
     "comment": "Listing of Science Gateways",
     "engine": "myisam",
-    "charset": "utf8mb4",
-    "collation": "utf8mb4_general_ci",
+    "charset": "utf8",
+    "collation": "utf8_unicode_ci",
     "columns": [
       {
         "type": "int(11)",

diff --git a/configuration/etl/etl_tables.d/gateways/job_metadata.json b/configuration/etl/etl_tables.d/gateways/job_metadata.json
@@ -3,8 +3,8 @@
     "name": "job_metadata",
     "comment": "Metadata associated with gateways-submitted jobs",
     "engine": "myisam",
-    "charset": "utf8mb4",
-    "collation": "utf8mb4_general_ci",
+    "charset": "utf8",
+    "collation": "utf8_unicode_ci",
     "columns": [
       {
         "type": "int(11)",

diff --git a/configuration/etl/etl_tables.d/jobs/xdw/federation-instances.json b/configuration/etl/etl_tables.d/jobs/xdw/federation-instances.json
@@ -12,13 +12,13 @@
             {
                 "name": "prefix",
                 "type": "varchar(191)",
-                "comment": "generally fqdn with . replaced by - 191 limit due to utf8mb4",
+                "comment": "generally fqdn with . replaced by - 191 limit due to utf8",
                 "nullable": true
             },
             {
                 "name": "timezone",
                 "type": "varchar(191)",
-                "comment": "Timezone of the instance - 191 limit due to utf8mb4",
+                "comment": "Timezone of the instance - 191 limit due to utf8",
                 "nullable": true
             },
             {

diff --git a/configuration/etl/etl_tables.d/xdb/report-template-charts.json b/configuration/etl/etl_tables.d/xdb/report-template-charts.json
@@ -2,8 +2,8 @@
     "table_definition": {
         "name": "ReportTemplateCharts",
         "engine": "InnoDB",
-        "charset": "utf8mb4",
-        "collation": "utf8mb4_general_ci",
+        "charset": "utf8",
+        "collation": "utf8_unicode_ci",
         "columns": [
             {
                 "name": "template_id",

diff --git a/...artifacts/xdmod/etlv2/configuration/input/etl_tables_8.0.0.d/db_model_baseline_table.json b/...artifacts/xdmod/etlv2/configuration/input/etl_tables_8.0.0.d/db_model_baseline_table.json
@@ -4,7 +4,7 @@
     "name": "normalize_table_test",
     "engine": "MyISAM",
     "charset": "utf8",
-    "collation": "utf8_general_ci",
+    "collation": "utf8_unicode_ci",
     "columns": [
       {
         "name": "resource_id",
@@ -17,7 +17,7 @@
         "type": "varchar(40)",
         "nullable": true,
         "charset": "utf8",
-        "collation": "utf8_general_ci",
+        "collation": "utf8_unicode_ci",
         "comment": "This is a comment"
       },
       {

diff --git a/...od/etlv2/configuration/input/etl_tables_8.0.0.d/db_model_normalize_table_definitions.json b/...od/etlv2/configuration/input/etl_tables_8.0.0.d/db_model_normalize_table_definitions.json
@@ -3,8 +3,8 @@
   "table_definition": {
     "name": "normalize_table_test",
     "engine": "myisam",
-    "charset": "UTF8",
-    "collation": "UTF8_GENERAL_CI",
+    "charset": "utf8",
+    "collation": "utf8_unicode_ci",
     "columns": [
       {
         "name": "resource_id",
@@ -16,8 +16,8 @@
         "name": "RESOURCE",
         "type": "VARCHAR(40)",
         "nullable": true,
-        "charset": "UTF8",
-        "collation": "utf8_general_ci",
+        "charset": "utf8",
+        "collation": "utf8_unicode_ci",
         "comment": "This is a comment"
       },
       {

diff --git a/tests/artifacts/xdmod/etlv2/configuration/output/create_table.json b/tests/artifacts/xdmod/etlv2/configuration/output/create_table.json
@@ -1,13 +1,13 @@
 {
   "comment": "",
   "engine": "myisam",
-  "charset": "latin1",
-  "collation": "latin1_swedish_ci",
+  "charset": "utf8",
+  "collation": "utf8_unicode_ci",
   "columns": [
     {
       "type": "varchar(40)",
-      "charset": "latin1",
-      "collation": "latin1_swedish_ci",
+      "charset": "utf8",
+      "collation": "utf8_unicode_ci",
       "nullable": true,
       "default": null,
       "extra": null,

diff --git a/tests/artifacts/xdmod/etlv2/configuration/output/modify_table.json b/tests/artifacts/xdmod/etlv2/configuration/output/modify_table.json
@@ -1,13 +1,13 @@
 {
   "comment": "",
   "engine": "myisam",
-  "charset": "latin1",
-  "collation": "latin1_swedish_ci",
+  "charset": "utf8",
+  "collation": "utf8_unicode_ci",
   "columns": [
     {
       "type": "varchar(40)",
-      "charset": "latin1",
-      "collation": "latin1_swedish_ci",
+      "charset": "utf8",
+      "collation": "utf8_unicode_ci",
       "nullable": true,
       "default": null,
       "extra": null,
@@ -17,8 +17,8 @@
     },
     {
       "type": "varchar(40)",
-      "charset": "latin1",
-      "collation": "latin1_swedish_ci",
+      "charset": "utf8",
+      "collation": "utf8_unicode_ci",
       "nullable": true,
       "default": null,
       "extra": null,

diff --git a/tests/artifacts/xdmod/etlv2/configuration/output/normalized_table_definition.json b/tests/artifacts/xdmod/etlv2/configuration/output/normalized_table_definition.json
@@ -2,7 +2,7 @@
   "comment": "",
   "engine": "myisam",
   "charset": "utf8",
-  "collation": "utf8_general_ci",
+  "collation": "utf8_unicode_ci",
   "columns": [
     {
       "type": "int(11) unsigned",
@@ -18,7 +18,7 @@
     {
       "type": "varchar(40)",
       "charset": "utf8",
-      "collation": "utf8_general_ci",
+      "collation": "utf8_unicode_ci",
       "nullable": true,
       "default": null,
       "extra": null,
@@ -29,7 +29,7 @@
     {
       "type": "varchar(16)",
       "charset": "utf8",
-      "collation": "utf8_general_ci",
+      "collation": "utf8_unicode_ci",
       "nullable": false,
       "default": "first name",
       "extra": null,
@@ -40,7 +40,7 @@
     {
       "type": "enum('Sample1','sample2')",
       "charset": "utf8",
-      "collation": "utf8_general_ci",
+      "collation": "utf8_unicode_ci",
       "nullable": true,
       "default": null,
       "extra": null,
@@ -75,7 +75,7 @@
       "event": "INSERT",
       "table": "normalize_table_test",
       "body": "BEGIN\nSET @resource = CONCAT(@resource, 'X');\nEND",
-      "definer": "xdmod@localhost",
+      "definer": "xdmod@xdmod.xdmod_default",
       "schema": "test",
       "name": "mytrigger"
     }