Skip to content

Commit d34e84e

Browse files
clean up formatting and improve readability in process_sample_data.sh
1 parent 936ec8b commit d34e84e

File tree

1 file changed

+45
-46
lines changed

1 file changed

+45
-46
lines changed

infra/scripts/process_sample_data.sh

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -137,48 +137,48 @@ enable_public_access() {
137137
fi
138138

139139
# Add (or verify) a firewall rule allowing all IPs (TEMPORARY)
140-
echo "Ensuring temporary wide-open firewall rule exists for data load"
141-
sql_allow_all_rule_name="temp-allow-all-ip"
142-
143-
# Detect if a full-range rule (any name) already existed before we potentially create one
144-
pre_existing_full_range_rule=$(az sql server firewall-rule list \
145-
--server "$sqlServerName" \
146-
--resource-group "$resourceGroupName" \
147-
--query "[?startIpAddress=='0.0.0.0' && endIpAddress=='255.255.255.255'] | [0].name" \
148-
-o tsv 2>/dev/null)
149-
if [ -n "$pre_existing_full_range_rule" ]; then
150-
original_full_range_rule_present="true"
151-
fi
140+
echo "Ensuring temporary wide-open firewall rule exists for data load"
141+
sql_allow_all_rule_name="temp-allow-all-ip"
142+
143+
# Detect if a full-range rule (any name) already existed before we potentially create one
144+
pre_existing_full_range_rule=$(az sql server firewall-rule list \
145+
--server "$sqlServerName" \
146+
--resource-group "$resourceGroupName" \
147+
--query "[?startIpAddress=='0.0.0.0' && endIpAddress=='255.255.255.255'] | [0].name" \
148+
-o tsv 2>/dev/null)
149+
if [ -n "$pre_existing_full_range_rule" ]; then
150+
original_full_range_rule_present="true"
151+
fi
152152

153-
existing_allow_all_rule=$(az sql server firewall-rule list \
154-
--server "$sqlServerName" \
155-
--resource-group "$resourceGroupName" \
156-
--query "[?name=='${sql_allow_all_rule_name}'] | [0].name" \
157-
-o tsv 2>/dev/null)
158-
159-
if [ -z "$existing_allow_all_rule" ]; then
160-
if [ -n "$pre_existing_full_range_rule" ]; then
161-
echo "✓ Existing rule ($pre_existing_full_range_rule) already allows full IP range."
162-
else
163-
echo "Creating temporary allow-all firewall rule ($sql_allow_all_rule_name)..."
164-
if az sql server firewall-rule create \
165-
--resource-group "$resourceGroupName" \
166-
--server "$sqlServerName" \
167-
--name "$sql_allow_all_rule_name" \
168-
--start-ip-address 0.0.0.0 \
169-
--end-ip-address 255.255.255.255 \
170-
--output none; then
171-
created_sql_allow_all_firewall_rule="true"
172-
echo "✓ Temporary allow-all firewall rule created"
173-
else
174-
echo "⚠ Warning: Failed to create allow-all firewall rule"
175-
fi
176-
fi
177-
else
178-
echo "✓ Temporary allow-all firewall rule already present"
179-
# Since it was present beforehand, mark that a full-range rule existed originally
180-
original_full_range_rule_present="true"
181-
fi
153+
existing_allow_all_rule=$(az sql server firewall-rule list \
154+
--server "$sqlServerName" \
155+
--resource-group "$resourceGroupName" \
156+
--query "[?name=='${sql_allow_all_rule_name}'] | [0].name" \
157+
-o tsv 2>/dev/null)
158+
159+
if [ -z "$existing_allow_all_rule" ]; then
160+
if [ -n "$pre_existing_full_range_rule" ]; then
161+
echo "✓ Existing rule ($pre_existing_full_range_rule) already allows full IP range."
162+
else
163+
echo "Creating temporary allow-all firewall rule ($sql_allow_all_rule_name)..."
164+
if az sql server firewall-rule create \
165+
--resource-group "$resourceGroupName" \
166+
--server "$sqlServerName" \
167+
--name "$sql_allow_all_rule_name" \
168+
--start-ip-address 0.0.0.0 \
169+
--end-ip-address 255.255.255.255 \
170+
--output none; then
171+
created_sql_allow_all_firewall_rule="true"
172+
echo "✓ Temporary allow-all firewall rule created"
173+
else
174+
echo "⚠ Warning: Failed to create allow-all firewall rule"
175+
fi
176+
fi
177+
else
178+
echo "✓ Temporary allow-all firewall rule already present"
179+
# Since it was present beforehand, mark that a full-range rule existed originally
180+
original_full_range_rule_present="true"
181+
fi
182182

183183
# Wait a bit for changes to take effect
184184
echo "Waiting for network access changes to propagate..."
@@ -276,7 +276,6 @@ restore_network_access() {
276276
echo "=== Network access restoration completed ==="
277277
}
278278

279-
280279
# Function to handle script cleanup on exit
281280
cleanup_on_exit() {
282281
exit_code=$?
@@ -294,10 +293,10 @@ trap cleanup_on_exit EXIT INT TERM
294293

295294
# check if azd cli is installed
296295
check_azd_installed() {
297-
if command -v azd &> /dev/null; then
298-
return 0
299-
else
300-
return 1
296+
if command -v azd &> /dev/null; then
297+
return 0
298+
else
299+
return 1
301300
fi
302301
}
303302

0 commit comments

Comments
 (0)