Add delete automate domain support #548
Conversation
|
@miq-bot add_label enhancement |
|
@miq-bot add_label hammer/no |
|
@miq-bot assign @juliancheal |
|
@mkanoor Please review |
|
@gtanzillo Please review |
|
rerunning build. Failures look unrelated. |
| api_log_info("Deleting #{automate_domain_ident(domain)}") | ||
|
|
||
| begin | ||
| MiqAeDomain.where(:name => domain.name).each(&:destroy) |
There was a problem hiding this comment.
@jvlcek I think we have something called readonly domains like ManageIQ and Redhat should the user be allowed to delete these domains. Or should this be allowed only for user domains?
There was a problem hiding this comment.
@jvlcek is this going to use some RBAC check to see if a user is allowed to delete a domain.
There was a problem hiding this comment.
@jvlcek I think instead of destroy it might be better to call destroy_queue since we would want to delete the git directories if the domain is a git based domain.
https://github.com/ManageIQ/manageiq-automation_engine/blob/e136b74e9b2005d050149d9c7019784a531d82e1/app/models/miq_ae_domain.rb#L162
There was a problem hiding this comment.
Thank you for your help @mkanoor! It is very much appreciated.
I have pushed a change to address two of your three comments.
I will push the resolution the the RBAC check issue and an updated spec shortly.
JoeV
There was a problem hiding this comment.
@mkanoor RBAC is already being handled by the change to the config/api.yml file.
e.g.:
https://github.com/ManageIQ/manageiq-api/pull/548/files#diff-15502b585d5033aa8043cc26237a06baR257
:identifier: miq_ae_domain_delete
So the user must be associated with a role that has the miq_ae_domain_delete product feature enabled.
So RBAC is being check.
Thank you.
|
|
||
| begin | ||
| # Do not delete the domain if any are locked | ||
| MiqAeDomain.where(:name => domain.name).each { |d| raise "Not deleting. Domain is locked." if d.contents_locked? } |
There was a problem hiding this comment.
@jvlcek Looks good, you might want to mention somewhere that we won't be deleting
- System Domains
- GIT Based domains
The only ones you can delete are user domains which are unlocked.
|
I'm going to squash all the commits. |
45f2534 to
a39a2f4
Compare
|
Checked commit jvlcek@a39a2f4 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 app/controllers/api/automate_domains_controller.rb
|
|
👍 |
|
LGTM @jvlcek |
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1645041
This PR adds support to allow removal of automate domains via the API
This change only supports deletion of unlocked user domains. System and
GIT based domains will not be deleted.
To test:
e.g.:
curl --insecure --user <user>:<password> -X DELETE <appliance URL>/api/automate_domains/<domain name>e.g.:
curl --insecure --user " <user>:<password>" -H "Content-Type: application/json" --data '{"action":"delete"}' -X POST <URL>/api/automate_domains/<domain name>