Pr 285

LICENSE.md

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------------
- 
-  Copyright (c) 2021-2025, pgEdge, Inc.
- 
+
+  Copyright (c) 2025, pgEdge, Inc.
+
 --------------------------------------------------------------------------
 
 ## pgEdge Community License Agreement 1.1

bp.sh

@@ -22,8 +22,15 @@ if [ -d $outp ]; then
 fi
 
 ./devel/startHTTP.sh
-./build.sh -X posix -R
 
+echo "Waiting for Python HTTP server to start..."
+while ! nc -z localhost 8000; do
+  sleep 1  # Check every second
+done
+
+echo "HTTP server is up!"
+
+./build.sh -X posix -R
 cd $outp
 
 ./$api set GLOBAL REPO http://localhost:8000

cli/scripts/install.py

@@ -3,7 +3,7 @@
 
 import sys, os, tarfile, platform
 
-VER = "24.12.1"
+VER = "25.0.0"
 REPO = os.getenv("REPO", "https://pgedge-upstream.s3.amazonaws.com/REPO")
 
 if sys.version_info < (3, 9):

cli/scripts/meta.py

@@ -313,7 +313,7 @@ def get_default_spock(pgv):
         c.execute(sql)
         data = c.fetchall()
         for comp in data:
-            spock_ver_minor = comp[0][0:5]
+            spock_ver_minor = comp[0].split('-')[0]
             avail_spock.append(spock_ver_minor)
             if f"{default_spock[0]}.{default_spock[1]}" in spock_ver_minor:
                 default_spock = spock_ver_minor

cli/scripts/util.py

@@ -4,8 +4,8 @@
 import os
 import time
 
-MY_VERSION = "24.12.1"
-MY_CODENAME = "Constellation"
+MY_VERSION = "25.0.0"
+MY_CODENAME = ""
 
 DEFAULT_PG = "16"
 DEFAULT_SPOCK = "40"
@@ -37,7 +37,6 @@
 import subprocess
 import getpass
 import filecmp
-
 from subprocess import Popen, PIPE, STDOUT
 from datetime import datetime, timedelta
 from urllib import request as urllib2
@@ -255,7 +254,7 @@ def format_ver(p_ver):
         message(f"'{p_ver}' is not a valid three part version string", "warning")
         return(p_ver)
 
-    return(f"{v[0]}.{str(v[1]).rjust(2,'0')}-{v[2]}")
+    return(f"{v[0]}.{v[1]}-{v[2]}")
 
 
 def autostart_verify_prereqs():
@@ -4154,36 +4153,59 @@ def echo_node(node):
 
     print(bold_hashes)
 
-def run_command(command_args, max_attempts=1, timeout=None, capture_output=True, env=None, cwd=None, verbose=False):
+
+def run_command(command_args, max_attempts=1, timeout=None, capture_output=True,
+                env=None, cwd=None, verbose=False):
     attempts = 0
     output, error = "", ""
 
-
     while attempts < max_attempts:
         try:
             attempts += 1
-            result = subprocess.run(command_args, check=True, text=True,
-                                    capture_output=capture_output, timeout=timeout,
-                                    env=env, cwd=cwd)
+            result = subprocess.run(
+                command_args,
+                check=True,
+                text=True,
+                capture_output=capture_output,
+                timeout=timeout,
+                env=env,
+                cwd=cwd,
+                # Added lines to handle invalid UTF-8 gracefully:
+                encoding="utf-8",
+                errors="replace"   # or "ignore" if you prefer
+            )
             if capture_output:
                 output = result.stdout
                 error = result.stderr
+
             if verbose:
                 print(f"Command executed successfully.")
-            return {"success": True, "output": output, "error": error, "attempts": attempts}
+
+            return {
+                "success": True,
+                "output": output,
+                "error": error,
+                "attempts": attempts
+            }
 
         except subprocess.CalledProcessError as e:
             error = e.stderr if capture_output else str(e)
             if verbose:
                 print(f"Error executing command: {error}")
-            time.sleep(1)  # Simple backoff strategy
+            time.sleep(1)  # Simple backoff before retry
+
         except subprocess.TimeoutExpired as e:
             error = f"Command timed out after {timeout} seconds."
             if verbose:
                 print(f"Attempt {attempts}: {error}")
             break  # No retry after timeout
 
-    return {"success": False, "output": output, "error": error, "attempts": attempts}
+    return {
+        "success": False,
+        "output": output,
+        "error": error,
+        "attempts": attempts
+    }
 
 
 def get_cluster_info(cluster_name):
@@ -4287,3 +4309,20 @@ def process_nodes(group, group_name):
 REPO = get_value("GLOBAL", "REPO")
 
 
+
+def check_directory_status(directory):
+    """
+    Check if the directory exists and is writable.
+
+    Returns a dictionary with:
+      - 'exists': True if the directory exists, otherwise False.
+      - 'writable': True if the directory exists and is writable, otherwise False.
+      - 'message': A string describing the status.
+    """
+    if os.path.isdir(directory):
+        writable = os.access(directory, os.W_OK)
+        message = f"Directory {directory} exists and is {'writable' if writable else 'not writable'}."
+        return {"exists": True, "writable": writable, "message": message}
+    else:
+        message = f"Directory {directory} does not exist."
+        return {"exists": False, "writable": False, "message": message}

env.sh

@@ -1,5 +1,5 @@
-hubV=24.12.1
-hubVV=24.12-1
+hubV=25.0.0
+hubVV=25.0.0
 
 aceV=$hubV
 kirkV=$hubV
@@ -56,7 +56,7 @@ audit15V=1.7.0-1
 audit16V=16.0-1
 audit17V=17.0-1
 
-postgisV=3.5.0-1
+postgisV=3.5.0-2
 
 debuggerV=1.8-1
 cronV=1.6.4-1