Skip to content

Commit ac7d4e8

Browse files
DrisDaryDrisDary
committed
revert changes
1 parent e310d21 commit ac7d4e8

3 files changed

Lines changed: 30 additions & 122 deletions

File tree

‎run-samples.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ TERRAFORM_SAMPLES=(
9494

9595
# 3b. Define Bicep Samples
9696
BICEP_SAMPLES=(
97-
"samples/web-app-sql-database/python/bicep|bash deploy.sh"
97+
#"samples/web-app-sql-database/python/bicep|bash deploy.sh"
9898
"samples/function-app-managed-identity/python/bicep|bash deploy.sh"
9999
"samples/function-app-storage-http/dotnet/bicep|bash deploy.sh"
100100
"samples/web-app-cosmosdb-mongodb-api/python/bicep|bash deploy.sh"

‎samples/web-app-managed-identity/python/bicep/deploy.sh‎

Lines changed: 15 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -107,89 +107,29 @@ fi
107107

108108
# Deploy the Bicep template
109109
echo "Deploying Bicep template [$TEMPLATE]..."
110-
echo "DEBUG: Listing existing resource groups before deployment..."
111-
$AZ group list --query "[].name" -o table || true
112-
113-
# Capture full deployment output for debugging
114-
DEPLOYMENT_RESULT=$($AZ deployment group create \
110+
if DEPLOYMENT_OUTPUTS=$($AZ deployment group create \
115111
--resource-group $RESOURCE_GROUP_NAME \
112+
--only-show-errors \
116113
--template-file $TEMPLATE \
117114
--parameters $PARAMETERS \
118115
--parameters location=$LOCATION \
119116
prefix=$PREFIX \
120117
suffix=$SUFFIX \
121118
managedIdentityType=$MANAGED_IDENTITY_TYPE \
122-
-o json 2>&1) || true
123-
124-
echo "DEBUG: Full deployment result:"
125-
echo "$DEPLOYMENT_RESULT" | jq . 2>/dev/null || echo "$DEPLOYMENT_RESULT"
126-
127-
# Check if deployment succeeded
128-
PROVISIONING_STATE=$(echo "$DEPLOYMENT_RESULT" | jq -r '.properties.provisioningState // empty' 2>/dev/null)
129-
echo "DEBUG: Provisioning State: $PROVISIONING_STATE"
130-
131-
if [[ "$PROVISIONING_STATE" == "Succeeded" ]]; then
132-
echo "Bicep template [$TEMPLATE] deployed successfully."
133-
134-
# Extract outputs
135-
DEPLOYMENT_OUTPUTS=$(echo "$DEPLOYMENT_RESULT" | jq '.properties.outputs // empty' 2>/dev/null)
136-
137-
if [[ -n "$DEPLOYMENT_OUTPUTS" ]] && echo "$DEPLOYMENT_OUTPUTS" | jq empty 2>/dev/null; then
138-
echo "Outputs:"
139-
echo "$DEPLOYMENT_OUTPUTS" | jq .
140-
APP_SERVICE_PLAN_NAME=$(echo "$DEPLOYMENT_OUTPUTS" | jq -r '.appServicePlanName.value // empty')
141-
WEB_APP_NAME=$(echo "$DEPLOYMENT_OUTPUTS" | jq -r '.webAppName.value // empty')
142-
WEB_APP_URL=$(echo "$DEPLOYMENT_OUTPUTS" | jq -r '.webAppUrl.value // empty')
143-
STORAGE_ACCOUNT_NAME=$(echo "$DEPLOYMENT_OUTPUTS" | jq -r '.storageAccountName.value // empty')
144-
echo "Deployment details:"
145-
echo "- appServicePlanName: $APP_SERVICE_PLAN_NAME"
146-
echo "- webAppName: $WEB_APP_NAME"
147-
echo "- webAppUrl: $WEB_APP_URL"
148-
echo "- storageAccountName: $STORAGE_ACCOUNT_NAME"
149-
else
150-
echo "Warning: Could not parse deployment outputs. Attempting to retrieve resource names directly..."
151-
152-
WEB_APP_NAME=$($AZ webapp list \
153-
--resource-group $RESOURCE_GROUP_NAME \
154-
--query "[0].name" \
155-
-o tsv 2>/dev/null || echo "")
156-
157-
STORAGE_ACCOUNT_NAME=$($AZ storage account list \
158-
--resource-group $RESOURCE_GROUP_NAME \
159-
--query "[0].name" \
160-
-o tsv 2>/dev/null || echo "")
161-
162-
APP_SERVICE_PLAN_NAME=$($AZ appservice plan list \
163-
--resource-group $RESOURCE_GROUP_NAME \
164-
--query "[0].name" \
165-
-o tsv 2>/dev/null || echo "")
166-
167-
echo "Retrieved resource names:"
168-
echo "- appServicePlanName: $APP_SERVICE_PLAN_NAME"
169-
echo "- webAppName: $WEB_APP_NAME"
170-
echo "- storageAccountName: $STORAGE_ACCOUNT_NAME"
171-
fi
119+
--query 'properties.outputs' -o json); then
120+
echo "Bicep template [$TEMPLATE] deployed successfully. Outputs:"
121+
echo "$DEPLOYMENT_OUTPUTS" | jq .
122+
APP_SERVICE_PLAN_NAME=$(echo "$DEPLOYMENT_OUTPUTS" | jq -r '.appServicePlanName.value')
123+
WEB_APP_NAME=$(echo "$DEPLOYMENT_OUTPUTS" | jq -r '.webAppName.value')
124+
WEB_APP_URL=$(echo "$DEPLOYMENT_OUTPUTS" | jq -r '.webAppUrl.value')
125+
STORAGE_ACCOUNT_NAME=$(echo "$DEPLOYMENT_OUTPUTS" | jq -r '.storageAccountName.value')
126+
echo "Deployment details:"
127+
echo "- appServicePlanName: $APP_SERVICE_PLAN_NAME"
128+
echo "- webAppName: $WEB_APP_NAME"
129+
echo "- webAppUrl: $WEB_APP_URL"
130+
echo "- storageAccountName: $STORAGE_ACCOUNT_NAME"
172131
else
173-
echo "ERROR: Bicep template [$TEMPLATE] deployment failed!"
174-
echo "Provisioning State: $PROVISIONING_STATE"
175-
echo ""
176-
echo "Full deployment error details:"
177-
echo "$DEPLOYMENT_RESULT" | jq . 2>/dev/null || echo "$DEPLOYMENT_RESULT"
178-
echo ""
179-
180-
# Try to extract specific error message
181-
ERROR_MESSAGE=$(echo "$DEPLOYMENT_RESULT" | jq -r '.properties.error.message // .error.message // .message // empty' 2>/dev/null)
182-
ERROR_CODE=$(echo "$DEPLOYMENT_RESULT" | jq -r '.properties.error.code // .error.code // .code // empty' 2>/dev/null)
183-
if [[ -n "$ERROR_MESSAGE" ]]; then
184-
echo "Error Code: $ERROR_CODE"
185-
echo "Error Message: $ERROR_MESSAGE"
186-
fi
187-
188-
# Check for resource-specific errors
189-
echo ""
190-
echo "DEBUG: Checking LocalStack logs..."
191-
docker logs localstack-main --tail 50 2>&1 | grep -i "error\|exception\|fail" || true
192-
132+
echo "Failed to deploy Bicep template [$TEMPLATE]"
193133
exit 1
194134
fi
195135

‎samples/web-app-sql-database/python/bicep/deploy.sh‎

Lines changed: 14 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,9 @@ fi
116116

117117
# Deploy the Bicep template
118118
echo "Deploying Bicep template [$TEMPLATE]..."
119-
echo "DEBUG: Listing existing resource groups before deployment..."
120-
$AZ group list --query "[].name" -o table || true
121-
122-
# Capture full deployment output for debugging
123-
DEPLOYMENT_RESULT=$($AZ deployment group create \
119+
if DEPLOYMENT_OUTPUTS=$($AZ deployment group create \
124120
--resource-group $RESOURCE_GROUP_NAME \
121+
--only-show-errors \
125122
--template-file $TEMPLATE \
126123
--parameters $PARAMETERS \
127124
--parameters location=$LOCATION \
@@ -131,54 +128,25 @@ DEPLOYMENT_RESULT=$($AZ deployment group create \
131128
administratorLoginPassword=$ADMIN_PASSWORD \
132129
sqlDatabaseUsername=$DATABASE_USER_NAME \
133130
sqlDatabasePassword=$DATABASE_USER_PASSWORD \
134-
-o json 2>&1) || true
135-
136-
echo "DEBUG: Full deployment result:"
137-
echo "$DEPLOYMENT_RESULT" | jq . 2>/dev/null || echo "$DEPLOYMENT_RESULT"
138-
139-
# Check if deployment succeeded
140-
PROVISIONING_STATE=$(echo "$DEPLOYMENT_RESULT" | jq -r '.properties.provisioningState // empty' 2>/dev/null)
141-
echo "DEBUG: Provisioning State: $PROVISIONING_STATE"
142-
143-
if [[ "$PROVISIONING_STATE" == "Succeeded" ]]; then
144-
echo "Bicep template [$TEMPLATE] deployed successfully."
145-
DEPLOYMENT_JSON=$(echo "$DEPLOYMENT_RESULT" | jq '.properties.outputs // empty' 2>/dev/null)
146-
echo "Outputs:"
131+
--query 'properties.outputs' \
132+
--output json); then
133+
# Extract only the JSON portion (everything from first { to the end)
134+
DEPLOYMENT_JSON=$(echo "$DEPLOYMENT_OUTPUTS" | sed -n '/{/,$ p')
135+
echo "Bicep template [$TEMPLATE] deployed successfully. Outputs:"
147136
echo "$DEPLOYMENT_JSON" | jq .
148-
APP_SERVICE_PLAN_NAME=$(echo "$DEPLOYMENT_JSON" | jq -r '.appServicePlanName.value // empty')
149-
WEB_APP_NAME=$(echo "$DEPLOYMENT_JSON" | jq -r '.webAppName.value // empty')
150-
SQL_SERVER_NAME=$(echo "$DEPLOYMENT_JSON" | jq -r '.sqlServerName.value // empty')
151-
SQL_DATABASE_NAME=$(echo "$DEPLOYMENT_JSON" | jq -r '.sqlDatabaseName.value // empty')
137+
APP_SERVICE_PLAN_NAME=$(echo "$DEPLOYMENT_JSON" | jq -r '.appServicePlanName.value')
138+
WEB_APP_NAME=$(echo "$DEPLOYMENT_JSON" | jq -r '.webAppName.value')
139+
SQL_SERVER_NAME=$(echo "$DEPLOYMENT_JSON" | jq -r '.sqlServerName.value')
140+
SQL_DATABASE_NAME=$(echo "$DEPLOYMENT_JSON" | jq -r '.sqlDatabaseName.value')
152141
echo "Deployment details:"
153142
echo "appServicePlanName: $APP_SERVICE_PLAN_NAME"
154143
echo "webAppName: $WEB_APP_NAME"
144+
echo "webAppUrl: $WEB_APP_URL"
155145
echo "sqlServerName: $SQL_SERVER_NAME"
156146
echo "sqlDatabaseName: $SQL_DATABASE_NAME"
157147
else
158-
echo "ERROR: Bicep template [$TEMPLATE] deployment failed!"
159-
echo "Provisioning State: $PROVISIONING_STATE"
160-
echo ""
161-
echo "Full deployment error details:"
162-
echo "$DEPLOYMENT_RESULT" | jq . 2>/dev/null || echo "$DEPLOYMENT_RESULT"
163-
echo ""
164-
165-
# Try to extract specific error message
166-
ERROR_MESSAGE=$(echo "$DEPLOYMENT_RESULT" | jq -r '.properties.error.message // .error.message // .message // empty' 2>/dev/null)
167-
ERROR_CODE=$(echo "$DEPLOYMENT_RESULT" | jq -r '.properties.error.code // .error.code // .code // empty' 2>/dev/null)
168-
if [[ -n "$ERROR_MESSAGE" ]]; then
169-
echo "Error Code: $ERROR_CODE"
170-
echo "Error Message: $ERROR_MESSAGE"
171-
fi
172-
173-
# Check for resource-specific errors in LocalStack logs
174-
echo ""
175-
echo "DEBUG: Checking LocalStack logs for SQL-related errors..."
176-
docker logs localstack-main --tail 100 2>&1 | grep -i "error\|exception\|fail\|sql" || true
177-
178-
echo ""
179-
echo "NOTE: SQL Database deployment is not fully supported in LocalStack Azure emulator yet."
180-
echo "Skipping this test..."
181-
exit 0
148+
echo "Failed to deploy Bicep template [$TEMPLATE]"
149+
exit 1
182150
fi
183151

184152
if [[ -z "$WEB_APP_NAME" || -z "$SQL_SERVER_NAME" || -z "$SQL_DATABASE_NAME" ]]; then

0 commit comments

Comments
 (0)