3scale_toolbox 0.16.0 → 0.18.3

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

@@ -7,7 +7,8 @@ module ThreeScaleToolbox
 
           def call
             operations.each do |op|
-              service.create_mapping_rule(op.mapping_rule)
+              Entities::MappingRule.create(service: service,
+                                           attrs: op.mapping_rule)
               puts "Created #{op.http_method} #{op.pattern} endpoint"
             end
           end

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

@@ -7,18 +7,13 @@ module ThreeScaleToolbox
 
           def call
             missing_operations.each do |op|
-              method = Entities::Method.create(service: service, parent_id: hits_metric_id,
-                                               attrs: op.method)
+              method = Entities::Method.create(service: service, attrs: op.method)
               op.set(:metric_id, method.id)
             end
 
             existing_operations.each do |op|
-              method_attrs = methods_index.fetch(op.method['system_name'])
-              method = Entities::Method.new(
-                id: method_attrs.fetch('id'),
-                parent_id: hits_metric_id,
-                service: service
-              )
+              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)
             end
@@ -26,13 +21,9 @@ module ThreeScaleToolbox
 
           private
 
-          def hits_metric_id
-            @hits_metric_id ||= service.hits['id']
-          end
-
           def methods_index
-            @methods_index ||= service.methods(hits_metric_id).each_with_object({}) do |method, acc|
-              acc[method['system_name']] = method
+            @methods_index ||= service.methods.each_with_object({}) do |method, acc|
+              acc[method.system_name] = method
             end
           end
 

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

@@ -57,6 +57,10 @@ module ThreeScaleToolbox
             context[:api_spec_resource]
           end
 
+          def oidc_issuer_type
+            context[:oidc_issuer_type]
+          end
+
           def oidc_issuer_endpoint
             context[:oidc_issuer_endpoint]
           end

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

@@ -52,6 +52,7 @@ module ThreeScaleToolbox
             case (type = api_spec.security[:type])
             when 'oauth2'
               settings[:credentials_location] = 'headers'
+              settings[:oidc_issuer_type] = oidc_issuer_type unless oidc_issuer_type.nil?
               settings[:oidc_issuer_endpoint] = oidc_issuer_endpoint unless oidc_issuer_endpoint.nil?
             when 'apiKey'
               settings[:credentials_location] = credentials_location

data/lib/3scale_toolbox/commands/methods_command/apply_command.rb

@@ -47,11 +47,9 @@ module ThreeScaleToolbox
           def run
             validate_option_params
             hits = service.hits
-            method = Entities::Method.find(service: service, parent_id: hits.fetch('id'),
-                                           ref: method_ref)
+            method = Entities::Method.find(service: service, ref: method_ref)
             if method.nil?
-              method = Entities::Method.create(service: service, parent_id: hits.fetch('id'),
-                                               attrs: create_method_attrs)
+              method = Entities::Method.create(service: service, attrs: create_method_attrs)
             else
               method.update(method_attrs) unless method_attrs.empty?
             end

data/lib/3scale_toolbox/commands/methods_command/create_command.rb

@@ -40,10 +40,8 @@ module ThreeScaleToolbox
           end
 
           def run
-            hits = service.hits
             method = ThreeScaleToolbox::Entities::Method.create(
               service: service,
-              parent_id: hits.fetch('id'),
               attrs: method_attrs
             )
             method.disable if option_disabled

data/lib/3scale_toolbox/commands/methods_command/delete_command.rb

@@ -44,7 +44,7 @@ module ThreeScaleToolbox
 
           def find_method
             hits = service.hits
-            Entities::Method.find(service: service, parent_id: hits.fetch('id'), ref: method_ref).tap do |p|
+            Entities::Method.find(service: service, ref: method_ref).tap do |p|
               raise ThreeScaleToolbox::Error, "Method #{method_ref} does not exist" if p.nil?
             end
           end

data/lib/3scale_toolbox/commands/methods_command/list_command.rb

@@ -23,19 +23,11 @@ module ThreeScaleToolbox
           end
 
           def run
-            printer.print_collection service_methods
+            printer.print_collection service.methods.map(&:attrs)
           end
 
           private
 
-          def service_methods
-            @service_methods ||= service.methods service_hits_id
-          end
-
-          def service_hits_id
-            @service_hits_id ||= service.hits.fetch('id')
-          end
-
           def service
             @service ||= find_service
           end

data/lib/3scale_toolbox/commands/metrics_command/list_command.rb

@@ -23,7 +23,7 @@ module ThreeScaleToolbox
           end
 
           def run
-            printer.print_collection service.metrics
+            printer.print_collection service.metrics.map(&:attrs)
           end
 
           private

data/lib/3scale_toolbox/commands/plans_command/export/read_plan_limits_step.rb

@@ -9,7 +9,7 @@ module ThreeScaleToolbox
           # add metric system_name out of metric_id
           def call
             result[:limits] = plan.limits.map do |limit|
-              limit.tap { |l| l['metric'] = metric_info(l, 'Limit') }
+              limit.attrs.merge('metric' => metric_info(limit, 'Limit'))
             end
           end
         end

data/lib/3scale_toolbox/commands/plans_command/export/read_plan_methods_step.rb

@@ -21,7 +21,7 @@ module ThreeScaleToolbox
             filtered_limit_methods.each_with_object({}) do |elem, acc|
               # find_method should not return nil.
               # It is assumed that metric_id refers to existing element from previous steps
-              acc[elem['metric_id']] = find_method(elem['metric_id'])
+              acc[elem['metric_id']] = find_method(elem['metric_id']).attrs
             end
           end
 
@@ -33,7 +33,7 @@ module ThreeScaleToolbox
             filtered_pricing_rule_methods.each_with_object({}) do |elem, acc|
               # find_method should not return nil.
               # It is assumed that metric_id refers to existing element from previous steps
-              acc[elem['metric_id']] = find_method(elem['metric_id'])
+              acc[elem['metric_id']] = find_method(elem['metric_id']).attrs
             end
           end
 

data/lib/3scale_toolbox/commands/plans_command/export/read_plan_metrics_step.rb

@@ -21,7 +21,7 @@ module ThreeScaleToolbox
             filtered_limit_metrics.each_with_object({}) do |elem, acc|
               # find_metric should not return nil.
               # It is assumed that metric_id refers to existing element from previous steps
-              acc[elem['metric_id']] = find_metric(elem['metric_id'])
+              acc[elem['metric_id']] = find_metric(elem['metric_id']).attrs
             end
           end
 
@@ -33,7 +33,7 @@ module ThreeScaleToolbox
             filtered_pricing_rule_metrics.each_with_object({}) do |elem, acc|
               # find_metric should not return nil.
               # It is assumed that metric_id refers to existing element from previous steps
-              acc[elem['metric_id']] = find_metric(elem['metric_id'])
+              acc[elem['metric_id']] = find_metric(elem['metric_id']).attrs
             end
           end
 

data/lib/3scale_toolbox/commands/plans_command/export/read_plan_pricing_rules_step.rb

@@ -9,8 +9,7 @@ module ThreeScaleToolbox
           # add metric system_name out of metric_id
           def call
             result[:pricingrules] = plan.pricing_rules.map do |pr|
-              pr.merge('metric' => metric_info(pr, 'PricingRule'),
-                       'cost_per_unit' => pr.fetch('cost_per_unit').to_f)
+              pr.attrs.merge('metric' => metric_info(pr, 'PricingRule'), 'cost_per_unit' => pr.cost_per_unit.to_f)
             end
           end
         end

data/lib/3scale_toolbox/commands/plans_command/export/step.rb

@@ -45,22 +45,14 @@ module ThreeScaleToolbox
             context[:plan] ||= find_plan
           end
 
-          def service_metrics
-            context[:service_metrics] ||= service.metrics
-          end
-
-          def service_methods
-            context[:service_methods] ||= service.methods(service_hits['id'])
-          end
-
           def metric_info(elem, elem_name)
-            if (method = find_method(elem.fetch('metric_id')))
-              { 'type' => 'method', 'system_name' => method.fetch('system_name') }
-            elsif (metric = find_metric(elem.fetch('metric_id')))
-              { 'type' => 'metric', 'system_name' => metric.fetch('system_name') }
+            if (method = find_method(elem.metric_id))
+              { 'type' => 'method', 'system_name' => method.system_name }
+            elsif (metric = find_metric(elem.metric_id))
+              { 'type' => 'metric', 'system_name' => metric.system_name }
             else
-              raise ThreeScaleToolbox::Error, "Unexpected error. #{elem_name} #{elem['id']} " \
-                "referencing to metric id #{elem.fetch('metric_id')} which has not been found"
+              raise ThreeScaleToolbox::Error, "Unexpected error. #{elem_name} #{elem.id} " \
+                "referencing to metric id #{elem.metric_id} which has not been found"
             end
           end
 
@@ -80,15 +72,11 @@ module ThreeScaleToolbox
           end
 
           def find_metric(id)
-            service_metrics.find { |metric| metric['id'] == id }
+            service.metrics.find { |metric| metric.id == id }
           end
 
           def find_method(id)
-            service_methods.find { |method| method['id'] == id }
-          end
-
-          def service_hits
-            context[:service_hits] ||= service.hits
+            service.methods.find { |method| method.id == id }
           end
         end
       end

data/lib/3scale_toolbox/commands/plans_command/import/import_plan_limits_step.rb

@@ -7,31 +7,29 @@ module ThreeScaleToolbox
           ##
           # Writes Plan limits
           def call
-            missing_limits.each do |limit|
-              metric_id = limit.delete('metric_id')
-              limit_obj = plan.create_limit(metric_id, limit)
-              if (errors = limit_obj['errors'])
-                raise ThreeScaleToolbox::Error, "Plan limit has not been created. #{errors}"
-              end
+            # SET semantics
+            # First, delete existing limits
+            # Second, add new limits
+            plan.limits.each do |limit|
+              limit.delete()
+              puts "Deleted existing plan limit: [metric: #{limit.metric_id}, #{limit.attrs}]"
+            end
 
-              puts "Created plan limit: [metric: #{metric_id}, #{limit}]"
+            resource_limits_processed.each do |limit_attrs|
+              metric_id = limit_attrs.delete('metric_id')
+              plan.create_limit(metric_id, limit_attrs)
+              puts "Created plan limit: [metric: #{metric_id}, #{limit_attrs}]"
             end
           end
 
           private
 
-          def missing_limits
-            ThreeScaleToolbox::Helper.array_difference(resource_limits_processed, plan.limits) do |a, b|
-              ThreeScaleToolbox::Helper.compare_hashes(a, b, %w[metric_id period])
-            end
-          end
-
           def resource_limits_processed
             resource_limits.map do |limit|
               metric = find_metric_by_system_name(limit.delete('metric_system_name'))
               # this ImportMetricLimitsStep step is assuming all metrics/methods have been created
               # in previous step, so finding metric should always succeed.
-              limit.merge('metric_id' => metric.fetch('id'))
+              limit.merge('metric_id' => metric.id)
             end
           end
         end

data/lib/3scale_toolbox/commands/plans_command/import/import_plan_metrics_step.rb

@@ -9,36 +9,29 @@ module ThreeScaleToolbox
           def call
             missing_metrics.each(&method(:create_metric))
             missing_methods.each(&method(:create_method))
-
-            # invalidate memoized methods and metrics
-            invalidate_service_methods
-            invalidate_service_metrics
           end
 
           private
 
           def missing_metrics
-            ThreeScaleToolbox::Helper.array_difference(resource_metrics, service_metrics) do |a, b|
-              ThreeScaleToolbox::Helper.compare_hashes(a, b, ['system_name'])
+            ThreeScaleToolbox::Helper.array_difference(resource_metrics, service.metrics) do |a, b|
+              a['system_name'] == b.system_name
             end
           end
 
           def missing_methods
-            ThreeScaleToolbox::Helper.array_difference(resource_methods, service_methods) do |a, b|
-              ThreeScaleToolbox::Helper.compare_hashes(a, b, ['system_name'])
+            ThreeScaleToolbox::Helper.array_difference(resource_methods, service.methods) do |a, b|
+              a['system_name'] == b.system_name
             end
           end
 
           def create_metric(metric_attrs)
-            metric = ThreeScaleToolbox::Entities::Metric.create(service: service,
-                                                                attrs: metric_attrs)
+            metric = ThreeScaleToolbox::Entities::Metric.create(service: service, attrs: metric_attrs)
             puts "Created metric: #{metric.attrs['system_name']}"
           end
 
           def create_method(method_attrs)
-            method = ThreeScaleToolbox::Entities::Method.create(service: service,
-                                                                parent_id: service_hits['id'],
-                                                                attrs: method_attrs)
+            method = ThreeScaleToolbox::Entities::Method.create(service: service, attrs: method_attrs)
             puts "Created method: #{method.attrs['system_name']}"
           end
         end

data/lib/3scale_toolbox/commands/plans_command/import/import_plan_pricing_rules_step.rb

@@ -7,35 +7,27 @@ module ThreeScaleToolbox
           ##
           # Writes Plan pricing rules
           def call
-            missing_pricing_rules.each do |pr|
-              metric_id = pr.delete('metric_id')
-              resp = plan.create_pricing_rule(metric_id, pr)
-              if (errors = resp['errors'])
-                raise ThreeScaleToolbox::Error, "Plan pricing rule has not been created. #{errors}"
-              end
-
-              puts "Created plan pricing rule: [metric: #{metric_id}, #{pr}]"
+            # SET semantics
+            # First, delete existing pricing rules
+            # Second, add new pricing rules
+            plan.pricing_rules.each do |pr|
+              pr.delete()
+              puts "Deleted existing plan pricing rule: [metric: #{pr.metric_id}, #{pr.attrs}]"
             end
-          end
-
-          private
 
-          def missing_pricing_rules
-            ThreeScaleToolbox::Helper.array_difference(resource_pr_processed, remote_pr_processed) do |a, b|
-              ThreeScaleToolbox::Helper.compare_hashes(a, b, %w[metric_id cost_per_unit min max])
+            resource_pr_processed.each do |pr_attrs|
+              metric_id = pr_attrs.delete('metric_id')
+              plan.create_pricing_rule(metric_id, pr_attrs)
+              puts "Created plan pricing rule: [metric: #{metric_id}, #{pr_attrs}]"
             end
           end
 
-          def remote_pr_processed
-            plan.pricing_rules.map do |pr|
-              pr.merge('cost_per_unit' => pr.fetch('cost_per_unit').to_f)
-            end
-          end
+          private
 
           def resource_pr_processed
             resource_pricing_rules.map do |pr|
               metric = find_metric_by_system_name(pr.delete('metric_system_name'))
-              pr.merge('metric_id' => metric.fetch('id'),
+              pr.merge('metric_id' => metric.id,
                        'cost_per_unit' => pr.fetch('cost_per_unit').to_f)
             end
           end

data/lib/3scale_toolbox/commands/plans_command/import/step.rb

@@ -65,28 +65,8 @@ module ThreeScaleToolbox
             artifacts_resource['plan_features'] || []
           end
 
-          def service_metrics
-            context[:service_metrics] ||= service.metrics
-          end
-
-          def invalidate_service_metrics
-            context[:service_metrics] = nil
-          end
-
-          def service_hits
-            context[:service_hits] ||= service.hits
-          end
-
-          def service_methods
-            context[:service_methods] ||= service.methods(service_hits['id'])
-          end
-
           def service_metrics_and_methods
-            service_metrics + service_methods
-          end
-
-          def invalidate_service_methods
-            context[:service_methods] = nil
+            service.metrics + service.methods
           end
 
           def service_features
@@ -103,7 +83,7 @@ module ThreeScaleToolbox
           end
 
           def find_metric_by_system_name(system_name)
-            service_metrics_and_methods.find { |metric| metric['system_name'] == system_name }
+            service_metrics_and_methods.find { |metric| metric.system_name == system_name }
           end
 
           private

data/lib/3scale_toolbox/commands/plans_command/list_command.rb

@@ -23,7 +23,7 @@ module ThreeScaleToolbox
           end
 
           def run
-            printer.print_collection service.plans
+            printer.print_collection service.plans.map(&:attrs)
           end
 
           private

data/lib/3scale_toolbox/commands/plans_command/show_command.rb

@@ -5,7 +5,7 @@ module ThreeScaleToolbox
         class ShowSubcommand < Cri::CommandRunner
           include ThreeScaleToolbox::Command
 
-          FIELDS_TO_SHOW = %w[id name system_name approval_required end_user_required
+          FIELDS_TO_SHOW = %w[id name system_name approval_required
                               cost_per_month setup_fee trial_period_days].freeze
 
           def self.command

data/lib/3scale_toolbox/commands/policies_command.rb

@@ -0,0 +1,24 @@
+require '3scale_toolbox/commands/policies_command/export_command'
+require '3scale_toolbox/commands/policies_command/import_command'
+
+module ThreeScaleToolbox
+  module Commands
+    module PoliciesCommand
+      include ThreeScaleToolbox::Command
+      def self.command
+        Cri::Command.define do
+          name        'policies'
+          usage       'policies <sub-command> [options]'
+          summary     'policies super command'
+          description 'Policies commands'
+
+          run do |_opts, _args, cmd|
+            puts cmd.help
+          end
+        end
+      end
+      add_subcommand(ExportSubcommand)
+      add_subcommand(ImportSubcommand)
+    end
+  end
+end