Skip to content

Improve resource deletion flow #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
polldo merged 1 commit into from
Nov 23, 2021
Merged

Improve resource deletion flow #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions command/device/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,26 +52,25 @@ func Delete(params *DeleteParams) error {
return err
}

deviceIDs := []string{}
if params.ID != nil {
// Delete by id
return iotClient.DeviceDelete(*params.ID)

} else if params.Tags != nil {
// Delete by tags
deviceIDs = append(deviceIDs, *params.ID)
}
if params.Tags != nil {
dev, err := iotClient.DeviceList(params.Tags)
if err != nil {
return err
}
for _, d := range dev {
err = iotClient.DeviceDelete(d.Id)
if err != nil {
return err
}
deviceIDs = append(deviceIDs, d.Id)
}
}

} else {
// should not be reachable
return errors.New("provide either '--id' or '--tags' flag")
for _, id := range deviceIDs {
err = iotClient.DeviceDelete(id)
if err != nil {
return err
}
}

return nil
Expand Down
26 changes: 13 additions & 13 deletions command/thing/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,25 @@ func Delete(params *DeleteParams) error {
return err
}

thingIDs := []string{}
if params.ID != nil {
// Delete by ID
return iotClient.ThingDelete(*params.ID)

} else if params.Tags != nil {
things, err := iotClient.ThingList(nil, nil, false, params.Tags)
thingIDs = append(thingIDs, *params.ID)
}
if params.Tags != nil {
th, err := iotClient.ThingList(nil, nil, false, params.Tags)
if err != nil {
return err
}
for _, t := range things {
err = iotClient.ThingDelete(t.Id)
if err != nil {
return err
}
for _, t := range th {
thingIDs = append(thingIDs, t.Id)
}
}

} else {
// should not be reachable
return errors.New("provide either '--id' or '--tags' flag")
for _, id := range thingIDs {
err = iotClient.ThingDelete(id)
if err != nil {
return err
}
}

return nil
Expand Down