manageiq-api-common 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d35c1494c8e7dc4e65e029d1c6814b66688118153bf17b7749389a7000c05c5c
-  data.tar.gz: 54cd0ee67b21e425d103204e6fb3932e91492a8db20f757222392f814313546c
+  metadata.gz: 7aa3a3a98c142ee7b4e8e62af8acd12e08a86d189bf74ad2eb902b454c9b20bb
+  data.tar.gz: eddfcfd2730f8a252a76482a72d213c2cdc18d887b3c6465d378bc8b9119a3f4
 SHA512:
-  metadata.gz: 33e58ae59d3dfbc82dc63830b3b25d51bfd63e66053b8944c69aad095c8b76396bcd95afc83836c5a807daac4b899305895fdd1ae2620b95fd8fabb2ad13f4a8
-  data.tar.gz: 34f48cca119558d4f7bc504fed53dedf15b19779e2ecc5753b04dc58aa551ac1ef0ef0af3d9454c84a3ea47b4700a17c3993d7c349034a7cea20af6a355f7885
+  metadata.gz: 6f7a9bbfaf5e56fc3f625d35e8a1e0f466e65581980a88a72d052e5d5d2bd472b0f1de63380b84cf678e85b12b03713fbaf84adb2b6d23544947cecb79200f3b
+  data.tar.gz: 1e563fc8760b903a88f7dffcb7e3569400e84dc2b4f86a0e440c74b7bc191d4ced1b7162120401554d6bd1b7770ee9918b2f173636f6433975ab111c2a643876

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

@@ -9,8 +9,10 @@ module ManageIQ
         end
 
         %w[
+          ansible
           hybrid_cloud
           insights
+          migrations
           openshift
           smart_management
         ].each do |m|

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

@@ -13,6 +13,9 @@ module ManageIQ
   module API
     module Common
       module GraphQL
+        module Api
+        end
+
         def self.version(request)
           /\/?\w+\/v(?<major>\d+)[x\.]?(?<minor>\d+)?\// =~ request.original_url
           [major, minor].compact.join(".")
@@ -27,27 +30,6 @@ module ManageIQ
               "content"     => {
                 "application/json" => {
                   "schema" => {
-                    "type"       => "object",
-                    "properties" => {
-                      "query"         => {
-                        "type"        => "string",
-                        "description" => "The GraphQL query",
-                        "default"     => "{}"
-                      },
-                      "operationName" => {
-                        "type"        => "string",
-                        "description" => "If the Query contains several named operations, the operationName controls which one should be executed",
-                        "default"     => ""
-                      },
-                      "variables"     => {
-                        "type"        => "object",
-                        "description" => "Optional Query variables",
-                        "nullable"    => true
-                      }
-                    },
-                    "required"   => [
-                      "query"
-                    ]
                   }
                 }
               },
@@ -69,6 +51,32 @@ module ManageIQ
           }
         end
 
+        def self.openapi_graphql_request
+          {
+            "type"       => "object",
+            "properties" => {
+              "query"         => {
+                "type"        => "string",
+                "description" => "The GraphQL query",
+                "default"     => "{}"
+              },
+              "operationName" => {
+                "type"        => "string",
+                "description" => "If the Query contains several named operations, the operationName controls which one should be executed",
+                "default"     => ""
+              },
+              "variables"     => {
+                "type"        => "object",
+                "description" => "Optional Query variables",
+                "nullable"    => true
+              }
+            },
+            "required"   => [
+              "query"
+            ]
+          }
+        end
+
         def self.openapi_graphql_response
           {
             "type"       => "object",

data/lib/manageiq/api/common/graphql/generator.rb

@@ -41,16 +41,19 @@ module ManageIQ
 
           def self.resource_associations(openapi_content, collection)
             collection_is_associated = openapi_content["paths"].keys.any? do |path|
-              path.match("^/[^/]*/{id}/#{collection}$") &&
-                openapi_content.dig("paths", path, "get")
+              path.match?("^/[^/]*/{[[a-z]*_]*id}/#{collection}$") &&
+                openapi_content.dig("paths", path, "get").present?
             end
             collection_associations = []
             openapi_content["paths"].keys.each do |path|
-              subcollection_match = path.match("^/#{collection}/{id}/([^/]*)$")
+              subcollection_match = path.match("^/#{collection}/{[[a-z]*_]*id}/([^/]*)$")
               next unless subcollection_match
 
               subcollection = subcollection_match[1]
-              next unless openapi_content.dig("paths", "/#{subcollection}/{id}", "get")
+              next unless openapi_content["paths"].keys.any? do |subcollection_path|
+                subcollection_path.match?("^/#{subcollection}/{[[a-z]*_]*id}$") &&
+                openapi_content.dig("paths", subcollection_path, "get").present?
+              end
 
               collection_associations << subcollection
             end
@@ -81,16 +84,10 @@ module ManageIQ
             openapi_doc       = ::ManageIQ::API::Common::OpenApi::Docs.instance[api_version]
             openapi_content   = openapi_doc.content
 
-            api_namespace = if ::Api.const_defined?(version_namespace, false)
-                              ::Api.const_get(version_namespace)
-                            else
-                              ::Api.const_set(version_namespace, Module.new)
-                            end
-
-            graphql_namespace = if api_namespace.const_defined?("GraphQL", false)
-                                  api_namespace.const_get("GraphQL")
+            graphql_namespace = if ::ManageIQ::API::Common::GraphQL::Api.const_defined?(version_namespace, false)
+                                  ::ManageIQ::API::Common::GraphQL::Api.const_get(version_namespace)
                                 else
-                                  api_namespace.const_set("GraphQL", Module.new)
+                                  ::ManageIQ::API::Common::GraphQL::Api.const_set(version_namespace, Module.new)
                                 end
 
             return graphql_namespace.const_get("Schema") if graphql_namespace.const_defined?("Schema", false)
@@ -100,11 +97,13 @@ module ManageIQ
             resources.each do |resource|
               next unless openapi_content.dig("paths", resource, "get") # we only care for queries
 
-              rmatch = resource.match("^/(.*/)?([^/]*)/{id}$")
+              rmatch = resource.match("^/(.*/)?([^/]*)/{[[a-z]*_]*id}$")
               next unless rmatch
 
               collection = rmatch[2]
               klass_name = collection.camelize.singularize
+              next if graphql_namespace.const_defined?("#{klass_name}Type", false)
+
               _schema_name, this_schema = openapi_schema(openapi_doc, klass_name)
               next if this_schema.nil? || this_schema["type"] != "object" || this_schema["properties"].nil?
 

data/lib/manageiq/api/common/graphql/templates/query_type.erb

@@ -9,7 +9,7 @@ QueryType = ::GraphQL::ObjectType.define do
     klass_names   = collection.to_s.camelize
     klass_name    = klass_names.singularize
     model_class   = klass_name.constantize
-    resource_type = "Api::#{version_namespace}::GraphQL::#{klass_name}Type".constantize
+    resource_type = "::ManageIQ::API::Common::GraphQL::Api::#{version_namespace}::#{klass_name}Type".constantize
 
     collection_schema_overlay = ::ManageIQ::API::Common::GraphQL::Generator.collection_schema_overlay(schema_overlay, collection)
     base_query                = collection_schema_overlay["base_query"]

data/lib/manageiq/api/common/open_api/generator.rb

@@ -419,6 +419,7 @@ module ManageIQ
                 case verb
                 when "post"
                   if sub_path == "/graphql" && route.action == "query"
+                    schemas["GraphQLRequest"]  = ::ManageIQ::API::Common::GraphQL.openapi_graphql_request
                     schemas["GraphQLResponse"] = ::ManageIQ::API::Common::GraphQL.openapi_graphql_response
                     ::ManageIQ::API::Common::GraphQL.openapi_graphql_description
                   else

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

@@ -10,7 +10,8 @@ module ManageIQ
       class Request
         REQUEST_ID_KEY = "x-rh-insights-request-id".freeze
         IDENTITY_KEY   = 'x-rh-identity'.freeze
-        FORWARDABLE_HEADER_KEYS = [REQUEST_ID_KEY, IDENTITY_KEY].freeze
+        PERSONA_KEY    = 'x-rh-persona'.freeze
+        FORWARDABLE_HEADER_KEYS = [REQUEST_ID_KEY, IDENTITY_KEY, PERSONA_KEY].freeze
         OPTIONAL_AUTH_PATHS = [
           %r{\A/api/v[0-9]+(\.[0-9]+)?/openapi.json\z},
           %r{\A/api/[^/]+/v[0-9]+(\.[0-9]+)?/openapi.json\z}

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

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

data/spec/support/user_header_spec_helper.rb

@@ -1,12 +1,18 @@
 module UserHeaderSpecHelper
   DEFAULT_USER = {
     "entitlements" => {
+      "ansible"          => {
+        "is_entitled" => true
+      },
       "hybrid_cloud"     => {
         "is_entitled" => true
       },
       "insights"         => {
         "is_entitled" => true
       },
+      "migrations"       => {
+        "is_entitled" => true
+      },
       "openshift"        => {
         "is_entitled" => true
       },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-api-common
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - ManageIQ Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_tenant
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement