3scale_toolbox 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01faabdd78fbba6945dd5c5648ecf70a7ee5307e
-  data.tar.gz: 09110b6291e2698d984816afa1ae195e1607c39d
+  metadata.gz: 2210eb206ba4503c7a5e144ee02a579e128699e3
+  data.tar.gz: 36bb0f56aefa3366fb804c3c93699a778e982543
 SHA512:
-  metadata.gz: ba7960b6f7f2259297a95867fcd6fad4fc1916c9248a69571713399789cb6f9d5f4f64f33db14136f583507ff59dcf5649eb1aa5d820acca1d21689783b315d2
-  data.tar.gz: 334aa15532171cbdecf9c744d4446de407da481459271f26412ab4f1f16e4349b38dc99cfb65bce863b6f993654147d7a4affb333ece3531ccbf9794d20ab3df
+  metadata.gz: 1891b41f0278ca43b71fbaa27b05a993babf785917e0fb4dadc5f188db31d6122897dd855e819af0f2ea4951376ef0048d5dde8d7d16ff76c9e71d774ef81d78
+  data.tar.gz: db6158bc763ac25acc70bc12ecac8667d8af0d7572345b3a66244e330a99d39253d3f6b0bf2ec417edfc2a26b1b0bf91a47e4bc811611b0072ac4c270ca862e7

data/README.md

@@ -20,7 +20,7 @@ Install the CLI:
 Will create a new service, copy existing methods, metrics, application plans and their usage limits.
 
 ```shell
-3scale copy service NUMBER --endpoint=https://foo-admin.3scale.net --provider-key=your-key
+3scale copy service NUMBER --source=https://provider_key@foo-admin.3scale.net --destination=https://provider_key@foo2-admin.3scale.net
 ```
 
 ## Development

data/exe/3scale-copy

@@ -5,63 +5,94 @@ require '3scale_toolbox/cli'
 require 'optparse'
 
 options = {}
-OptionParser.new do |parser|
+
+parser = OptionParser.new do |parser|
   parser.banner = '3scale copy <command> [options]'
 
-  parser.on('-e', '--endpoint ENDPOINT', "Endpoint") do |domain|
-    options[:endpoint] = domain
+  parser.on('-source', '--source SOURCE', "Source") do |domain|
+    options[:source] = domain
   end
 
-  parser.on('-p', '--provider-key PROVIDER_KEY', "Provider Key") do |provider_key|
-    options[:provider_key] = provider_key
+  parser.on('-destination', '--destination DESTINATION', "Destination") do |domain|
+    options[:destination] = domain
   end
 
   parser.on('-h', '--help', 'Prints this help') do
     puts parser
+    puts
+    puts 'Available Commands:', ['service <service_id>', 'help']
     exit
   end
-end.parse!
+end
 
-endpoint = options.fetch(:endpoint) { raise OptionParser::MissingArgument, 'endpoint' }
-provider_key = options.fetch(:provider_key) { raise OptionParser::MissingArgument, 'provider_key' }
+print_help = ->(error = nil) do
+  if error
+    puts "Error: #{error}"
+    puts
+  end
+  parser.parse(['--help'])
+end
 
-require '3scale/api'
 
-client = ThreeScale::API.new(endpoint: endpoint, provider_key: provider_key)
+parser.parse!
 
 def compare_hashes(first, second, keys)
   keys.map{ |key| first.fetch(key) } == keys.map{ |key| second.fetch(key) }
 end
 
+def fetch_option(options, key)
+  options.fetch(key) { raise OptionParser::MissingArgument, key }
+end
+
+def provider_key_from_url(url)
+  url[/\w*@/][0..-2]
+end
+
+def endpoint_from_url(url)
+  url.sub /\w*@/, ''
+end
+
 case (command = ARGV.shift)
   when 'service'
-    service_id = ARGV.shift or raise OptionParser::MissingArgument, 'service_id'
-
-    service = client.show_service(service_id)
+    source      = fetch_option options, :source
+    destination = fetch_option options, :destination
+    
+    require '3scale/api'
 
-    name = "#{service['name']} (copy)"
+    service_id = ARGV.shift or raise OptionParser::MissingArgument, 'service_id'
 
-    copy = client.list_services.find do |service|
-      service['name'] == name
-    end
+    source_client = ThreeScale::API.new(
+      endpoint:     endpoint_from_url(source), 
+      provider_key: provider_key_from_url(source)
+    )
+    client        = ThreeScale::API.new(
+      endpoint:     endpoint_from_url(destination), 
+      provider_key: provider_key_from_url(destination)
+    )
+    
+    service = source_client.show_service(service_id)
+    copy    = client.create_service(
+      name: service['name'],
+      end_user_registration_required: service['end_user_registration_required']
+    )
+
+    raise "Service has not been saved. Errors: #{copy['errors']}" unless copy['errors'].nil?
 
-    copy ||= client.create_service(name: name,
-                                   end_user_registration_required: service['end_user_registration_required'])
     service_copy_id = copy.fetch('id')
 
     puts "new service id #{service_copy_id}"
 
-    proxy = client.show_proxy(service_id)
+    proxy = source_client.show_proxy(service_id)
     client.update_proxy(service_copy_id, proxy)
     puts "updated proxy of #{service_copy_id} to match the original"
 
-    metrics = client.list_metrics(service_id)
+    metrics = source_client.list_metrics(service_id)
     metrics_copies = client.list_metrics(service_copy_id)
 
     hits = metrics.find{ |metric| metric['system_name'] == 'hits' } or raise 'missing hits metric'
     hits_copy = metrics_copies.find{ |metric| metric['system_name'] == 'hits' } or raise 'missing hits metric'
 
-    methods = client.list_methods(service_id, hits['id'])
+    methods = source_client.list_methods(service_id, hits['id'])
     methods_copies = client.list_methods(service_copy_id, hits_copy['id'])
 
     puts "original service hits metric #{hits['id']} has #{methods.size} methods"
@@ -79,7 +110,7 @@ case (command = ARGV.shift)
     metrics_copies = client.list_metrics(service_copy_id)
 
     puts "original service has #{metrics.size} metrics"
-    puts "copied service has #{metrics.size} metrics"
+    puts "copied service has #{metrics_copies.size} metrics"
 
     missing_metrics = metrics.reject { |metric| metrics_copies.find{|copy| compare_hashes(metric, copy, ['system_name']) } }
 
@@ -90,7 +121,7 @@ case (command = ARGV.shift)
 
     puts "created #{missing_metrics.size} metrics on the copied service"
 
-    plans = client.list_service_application_plans(service_id)
+    plans = source_client.list_service_application_plans(service_id)
     plan_copies = client.list_service_application_plans(service_copy_id)
 
     puts "original service has #{plans.size} application plans "
@@ -120,12 +151,17 @@ case (command = ARGV.shift)
 
     metrics_mapping = client.list_metrics(service_copy_id).map do |copy|
       metric = metrics.find{|metric| metric.fetch('system_name') == copy.fetch('system_name') }
+      metric ||= {}
 
       [metric['id'], copy['id']]
     end.to_h
 
+    puts "destroying all mapping rules of the copy which have been created by default"
+    client.list_mapping_rules(service_copy_id).each do |mapping_rule|
+      client.delete_mapping_rule(service_copy_id, mapping_rule['id'])
+    end
 
-    mapping_rules = client.list_mapping_rules(service_id)
+    mapping_rules = source_client.list_mapping_rules(service_id)
     mapping_rules_copy = client.list_mapping_rules(service_copy_id)
 
     puts "the original service has #{mapping_rules.size} mapping rules"
@@ -155,7 +191,7 @@ case (command = ARGV.shift)
     puts unique_mapping_rules_copy.each{|rule| rule.delete('links') }
 
     application_plan_mapping.each do |original_id, copy_id|
-      limits = client.list_application_plan_limits(original_id)
+      limits = source_client.list_application_plan_limits(original_id)
       limits_copy = client.list_application_plan_limits(copy_id)
 
       missing_limits = limits.reject { |limit| limits_copy.find{|limit_copy| limit.fetch('period') == limit_copy.fetch('period') } }
@@ -166,8 +202,10 @@ case (command = ARGV.shift)
       end
       puts "copied application plan #{copy_id} is missing #{missing_limits.size} from the original plan #{original_id}"
     end
+  when 'help'
+    print_help.call
   when nil
-    puts "missing subcommand"
+    print_help.call("missing subcommand")
   else
-    puts "unknown command #{command}"
+    print_help.call("unknown command #{command}")
 end

data/lib/3scale_toolbox/version.rb

@@ -1,3 +1,3 @@
 module ThreeScaleToolbox
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: 3scale_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Michal Cichra
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler