From 0b4fe290266699de2e007318c78b74b196100955 Mon Sep 17 00:00:00 2001 From: Sprite Date: Sun, 8 Feb 2026 01:20:06 +0000 Subject: [PATCH] refactor: fix SC2154 warnings for SSH_OPTS in provider libraries Added shellcheck directive comments before first SSH_OPTS usage in: - aws-lightsail/lib/common.sh - gcp/lib/common.sh - lambda/lib/common.sh - vultr/lib/common.sh - linode/lib/common.sh - hetzner/lib/common.sh - digitalocean/lib/common.sh SSH_OPTS is defined in shared/common.sh but shellcheck can't detect cross-file variable definitions, so we suppress the warning with an explanatory comment. Co-Authored-By: Claude Sonnet 4.5 --- aws-lightsail/lib/common.sh | 2 ++ digitalocean/lib/common.sh | 2 ++ gcp/lib/common.sh | 2 ++ hetzner/lib/common.sh | 2 ++ lambda/lib/common.sh | 2 ++ linode/lib/common.sh | 2 ++ vultr/lib/common.sh | 2 ++ 7 files changed, 14 insertions(+) diff --git a/aws-lightsail/lib/common.sh b/aws-lightsail/lib/common.sh index 01d4e640..8f5bc92b 100644 --- a/aws-lightsail/lib/common.sh +++ b/aws-lightsail/lib/common.sh @@ -136,6 +136,8 @@ verify_server_connectivity() { local ip="$1" max_attempts=${2:-30} attempt=1 log_warn "Waiting for SSH connectivity to $ip..." while [[ $attempt -le $max_attempts ]]; do + # SSH_OPTS is defined in shared/common.sh + # shellcheck disable=SC2154 if ssh $SSH_OPTS -o ConnectTimeout=5 "ubuntu@$ip" "echo ok" >/dev/null 2>&1; then log_info "SSH connection established"; return 0 fi diff --git a/digitalocean/lib/common.sh b/digitalocean/lib/common.sh index d9dd0cb3..bc7eea44 100755 --- a/digitalocean/lib/common.sh +++ b/digitalocean/lib/common.sh @@ -241,6 +241,8 @@ for net in data['droplet']['networks']['v4']: verify_server_connectivity() { local ip="$1" local max_attempts=${2:-30} + # SSH_OPTS is defined in shared/common.sh + # shellcheck disable=SC2154 generic_ssh_wait "$ip" "$SSH_OPTS -o ConnectTimeout=5" "echo ok" "SSH connectivity" "$max_attempts" 5 } diff --git a/gcp/lib/common.sh b/gcp/lib/common.sh index 3d5647a0..6f837fdd 100644 --- a/gcp/lib/common.sh +++ b/gcp/lib/common.sh @@ -122,6 +122,8 @@ verify_server_connectivity() { local username=$(whoami) log_warn "Waiting for SSH connectivity to $ip..." while [[ $attempt -le $max_attempts ]]; do + # SSH_OPTS is defined in shared/common.sh + # shellcheck disable=SC2154 if ssh $SSH_OPTS -o ConnectTimeout=5 "${username}@$ip" "echo ok" >/dev/null 2>&1; then log_info "SSH connection established"; return 0 fi diff --git a/hetzner/lib/common.sh b/hetzner/lib/common.sh index 0e8946bc..1222c450 100755 --- a/hetzner/lib/common.sh +++ b/hetzner/lib/common.sh @@ -209,6 +209,8 @@ print(json.dumps(body)) verify_server_connectivity() { local ip="$1" local max_attempts=${2:-30} + # SSH_OPTS is defined in shared/common.sh + # shellcheck disable=SC2154 generic_ssh_wait "$ip" "$SSH_OPTS -o ConnectTimeout=5" "echo ok" "SSH connectivity" "$max_attempts" 5 } diff --git a/lambda/lib/common.sh b/lambda/lib/common.sh index 1e6dace0..416be8c0 100644 --- a/lambda/lib/common.sh +++ b/lambda/lib/common.sh @@ -172,6 +172,8 @@ verify_server_connectivity() { local ip="$1" max_attempts=${2:-30} attempt=1 log_warn "Waiting for SSH connectivity to $ip..." while [[ $attempt -le $max_attempts ]]; do + # SSH_OPTS is defined in shared/common.sh + # shellcheck disable=SC2154 if ssh $SSH_OPTS -o ConnectTimeout=5 "ubuntu@$ip" "echo ok" >/dev/null 2>&1; then log_info "SSH connection established"; return 0 fi diff --git a/linode/lib/common.sh b/linode/lib/common.sh index 63632425..8ea77ab6 100644 --- a/linode/lib/common.sh +++ b/linode/lib/common.sh @@ -209,6 +209,8 @@ print('; '.join(e.get('reason','Unknown') for e in errs) if errs else 'Unknown e verify_server_connectivity() { local ip="$1" max_attempts=${2:-30} + # SSH_OPTS is defined in shared/common.sh + # shellcheck disable=SC2154 generic_ssh_wait "$ip" "$SSH_OPTS -o ConnectTimeout=5" "echo ok" "SSH connectivity" "$max_attempts" 5 } diff --git a/vultr/lib/common.sh b/vultr/lib/common.sh index e42fda52..03af6307 100755 --- a/vultr/lib/common.sh +++ b/vultr/lib/common.sh @@ -218,6 +218,8 @@ print(json.dumps(body)) verify_server_connectivity() { local ip="$1" local max_attempts=${2:-30} + # SSH_OPTS is defined in shared/common.sh + # shellcheck disable=SC2154 generic_ssh_wait "$ip" "$SSH_OPTS -o ConnectTimeout=5" "echo ok" "SSH connectivity" "$max_attempts" 5 }