RubyGems - 3scale_toolbox - Versions diffs - 0.18.0 → 0.19.1 - Mend

3scale_toolbox 0.18.0 → 0.19.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8b53876bf5759606f9517c2c62a32d66587a28ee6425afd1ba011f20222359c
-  data.tar.gz: 35a2783fdf7d5ee796014cbb7d1e3f85b08987b134b168a84ee40c42308b6150
+  metadata.gz: e6612a1233c5601cb6c08ccdfdf3f05c9b12d7b1746b3d0394082eecf91b3059
+  data.tar.gz: dc672daa8b8293c16565ade6d6eab1a7abea6c76f16e61d3383d0c592e44478d
 SHA512:
-  metadata.gz: 958cb7be80dfc2293e00ad6ca4f9021c12e6e817871f7eb0f25c4ead5aa9a10fca8b42db16b45d01e998cd39980545e30087f5a8064ba57c3e3acb07f07c4934
-  data.tar.gz: 7c6e163ad4948037a50c88365407e2b91dd4217d0e3effc9c21d79badbbcd93f823e0695997edf791ade3ffe0e7f67e0b4bf61dde91729a1a62fdc4de42ba7c8
+  metadata.gz: a2b1652854dedbf1d508a135c2c227fefa8f6872032f02a75e48fcc921780709a595e6dd5ab8d245712b1fe8fac412b38ee12ac1bbfd31c20273d67eaf13c3ce
+  data.tar.gz: d5636f0a7ee7223a70e6215bbf41d084df57b0b9b583b98b9f5b111f6835c59ab14a0e6fad6e19c12b2a92d54600dc475913e853fcf4c350f14774e86088aace

data/3scale_toolbox.gemspec CHANGED Viewed

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.name          = '3scale_toolbox'
   spec.version       = ThreeScaleToolbox::VERSION
   spec.licenses      = ['MIT']
-  spec.authors       = ['Michal Cichra', 'Eguzki Astiz Lezaun']
-  spec.email         = ['michal@3scale.net', 'eastizle@redhat.com']
+  spec.authors       = ['Miguel Soriano', 'Eguzki Astiz Lezaun']
+  spec.email         = ['msoriano@redhat.com', 'eastizle@redhat.com']
   spec.summary       = %q{3scale Toolbox.}
   spec.description   = %q{3scale tools to manage your API from the terminal.}
@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.8'
   spec.add_development_dependency 'webmock', '~> 3.4'
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 2.6'
   spec.add_dependency '3scale-api', '~> 1.4'
   spec.add_dependency 'cri', '~> 2.15'

data/README.md CHANGED Viewed

@@ -39,7 +39,6 @@
 ## Requirements
 Supported Ruby interpreters
-* MRI 2.5
 * MRI 2.6
 * MRI 2.7
@@ -219,5 +218,5 @@ Install, uninstall and update plugins using tools like [RubyGems](https://guides
 ## Contributing
-Bug reports and pull requests are welcome on GitHub at https://github.com/3scale/3scale_toolbox.
+If you are interested in contributing to 3scale Toolbox, please refer to instructions available [here](docs/contributing.md)

data/lib/3scale_toolbox/commands/backend_command/copy_command/delete_mapping_rules_task.rb ADDED Viewed

@@ -0,0 +1,18 @@
+module ThreeScaleToolbox
+  module Commands
+    module BackendCommand
+      module CopyCommand
+        class DeleteMappingRulesTask
+          include Task
+          # entrypoint
+          def run
+            return unless delete_mapping_rules
+            target_backend.mapping_rules.each(&:delete)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/3scale_toolbox/commands/backend_command/copy_command/task.rb CHANGED Viewed

@@ -53,6 +53,10 @@ module ThreeScaleToolbox
             context[:report] ||= {}
           end
+          def delete_mapping_rules
+            context.fetch(:delete_mapping_rules, false)
+          end
           private
           def find_source_backend

data/lib/3scale_toolbox/commands/backend_command/copy_command.rb CHANGED Viewed

@@ -2,6 +2,7 @@ require '3scale_toolbox/commands/backend_command/copy_command/task'
 require '3scale_toolbox/commands/backend_command/copy_command/create_or_update_target_backend_task'
 require '3scale_toolbox/commands/backend_command/copy_command/copy_metrics_task'
 require '3scale_toolbox/commands/backend_command/copy_command/copy_methods_task'
+require '3scale_toolbox/commands/backend_command/copy_command/delete_mapping_rules_task'
 require '3scale_toolbox/commands/backend_command/copy_command/copy_mapping_rules_task'
 module ThreeScaleToolbox
@@ -41,6 +42,7 @@ module ThreeScaleToolbox
           # First metrics as methods need 'hits' metric in target backend
           tasks << CopyCommand::CopyMetricsTask.new(context)
           tasks << CopyCommand::CopyMethodsTask.new(context)
+          tasks << CopyCommand::DeleteMappingRulesTask.new(context)
           tasks << CopyCommand::CopyMappingRulesTask.new(context)
           tasks.each(&:call)
         end
@@ -56,6 +58,7 @@ module ThreeScaleToolbox
             source_remote: threescale_client(fetch_required_option(:source)),
             target_remote: threescale_client(fetch_required_option(:destination)),
             source_backend_ref: arguments[:source_backend],
+            delete_mapping_rules: true,
             option_target_system_name: options[:'target-system-name']
           }
         end

data/lib/3scale_toolbox/commands/import_command/import_csv.rb CHANGED Viewed

@@ -104,14 +104,14 @@ module ThreeScaleToolbox
               # create a mapping rule
               if (metric_id = metric['id'] || method['id'])
-                mapping_rule = client.create_mapping_rule(service['id'], {
-                                                            metric_id:          metric_id,
-                                                            pattern:            item['endpoint_path'],
-                                                            http_method:        item['endpoint_http_method'],
-                                                            metric_system_name: item['endpoint_system_name'],
-                                                            auth_app_key:       auth_app_key_according_service(service),
-                                                            delta:              1
-                                                          })
+                mapping_rule = client.create_mapping_rule(service['id'],{
+                                                          metric_id:          metric_id,
+                                                          pattern:            item['endpoint_path'],
+                                                          http_method:        item['endpoint_http_method'],
+                                                          metric_system_name: item['endpoint_system_name'],
+                                                          auth_app_key:       auth_app_key_according_service(service),
+                                                          delta:              1
+                })
                 if mapping_rule['errors'].nil?
                   stats[:mapping_rules] += 1

data/lib/3scale_toolbox/commands/import_command/openapi/create_activedocs_step.rb CHANGED Viewed

@@ -54,8 +54,9 @@ module ThreeScaleToolbox
             Helper.hash_deep_dup(resource).tap do |activedocs|
               # public production base URL
               # the basePath field is updated to a new value only when overriden by optional param
-              api_spec.set_server_url(activedocs,
-                                      URI.join(service.proxy.fetch('endpoint'), public_base_path))
+              unless service.proxy['endpoint'].nil?
+                api_spec.set_server_url(activedocs, URI.join(service.proxy.fetch('endpoint'), public_base_path))
+              end
               # security definitions
               # just valid for oauth2 when oidc_issuer_endpoint is supplied
               if !api_spec.security.nil? && api_spec.security[:type] == 'oauth2' && !oidc_issuer_endpoint.nil?

data/lib/3scale_toolbox/commands/import_command/openapi/create_method_step.rb CHANGED Viewed

@@ -12,7 +12,7 @@ module ThreeScaleToolbox
             end
             existing_operations.each do |op|
-              method_attrs = methods_index.fetch(op.method['system_name'])
+              method_attrs = methods_index.fetch(op.method['system_name']).attrs
               method = Entities::Method.new(id: method_attrs.fetch('id'), service: service)
               method.update(op.method)
               op.set(:metric_id, method.id)
@@ -23,7 +23,7 @@ module ThreeScaleToolbox
           def methods_index
             @methods_index ||= service.methods.each_with_object({}) do |method, acc|
-              acc[method['system_name']] = method
+              acc[method.system_name] = method
             end
           end

data/lib/3scale_toolbox/commands/import_command/openapi.rb CHANGED Viewed

@@ -108,6 +108,8 @@ module ThreeScaleToolbox
           end
           def openapi_parser
+            raise ThreeScaleToolbox::Error, 'only JSON/YAML format is supported' unless openapi_resource.is_a?(Hash)
             if openapi_resource.key?('openapi')
               ThreeScaleToolbox::OpenAPI::OAS3.build(openapi_path, openapi_resource, validate: validate)
             else

data/lib/3scale_toolbox/commands/product_command/copy_command/copy_backends_task.rb CHANGED Viewed

@@ -27,6 +27,7 @@ module ThreeScaleToolbox
             # First metrics as methods need 'hits' metric in target backend
             tasks << Commands::BackendCommand::CopyCommand::CopyMetricsTask.new(backend_context)
             tasks << Commands::BackendCommand::CopyCommand::CopyMethodsTask.new(backend_context)
+            tasks << Commands::BackendCommand::CopyCommand::DeleteMappingRulesTask.new(backend_context)
             tasks << Commands::BackendCommand::CopyCommand::CopyMappingRulesTask.new(backend_context)
             tasks.each(&:call)
@@ -72,12 +73,17 @@ module ThreeScaleToolbox
             context.fetch(:logger)
           end
+          def delete_mapping_rules
+            context.fetch(:delete_mapping_rules, false)
+          end
           def create_backend_context(source_backend)
             {
               source_remote: source_remote,
               target_remote: target_remote,
               source_backend: source_backend,
               source_backend_ref: source_backend.id,
+              delete_mapping_rules: delete_mapping_rules,
               logger: logger
             }
           end

data/lib/3scale_toolbox/commands/product_command/copy_command.rb CHANGED Viewed

@@ -73,6 +73,7 @@ module ThreeScaleToolbox
             source_remote: threescale_client(fetch_required_option(:source)),
             target_remote: threescale_client(fetch_required_option(:destination)),
             source_service_ref: arguments[:source_product],
+            delete_mapping_rules: true,
             option_target_system_name: options[:'target-system-name']
           }
         end

data/lib/3scale_toolbox/commands/product_command/import_command.rb CHANGED Viewed

@@ -28,7 +28,8 @@ module ThreeScaleToolbox
                 target_remote: remote,
                 source_remote: crd_remote,
                 source_service_ref: product.system_name,
-                logger: Logger.new('/dev/null')
+                delete_mapping_rules: true,
+                logger: Logger.new(File::NULL)
             }
             Commands::ProductCommand::CopySubcommand.workflow(context)

data/lib/3scale_toolbox/commands/service_command/copy_command/copy_methods_task.rb CHANGED Viewed

@@ -16,10 +16,8 @@ module ThreeScaleToolbox
           private
           def create_method(method)
-            Entities::Method.create(
-              service: target,
-              attrs: ThreeScaleToolbox::Helper.filter_params(%w[friendly_name system_name], method.attrs)
-            )
+            new_method = method.attrs.reject { |key, _| %w[id links].include? key }
+            Entities::Method.create(service: target, attrs: new_method)
           rescue ThreeScaleToolbox::ThreeScaleApiError => e
             raise e unless ThreeScaleToolbox::Helper.system_name_already_taken_error?(e.apierrors)

data/lib/3scale_toolbox/proxy_logger.rb CHANGED Viewed

@@ -5,6 +5,7 @@ module ThreeScaleToolbox
     end
     def method_missing(name, *args)
+      # Correct delegation https://eregon.me/blog/2021/02/13/correct-delegation-in-ruby-2-27-3.html
       start_time = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
       result = @subject.public_send(name, *args)
     ensure
@@ -12,6 +13,7 @@ module ThreeScaleToolbox
       ::Kernel.warn "-- call #{name} args |#{args.inspect[0..2000]}| response |#{result.inspect[0..2000]}| - (#{end_time}s)"
       result
     end
+    ruby2_keywords :method_missing if respond_to?(:ruby2_keywords, true)
     def public_send(name, *args)
       method_missing(name, *args)

data/lib/3scale_toolbox/remote_cache.rb CHANGED Viewed

@@ -141,7 +141,13 @@ module ThreeScaleToolbox
     ###
     def method_missing(name, *args)
-      subject.public_send(name, *args)
+      # Correct delegation https://eregon.me/blog/2021/02/13/correct-delegation-in-ruby-2-27-3.html
+      @subject.public_send(name, *args)
+    end
+    ruby2_keywords :method_missing if respond_to?(:ruby2_keywords, true)
+    def public_send(name, *args)
+      method_missing(name, *args)
     end
     def respond_to_missing?(method_name, include_private = false)

data/lib/3scale_toolbox/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module ThreeScaleToolbox
-  VERSION = '0.18.0'
+  VERSION = '0.19.1'
 end

data/licenses.xml CHANGED Viewed

@@ -13,7 +13,7 @@
       </dependency>
           <dependency>
         <packageName>3scale_toolbox</packageName>
-        <version>0.18.0</version>
+        <version>0.19.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -23,7 +23,7 @@
       </dependency>
           <dependency>
         <packageName>activesupport</packageName>
-        <version>6.1.3</version>
+        <version>6.1.4.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -33,7 +33,7 @@
       </dependency>
           <dependency>
         <packageName>addressable</packageName>
-        <version>2.7.0</version>
+        <version>2.8.0</version>
         <licenses>
                       <license>
               <name>Apache 2.0</name>
@@ -53,7 +53,17 @@
       </dependency>
           <dependency>
         <packageName>bundler</packageName>
-        <version>2.1.4</version>
+        <version>2.2.21</version>
+        <licenses>
+                      <license>
+              <name>MIT</name>
+              <url>http://opensource.org/licenses/mit-license</url>
+            </license>
+                  </licenses>
+      </dependency>
+          <dependency>
+        <packageName>codecov</packageName>
+        <version>0.5.2</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -73,7 +83,7 @@
       </dependency>
           <dependency>
         <packageName>concurrent-ruby</packageName>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -128,6 +138,16 @@
               <url></url>
             </license>
                   </licenses>
+      </dependency>
+          <dependency>
+        <packageName>docile</packageName>
+        <version>1.4.0</version>
+        <licenses>
+                      <license>
+              <name>MIT</name>
+              <url>http://opensource.org/licenses/mit-license</url>
+            </license>
+                  </licenses>
       </dependency>
           <dependency>
         <packageName>dotenv</packageName>
@@ -171,7 +191,7 @@
       </dependency>
           <dependency>
         <packageName>i18n</packageName>
-        <version>1.8.9</version>
+        <version>1.8.10</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -208,20 +228,10 @@
               <url>http://opensource.org/licenses/mit-license</url>
             </license>
                   </licenses>
-      </dependency>
-          <dependency>
-        <packageName>mini_portile2</packageName>
-        <version>2.5.0</version>
-        <licenses>
-                      <license>
-              <name>MIT</name>
-              <url>http://opensource.org/licenses/mit-license</url>
-            </license>
-                  </licenses>
       </dependency>
           <dependency>
         <packageName>minitest</packageName>
-        <version>5.14.3</version>
+        <version>5.14.4</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -251,7 +261,7 @@
       </dependency>
           <dependency>
         <packageName>nokogiri</packageName>
-        <version>1.11.1</version>
+        <version>1.12.4</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -261,7 +271,7 @@
       </dependency>
           <dependency>
         <packageName>oas_parser</packageName>
-        <version>0.25.1</version>
+        <version>0.25.4</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -281,7 +291,7 @@
       </dependency>
           <dependency>
         <packageName>pry</packageName>
-        <version>0.13.1</version>
+        <version>0.14.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -325,7 +335,7 @@
       </dependency>
           <dependency>
         <packageName>rexml</packageName>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
         <licenses>
                       <license>
               <name>Simplified BSD</name>
@@ -365,7 +375,7 @@
       </dependency>
           <dependency>
         <packageName>rspec-mocks</packageName>
-        <version>3.10.1</version>
+        <version>3.10.2</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -375,7 +385,7 @@
       </dependency>
           <dependency>
         <packageName>rspec-support</packageName>
-        <version>3.10.1</version>
+        <version>3.10.2</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -385,7 +395,7 @@
       </dependency>
           <dependency>
         <packageName>ruby2_keywords</packageName>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
         <licenses>
                       <license>
               <name>ruby</name>
@@ -406,6 +416,36 @@
               <url>http://opensource.org/licenses/bsd-license</url>
             </license>
                   </licenses>
+      </dependency>
+          <dependency>
+        <packageName>simplecov</packageName>
+        <version>0.21.2</version>
+        <licenses>
+                      <license>
+              <name>MIT</name>
+              <url>http://opensource.org/licenses/mit-license</url>
+            </license>
+                  </licenses>
+      </dependency>
+          <dependency>
+        <packageName>simplecov-html</packageName>
+        <version>0.12.3</version>
+        <licenses>
+                      <license>
+              <name>MIT</name>
+              <url>http://opensource.org/licenses/mit-license</url>
+            </license>
+                  </licenses>
+      </dependency>
+          <dependency>
+        <packageName>simplecov_json_formatter</packageName>
+        <version>0.1.3</version>
+        <licenses>
+                      <license>
+              <name>MIT</name>
+              <url>http://opensource.org/licenses/mit-license</url>
+            </license>
+                  </licenses>
       </dependency>
           <dependency>
         <packageName>thor</packageName>
@@ -439,7 +479,7 @@
       </dependency>
           <dependency>
         <packageName>webmock</packageName>
-        <version>3.11.1</version>
+        <version>3.13.0</version>
         <licenses>
                       <license>
               <name>MIT</name>

metadata CHANGED Viewed

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: 3scale_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.1
 platform: ruby
 authors:
-- Michal Cichra
+- Miguel Soriano
 - Eguzki Astiz Lezaun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,7 +139,7 @@ dependencies:
         version: '0.20'
 description: 3scale tools to manage your API from the terminal.
 email:
-- michal@3scale.net
+- msoriano@redhat.com
 - eastizle@redhat.com
 executables:
 - 3scale
@@ -184,6 +184,7 @@ files:
 - lib/3scale_toolbox/commands/backend_command/copy_command/copy_methods_task.rb
 - lib/3scale_toolbox/commands/backend_command/copy_command/copy_metrics_task.rb
 - lib/3scale_toolbox/commands/backend_command/copy_command/create_or_update_target_backend_task.rb
+- lib/3scale_toolbox/commands/backend_command/copy_command/delete_mapping_rules_task.rb
 - lib/3scale_toolbox/commands/backend_command/copy_command/task.rb
 - lib/3scale_toolbox/commands/copy_command.rb
 - lib/3scale_toolbox/commands/copy_command/service_command.rb
@@ -343,14 +344,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: 3scale Toolbox.