Skip to content

Commit 474f611

Browse files
danischmlhercot
authored andcommitted
Ignore rest errors if object cannot be deleted
1 parent e56107b commit 474f611

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

aci/resource_rest.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,13 @@ func resourceAciRestRead(d *schema.ResourceData, m interface{}) error {
9696
}
9797

9898
func resourceAciRestDelete(d *schema.ResourceData, m interface{}) error {
99-
_, err := PostAndSetStatus(d, m, Deleted)
99+
cont, err := PostAndSetStatus(d, m, Deleted)
100100
if err != nil {
101+
errCode := models.StripQuotes(models.StripSquareBrackets(cont.Search("imdata", "error", "attributes", "code").String()))
102+
// Ignore errors of type "Cannot delete object of class"
103+
if errCode == "107" {
104+
return nil
105+
}
101106
return err
102107
}
103108
d.SetId("")
@@ -180,11 +185,11 @@ func PostAndSetStatus(d *schema.ResourceData, m interface{}, status string) (*co
180185

181186
respCont, _, err := aciClient.Do(req)
182187
if err != nil {
183-
return nil, err
188+
return respCont, err
184189
}
185190
err = client.CheckForErrors(respCont, method, false)
186191
if err != nil {
187-
return nil, err
192+
return respCont, err
188193
}
189194
return cont, nil
190195
}

0 commit comments

Comments
 (0)