Skip to content

Commit 514bbe8

Browse files
committed
fixed extraction
1 parent a4a9376 commit 514bbe8

File tree

1 file changed

+14
-18
lines changed

1 file changed

+14
-18
lines changed

.github/workflows/terraform.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -145,33 +145,29 @@ jobs:
145145

146146
# ./ansible/deploy-api-to-jumpbox.sh "$DB_HOST" "$DB_USER" "$DB_PASS" "$DB_NAME" "$JUMP_HOST" "$JUMP_USER"
147147

148-
- name: 🧩 Run Script Deploy API to Jumbox
148+
- name: 🧩 Run Script Deploy API to Jumpbox
149149
run: |
150150
chmod +x ./ansible/deploy-api-to-jumpbox.sh
151151
152-
# Get Terraform outputs
153-
DB_HOST=$(terraform -chdir=infra output -raw mysql_fqdn 2>/dev/null | tr -d '\r\n ')
154-
echo ">>> RAW DB_HOST from Terraform: '$DB_HOST'"
155-
echo ">>> Sanitized DB_HOST: '${DB_HOST//[^a-zA-Z0-9.-]/}'"
152+
# Get clean DB_HOST (add additional sanitization)
153+
DB_HOST=$(terraform -chdir=infra output -raw mysql_fqdn | sed 's/[^a-zA-Z0-9.-]//g')
154+
echo "DB_HOST='$DB_HOST'" # Verify output
156155
156+
# Verify this matches exactly: softdefault-mysql-westus2.mysql.database.azure.com
157+
if [[ ! "$DB_HOST" =~ ^[a-zA-Z0-9.-]+$ ]]; then
158+
echo "ERROR: Invalid DB_HOST format"
159+
exit 1
160+
fi
161+
157162
DB_USER="${{ secrets.MYSQL_USER }}"
158163
DB_PASS="${{ secrets.MYSQL_ADMIN_PASSWORD }}"
159164
DB_NAME="moviesdb"
160165
161-
JUMP_HOST=$(terraform -chdir=infra output -raw control_node_public_ip | grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}' | tail -n1)
162-
JUMP_USER=$(terraform -chdir=infra output -raw ssh_user | grep -Eo '^[a-zA-Z0-9]+' | tail -n1)
163-
164-
# Debug outputs
165-
echo "=== Variables being passed to script ==="
166-
echo "DB_HOST: $DB_HOST"
167-
echo "DB_USER: $DB_USER"
168-
echo "DB_PASS: ******" # Don't log passwords
169-
echo "DB_NAME: $DB_NAME"
170-
echo "JUMP_HOST: $JUMP_HOST"
171-
echo "JUMP_USER: $JUMP_USER"
166+
JUMP_HOST=$(terraform -chdir=infra output -raw control_node_public_ip | grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}')
167+
JUMP_USER=$(terraform -chdir=infra output -raw ssh_user | head -n1 | tr -d '\r\n')
172168
173-
./ansible/deploy-api-to-jumpbox.sh "$DB_HOST" "$DB_USER" "$DB_PASS" "$DB_NAME" "$JUMP_HOST" "$JUMP_USER"
174-
169+
./ansible/deploy-api-to-jumpbox.sh "$DB_HOST" "$DB_USER" "$DB_PASS" "$DB_NAME" "$JUMP_HOST" "$JUMP_USER"
170+
175171
- name: 🛢️ Run Script Deploy Database
176172
run: |
177173
chmod +x ./ansible/deploy-db-from-local.sh

0 commit comments

Comments
 (0)