Skip to content

Commit d9d9927

Browse files
Roopan-MicrosoftRoopan-Microsoft
authored
Merge pull request #112 from microsoft/psl-workflow-codeowners
ci: workflow updated for purging resources
2 parents 3a019d7 + cd862f0 commit d9d9927

File tree

3 files changed

+299
-3
lines changed

3 files changed

+299
-3
lines changed

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
# Specific directory ownership
88
/ClientAdvisor/ @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft
99

10-
/ResearchAssistant/ @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft
10+
/ResearchAssistant/ @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft

‎.github/workflows/CAdeploy.yml

+149-1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,39 @@ jobs:
7373
--template-file ClientAdvisor/Deployment/bicep/main.bicep \
7474
--parameters solutionPrefix=${{ env.SOLUTION_PREFIX }} cosmosLocation=eastus2
7575
76+
- name: List KeyVaults and Store in Array
77+
id: list_keyvaults
78+
run: |
79+
80+
set -e
81+
echo "Listing all KeyVaults in the resource group ${RESOURCE_GROUP_NAME}..."
82+
83+
# Get the list of KeyVaults in the specified resource group
84+
keyvaults=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --query "[?type=='Microsoft.KeyVault/vaults'].name" -o tsv)
85+
86+
if [ -z "$keyvaults" ]; then
87+
echo "No KeyVaults found in resource group ${RESOURCE_GROUP_NAME}."
88+
echo "KEYVAULTS=[]" >> $GITHUB_ENV # If no KeyVaults found, set an empty array
89+
else
90+
echo "KeyVaults found: $keyvaults"
91+
92+
# Format the list into an array with proper formatting (no trailing comma)
93+
keyvault_array="["
94+
first=true
95+
for kv in $keyvaults; do
96+
if [ "$first" = true ]; then
97+
keyvault_array="$keyvault_array\"$kv\""
98+
first=false
99+
else
100+
keyvault_array="$keyvault_array,\"$kv\""
101+
fi
102+
done
103+
keyvault_array="$keyvault_array]"
104+
105+
# Output the formatted array and save it to the environment variable
106+
echo "KEYVAULTS=$keyvault_array" >> $GITHUB_ENV
107+
fi
108+
76109
- name: Update PowerBI URL
77110
if: success()
78111
run: |
@@ -109,10 +142,126 @@ jobs:
109142
else
110143
echo "Resource group does not exists."
111144
fi
145+
146+
- name: Wait for resource deletion to complete
147+
run: |
148+
149+
# List of keyvaults
150+
KEYVAULTS="${{ env.KEYVAULTS }}"
151+
152+
# Remove the surrounding square brackets, if they exist
153+
stripped_keyvaults=$(echo "$KEYVAULTS" | sed 's/\[\|\]//g')
154+
155+
# Convert the comma-separated string into an array
156+
IFS=',' read -r -a resources_to_check <<< "$stripped_keyvaults"
157+
158+
# Append new resources to the array
159+
resources_to_check+=("${{ env.SOLUTION_PREFIX }}-openai" "${{ env.SOLUTION_PREFIX }}-cogser")
160+
161+
echo "List of resources to check: ${resources_to_check[@]}"
162+
163+
# Get the list of resources in YAML format
164+
resource_list=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --output yaml)
165+
166+
# Maximum number of retries
167+
max_retries=3
168+
169+
# Retry intervals in seconds (30, 60, 120)
170+
retry_intervals=(30 60 120)
171+
172+
# Retry mechanism to check resources
173+
retries=0
174+
while true; do
175+
resource_found=false
176+
177+
# Iterate through the resources to check
178+
for resource in "${resources_to_check[@]}"; do
179+
echo "Checking resource: $resource"
180+
if echo "$resource_list" | grep -q "name: $resource"; then
181+
echo "Resource '$resource' exists in the resource group."
182+
resource_found=true
183+
else
184+
echo "Resource '$resource' does not exist in the resource group."
185+
fi
186+
done
187+
188+
# If any resource exists, retry
189+
if [ "$resource_found" = true ]; then
190+
retries=$((retries + 1))
191+
if [ "$retries" -ge "$max_retries" ]; then
192+
echo "Maximum retry attempts reached. Exiting."
193+
break
194+
else
195+
# Wait for the appropriate interval for the current retry
196+
echo "Waiting for ${retry_intervals[$retries-1]} seconds before retrying..."
197+
sleep ${retry_intervals[$retries-1]}
198+
fi
199+
else
200+
echo "No resources found. Exiting."
201+
break
202+
fi
203+
done
204+
205+
- name: Purging the Resources
206+
if: success()
207+
run: |
208+
209+
set -e
210+
# Define variables
211+
OPENAI_COMMON_PART="-openai"
212+
openai_name="${{ env.SOLUTION_PREFIX }}${OPENAI_COMMON_PART}"
213+
echo "Azure OpenAI: $openai_name"
214+
215+
MULTISERVICE_COMMON_PART="-cogser"
216+
multiservice_account_name="${{ env.SOLUTION_PREFIX }}${MULTISERVICE_COMMON_PART}"
217+
echo "Azure MultiService Account: $multiservice_account_name"
218+
219+
# Purge OpenAI Resource
220+
echo "Purging the OpenAI Resource..."
221+
if ! az resource delete --ids /subscriptions/${{ secrets.AZURE_SUBSCRIPTION_ID }}/providers/Microsoft.CognitiveServices/locations/uksouth/resourceGroups/${{ env.RESOURCE_GROUP_NAME }}/deletedAccounts/$openai_name --verbose; then
222+
echo "Failed to purge openai resource: $openai_name"
223+
else
224+
echo "Purged the openai resource: $openai_name"
225+
fi
226+
227+
# Purge MultiService Account Resource
228+
echo "Purging the MultiService Account Resource..."
229+
if ! az resource delete --ids /subscriptions/${{ secrets.AZURE_SUBSCRIPTION_ID }}/providers/Microsoft.CognitiveServices/locations/uksouth/resourceGroups/${{ env.RESOURCE_GROUP_NAME }}/deletedAccounts/$multiservice_account_name --verbose; then
230+
echo "Failed to purge multiService account resource: $multiservice_account_name"
231+
else
232+
echo "Purged the multiService account resource: $multiservice_account_name"
233+
fi
234+
235+
# Ensure KEYVAULTS is properly formatted as a comma-separated string
236+
KEYVAULTS="${{ env.KEYVAULTS }}"
237+
238+
# Remove the surrounding square brackets, if they exist
239+
stripped_keyvaults=$(echo "$KEYVAULTS" | sed 's/\[\|\]//g')
240+
241+
# Convert the comma-separated string into an array
242+
IFS=',' read -r -a keyvault_array <<< "$stripped_keyvaults"
243+
244+
echo "Using KeyVaults Array..."
245+
for keyvault_name in "${keyvault_array[@]}"; do
246+
echo "Processing KeyVault: $keyvault_name"
247+
# Check if the KeyVault is soft-deleted
248+
deleted_vaults=$(az keyvault list-deleted --query "[?name=='$keyvault_name']" -o json --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }})
249+
250+
# If the KeyVault is found in the soft-deleted state, purge it
251+
if [ "$(echo "$deleted_vaults" | jq length)" -gt 0 ]; then
252+
echo "KeyVault '$keyvault_name' is soft-deleted. Proceeding to purge..."
253+
az keyvault purge --name "$keyvault_name" --no-wait
254+
else
255+
echo "KeyVault '$keyvault_name' is not soft-deleted. No action taken."
256+
fi
257+
done
258+
259+
echo "Resource purging completed successfully"
112260

113261
- name: Send Notification on Failure
114262
if: failure()
115263
run: |
264+
116265
RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
117266
118267
# Construct the email body
@@ -127,4 +276,3 @@ jobs:
127276
curl -X POST "${{ secrets.LOGIC_APP_URL }}" \
128277
-H "Content-Type: application/json" \
129278
-d "$EMAIL_BODY" || echo "Failed to send notification"
130-

‎.github/workflows/RAdeploy.yml

+149-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,40 @@ jobs:
7070
--resource-group ${{ env.RESOURCE_GROUP_NAME }} \
7171
--template-file ResearchAssistant/Deployment/bicep/main.bicep \
7272
--parameters solutionPrefix=${{ env.SOLUTION_PREFIX }}
73-
73+
74+
- name: List KeyVaults and Store in Array
75+
id: list_keyvaults
76+
run: |
77+
78+
set -e
79+
echo "Listing all KeyVaults in the resource group ${RESOURCE_GROUP_NAME}..."
80+
81+
# Get the list of KeyVaults in the specified resource group
82+
keyvaults=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --query "[?type=='Microsoft.KeyVault/vaults'].name" -o tsv)
83+
84+
if [ -z "$keyvaults" ]; then
85+
echo "No KeyVaults found in resource group ${RESOURCE_GROUP_NAME}."
86+
echo "KEYVAULTS=[]" >> $GITHUB_ENV # If no KeyVaults found, set an empty array
87+
else
88+
echo "KeyVaults found: $keyvaults"
89+
90+
# Format the list into an array with proper formatting (no trailing comma)
91+
keyvault_array="["
92+
first=true
93+
for kv in $keyvaults; do
94+
if [ "$first" = true ]; then
95+
keyvault_array="$keyvault_array\"$kv\""
96+
first=false
97+
else
98+
keyvault_array="$keyvault_array,\"$kv\""
99+
fi
100+
done
101+
keyvault_array="$keyvault_array]"
102+
103+
# Output the formatted array and save it to the environment variable
104+
echo "KEYVAULTS=$keyvault_array" >> $GITHUB_ENV
105+
fi
106+
74107
- name: Delete Bicep Deployment
75108
if: success()
76109
run: |
@@ -88,6 +121,121 @@ jobs:
88121
echo "Resource group does not exists."
89122
fi
90123
124+
- name: Wait for resource deletion to complete
125+
run: |
126+
127+
# List of keyvaults
128+
KEYVAULTS="${{ env.KEYVAULTS }}"
129+
130+
# Remove the surrounding square brackets, if they exist
131+
stripped_keyvaults=$(echo "$KEYVAULTS" | sed 's/\[\|\]//g')
132+
133+
# Convert the comma-separated string into an array
134+
IFS=',' read -r -a resources_to_check <<< "$stripped_keyvaults"
135+
136+
# Append new resources to the array
137+
resources_to_check+=("${{ env.SOLUTION_PREFIX }}-openai" "${{ env.SOLUTION_PREFIX }}-cogser")
138+
139+
echo "List of resources to check: ${resources_to_check[@]}"
140+
141+
# Get the list of resources in YAML format
142+
resource_list=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --output yaml)
143+
144+
# Maximum number of retries
145+
max_retries=3
146+
147+
# Retry intervals in seconds (30, 60, 120)
148+
retry_intervals=(30 60 120)
149+
150+
# Retry mechanism to check resources
151+
retries=0
152+
while true; do
153+
resource_found=false
154+
155+
# Iterate through the resources to check
156+
for resource in "${resources_to_check[@]}"; do
157+
echo "Checking resource: $resource"
158+
if echo "$resource_list" | grep -q "name: $resource"; then
159+
echo "Resource '$resource' exists in the resource group."
160+
resource_found=true
161+
else
162+
echo "Resource '$resource' does not exist in the resource group."
163+
fi
164+
done
165+
166+
# If any resource exists, retry
167+
if [ "$resource_found" = true ]; then
168+
retries=$((retries + 1))
169+
if [ "$retries" -ge "$max_retries" ]; then
170+
echo "Maximum retry attempts reached. Exiting."
171+
break
172+
else
173+
# Wait for the appropriate interval for the current retry
174+
echo "Waiting for ${retry_intervals[$retries-1]} seconds before retrying..."
175+
sleep ${retry_intervals[$retries-1]}
176+
fi
177+
else
178+
echo "No resources found. Exiting."
179+
break
180+
fi
181+
done
182+
183+
- name: Purging the Resources
184+
if: success()
185+
run: |
186+
187+
set -e
188+
# Define variables
189+
OPENAI_COMMON_PART="-openai"
190+
openai_name="${{ env.SOLUTION_PREFIX }}${OPENAI_COMMON_PART}"
191+
echo "Azure OpenAI: $openai_name"
192+
193+
MULTISERVICE_COMMON_PART="-cogser"
194+
multiservice_account_name="${{ env.SOLUTION_PREFIX }}${MULTISERVICE_COMMON_PART}"
195+
echo "Azure MultiService Account: $multiservice_account_name"
196+
197+
# Purge OpenAI Resource
198+
echo "Purging the OpenAI Resource..."
199+
if ! az resource delete --ids /subscriptions/${{ secrets.AZURE_SUBSCRIPTION_ID }}/providers/Microsoft.CognitiveServices/locations/eastus2/resourceGroups/${{ env.RESOURCE_GROUP_NAME }}/deletedAccounts/$openai_name --verbose; then
200+
echo "Failed to purge openai resource: $openai_name"
201+
else
202+
echo "Purged the openai resource: $openai_name"
203+
fi
204+
205+
# Purge MultiService Account Resource
206+
echo "Purging the MultiService Account Resource..."
207+
if ! az resource delete --ids /subscriptions/${{ secrets.AZURE_SUBSCRIPTION_ID }}/providers/Microsoft.CognitiveServices/locations/eastus2/resourceGroups/${{ env.RESOURCE_GROUP_NAME }}/deletedAccounts/$multiservice_account_name --verbose; then
208+
echo "Failed to purge multiService account resource: $multiservice_account_name"
209+
else
210+
echo "Purged the multiService account resource: $multiservice_account_name"
211+
fi
212+
213+
# Ensure KEYVAULTS is properly formatted as a comma-separated string
214+
KEYVAULTS="${{ env.KEYVAULTS }}"
215+
216+
# Remove the surrounding square brackets, if they exist
217+
stripped_keyvaults=$(echo "$KEYVAULTS" | sed 's/\[\|\]//g')
218+
219+
# Convert the comma-separated string into an array
220+
IFS=',' read -r -a keyvault_array <<< "$stripped_keyvaults"
221+
222+
echo "Using KeyVaults Array..."
223+
for keyvault_name in "${keyvault_array[@]}"; do
224+
echo "Processing KeyVault: $keyvault_name"
225+
# Check if the KeyVault is soft-deleted
226+
deleted_vaults=$(az keyvault list-deleted --query "[?name=='$keyvault_name']" -o json --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }})
227+
228+
# If the KeyVault is found in the soft-deleted state, purge it
229+
if [ "$(echo "$deleted_vaults" | jq length)" -gt 0 ]; then
230+
echo "KeyVault '$keyvault_name' is soft-deleted. Proceeding to purge..."
231+
az keyvault purge --name "$keyvault_name" --no-wait
232+
else
233+
echo "KeyVault '$keyvault_name' is not soft-deleted. No action taken."
234+
fi
235+
done
236+
237+
echo "Resource purging completed successfully"
238+
91239
- name: Send Notification on Failure
92240
if: failure()
93241
run: |

0 commit comments

Comments
 (0)