3scale_toolbox 0.14.0 → 0.15.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 3scale_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Michal Cichra
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,6 +123,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: oas_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
 description: 3scale tools to manage your API from the terminal.
 email:
 - michal@3scale.net
@@ -139,6 +153,9 @@ files:
 - exe/3scale
 - lib/3scale_toolbox.rb
 - lib/3scale_toolbox/3scale_client_factory.rb
+- lib/3scale_toolbox/attribute_filters.rb
+- lib/3scale_toolbox/attribute_filters/attribute_filter.rb
+- lib/3scale_toolbox/attribute_filters/service_id_from_ref_filter.rb
 - lib/3scale_toolbox/base_command.rb
 - lib/3scale_toolbox/cli.rb
 - lib/3scale_toolbox/cli/error_handler.rb
@@ -171,7 +188,6 @@ files:
 - lib/3scale_toolbox/commands/import_command/openapi/method.rb
 - lib/3scale_toolbox/commands/import_command/openapi/operation.rb
 - lib/3scale_toolbox/commands/import_command/openapi/step.rb
-- lib/3scale_toolbox/commands/import_command/openapi/threescale_api_spec.rb
 - lib/3scale_toolbox/commands/import_command/openapi/update_policies_step.rb
 - lib/3scale_toolbox/commands/import_command/openapi/update_service_oidc_conf_step.rb
 - lib/3scale_toolbox/commands/import_command/openapi/update_service_proxy_step.rb
@@ -239,11 +255,12 @@ files:
 - lib/3scale_toolbox/entities/service.rb
 - lib/3scale_toolbox/error.rb
 - lib/3scale_toolbox/helper.rb
+- lib/3scale_toolbox/openapi.rb
+- lib/3scale_toolbox/openapi/oas3.rb
+- lib/3scale_toolbox/openapi/swagger.rb
 - lib/3scale_toolbox/proxy_logger.rb
 - lib/3scale_toolbox/remotes.rb
 - lib/3scale_toolbox/resource_reader.rb
-- lib/3scale_toolbox/swagger.rb
-- lib/3scale_toolbox/swagger/swagger.rb
 - lib/3scale_toolbox/tasks.rb
 - lib/3scale_toolbox/tasks/bump_proxy_version_task.rb
 - lib/3scale_toolbox/tasks/copy_activedocs_task.rb
@@ -262,6 +279,7 @@ files:
 - lib/3scale_toolbox/tasks/helper_task.rb
 - lib/3scale_toolbox/version.rb
 - licenses.xml
+- resources/oas3_meta_schema.json
 - resources/swagger_meta_schema.json
 homepage: https://github.com/3scale/3scale_toolbox
 licenses:
@@ -275,7 +293,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/3scale_toolbox/commands/import_command/openapi/threescale_api_spec.rb

@@ -1,80 +0,0 @@
-module ThreeScaleToolbox
-  module Commands
-    module ImportCommand
-      module OpenAPI
-        class ThreeScaleApiSpec
-          attr_reader :openapi
-
-          def initialize(openapi, base_path = nil)
-            @openapi = openapi
-            @base_path = base_path
-          end
-
-          def title
-            openapi.info.title
-          end
-
-          def description
-            openapi.info.description
-          end
-
-          def host
-            openapi.host
-          end
-
-          def schemes
-            Array(openapi.schemes)
-          end
-
-          def backend_version
-            # default authentication mode if no security requirement
-            return '1' if security.nil?
-
-            case security.type
-            when 'oauth2'
-              'oidc'
-            when 'apiKey'
-              '1'
-            else
-              raise ThreeScaleToolbox::Error, "Unexpected security scheme type #{security.type}"
-            end
-          end
-
-          def security
-            @security ||= parse_security
-          end
-
-          def operations
-            openapi.operations.map do |op|
-              Operation.new(
-                base_path: base_path,
-                public_base_path: public_base_path,
-                path: op.path,
-                verb: op.verb,
-                operationId: op.operation_id,
-                description: op.description,
-              )
-            end
-          end
-
-          def public_base_path
-            @base_path || base_path
-          end
-
-          def base_path
-            openapi.base_path || '/'
-          end
-
-          private
-
-          def parse_security
-            raise ThreeScaleToolbox::Error, 'Invalid OAS: multiple security requirements' \
-              if openapi.global_security_requirements.size > 1
-
-            openapi.global_security_requirements.first
-          end
-        end
-      end
-    end
-  end
-end

data/lib/3scale_toolbox/swagger.rb

@@ -1 +0,0 @@
-require '3scale_toolbox/swagger/swagger'

data/lib/3scale_toolbox/swagger/swagger.rb

@@ -1,123 +0,0 @@
-require 'json-schema'
-
-module ThreeScaleToolbox
-  module Swagger
-    META_SCHEMA_PATH = File.expand_path('../../../resources/swagger_meta_schema.json', __dir__)
-
-    def self.build(raw_specification, validate: true)
-      if validate
-        meta_schema = JSON.parse(File.read(META_SCHEMA_PATH))
-        JSON::Validator.validate!(meta_schema, raw_specification)
-      end
-
-      Specification.new(raw_specification)
-    end
-
-    class Info
-      attr_reader :title, :description
-
-      def initialize(title:, description:)
-        @title = title
-        @description = description
-      end
-    end
-
-    class Operation
-      attr_reader :verb, :operation_id, :path, :description
-
-      def initialize(verb:, operation_id:, path:, description:)
-        @verb = verb
-        @operation_id = operation_id
-        @path = path
-        @description = description
-      end
-    end
-
-    class SecurityRequirement
-      attr_reader :id, :type, :name, :in_f, :flow, :scopes
-
-      def initialize(id:, type:, name: nil, in_f: nil, flow: nil, scopes: [])
-        @id = id
-        @type = type
-        @name = name
-        @in_f = in_f
-        @flow = flow
-        @scopes = scopes
-      end
-    end
-
-    class Specification
-      attr_reader :raw
-
-      def initialize(raw_resource)
-        @raw = raw_resource
-      end
-
-      def base_path
-        raw['basePath']
-      end
-
-      def host
-        raw['host']
-      end
-
-      def schemes
-        raw['schemes']
-      end
-
-      def info
-        @info ||= parse_info(raw['info'])
-      end
-
-      def operations
-        @operations ||= parse_operations
-      end
-
-      def global_security_requirements
-        @global_security_requirements ||= parse_global_security_reqs
-      end
-
-      private
-
-      def parse_operations
-        raw['paths'].flat_map do |path, path_obj|
-          path_obj.flat_map do |method, operation|
-            next unless %w[get head post put patch delete trace options].include? method
-
-            Operation.new(verb: method, path: path, description: operation['description'],
-                          operation_id: operation['operationId'])
-          end.compact
-        end
-      end
-
-      def parse_info(info)
-        Info.new(title: info['title'], description: info['description'])
-      end
-
-      def parse_global_security_reqs
-        security_requirements.flat_map do |sec_req|
-          sec_req.map do |sec_item_name, sec_item|
-            sec_def = fetch_security_definition(sec_item_name)
-            SecurityRequirement.new(id: sec_item_name, type: sec_def['type'],
-                                    name: sec_def['name'], in_f: sec_def['in'],
-                                    flow: sec_def['flow'], scopes: sec_item)
-          end
-        end
-      end
-
-      def fetch_security_definition(name)
-        security_definitions.fetch(name) do |el|
-          raise ThreeScaleToolbox::Error, "Swagger parsing error: #{el} not found in security definitions"
-        end
-      end
-
-      def security_requirements
-        raw['security'] || []
-      end
-
-      def security_definitions
-        raw['securityDefinitions'] || {}
-      end
-    end
-  end
-end