tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Display errors if resource not found when deleting volumes (file share or storage account) 

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
This commit is contained in:
Guillaume Tardif 2020-09-09 10:26:30 +02:00
parent b96a6d1086
commit 18ad20f1c5
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
aci/volumes.go
View File

@ -152,7 +152,6 @@ func (cs *aciVolumeService) Create(ctx context.Context, options interface{}) (vo
w.Event(errorEvent(opts.Fileshare))
return volumes.Volume{}, err
}
//TODO tag fileshare
fileShare, err = fileShareClient.Create(ctx, cs.aciContext.ResourceGroup, *account.Name, opts.Fileshare, storage.FileShare{})
if err != nil {
w.Event(errorEvent(opts.Fileshare))
@ -185,14 +184,16 @@ func (cs *aciVolumeService) Delete(ctx context.Context, options interface{}) err
}
if opts.DeleteAccount {
//TODO check if there are other fileshares on this account
//TODO flag account and only delete ours?
//TODO error when not found
storageAccountsClient, err := login.NewStorageAccountsClient(cs.aciContext.SubscriptionID)
if err != nil {
return err
}
_, err = storageAccountsClient.Delete(ctx, cs.aciContext.ResourceGroup, opts.Account)
result, err := storageAccountsClient.Delete(ctx, cs.aciContext.ResourceGroup, opts.Account)
if result.StatusCode == 204 {
return errors.Wrapf(errdefs.ErrNotFound, "storage account %s does not exist", opts.Account)
}
return err
}
@ -201,7 +202,13 @@ func (cs *aciVolumeService) Delete(ctx context.Context, options interface{}) err
return err
}
_, err = fileShareClient.Delete(ctx, cs.aciContext.ResourceGroup, opts.Account, opts.Fileshare)
result, err := fileShareClient.Delete(ctx, cs.aciContext.ResourceGroup, opts.Account, opts.Fileshare)
if result.StatusCode == 204 {
return errors.Wrapf(errdefs.ErrNotFound, "fileshare %s does not exist", opts.Fileshare)
}
if result.StatusCode == 404 {
return errors.Wrapf(errdefs.ErrNotFound, "storage account %s does not exist", opts.Account)
}
return err
}