manageiq-api-common 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf558ff2ddd7a2cbed5ffca066b2f769523d4fdd3b835d9497c280d97838f81b
-  data.tar.gz: 160883b30284ec6b53f0c14c43b66413ac9b9ab75a87766ebc91bdfb15b4c658
+  metadata.gz: 505d9b26de12a65214f045cba58f0cd0d3f03f24b52e34c9f91c93438107593a
+  data.tar.gz: 93742f14fcc2493740e3b85b42cbcd8f3bc2e06b0b1e35ee3e306dc5eacb6564
 SHA512:
-  metadata.gz: 108cba357408d2e2889321672976053c8a2d45a0b2f189ad5c6534b6d1d9d0f30e9637681c6e45751b157acc38061f93cf805c08c5ecba2b367284e639061f44
-  data.tar.gz: 30f9ab415d4b6d949b1ae62d40ee22a53f0f0ec5c5a938da3cec4a98b926b472e95e33531cf7cb7f3f914d9ba3ca204916175ee1ca7a1dc4c8ac18f0dfa826b5
+  metadata.gz: 46a55bf1c465a7de8ef16d7245f182dc60b1e14a6a650ac4f882f894889df8fe481e160c76a8701b3882c2abd72656f1bd38d0cdadf1467dff70d4f6e29e9206
+  data.tar.gz: 90ece62ebe786c71c3bc94d20d6bbbacced40abe5168ab9aabf93d628289ab5ef47fd6a982958dd228c7c72fd90dc9dff8fbba4ac8173767d15aa452fc38bbb8

data/lib/manageiq/api/common/filter.rb

@@ -23,11 +23,11 @@ module ManageIQ
               type = determine_string_attribute_type(attribute)
               send(type, k, v)
             else
-              errors.add("unsupported attribute type for: #{k}")
+              errors << "unsupported attribute type for: #{k}"
             end
           end
 
-          raise ManageIQ::API::Common::Filter::Error.new(:error_document => errors) unless errors.blank?
+          raise(ManageIQ::API::Common::Filter::Error, errors.join(", ")) unless errors.blank?
           query
         end
 
@@ -35,18 +35,12 @@ module ManageIQ
 
         attr_accessor :query
 
-        class Error < ArgumentError
-          attr_reader :error_document
-
-          def initialize(attrs)
-            @error_document = attrs[:error_document]
-          end
-        end
+        class Error < ArgumentError; end
 
         def attribute_for_key(key)
           attribute = api_doc_definition.properties[key.to_s]
           return attribute if attribute
-          errors.add("found unpermitted parameter: #{key}")
+          errors << "found unpermitted parameter: #{key}"
           nil
         end
 
@@ -57,7 +51,7 @@ module ManageIQ
         end
 
         def errors
-          @errors ||= ManageIQ::API::Common::ErrorDocument.new
+          @errors ||= []
         end
 
         def string(k, val)
@@ -81,7 +75,7 @@ module ManageIQ
             return if value.nil?
             send("comparator_#{requested_comparator}", key, value)
           else
-            errors.add("unsupported #{type} comparator: #{requested_comparator}")
+            errors << "unsupported #{type} comparator: #{requested_comparator}"
           end
         end
 
@@ -100,7 +94,7 @@ module ManageIQ
 
           DateTime.parse(value)
         rescue ArgumentError
-          errors.add("invalid timestamp: #{value}")
+          errors << "invalid timestamp: #{value}"
           return nil
         end
 

data/lib/manageiq/api/common/open_api/docs/object_definition.rb

@@ -5,7 +5,7 @@ module ManageIQ
         class Docs
           class ObjectDefinition < Hash
             def all_attributes
-              properties.keys
+              properties.map { |key, val| all_attributes_recursive(key, val) }
             end
 
             def read_only_attributes
@@ -19,6 +19,18 @@ module ManageIQ
             def properties
               self["properties"]
             end
+
+            private
+
+            def all_attributes_recursive(key, value)
+              if value["properties"]
+                {
+                  key => value["properties"].map { |k, v| all_attributes_recursive(k, v) }
+                }
+              else
+                key
+              end
+            end
           end
         end
       end

data/lib/manageiq/api/common/rbac/seed.rb

@@ -5,9 +5,9 @@ module ManageIQ
         require 'rbac-api-client'
 
         class Seed
-          def initialize(seed_file, user_file)
+          def initialize(seed_file, user_file = nil)
             @acl_data = YAML.load_file(seed_file)
-            @request = create_request(user_file)
+            @request = ManageIQ::API::Common::Request.current || create_request(user_file)
           end
 
           def process

data/lib/manageiq/api/common/version.rb

@@ -1,7 +1,7 @@
 module ManageIQ
   module API
     module Common
-      VERSION = "2.0.0".freeze
+      VERSION = "2.0.1".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-api-common
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - ManageIQ Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-17 00:00:00.000000000 Z
+date: 2019-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_tenant