ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-16 20:08:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle azure-storage deleting nonexistent containers (#948)

Browse Source
This commit is contained in:
bmc-msft
2021-06-02 11:11:33 -04:00
committed by GitHub
parent 74c0e0a5c5
commit 60ae07c34f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/api-service/__app__/onefuzzlib/azure/containers.py
View File

@ -10,7 +10,7 @@ import urllib.parse
from typing import Dict, Optional, Union, cast
from azure.common import AzureHttpError, AzureMissingResourceHttpError
from azure.core.exceptions import ResourceExistsError
from azure.core.exceptions import ResourceExistsError, ResourceNotFoundError
from azure.storage.blob import (
BlobClient,
BlobSasPermissions,
@ -146,12 +146,16 @@ def create_container(
def delete_container(container: Container, storage_type: StorageType) -> bool:
accounts = get_accounts(storage_type)
deleted = False
for account in accounts:
service = get_blob_service(account)
if bool(service.delete_container(container)):
return True
try:
service.delete_container(container)
deleted = True
except ResourceNotFoundError:
pass
return False
return deleted
def get_container_sas_url_service(