Merge pull request #299 from lpichler/allow_multiple_role_identifiers…

…_for_cloud_volume Allow multiple role identifiers for cloud volume
ManageIQ · Feb 1, 2018 · aca3a26 · aca3a26
2 parents a9e5bf5 + 4202930
commit aca3a26
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/config/api.yml b/config/api.yml
@@ -1814,10 +1814,14 @@
     :collection_actions:
       :get:
       - :name: read
-        :identifier: ems_infra_show_list
+        :identifier:
+        - ems_infra_show_list
+        - ems_block_storage_show_list
       :post:
       - :name: query
-        :identifier: ems_infra_show_list
+        :identifier:
+        - ems_infra_show_list
+        - ems_block_storage_show_list
       - :name: create
         :identifier: ems_infra_new
       - :name: edit
@@ -1829,7 +1833,9 @@
     :resource_actions:
       :get:
       - :name: read
-        :identifier: ems_infra_show
+        :identifier:
+        - ems_infra_show
+        - ems_block_storage_show
       :post:
       - :name: edit
         :identifier: ems_infra_edit

diff --git a/spec/lib/api/api_config_spec.rb b/spec/lib/api/api_config_spec.rb
@@ -19,7 +19,7 @@
 
       let(:api_feature_identifiers) do
         collection_settings.each_with_object(Set.new) do |(_, cfg), set|
-          set.add(cfg[:identifier]) if cfg[:identifier]
+          Array(cfg[:identifier]).each { |id| set.add(id) }
           keys = [:collection_actions, :resource_actions, :subcollection_actions, :subresource_actions]
           Array(cfg[:subcollections]).each do |s|
             keys << "#{s}_subcollection_actions" << "#{s}_subresource_actions"