3scale_toolbox 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2041609888563be7ca7b60bbd7cdb6ddd8f60911
-  data.tar.gz: 417e59c876b5111b84af2472ca3df9e51dd1f4e8
+  metadata.gz: 01faabdd78fbba6945dd5c5648ecf70a7ee5307e
+  data.tar.gz: 09110b6291e2698d984816afa1ae195e1607c39d
 SHA512:
-  metadata.gz: 7ffdb592223d2a9bf649bba41c8984d63b13c27863fb146a73623a98b561a62bc56f3ae4544dd9679fa8ffa65c782b5dbf4baebcdc826272ef65a059e36c1eea
-  data.tar.gz: 47750f59a33e3839b0e4cfa3b2005b247a20f4476029ea3e546d34290dca615d0406c466e2109fff9f04e591917ac0a0e38d00163372a02bd35bc1b8ee8a1d4c
+  metadata.gz: ba7960b6f7f2259297a95867fcd6fad4fc1916c9248a69571713399789cb6f9d5f4f64f33db14136f583507ff59dcf5649eb1aa5d820acca1d21689783b315d2
+  data.tar.gz: 334aa15532171cbdecf9c744d4446de407da481459271f26412ab4f1f16e4349b38dc99cfb65bce863b6f993654147d7a4affb333ece3531ccbf9794d20ab3df

data/exe/3scale-copy

@@ -29,6 +29,10 @@ require '3scale/api'
 
 client = ThreeScale::API.new(endpoint: endpoint, provider_key: provider_key)
 
+def compare_hashes(first, second, keys)
+  keys.map{ |key| first.fetch(key) } == keys.map{ |key| second.fetch(key) }
+end
+
 case (command = ARGV.shift)
   when 'service'
     service_id = ARGV.shift or raise OptionParser::MissingArgument, 'service_id'
@@ -47,6 +51,10 @@ case (command = ARGV.shift)
 
     puts "new service id #{service_copy_id}"
 
+    proxy = 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_copies = client.list_metrics(service_copy_id)
 
@@ -59,7 +67,7 @@ case (command = ARGV.shift)
     puts "original service hits metric #{hits['id']} has #{methods.size} methods"
     puts "copied service hits metric #{hits_copy['id']} has #{methods_copies.size} methods"
 
-    missing_methods = methods.reject { |method|  methods_copies.find{|copy| method.fetch('system_name') == copy.fetch('system_name') } }
+    missing_methods = methods.reject { |method|  methods_copies.find{|copy| compare_hashes(method, copy, ['system_name']) } }
 
     puts "creating #{missing_methods.size} missing methods on copied service"
 
@@ -73,7 +81,7 @@ case (command = ARGV.shift)
     puts "original service has #{metrics.size} metrics"
     puts "copied service has #{metrics.size} metrics"
 
-    missing_metrics = metrics.reject { |metric| metrics_copies.find{|copy| metric.fetch('system_name') == copy.fetch('system_name') } }
+    missing_metrics = metrics.reject { |metric| metrics_copies.find{|copy| compare_hashes(metric, copy, ['system_name']) } }
 
     missing_metrics.map do |metric|
       metric.delete('links')
@@ -116,6 +124,36 @@ case (command = ARGV.shift)
       [metric['id'], copy['id']]
     end.to_h
 
+
+    mapping_rules = 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"
+    puts "the copy has #{mapping_rules_copy.size} mapping rules"
+
+    unique_mapping_rules_copy = mapping_rules_copy.dup
+
+    missing_mapping_rules = mapping_rules.reject do |mapping_rule|
+      matching_metric = unique_mapping_rules_copy.find do |copy|
+        compare_hashes(mapping_rule, copy, %w(pattern http_method delta)) &&
+            metrics_mapping.fetch(mapping_rule.fetch('metric_id')) == copy.fetch('metric_id')
+      end
+
+      unique_mapping_rules_copy.delete(matching_metric)
+    end
+
+    puts "missing #{missing_mapping_rules.size} mapping rules"
+
+    missing_mapping_rules.each do |mapping_rule|
+      mapping_rule.delete('links')
+      mapping_rule['metric_id'] = metrics_mapping.fetch(mapping_rule.delete('metric_id'))
+      client.create_mapping_rule(service_copy_id, mapping_rule)
+    end
+    puts "created #{missing_mapping_rules.size} mapping rules"
+
+    puts "extra #{unique_mapping_rules_copy.size} mapping rules"
+    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_copy = client.list_application_plan_limits(copy_id)
@@ -128,9 +166,8 @@ case (command = ARGV.shift)
       end
       puts "copied application plan #{copy_id} is missing #{missing_limits.size} from the original plan #{original_id}"
     end
-
-
-
+  when nil
+    puts "missing subcommand"
   else
-
+    puts "unknown command #{command}"
 end

data/lib/3scale_toolbox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: 3scale_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michal Cichra
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
 description: 3scale CLI tools to manage your API from the terminal.
 email:
 - michal@3scale.net