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.

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

Jump to bottom

Rails 6.0 #663

Merged
merged 2 commits into from
Jan 11, 2021
Merged

Rails 6.0 #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb5497b
Rails 6.0
NickLaMuro May 4, 2020
2b20c81
[rails6][CloudManager] Use .module_parent
NickLaMuro Nov 4, 2020
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
4 changes: 2 additions & 2 deletions app/models/manageiq/providers/openstack/cloud_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ class ManageIQ::Providers::Openstack::CloudManager < ManageIQ::Providers::CloudM
supports :provisioning
supports :cloud_tenants
supports :cloud_tenant_mapping do
if defined?(self.class.parent::CloudManager::CloudTenant) && !tenant_mapping_enabled?
if defined?(self.class.module_parent::CloudManager::CloudTenant) && !tenant_mapping_enabled?
unsupported_reason_add(:cloud_tenant_mapping, _("Tenant mapping is disabled on the Provider"))
elsif !defined?(self.class.parent::CloudManager::CloudTenant)
elsif !defined?(self.class.module_parent::CloudManager::CloudTenant)
unsupported_reason_add(:cloud_tenant_mapping, _("Tenant mapping is supported only when CloudTenant exists "\
"on the CloudManager"))
end
Expand Down
2 changes: 1 addition & 1 deletion manageiq-providers-openstack.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency "activesupport", "~> 5.2.4", ">= 5.2.4.3"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we apply https://github.com/ManageIQ/activerecord-id_regions/pull/18/files#r537735807 here as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see why we would, as this isn't a gem that ever needs to be released, and is only used by ManageIQ/manageiq, which now requires Rails 6. The only place where I think this does make sense is in gems that are released to rubygems.org or rubygems.manageiq.org which this is not.

(This is going to be a carbon copy answer that I will be pasting in all provider repos where this comment exists)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still look at the provider plugins like they are regular gems and question why a gem would have a tight dependency like this unless something in the code base requires that tight dependency.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this was a more broken out plugin, where customers could add gems as they see fit, we would probably have a manageiq-core gem that plugins would instead be consuming, which would probably be tightly coupled to a version of Rails.

I see this dependency as a gemspec version of that for now, where in reality, it really is being done as part of bin/update and the dependency of spec/manageiq being required to run anything in this repo standalone at the moment.

spec.add_dependency "activesupport", "~> 6.0"
spec.add_dependency "bunny", "~> 2.1.0"
spec.add_dependency "excon", "~> 0.71"
spec.add_dependency "fog-openstack", ">= 0.3.10"
Expand Down