3scale_toolbox 0.9.0 → 0.10.0

data/lib/3scale_toolbox/error.rb

@@ -5,4 +5,17 @@ module ThreeScaleToolbox
 
   class InvalidUrlError < Error
   end
+
+  class ThreeScaleApiError < Error
+    attr_reader :apierrors
+
+    def initialize(msg = '', apierrors = {})
+      @apierrors = apierrors
+      super(msg)
+    end
+
+    def message
+      "#{super}. Errors: #{apierrors}"
+    end
+  end
 end

data/lib/3scale_toolbox/tasks/copy_activedocs_task.rb

@@ -6,7 +6,7 @@ module ThreeScaleToolbox
       def call
         puts 'copying all service ActiveDocs'
 
-        target_activedocs = source.list_activedocs.map do |source_activedoc|
+        target_activedocs = source.activedocs.map do |source_activedoc|
           source_activedoc.clone.tap do |target_activedoc|
             target_activedoc.delete('id')
             target_activedoc['service_id'] = target.id

data/lib/3scale_toolbox/tasks/copy_methods_task.rb

@@ -4,15 +4,18 @@ module ThreeScaleToolbox
       include CopyTask
 
       def call
-        source_methods = source.methods
-        target_methods = target.methods
-        target_hits_metric_id = target.hits['id']
-        puts "original service hits metric #{source.hits['id']} has #{source_methods.size} methods"
-        puts "target service hits metric #{target_hits_metric_id} has #{target_methods.size} methods"
+        source_hits_id = source.hits['id']
+        target_hits_id = target.hits['id']
+        source_methods = source.methods source_hits_id
+        target_methods = target.methods target_hits_id
+        puts "original service hits metric #{source_hits_id} has #{source_methods.size} methods"
+        puts "target service hits metric #{target_hits_id} has #{target_methods.size} methods"
         missing = missing_methods(source_methods, target_methods).each do |method|
-          filtered_method = ThreeScaleToolbox::Helper.filter_params(%w[friendly_name system_name],
-                                                                    method)
-          target.create_method(target_hits_metric_id, filtered_method)
+          Entities::Method.create(
+            service: target,
+            parent_id: target_hits_id,
+            attrs: ThreeScaleToolbox::Helper.filter_params(%w[friendly_name system_name], method)
+          )
         end
         puts "created #{missing.size} missing methods on target service"
       end

data/lib/3scale_toolbox/tasks/copy_metrics_task.rb

@@ -14,7 +14,7 @@ module ThreeScaleToolbox
 
         missing.each do |metric|
           metric.delete('links')
-          target.create_metric(metric)
+          Entities::Metric.create(service: target, attrs: metric)
         end
 
         puts "created #{missing.size} metrics on the target service"

data/lib/3scale_toolbox/tasks/copy_service_proxy_task.rb

@@ -4,7 +4,7 @@ module ThreeScaleToolbox
       include CopyTask
 
       def call
-        target.update_proxy source.show_proxy
+        target.update_proxy source.proxy
         puts "updated proxy of #{target.id} to match the original"
       end
     end

data/lib/3scale_toolbox/tasks/delete_activedocs_task.rb

@@ -9,7 +9,7 @@ module ThreeScaleToolbox
 
       def call
         puts 'deleting all target service ActiveDocs'
-        target.list_activedocs.each do |activedoc|
+        target.activedocs.each do |activedoc|
           target.remote.delete_activedocs(activedoc['id'])
         end
       end

data/lib/3scale_toolbox/tasks/update_service_settings_task.rb

@@ -10,7 +10,7 @@ module ThreeScaleToolbox
       end
 
       def call
-        source_obj = source.show_service
+        source_obj = source.attrs
         svc_obj = update_service target_service_params(source_obj)
         if (errors = svc_obj['errors'])
           raise ThreeScaleToolbox::Error, "Service has not been saved. Errors: #{errors}" \
@@ -22,7 +22,7 @@ module ThreeScaleToolbox
       private
 
       def update_service(service)
-        svc_obj = target.update_service service
+        svc_obj = target.update service
 
         # Source and target remotes might not allow same set of deployment options
         # Invalid deployment option check
@@ -30,7 +30,7 @@ module ThreeScaleToolbox
         if (errors = svc_obj['errors']) &&
            ThreeScaleToolbox::Helper.service_invalid_deployment_option?(errors)
           service.delete('deployment_option')
-          svc_obj = target.update_service(service)
+          svc_obj = target.update service
         end
 
         svc_obj

data/lib/3scale_toolbox/version.rb

@@ -1,3 +1,3 @@
 module ThreeScaleToolbox
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 3scale_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Michal Cichra
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: cri
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +159,16 @@ files:
 - 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
+- lib/3scale_toolbox/commands/methods_command.rb
+- lib/3scale_toolbox/commands/methods_command/apply_command.rb
+- lib/3scale_toolbox/commands/methods_command/create_command.rb
+- lib/3scale_toolbox/commands/methods_command/delete_command.rb
+- lib/3scale_toolbox/commands/methods_command/list_command.rb
+- lib/3scale_toolbox/commands/metrics_command.rb
+- lib/3scale_toolbox/commands/metrics_command/apply_command.rb
+- lib/3scale_toolbox/commands/metrics_command/create_command.rb
+- lib/3scale_toolbox/commands/metrics_command/delete_command.rb
+- lib/3scale_toolbox/commands/metrics_command/list_command.rb
 - lib/3scale_toolbox/commands/plans_command.rb
 - lib/3scale_toolbox/commands/plans_command/apply_command.rb
 - lib/3scale_toolbox/commands/plans_command/create_command.rb
@@ -191,6 +201,8 @@ files:
 - lib/3scale_toolbox/configuration.rb
 - lib/3scale_toolbox/entities.rb
 - lib/3scale_toolbox/entities/application_plan.rb
+- lib/3scale_toolbox/entities/method.rb
+- lib/3scale_toolbox/entities/metric.rb
 - lib/3scale_toolbox/entities/service.rb
 - lib/3scale_toolbox/error.rb
 - lib/3scale_toolbox/helper.rb