Skip to content

[WIP] Extract the tenant id from the x_node #9527

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

Closed
wants to merge 1 commit into from
Closed

[WIP] Extract the tenant id from the x_node #9527

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
9 changes: 2 additions & 7 deletions app/controllers/ops_controller/ops_rbac.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ module OpsController::OpsRbac
}.freeze

def role_allows?(**options)
if MiqProductFeature.my_root_tenant_identifier?(options[:feature]) && params.key?(:id) && params[:id] != 'xx-tn'
if params[:id].to_s.include?('tn')
_, id, _ = TreeBuilder.extract_node_model_and_id(params[:id].to_s)
else
id = params[:id].to_s
end

if MiqProductFeature.my_root_tenant_identifier?(options[:feature]) && self.x_node.to_s.start_with?("tn-")
_, id, _ = TreeBuilder.extract_node_model_and_id(self.x_node.to_s)
Copy link
Member

Choose a reason for hiding this comment

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

Bonus whitespace

Suggested change
_, id, _ = TreeBuilder.extract_node_model_and_id(self.x_node.to_s)
_, id, _ = TreeBuilder.extract_node_model_and_id(self.x_node.to_s)

options[:feature] = MiqProductFeature.tenant_identifier(options[:feature], id)
end

Expand Down
Loading