Skip to content

fix: reliably capture ssh exit status in API deploy connectivity check #3607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidsmejia wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: reliably capture ssh exit status in API deploy connectivity check #3607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions infrastructure/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,15 +361,18 @@ terraform apply -var-file="environments/$env.tfvars" -auto-approve
chmod 600 data-refinery-key.pem
API_IP_ADDRESS=$(terraform output -json api_server_1_ip | tr -d '"')

# Check SSH connection.
if ! ssh -o StrictHostKeyChecking=no \
# Verify we can reach the API server before trying to update it. Capture
# ssh's own exit status directly so a connection failure aborts the deploy
# instead of leaving the API running its old image.
ssh_exit_code=0
ssh -o StrictHostKeyChecking=no \
-o ServerAliveInterval=15 \
-o ConnectTimeout=5 \
-i data-refinery-key.pem \
"ubuntu@$API_IP_ADDRESS" "exit"; then
exit_code=$?
"ubuntu@$API_IP_ADDRESS" "exit" || ssh_exit_code=$?
if [[ $ssh_exit_code -ne 0 ]]; then
echo "Could not SSH into the API server. Did you rotate the SSH keys recently?"
exit $exit_code;
exit $ssh_exit_code
fi

# To check to see if the docker container needs to be stopped before
Expand Down
Loading