Merge pull request #1365 from liangxin1300/20240321_ssh_agent_warning…

…_crmsh46

[crmsh-4.6] Fix: sh: Return the value of AuthorizationError.diagnose if it is not None

.github/workflows/crmsh-ci.yml

@@ -351,7 +351,7 @@ jobs:
     timeout-minutes: 40
     steps:
     - uses: actions/checkout@v3
-    - name: functional test for user access
+    - name: functional test for ssh agent
       run:  |
         echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee /etc/docker/daemon.json
         sudo systemctl restart docker.service

crmsh/sh.py

@@ -72,6 +72,7 @@ def diagnose(self) -> str:
         ret = super().diagnose()
         if not ret:
             return 'Please configure passwordless authentication with "crm cluster init ssh" and "crm cluster join ssh"'
+        return ret
 
 
 class CommandFailure(Error):

test/features/ssh_agent.feature

@@ -30,6 +30,12 @@ Feature: ssh-agent support
     And     Run "test x3 == x$(sudo awk 'END {print NR}' ~hacluster/.ssh/authorized_keys)" OK
     And     Run "grep -E 'hosts = (root|alice)@hanode1' /root/.config/crm/crm.conf" OK on "hanode1,hanode2,hanode3"
 
+  # This test is not applicable for non-root user, since the root ssh key pair exists
+  @skip_non_root
+  Scenario: Verify expected error message when SSH_AUTH_SOCK is not set
+    When    Try "crm cluster remove hanode3 -y" on "hanode1"
+    Then    Expected "Environment variable SSH_AUTH_SOCK does not exist" in stderr
+
   Scenario: Skip creating ssh key pairs with --use-ssh-agent and use -N
     Given   Run "crm cluster stop" OK on "hanode1,hanode2,hanode3"
     When    Run "SSH_AUTH_SOCK=/tmp/ssh-auth-sock crm cluster init --use-ssh-agent -y -N hanode2 -N hanode3" on "hanode1"