Merge pull request #12 from eclipsevortex/release/0.0.7

Release/0.0.7

Author: eclipsevortex

VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

scripts/cleaner/clean_dumps.sh

@@ -6,46 +6,16 @@ set -e
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 cd "$SCRIPT_DIR/../.."
 
-source ./scripts/utils/utils.sh
+# Load environment variables
+echo "🔍 Loading environment variables from .env..."
+export $(grep -v '^#' subvortex/auto_upgrader/.env | xargs)
 
-show_help() {
-    echo "Usage: $0"
-    echo
-    echo "Description:"
-    echo "  Clean all contents under the dump directory"
-    echo
-    echo "Options:"
-    echo "  -d, --dump-path         Path of the dumps and cheksum directory. Reflect `dir` in redis.config". Default /var/tmp/dumps/redis
-    exit 0
-}
+# Extract default DUMP_DIR from Redis config
+REDIS_CONF_PATH="./subvortex/auto_upgrader/template/template-subvortex-$SUBVORTEX_EXECUTION_ROLE-redis.conf"
+DUMP_DIR=$(grep -E '^\s*dir\s+' "$REDIS_CONF_PATH" | awk '{print $2}')
 
-OPTIONS="d:h"
-LONGOPTIONS="dump-path:,help"
-
-DUMP_DIR=/var/tmp/dumps/redis
-
-# Parse arguments
-while [ "$#" -ge 1 ]; do
-    case "$1" in
-        -d|--dump-path)
-            DUMP_DIR="$2"
-            shift 2
-        ;;
-        -h|--help)
-            show_help
-            exit 0
-        ;;
-        --)
-            shift
-            break
-        ;;
-        *)
-            echo "❌ Unexpected argument: $1"
-            show_help
-            exit 1
-        ;;
-    esac
-done
+# Fallback if not found
+DUMP_DIR=${DUMP_DIR:-/var/tmp/dumps/redis}
 
 echo "🧹 Checking for dump directory at: $DUMP_DIR"
 if [[ -d "$DUMP_DIR" ]]; then

scripts/cleaner/clean_workspace.sh

@@ -72,7 +72,11 @@ while [ "$#" -ge 1 ]; do
     esac
 done
 
-TARGET_BASE="/var/tmp/subvortex"
+# Load environment variables
+echo "🔍 Loading environment variables from .env..."
+export $(grep -v '^#' subvortex/auto_upgrader/.env | xargs)
+
+TARGET_BASE=${SUBVORTEX_WORKING_DIRECTORY:-/var/tmp/subvortex}
 SYMLINK_PATH="/root/subvortex"
 
 if [ ! -d "$TARGET_BASE" ]; then

scripts/quick_clean.sh

@@ -10,14 +10,12 @@ source ./scripts/utils/utils.sh
 
 show_help() {
     echo "Usage:"
-    echo "  $0 [--execution=process|service] [--role=miner|validator] [--remove] [--force] [--workspace] [--dumps]"
+    echo "  $0 [--remove] [--force] [--workspace] [--dumps]"
     echo
     echo "Description:"
     echo "  Cleans the Auto Upgrader workspace and/or dumps. Optionally removes or marks the current version for reinstall."
     echo
     echo "Options:"
-    echo "  --execution   Execution method (default: from .env)"
-    echo "  --role        Role of the Auto Upgrader: miner or validator (default: from .env)"
     echo "  --workspace   Clean workspace (default: false)"
     echo "  --dumps       Clean dumps (default: false)"
     echo "  --remove      Remove the current version (will stop the component)"
@@ -27,8 +25,6 @@ show_help() {
 }
 
 # Default values
-EXECUTION="service"
-ROLE="miner"
 REMOVE_LATEST=false
 FORCE_REINSTALL=false
 CLEAN_WORKSPACE=false
@@ -37,14 +33,6 @@ CLEAN_DUMPS=false
 # Parse arguments
 while [ "$#" -ge 1 ]; do
     case "$1" in
-        -e|--execution)
-            EXECUTION="$2"
-            shift 2
-            ;;
-        -o|--role)
-            ROLE="$2"
-            shift 2
-            ;;
         --remove)
             REMOVE_LATEST=true
             shift
@@ -71,13 +59,6 @@ while [ "$#" -ge 1 ]; do
     esac
 done
 
-check_required_args EXECUTION ROLE
-
-# Stop component if --remove is passed
-if [[ "$REMOVE_LATEST" == "true" ]]; then
-    "./scripts/$ROLE/quick_stop.sh" --execution "$EXECUTION"
-fi
-
 # Build clean_workspace command
 if [[ "$CLEAN_WORKSPACE" == "true" || "$FORCE_REINSTALL" == "true" ]]; then
     CLEAN_CMD="./scripts/cleaner/clean_workspace.sh"

scripts/quick_stop.sh

@@ -10,7 +10,7 @@ source ./scripts/utils/utils.sh
 
 show_help() {
     echo "Usage:"
-    echo "  $0 [--execution=process|service] [--role=miner|validator] [--clean_all] [--clean_workspace] [--clean_all_workspace] [--clean_dumps]"
+    echo "  $0 [--execution=process|service] [--role=miner|validator]"
     echo
     echo "Description:"
     echo "  Gracefully stops and tears down the Auto Upgrader, and optionally"
@@ -20,21 +20,13 @@ show_help() {
     echo "  --execution           Set the execution method used to install the Auto Upgrader"
     echo "                        (choices: process, service; default: service)"
     echo "  --role                Role of the Auto Upgrader: miner or validator (default: miner)"
-    echo "  --clean_all           Stop, teardown, and clean both workspace and dumps"
-    echo "  --clean_workspace     Clean workspace (keep current version)"
-    echo "  --clean_all_workspace Clean workspace and remove the current version"
-    echo "  --clean_dumps         Clean all dump files"
     echo "  --help                Show this help message and exit"
     exit 0
 }
 
 # Defaults
 EXECUTION="service"
 ROLE="miner"
-CLEAN_ALL=false
-CLEAN_WORKSPACE=false
-CLEAN_ALL_WORKSPACE=false
-CLEAN_DUMPS=false
 
 # Parse arguments
 while [ "$#" -ge 1 ]; do
@@ -47,22 +39,6 @@ while [ "$#" -ge 1 ]; do
             ROLE="$2"
             shift 2
         ;;
-        --clean_all)
-            CLEAN_ALL=true
-            shift
-        ;;
-        --clean_workspace)
-            CLEAN_WORKSPACE=true
-            shift
-        ;;
-        --clean_all_workspace)
-            CLEAN_ALL_WORKSPACE=true
-            shift
-        ;;
-        --clean_dumps)
-            CLEAN_DUMPS=true
-            shift
-        ;;
         -h|--help)
             show_help
         ;;
@@ -78,22 +54,3 @@ check_required_args EXECUTION ROLE
 # Stop and teardown
 ./scripts/auto_upgrader/auto_upgrader_stop.sh --execution "$EXECUTION"
 ./scripts/auto_upgrader/auto_upgrader_teardown.sh --execution "$EXECUTION"
-
-# Cleanup via central clean script
-CLEAN_CMD="./scripts/auto_upgrader/clean.sh --execution $EXECUTION --role $ROLE"
-
-if [ "$CLEAN_ALL" = true ]; then
-    $CLEAN_CMD --workspace --dumps
-fi
-
-if [ "$CLEAN_WORKSPACE" = true ]; then
-    $CLEAN_CMD --workspace
-fi
-
-if [ "$CLEAN_ALL_WORKSPACE" = true ]; then
-    $CLEAN_CMD --workspace --remove
-fi
-
-if [ "$CLEAN_DUMPS" = true ]; then
-    $CLEAN_CMD --dumps
-fi

subvortex/auto_upgrader/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "subvortex-auto-upgrader"
-version = "0.0.6"
+version = "0.0.7"
 description = "SubVortex Auto Upgrader"
 authors = [{ name = "Eclipse Vortex", email = "subvortex.bt@gmail.com" }]
 readme = "README.md"

subvortex/auto_upgrader/src/github.py

@@ -562,6 +562,57 @@ def _get_latest_container_version_old(self):
         return versions.get("version")
 
     def _get_local_version(self):
+        if not os.path.islink(sauc.SV_EXECUTION_DIR):
+            btul.logging.warning(
+                f"❌ {sauc.SV_EXECUTION_DIR} is not a symlink",
+                prefix=sauc.SV_LOGGER_NAME,
+            )
+            return None
+
+        try:
+            # Resolve the symlink target
+            target_path = os.readlink(sauc.SV_EXECUTION_DIR)
+
+            # Extract version from the target path
+            match = re.search(r"subvortex-(\d+\.\d+\.\d+(?:[ab]|rc)?\d*)", target_path)
+            if not match:
+                btul.logging.warning(
+                    f"⚠️ No valid version found in symlink: {target_path}",
+                    prefix=sauc.SV_LOGGER_NAME,
+                )
+                return None
+
+            version_str = match.group(1)
+
+            try:
+                Version(version_str)  # Just to validate format
+            except InvalidVersion:
+                btul.logging.warning(
+                    f"⚠️ Invalid version format in symlink: {version_str}",
+                    prefix=sauc.SV_LOGGER_NAME,
+                )
+                return None
+
+            # Check for optional force_reinstall flag
+            version_dir = os.path.join(sauc.SV_ASSET_DIR, f"subvortex-{version_str}")
+            marker_path = os.path.join(version_dir, "force_reinstall")
+            if os.path.isfile(marker_path):
+                btul.logging.warning(
+                    f"⚠️ Force reinstall marker found for version {version_str}",
+                    prefix=sauc.SV_LOGGER_NAME,
+                )
+                os.remove(marker_path)
+                return None
+
+            return sauv.denormalize_version(version_str)
+
+        except OSError as e:
+            btul.logging.warning(
+                f"⚠️ Failed to read symlink: {e}", prefix=sauc.SV_LOGGER_NAME
+            )
+            return None
+
+    def _get_local_version_decommissioned(self):
         versions = []
 
         if "PYTEST_CURRENT_TEST" not in os.environ:

subvortex/version.py

@@ -1 +1 @@
-__version__ = "0.0.6"
+__version__ = "0.0.7"

tests/unit_tests/auto_upgrader/test_github.py

@@ -9,86 +9,51 @@
 from subvortex.auto_upgrader.src.github import Github
 
 
-@patch("subvortex.auto_upgrader.src.constants.SV_EXECUTION_METHOD", "service")
-@patch("subvortex.auto_upgrader.src.github.os.path.islink")
-@patch("subvortex.auto_upgrader.src.github.os.listdir")
-@patch("subvortex.auto_upgrader.src.github.os.path.isdir")
-@patch("subvortex.auto_upgrader.src.github.os.path.isfile")
-def test_get_local_version_service_returns_version(
-    mock_isfile,
-    mock_isdir,
-    mock_listdir,
-    mock_islink,
-):
+@patch("subvortex.auto_upgrader.src.github.os.readlink")
+@patch("subvortex.auto_upgrader.src.github.os.path.islink", return_value=True)
+@patch("subvortex.auto_upgrader.src.github.os.path.isfile", return_value=False)
+def test_get_local_version_symlink_returns_version(mock_isfile, mock_islink, mock_readlink):
     # Arrange
     github = Github()
-
-    # Simulate /var/tmp/subvortex directory listing
-    mock_listdir.return_value = [
-        "subvortex-1.2.3",  # Valid version folder
-        "subvortex-1.1.0",  # Older valid version
-        "random-folder",  # Should be ignored
-    ]
-
-    # Simulate os.path.isdir always returning True
-    mock_islink.side_effect = [False, False, False]
-    mock_isdir.side_effect = [True, True, True, True]
-    mock_isfile.side_effect = [False, False, False]
+    mock_readlink.return_value = "/var/tmp/subvortex/subvortex-1.2.3"
 
     # Act
     version = github.get_local_version()
 
     # Assert
     assert version == "1.2.3"
-    mock_listdir.assert_called_once_with("/var/tmp/subvortex")
-    assert mock_isdir.call_count == 4
+    mock_readlink.assert_called_once()
 
 
-@patch("subvortex.auto_upgrader.src.constants.SV_EXECUTION_METHOD", "service")
-@patch("subvortex.auto_upgrader.src.github.os.listdir")
-@patch("subvortex.auto_upgrader.src.github.os.path.isdir")
-def test_get_local_version_service_returns_none_when_no_valid_versions(
-    mock_isdir, mock_listdir
-):
+@patch("subvortex.auto_upgrader.src.github.os.readlink")
+@patch("subvortex.auto_upgrader.src.github.os.path.islink", return_value=True)
+def test_get_local_version_symlink_invalid_path(mock_islink, mock_readlink):
     # Arrange
     github = Github()
-
-    # Simulate /var/tmp/subvortex directory listing with no valid versions
-    mock_listdir.return_value = [
-        "random-folder",
-        "another-folder",
-        "not-a-version",
-    ]
-
-    # Simulate os.path.isdir always returning True
-    mock_isdir.return_value = True
+    mock_readlink.return_value = "/some/unknown/path/no-version-here"
 
     # Act
     version = github.get_local_version()
 
     # Assert
     assert version is None
-    mock_listdir.assert_called_once_with("/var/tmp/subvortex")
-    assert mock_isdir.call_count == 4  # 1 check for base dir + 3 entries
 
 
-@patch("subvortex.auto_upgrader.src.constants.SV_EXECUTION_METHOD", "service")
-@patch("subvortex.auto_upgrader.src.github.os.path.isdir")
-def test_get_local_version_service_returns_none_when_asset_dir_does_not_exist(
-    mock_isdir,
-):
+@patch("subvortex.auto_upgrader.src.github.os.readlink")
+@patch("subvortex.auto_upgrader.src.github.os.path.islink", return_value=True)
+@patch("subvortex.auto_upgrader.src.github.os.path.isfile", return_value=True)
+@patch("subvortex.auto_upgrader.src.github.os.remove")
+def test_get_local_version_symlink_force_marker(mock_remove, mock_isfile, mock_islink, mock_readlink):
     # Arrange
     github = Github()
-
-    # Simulate os.path.isdir always returning True
-    mock_isdir.return_value = False
+    mock_readlink.return_value = "/var/tmp/subvortex/subvortex-3.0.0a40"
 
     # Act
     version = github.get_local_version()
 
     # Assert
     assert version is None
-    assert mock_isdir.call_count == 1
+    mock_remove.assert_called_once()
 
 
 @patch("subvortex.auto_upgrader.src.github.requests.get")