Merge pull request #20058 from kbrock/rbac_performance_targets

Fix a bug when running Rbac on VimPerformanceDaily
ManageIQ · Apr 8, 2020 · 58ca113 · 58ca113
2 parents 74746cc + 048c861
commit 58ca113
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/rbac/filterer.rb b/lib/rbac/filterer.rb
@@ -414,7 +414,7 @@ def apply_rbac_directly?(klass)
     # the associated application model.  See #rbac_class method
     #
     def apply_rbac_through_association?(klass)
-      klass != VimPerformanceDaily && (klass < MetricRollup || klass < Metric)
+      klass != VimPerformanceDaily && klass != VimPerformanceTag && (klass < MetricRollup || klass < Metric)
     end
 
     def rbac_base_class(klass)

diff --git a/spec/lib/rbac/filterer_spec.rb b/spec/lib/rbac/filterer_spec.rb
@@ -2622,6 +2622,7 @@ def get_rbac_results_for_and_expect_objects(klass, expected_objects)
   it ".apply_rbac_through_association?" do
     expect(described_class.new.send(:apply_rbac_through_association?, HostMetric)).to be_truthy
     expect(described_class.new.send(:apply_rbac_through_association?, Vm)).not_to be
+    expect(described_class.new.send(:apply_rbac_through_association?, VimPerformanceTag)).not_to be
   end
 
   describe "find_targets_with_direct_rbac" do