Updating version - Fixing bug where SSH data was not storing properly for ZFSReplication (Creating/Editing Tasks)

Author: JordanKeo45

CHANGELOG.md

@@ -1,3 +1,4 @@
-## task scheduler 1.1.0-1
+## task scheduler 1.2.0-1
 
-* Updating Release Version
+* Major update, may require tasks to be destroyed + remade. Changes how task files are generated + read by system. Fixes major bug with SSH data not saving properly for ZFS Replication Tasks, also lays groundwork for CloudSync authentication to come in next update. Numerous other QoL updates and small bugfixes.
+* Updating version - Fixing bug where SSH data was not storing properly for ZFSReplication (Creating/Editing Tasks)

manifest.json

@@ -3,7 +3,7 @@
     "name": "cockpit-scheduler",
     "title": "task scheduler",
     "prerelease": true,
-    "version": "1.1.0",
+    "version": "1.2.0",
     "buildVersion": "1",
     "author": "Jordan Keough <[email protected]>",
     "url": "https://github.com/45Drives/cockpit-scheduler",
@@ -55,13 +55,11 @@
     ],
     "changelog": {
         "urgency": "medium",
-        "version": "1.1.0",
+        "version": "1.2.0",
         "buildVersion": "1",
         "ignore": [],
-        "date": "2024-08-02T15:27:03.043096",
+        "date": null,
         "packager": "Jordan Keough <[email protected]>",
-        "changes": [
-            "Major update, may require tasks to be destroyed + remade. Changes how task files are generated + read by system. Fixes major bug with SSH data not saving properly for ZFS Replication Tasks, also lays groundwork for CloudSync authentication to come in next update. Numerous other QoL updates and small bugfixes."
-        ]
+        "changes": []
     }
 }

packaging/el8/main.spec

@@ -28,6 +28,13 @@ make DESTDIR=%{buildroot} install
 /opt/45drives/houston/scheduler/*
 
 %changelog
+* Mon Aug 05 2024 Jordan Keough <[email protected]> 1.2.0-1
+- Major update, may require tasks to be destroyed + remade. Changes how task files
+  are generated + read by system. Fixes major bug with SSH data not saving properly
+  for ZFS Replication Tasks, also lays groundwork for CloudSync authentication to
+  come in next update. Numerous other QoL updates and small bugfixes.
+- Updating version - Fixing bug where SSH data was not storing properly for ZFSReplication
+  (Creating/Editing Tasks)
 * Fri Jun 14 2024 Jordan Keough <[email protected]> 1.1.0-1
 - Updating Release Version
 * Fri Jun 14 2024 Jordan Keough <[email protected]> 1.0.3-1

packaging/focal/changelog

@@ -1,3 +1,14 @@
+cockpit-scheduler (1.2.0-1focal) focal; urgency=medium
+
+  * Major update, may require tasks to be destroyed + remade. Changes how task files
+    are generated + read by system. Fixes major bug with SSH data not saving properly
+    for ZFS Replication Tasks, also lays groundwork for CloudSync authentication
+    to come in next update. Numerous other QoL updates and small bugfixes.
+  * Updating version - Fixing bug where SSH data was not storing properly for ZFSReplication
+    (Creating/Editing Tasks)
+
+ -- Jordan Keough <[email protected]>  Mon, 05 Aug 2024 09:33:04 -0300
+
 cockpit-scheduler (1.1.0-1focal) focal; urgency=medium
 
   * Updating Release Version

scheduler/src/components/parameters/task-parameters/ZfsRepTaskParams.vue

@@ -738,7 +738,7 @@ function validateParams() {
 function setParams() {
     const newParams = new ParameterNode("ZFS Replication Task Config", "zfsRepConfig")
         .addChild(new ZfsDatasetParameter('Source Dataset', 'sourceDataset', '', 0, '', sourcePool.value, sourceDataset.value))
-        .addChild(new ZfsDatasetParameter('Destination Dataset', 'destDataset', '', 22, '', destPool.value, destDataset.value))
+        .addChild(new ZfsDatasetParameter('Destination Dataset', 'destDataset', destHost.value, destPort.value, destUser.value, destPool.value, destDataset.value))
         .addChild(new ParameterNode('Send Options', 'sendOptions')
             .addChild(new BoolParameter('Compressed', 'compressed_flag', sendCompressed.value))
             .addChild(new BoolParameter('Raw', 'raw_flag', sendRaw.value))

scheduler/src/models/Scheduler.ts

@@ -297,6 +297,13 @@ export class Scheduler implements SchedulerType {
 
         const envKeyValuesString = envKeyValues.join('\n')
 
+        // Convert envKeyValues to an object for easier manipulation
+        let envObject = envKeyValues.reduce((acc, curr) => {
+            const [key, value] = curr.split('=');
+            acc[key] = value;
+            return acc;
+        }, {});
+
         const templateName = formatTemplateName(taskInstance.template.name);
 
         let scriptFileName = '';
@@ -305,12 +312,88 @@ export class Scheduler implements SchedulerType {
         switch (templateName) {
             case 'ZfsReplicationTask':
                 scriptFileName = 'replication-script';
+                if (envObject['zfsRepConfig_sendOptions_raw_flag'] === 'true') {
+                    envObject['zfsRepConfig_sendOptions_compressed_flag'] = '';
+                } else if (envObject['zfsRepConfig_sendOptions_compressed_flag'] === 'true') {
+                    envObject['zfsRepConfig_sendOptions_raw_flag'] = '';
+                }
+
+                ['recursive', 'customName', 'raw', 'compressed'].forEach(flag => {
+                    const flagKey = `zfsRepConfig_sendOptions_${flag}_flag`;
+                    if (envObject[flagKey] === 'true') {
+                        envObject[flagKey] = `--${flag}`;
+                    } else {
+                        envObject[flagKey] = '';
+                        if (flag === 'customName') {
+                            envObject['zfsRepConfig_sendOptions_customName'] = '';
+                        }
+                    }
+                });
                 break;
             case 'AutomatedSnapshotTask':
                 scriptFileName = 'autosnap-script';
+                ['recursive', 'customName'].forEach(flag => {
+                    const flagKey = `autoSnapConfig_${flag}_flag`;
+                    if (envObject[flagKey] === 'true') {
+                        envObject[flagKey] = `--${flag}`;
+                    } else {
+                        envObject[flagKey] = '';
+                        if (flag === 'customName') {
+                            envObject['autoSnapConfig_customName'] = '';
+                        }
+                    }
+                });
                 break;
             case 'RsyncTask':
                 scriptFileName = 'rsync-script';
+                ['archive', 'recursive', 'compressed', 'delete', 'quiet', 'times', 'hardLinks', 'permissions', 'xattr', 'parallel'].forEach(flag => {
+                    const flagKey = `rsyncConfig_rsyncOptions_${flag}_flag`;
+                    if (envObject[flagKey] === 'true') {
+                        envObject[flagKey] = `--${flag}`;
+                        if (flag === 'parallel') {
+                            envObject['rsyncConfig_rsyncOptions_parallel_threads'] = `--threads=${envObject['rsyncConfig_rsyncOptions_parallel_threads'] || '1'}`;
+                        }
+                    } else {
+                        envObject[flagKey] = '';
+                        if (flag === 'parallel') {
+                            envObject['rsyncConfig_rsyncOptions_parallel_threads'] = '';
+                        }
+                    }
+                });
+
+                if (!envObject['rsyncConfig_target_info_host']) {
+                    envObject['rsyncConfig_target_info_host'] = '';
+                    envObject['rsyncConfig_target_info_port'] = '';
+                    envObject['rsyncConfig_target_info_user'] = '';
+                } else {
+                    envObject['rsyncConfig_target_info_host'] = `--host=${envObject['rsyncConfig_target_info_host']}`;
+                    envObject['rsyncConfig_target_info_port'] = `--port=${envObject['rsyncConfig_target_info_port']}`;
+                    envObject['rsyncConfig_target_info_user'] = `--user=${envObject['rsyncConfig_target_info_user']}`;
+                }
+
+                if (envObject['rsyncConfig_rsyncOptions_bandwidth_limit_kbps'] !== '0') {
+                    envObject['rsyncConfig_rsyncOptions_bandwidth_limit_kbps'] = `--bandwidth=${envObject['rsyncConfig_rsyncOptions_bandwidth_limit_kbps']}`;
+                } else {
+                    envObject['rsyncConfig_rsyncOptions_bandwidth_limit_kbps'] = '';
+                }
+
+                if (envObject['rsyncConfig_rsyncOptions_include_pattern'] && envObject['rsyncConfig_rsyncOptions_include_pattern'] !== "''") {
+                    envObject['rsyncConfig_rsyncOptions_include_pattern'] = `--include=${envObject['rsyncConfig_rsyncOptions_include_pattern']}`;
+                } else {
+                    envObject['rsyncConfig_rsyncOptions_include_pattern'] = '';
+                }
+
+                if (envObject['rsyncConfig_rsyncOptions_exclude_pattern'] && envObject['rsyncConfig_rsyncOptions_exclude_pattern'] !== "''") {
+                    envObject['rsyncConfig_rsyncOptions_exclude_pattern'] = `--exclude=${envObject['rsyncConfig_rsyncOptions_exclude_pattern']}`;
+                } else {
+                    envObject['rsyncConfig_rsyncOptions_exclude_pattern'] = '';
+                }
+
+                if (envObject['rsyncConfig_rsyncOptions_custom_args'] && envObject['rsyncConfig_rsyncOptions_custom_args'] !== "''") {
+                    envObject['rsyncConfig_rsyncOptions_custom_args'] = `--customArgs=${envObject['rsyncConfig_rsyncOptions_custom_args']}`;
+                } else {
+                    envObject['rsyncConfig_rsyncOptions_custom_args'] = '';
+                }
                 break;
             case 'SmartTest':
                 scriptFileName = 'smart-test-script';
@@ -321,6 +404,7 @@ export class Scheduler implements SchedulerType {
             default:
                 break;
         }
+
 
         const scriptPath = `/opt/45drives/houston/scheduler/scripts/${scriptFileName}.py`;
         // const templateServicePath = `/opt/45drives/houston/scheduler/templates/${templateName}.service`;

scheduler/src/version.js

@@ -1 +1 @@
-export const pluginVersion = "1.0.2-1built_from_source";
+export const pluginVersion = "1.2.0built_from_source";