Merge pull request #13671 from imtayadeway/api/fix-cid-namespacing

Fix cid constant namespacing in the API
ManageIQ · Jan 27, 2017 · 22bf342 · 22bf342
2 parents 097f22c + 522366b
commit 22bf342
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/app/controllers/api/base_controller/parser.rb b/app/controllers/api/base_controller/parser.rb
@@ -1,8 +1,6 @@
 module Api
   class BaseController
     module Parser
-      include CompressedIds
-
       def parse_api_request
         @req = RequestAdapter.new(request, params)
       end
@@ -104,7 +102,7 @@ def parse_id(resource, collection)
       end
 
       def href_id(href, collection)
-        if href.present? && href.match(%r{^.*/#{collection}/(#{CID_OR_ID_MATCHER})$})
+        if href.present? && href.match(%r{^.*/#{collection}/(#{BaseController::CID_OR_ID_MATCHER})$})
           from_cid(Regexp.last_match(1))
         end
       end

diff --git a/app/controllers/api/subcollections/policies.rb b/app/controllers/api/subcollections/policies.rb
@@ -43,7 +43,7 @@ def parse_policy(data, collection, klass)
         return klass.find_by(:guid => guid) if guid.present?
 
         href = data["href"]
-        href =~ %r{^.*/#{collection}/#{CID_OR_ID_MATCHER}$} ? klass.find(from_cid(href.split('/').last)) : {}
+        href =~ %r{^.*/#{collection}/#{BaseController::CID_OR_ID_MATCHER}$} ? klass.find(from_cid(href.split('/').last)) : {}
       end
 
       def policy_subcollection_action(ctype, policy)

diff --git a/app/controllers/api/subcollections/tags.rb b/app/controllers/api/subcollections/tags.rb
@@ -85,7 +85,7 @@ def parse_tag(data)
 
       def parse_tag_from_href(data)
         href = data["href"]
-        tag  = if href && href.match(%r{^.*/tags/#{CID_OR_ID_MATCHER}$})
+        tag  = if href && href.match(%r{^.*/tags/#{BaseController::CID_OR_ID_MATCHER}$})
                  klass = collection_class(:tags)
                  klass.find(from_cid(href.split('/').last))
                end