Skip to content
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.

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

[HAMMER] Dropbox removed, in exchange for using support tool #6340

Conversation

jrafanie
Copy link
Member

@jrafanie jrafanie commented Oct 25, 2019

Manual backport of #6330 and #6341

Make both red hat dropbox and support tool read-only

https://bugzilla.redhat.com/show_bug.cgi?id=1765635

Note, there's still test files referencing the changed dropbox strings but #6330 passed tests and didn't include them. If needed, we can do another upstream PR for master/hammer to get them:

02:38:05 ~/Code/manageiq-ui-classic (hammer_backport_6330_dropbox_out_support_tool_in) (2.6.5) - git grep "Red Hat Dropbox"
spec/javascripts/controllers/ops/log_collection_form_controller_spec.js:        depot_name: 'Red Hat Dropbox',
spec/javascripts/controllers/ops/log_collection_form_controller_spec.js:        vm.logCollectionModel.log_protocol = 'Red Hat Dropbox';
spec/javascripts/controllers/ops/log_collection_form_controller_spec.js:        $httpBackend.whenGET('/ops/log_protocol_changed/123456?log_protocol=Red Hat Dropbox').respond(200, logProtocolChangedFormResponse);
0

@jrafanie
Copy link
Member Author

cc @simaishi

@jrafanie
Copy link
Member Author

cc @juliancheal

@miq-bot miq-bot changed the title Manual backport of #6330 [HAMMER] Manual backport of #6330 Oct 25, 2019
@simaishi simaishi changed the title [HAMMER] Manual backport of #6330 [HAMMER] Dropbox removed, in exchange for using support tool Oct 25, 2019
@simaishi simaishi requested a review from himdel October 28, 2019 13:23
@simaishi simaishi self-assigned this Oct 28, 2019
@himdel
Copy link
Contributor

himdel commented Oct 28, 2019

Soo... what this change does is allow users to edit their existing Red Hat Dropbox log settings.
Is that the intent? Or am I missing a migration/backend change to translate the log_protocol value somewhere?

@juliancheal
Copy link
Member

@himdel Ah sorry for the confusion. We were doing two things with one PR. RH Dropbox has been removed from downstream, and replaced with the file depo, with the settings for that not being editable. :)

@himdel
Copy link
Contributor

himdel commented Oct 28, 2019

Ah, thanks, ok, as long as the backend is dealing with this.. :)

👍

(we probably should fix those remaining mentions in master, but that's for another pr :))

@juliancheal
Copy link
Member

juliancheal commented Oct 28, 2019

@himdel Having spoken with @jrafanie et al, we've made a suppliment for this PR #6341 which still keeps RH Dropbox, as well as adding RH Support.

FYI, yes I fully agree this being upstream is not ideal, but that's tomorrows problem :)

@jrafanie
Copy link
Member Author

Hold off on merging, I'm pushing one other change to match the changes in #6341

@jrafanie jrafanie force-pushed the hammer_backport_6330_dropbox_out_support_tool_in branch from f7dc107 to 855d7a1 Compare October 28, 2019 18:05
@miq-bot
Copy link
Member

miq-bot commented Oct 28, 2019

Checked commit jrafanie@855d7a1 with ruby 2.4.6, rubocop 0.69.0, haml-lint 0.20.0, and yamllint 1.10.0
1 file checked, 1 offense detected

app/views/ops/_log_collection.html.haml

  • ⚠️ - Line 40 - Line is too long. [176/160]

@simaishi simaishi merged commit cd377fd into ManageIQ:hammer Oct 28, 2019
@simaishi simaishi added this to the Sprint 123 Ending Oct 28, 2019 milestone Oct 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants