fix(#5219): version fixes in examples + ssh connection for aws macOS …

…fixed

deployability/modules/testing/tests/helpers/executor.py

@@ -112,25 +112,49 @@ def _execute_command(data, command) -> dict:
 class MacosExecutor():
     @staticmethod
     def _execute_command(data, command) -> dict:
-        try:
-            ssh_client = paramiko.SSHClient()
-            ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-            ssh_client.connect(hostname=data.get('host'), port=data.get('port'), username=data.get('username'), password=data.get('password'))
-            stdin, stdout, stderr = ssh_client.exec_command(f"sudo {command}")
+        if data.get('private_key_path') == None:
+            try:
+                ssh_client = paramiko.SSHClient()
+                ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+                ssh_client.connect(hostname=data.get('host'), port=data.get('port'), username=data.get('username'), password=data.get('password'))
+                stdin, stdout, stderr = ssh_client.exec_command(f"sudo {command}")
 
-            stdout_str = ''.join(stdout.readlines())
-            stderr_str = ''.join(stderr.readlines())
+                stdout_str = ''.join(stdout.readlines())
+                stderr_str = ''.join(stderr.readlines())
 
-            ssh_client.close()
+                ssh_client.close()
 
-            if stdout_str:
-                return {'success': True, 'output': stdout_str.replace('\n', '')}
-            if stderr_str:
-                return {'success': False, 'output': stderr_str.replace('\n', '')}
-            return {'success': False, 'output': None}
+                if stdout_str:
+                    return {'success': True, 'output': stdout_str.replace('\n', '')}
+                if stderr_str:
+                    return {'success': False, 'output': stderr_str.replace('\n', '')}
+                return {'success': False, 'output': None}
 
-        except Exception as e:
-            raise Exception(f'Error executing command: {command} with error: {e}')
+            except Exception as e:
+                raise Exception(f'Error executing command: {command} with error: {e}')
+        else:
+            ssh_command = [
+                "ssh",
+                "-i", data.get('private_key_path'),
+                "-o", "StrictHostKeyChecking=no",
+                "-o", "UserKnownHostsFile=/dev/null",
+                "-p", str(data.get('port')),
+                f"{data.get('username')}@{data.get('host')}",
+                "sudo",
+                command
+            ]
+
+            try:
+                ret = subprocess.run(ssh_command, stdout=subprocess.PIPE, text=True)
+                if ret.stdout:
+                    return {'success': True, 'output': ret.stdout.replace('\n', '')}
+                if ret.stderr:
+                    return {'success': False, 'output': ret.stderr.replace('\n', '')}
+                return {'success': False, 'output': None}
+
+            except Exception as e:
+                #return {'success': False, 'output': ret.stderr}
+                raise Exception(f'Error executing command: {command} with error: {e}')
 
 # ------------------------------------------------------
 

deployability/modules/testing/tests/helpers/utils.py

@@ -62,7 +62,7 @@ def check_inventory_connection(inventory_path, attempts=10, sleep=30) -> bool:
         except Exception as e:
             logger.error(f"An unexpected error occurred: {e}")
 
-        if os_type == 'linux':
+        if private_key_path != None:
             ssh = paramiko.SSHClient()
             ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
             private_key = paramiko.RSAKey.from_private_key_file(private_key_path)
@@ -83,45 +83,46 @@ def check_inventory_connection(inventory_path, attempts=10, sleep=30) -> bool:
                     logger.warning(f'Error on attempt {attempt} of {attempts}: {e}')
                 time.sleep(sleep)
 
-        elif os_type == 'windows':
-            if port == 5986:
-                protocol = 'https'
-            else:
-                protocol = 'http'
-            endpoint_url = f'{protocol}://{host}:{port}'
+        else:
+            if os_type == 'windows':
+                if port == 5986:
+                    protocol = 'https'
+                else:
+                    protocol = 'http'
+                endpoint_url = f'{protocol}://{host}:{port}'
+
+                for attempt in range(1, attempts + 1):
+                    try:
+                        session = winrm.Session(endpoint_url, auth=(username, password),transport='ntlm', server_cert_validation='ignore')
+                        cmd = session.run_cmd('ipconfig')
+                        if cmd.status_code == 0:
+                            logger.info("WinRM connection successful.")
+                            return True
+                        else:
+                            logger.error('WinRM connection failed. Check the credentials in the inventory file.')
+                            return False
+                    except Exception as e:
+                        logger.warning(f'Error on attempt {attempt} of {attempts}: {e}')
+                    time.sleep(sleep)
+
+            elif os_type == 'macos':
+                ssh = paramiko.SSHClient()
+                ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 
-            for attempt in range(1, attempts + 1):
-                try:
-                    session = winrm.Session(endpoint_url, auth=(username, password),transport='ntlm', server_cert_validation='ignore')
-                    cmd = session.run_cmd('ipconfig')
-                    if cmd.status_code == 0:
-                        logger.info("WinRM connection successful.")
+                for attempt in range(1, attempts + 1):
+                    ssh = paramiko.SSHClient()
+                    ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+                    try:
+                        ssh.connect(hostname=host, port=port, username=username, password=password)
+                        logger.info(f'Connection established successfully in {os_name}')
+                        ssh.close()
                         return True
-                    else:
-                        logger.error('WinRM connection failed. Check the credentials in the inventory file.')
+                    except paramiko.AuthenticationException:
+                        logger.error(f'Authentication error. Check SSH credentials in {os_name}')
                         return False
-                except Exception as e:
-                    logger.warning(f'Error on attempt {attempt} of {attempts}: {e}')
-                time.sleep(sleep)
-
-        elif os_type == 'macos':
-            ssh = paramiko.SSHClient()
-            ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-
-            for attempt in range(1, attempts + 1):
-                ssh = paramiko.SSHClient()
-                ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-                try:
-                    ssh.connect(hostname=host, port=port, username=username, password=password)
-                    logger.info(f'Connection established successfully in {os_name}')
-                    ssh.close()
-                    return True
-                except paramiko.AuthenticationException:
-                    logger.error(f'Authentication error. Check SSH credentials in {os_name}')
-                    return False
-                except Exception as e:
-                    logger.warning(f'Error on attempt {attempt} of {attempts}: {e}')
-                time.sleep(sleep)
+                    except Exception as e:
+                        logger.warning(f'Error on attempt {attempt} of {attempts}: {e}')
+                    time.sleep(sleep)
 
         logger.error(f'Connection attempts failed after {attempts} tries. Connection timeout in {os_name}')
         return False

deployability/modules/workflow_engine/examples/agent/aws/test-agent-complete-macOS.yaml

@@ -84,7 +84,7 @@ tasks:
           - install:
             - component: wazuh-manager
               type: assistant
-              version: 4.7.3
+              version: 4.7.4
               live: True
     depends-on:
       - "allocate-manager-{manager-os}"
@@ -105,8 +105,8 @@ tasks:
             - agent: "{working-dir}/agent-{agent}/inventory.yaml"
           - tests: "install,registration,basic_info,connection,restart,stop,uninstall"
           - component: "agent"
-          - wazuh-version: "4.7.3"
-          - wazuh-revision: "40714"
+          - wazuh-version: "4.7.4"
+          - wazuh-revision: "40717"
           - live: "True"
     foreach:
       - variable: agent-os

deployability/modules/workflow_engine/examples/agent/aws/test-agent-complete.yaml

@@ -92,7 +92,7 @@ tasks:
           - install:
             - component: wazuh-manager
               type: assistant
-              version: 4.7.3
+              version: 4.7.4
               live: True
     depends-on:
       - "allocate-manager-{manager-os}"
@@ -112,8 +112,8 @@ tasks:
             - agent: "{working-dir}/agent-{agent}/inventory.yaml"
           - tests: "install,registration,connection,basic_info,restart,stop,uninstall"
           - component: "agent"
-          - wazuh-version: "4.7.3"
-          - wazuh-revision: "40714"
+          - wazuh-version: "4.7.4"
+          - wazuh-revision: "40717"
           - live: "True"
     foreach:
       - variable: agent-os

deployability/modules/workflow_engine/examples/agent/aws/test-agent-restart-ins-prov.yaml

@@ -90,7 +90,7 @@ tasks:
           - install:
             - component: wazuh-manager
               type: assistant
-              version: 4.7.3
+              version: 4.7.4
               live: True
     depends-on:
       - "allocate-manager-{manager-os}"
@@ -111,7 +111,7 @@ tasks:
           - install:
             - component: wazuh-agent
               type: package
-              version: 4.7.3
+              version: 4.7.4
               live: True
     depends-on:
       - "allocate-agent-{agent}"
@@ -135,8 +135,8 @@ tasks:
             - agent: "{working-dir}/agent-{agent}/inventory.yaml"
           - tests: "restart"
           - component: "agent"
-          - wazuh-version: "4.7.3"
-          - wazuh-revision: "40714"
+          - wazuh-version: "4.7.4"
+          - wazuh-revision: "40717"
           - live: "True"
     foreach:
       - variable: agent-os

deployability/modules/workflow_engine/examples/agent/aws/test-agent-stop-ins-prov.yaml

@@ -90,7 +90,7 @@ tasks:
           - install:
             - component: wazuh-manager
               type: assistant
-              version: 4.7.3
+              version: 4.7.4
               live: True
     depends-on:
       - "allocate-manager-{manager-os}"
@@ -111,7 +111,7 @@ tasks:
           - install:
             - component: wazuh-agent
               type: package
-              version: 4.7.3
+              version: 4.7.4
               live: True
     depends-on:
       - "allocate-agent-{agent}"
@@ -135,8 +135,8 @@ tasks:
             - agent: "{working-dir}/agent-{agent}/inventory.yaml"
           - tests: "stop"
           - component: "agent"
-          - wazuh-version: "4.7.3"
-          - wazuh-revision: "40714"
+          - wazuh-version: "4.7.4"
+          - wazuh-revision: "40717"
           - live: "True"
     foreach:
       - variable: agent-os

deployability/modules/workflow_engine/examples/agent/aws/test-agent-suse.yaml

@@ -82,7 +82,7 @@ tasks:
             - component: curl
             - component: wazuh-manager
               type: assistant
-              version: 4.7.3
+              version: 4.7.4
               live: True
     depends-on:
       - "allocate-manager-{manager-os}"
@@ -124,8 +124,8 @@ tasks:
             - agent: "{working-dir}/agent-{agent}/inventory.yaml"
           - tests: "install,registration,basic_info,connection,restart,stop,uninstall"
           - component: "agent"
-          - wazuh-version: "4.7.3"
-          - wazuh-revision: "40714"
+          - wazuh-version: "4.7.4"
+          - wazuh-revision: "40717"
           - live: "True"
     foreach:
       - variable: agent-os