Replace MiqUUID with inline clean_guid method #588
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
agrare
reviewed
Jun 8, 2020
| @@ -28,7 +30,7 @@ def parse_virtual_machine_summary(vm_hash, props) | |||
| if summary_config | |||
| uuid = summary_config[:uuid] | |||
| unless uuid.blank? | |||
| vm_hash[:uid_ems] = MiqUUID.clean_guid(uuid) || uuid | |||
| vm_hash[:uid_ems] = clean_guid(uuid) || uuid | |||
There was a problem hiding this comment.
@djberg96 I think we can just do vm_hash[:uid_ems] = clean_guid(uuid) without the || uuid if the only two cases that method returns nil for is if the uuid is nil (in which case we'd get nil || nil) or if the string is empty which isn't a valid uid_ems anyway. WDYT?
There was a problem hiding this comment.
@agrare I agree, will update.
|
Checked commits https://github.com/djberg96/manageiq-providers-vmware/compare/4ddceb3b07c71ffdd1da263dba01d423cc962e8d~...7b4711382fc95d9cb7c5784b970bed6161c776f3 with ruby 2.5.7, rubocop 0.69.0, haml-lint 0.28.0, and yamllint app/models/manageiq/providers/vmware/infra_manager/inventory/parser/virtual_machine.rb
|
agrare
approved these changes
Jun 8, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since the VMWare provider is the only provider that uses this code, let's move it directly into this code base, and out of gems-pending.
Part of the ManageIQ/manageiq-gems-pending#231 cleanup.