Skip to content

Commit 17b841d

Browse files
fixed purging issue
1 parent b79e459 commit 17b841d

3 files changed

Lines changed: 40956 additions & 19 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ jobs:
139139
aiDeploymentsLocation="eastus" \
140140
useWafAlignedArchitecture=false \
141141
capacity=${{ env.GPT_MIN_CAPACITY }} \
142-
imageVersion="${IMAGE_TAG}"\
143-
--debug
142+
imageVersion="${IMAGE_TAG}"
144143
145144
- name: Get Deployment Output and extract Values
146145
id: get_output
@@ -195,7 +194,6 @@ jobs:
195194
196195
if [ -z "$log_analytics_workspace_name" ]; then
197196
echo "No Log Analytics workspace found in resource group ${{ env.RESOURCE_GROUP_NAME }}."
198-
exit 1
199197
else
200198
echo "LOG_ANALYTICS_WORKSPACE_NAME=${log_analytics_workspace_name}" >> $GITHUB_ENV
201199
echo "Log Analytics workspace name: ${log_analytics_workspace_name}"
@@ -248,22 +246,6 @@ jobs:
248246
echo "KEYVAULTS=$keyvault_array" >> $GITHUB_ENV
249247
fi
250248
251-
- name: Purge log analytics workspace
252-
if: always()
253-
id: log_analytics_workspace
254-
run: |
255-
256-
set -e
257-
# Purge Log Analytics Workspace
258-
echo "Purging the Log Analytics Workspace..."
259-
if ! az monitor log-analytics workspace delete --force --resource-group ${{ env.RESOURCE_GROUP_NAME }} --workspace-name ${{ env.LOG_ANALYTICS_WORKSPACE_NAME }} --yes --verbose; then
260-
echo "Failed to purge Log Analytics workspace: ${{ env.LOG_ANALYTICS_WORKSPACE_NAME }}"
261-
else
262-
echo "Purged the Log Analytics workspace: ${{ env.LOG_ANALYTICS_WORKSPACE_NAME }}"
263-
fi
264-
265-
echo "Log analytics workspace resource purging completed successfully"
266-
267249
- name: Delete Bicep Deployment
268250
if: always()
269251
run: |
@@ -281,6 +263,23 @@ jobs:
281263
echo "Resource group does not exists."
282264
fi
283265
266+
- name: Purge log analytics workspace
267+
if: always()
268+
id: log_analytics_workspace
269+
run: |
270+
271+
set -e
272+
# Purge Log Analytics Workspace
273+
echo "Purging the Log Analytics Workspace..."
274+
if ! az monitor log-analytics workspace delete --force --resource-group ${{ env.RESOURCE_GROUP_NAME }} --workspace-name ${{ env.LOG_ANALYTICS_WORKSPACE_NAME }} --yes --verbose; then
275+
echo "Failed to purge Log Analytics workspace: ${{ env.LOG_ANALYTICS_WORKSPACE_NAME }}"
276+
else
277+
echo "Purged the Log Analytics workspace: ${{ env.LOG_ANALYTICS_WORKSPACE_NAME }}"
278+
fi
279+
280+
echo "Log analytics workspace resource purging completed successfully"
281+
282+
284283
- name: Wait for resource deletion to complete
285284
if: always()
286285
run: |

infra/main.bicep

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,3 +600,4 @@ module containerAppFrontend 'br/public:avm/res/app/container-app:0.17.0' = {
600600

601601
@description('The resource group the resources were deployed into.')
602602
output resourceGroupName string = resourceGroup().name
603+
output WEB_APP_URL string = 'https://${containerAppFrontend.outputs.fqdn}'

0 commit comments

Comments
 (0)