3scale_toolbox 0.15.0 → 0.18.2

data/lib/3scale_toolbox/error.rb

@@ -1,9 +1,24 @@
 module ThreeScaleToolbox
   # Generic error. Superclass for all specific errors.
   class Error < ::StandardError
+    def code
+      'E_3SCALE'
+    end
+
+    def kind
+      self.class
+    end
+
+    def stacktrace
+      # For managed errors, stacktrace should not be necessary
+      nil
+    end
   end
 
   class InvalidUrlError < Error
+    def code
+      'E_INVALID_URL'
+    end
   end
 
   class ActiveDocsNotFoundError < Error
@@ -12,6 +27,10 @@ module ThreeScaleToolbox
     def initialize(id)
       super("ActiveDocs with ID #{id} not found")
     end
+
+    def code
+      'E_ACTIVEDOCS_NOT_FOUND'
+    end
   end
 
   class ThreeScaleApiError < Error
@@ -25,5 +44,39 @@ module ThreeScaleToolbox
     def message
       "#{super}. Errors: #{apierrors}"
     end
+
+    def code
+      'E_3SCALE_API'
+    end
+  end
+
+  class InvalidIdError < Error
+    def code
+      'E_INVALID_ID'
+    end
+  end
+
+  class UnexpectedError < ::StandardError
+    attr_reader :unexpectederror
+
+    def initialize(err)
+      @unexpectederror = err
+    end
+
+    def message
+      unexpectederror.message
+    end
+
+    def kind
+      unexpectederror.class
+    end
+
+    def code
+      'E_UNKNOWN'
+    end
+
+    def stacktrace
+      unexpectederror.backtrace
+    end
   end
 end

data/lib/3scale_toolbox/helper.rb

@@ -50,6 +50,23 @@ module ThreeScaleToolbox
       def period_already_taken_error?(error)
         Array(Hash(error)['period']).any? { |msg| msg.match(/has already been taken/) }
       end
+
+      def application_plan_mapping(source_app_plans, target_app_plans)
+        target_app_plans.map do |target|
+          source = source_app_plans.find { |app_plan| app_plan.system_name == target.system_name }
+          [source, target]
+        end.reject { |key, _| key.nil? }
+      end
+
+      def random_lowercase_name(length=8)
+        [*('a'..'z')].sample(length).join
+      end
+
+      def backend_metric_link_parser(link)
+        return if link.nil?
+
+        link.match(/admin\/api\/backend_apis\/(\d+)\/metrics/) { |m| m.captures[0] }
+      end
     end
 
     class BooleanTransformer

data/lib/3scale_toolbox/openapi/oas3.rb

@@ -64,7 +64,7 @@ module ThreeScaleToolbox
 
       def host
         # If there are many? take first
-        server_objects(&:host).first
+        server_objects { |url| "#{url.host}:#{url.port}" }.first
       end
 
       def scheme

data/lib/3scale_toolbox/proxy_logger.rb

@@ -9,10 +9,14 @@ module ThreeScaleToolbox
       result = @subject.public_send(name, *args)
     ensure
       end_time = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC) - start_time
-      ::Kernel.warn "-- call #{name} args |#{args.inspect[0..200]}| response |#{result.inspect[0..200]}| - (#{end_time}s)"
+      ::Kernel.warn "-- call #{name} args |#{args.inspect[0..2000]}| response |#{result.inspect[0..2000]}| - (#{end_time}s)"
       result
     end
 
+    def public_send(name, *args)
+      method_missing(name, *args)
+    end
+
     def respond_to_missing?(method_name, include_private = false)
       super
     end

data/lib/3scale_toolbox/remote_cache.rb

@@ -0,0 +1,157 @@
+module ThreeScaleToolbox
+  class RemoteCache < BasicObject
+
+    attr_reader :metrics_cache, :methods_cache, :backend_metrics_cache, :backend_methods_cache, :subject
+
+    def initialize(subject)
+      @subject = subject
+      # Metrics and methods cache data
+      @metrics_cache = {}
+      # methods cache data
+      @methods_cache = {}
+      # Backend Metrics and methods cache data
+      @backend_metrics_cache = {}
+      # Backend methods cache data
+      @backend_methods_cache = {}
+    end
+
+    def list_metrics(service_id)
+      return metrics_cache[service_id] if metrics_cache.has_key? service_id
+
+      subject.list_metrics(service_id).tap do |metrics|
+        metrics_cache[service_id] = metrics unless metrics.respond_to?(:has_key?) && !metrics['errors'].nil?
+      end
+    end
+
+    def list_methods(service_id, metric_id)
+      key = method_cache_key(service_id, metric_id)
+      return methods_cache[key] if methods_cache.has_key? key
+
+      subject.list_methods(service_id, metric_id).tap do |methods|
+        methods_cache[key] = methods unless methods.respond_to?(:has_key?) && !methods['errors'].nil?
+      end
+    end
+
+    def create_metric(service_id, attributes)
+      subject.create_metric(service_id, attributes).tap do |metric_attrs|
+        metrics_cache.delete(service_id) unless metric_attrs.respond_to?(:has_key?) && !metric_attrs['errors'].nil?
+      end
+    end
+
+    def update_metric(service_id, metric_id, attributes)
+      subject.update_metric(service_id, metric_id, attributes).tap do |metric_attrs|
+        metrics_cache.delete(service_id) unless metric_attrs.respond_to?(:has_key?) && !metric_attrs['errors'].nil?
+      end
+    end
+
+    def delete_metric(service_id, metric_id)
+      subject.delete_metric(service_id, metric_id).tap do |_|
+        metrics_cache.delete(service_id)
+      end
+    end
+
+    def update_method(service_id, parent_id, id, attributes)
+      subject.update_method(service_id, parent_id, id, attributes).tap do |method_attrs|
+        metrics_cache.delete(service_id) unless method_attrs.respond_to?(:has_key?) && !method_attrs['errors'].nil?
+        methods_cache.delete(method_cache_key(service_id, parent_id)) unless method_attrs.respond_to?(:has_key?) && !method_attrs['errors'].nil?
+      end
+    end
+
+
+    def create_method(service_id, metric_id, attributes)
+      subject.create_method(service_id, metric_id, attributes).tap do |method_attrs|
+        metrics_cache.delete(service_id) unless method_attrs.respond_to?(:has_key?) && !method_attrs['errors'].nil?
+        methods_cache.delete(method_cache_key(service_id, metric_id)) unless method_attrs.respond_to?(:has_key?) && !method_attrs['errors'].nil?
+      end
+    end
+
+    def delete_method(service_id, parent_id, id)
+      subject.delete_method(service_id, parent_id, id).tap do |_|
+        metrics_cache.delete(service_id)
+        methods_cache.delete(method_cache_key(service_id, parent_id))
+      end
+    end
+
+    ###
+    # Backends
+    ###
+
+    def list_backend_metrics(backend_id)
+      return backend_metrics_cache[backend_id] if backend_metrics_cache.has_key? backend_id
+
+      subject.list_backend_metrics(backend_id).tap do |metrics|
+        backend_metrics_cache[backend_id] = metrics unless metrics.respond_to?(:has_key?) && !metrics['errors'].nil?
+      end
+    end
+
+    def list_backend_methods(backend_id, metric_id)
+      key = method_cache_key(backend_id, metric_id)
+      return backend_methods_cache[key] if backend_methods_cache.has_key? key
+
+      subject.list_backend_methods(backend_id, metric_id).tap do |methods|
+        backend_methods_cache[key] = methods unless methods.respond_to?(:has_key?) && !methods['errors'].nil?
+      end
+    end
+
+    def create_backend_metric(backend_id, attributes)
+      subject.create_backend_metric(backend_id, attributes).tap do |metric_attrs|
+        backend_metrics_cache.delete(backend_id) unless metric_attrs.respond_to?(:has_key?) && !metric_attrs['errors'].nil?
+      end
+    end
+
+    def update_backend_metric(backend_id, metric_id, attributes)
+      subject.update_backend_metric(backend_id, metric_id, attributes).tap do |metric_attrs|
+        backend_metrics_cache.delete(backend_id) unless metric_attrs.respond_to?(:has_key?) && !metric_attrs['errors'].nil?
+      end
+    end
+
+    def delete_backend_metric(backend_id, metric_id)
+      subject.delete_backend_metric(backend_id, metric_id).tap do |_|
+        backend_metrics_cache.delete(backend_id)
+      end
+    end
+
+    def create_backend_method(backend_id, metric_id, attributes)
+      subject.create_backend_method(backend_id, metric_id, attributes).tap do |method_attrs|
+        unless method_attrs.respond_to?(:has_key?) && !method_attrs['errors'].nil?
+          backend_metrics_cache.delete(backend_id)
+          backend_methods_cache.delete(method_cache_key(backend_id, metric_id))
+        end
+      end
+    end
+
+    def delete_backend_method(backend_id, metric_id, method_id)
+      subject.delete_backend_method(backend_id, metric_id, method_id).tap do |_|
+        backend_metrics_cache.delete(backend_id)
+        backend_methods_cache.delete(method_cache_key(backend_id, metric_id))
+      end
+    end
+
+    def update_backend_method(backend_id, metric_id, method_id, attributes)
+      subject.update_backend_method(backend_id, metric_id, method_id, attributes).tap do |method_attrs|
+        unless method_attrs.respond_to?(:has_key?) && !method_attrs['errors'].nil?
+          backend_metrics_cache.delete(backend_id)
+          backend_methods_cache.delete(method_cache_key(backend_id, metric_id))
+        end
+      end
+    end
+
+    ###
+    # Generic methods
+    ###
+
+    def method_missing(name, *args)
+      subject.public_send(name, *args)
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      super
+    end
+
+    private
+
+    def method_cache_key(id, metric_id)
+      "#{id}#{metric_id}"
+    end
+  end
+end

data/lib/3scale_toolbox/remotes.rb

@@ -35,14 +35,14 @@ module ThreeScaleToolbox
       end
     end
 
-    def delete(key)
+    def delete(key, &block)
       value = nil
       update do |rmts|
         # block should return rmts
         # but main method should return deleted value
         rmts.tap do |r|
           value = if block_given?
-                    r.delete(key, &Proc.new)
+                    r.delete(key, &block)
                   else
                     r.delete(key)
                   end

data/lib/3scale_toolbox/version.rb

@@ -1,3 +1,3 @@
 module ThreeScaleToolbox
-  VERSION = '0.15.0'
+  VERSION = '0.18.2'
 end

data/licenses.xml

@@ -3,7 +3,7 @@
   <dependencies>
           <dependency>
         <packageName>3scale-api</packageName>
-        <version>0.6.0</version>
+        <version>1.4.0</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -13,7 +13,7 @@
       </dependency>
           <dependency>
         <packageName>3scale_toolbox</packageName>
-        <version>0.15.0</version>
+        <version>0.18.2</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -23,7 +23,7 @@
       </dependency>
           <dependency>
         <packageName>activesupport</packageName>
-        <version>6.0.2.1</version>
+        <version>6.1.3.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -53,17 +53,27 @@
       </dependency>
           <dependency>
         <packageName>bundler</packageName>
-        <version>1.16.1</version>
+        <version>2.1.4</version>
         <licenses>
                       <license>
-              <name>unknown</name>
-              <url></url>
+              <name>MIT</name>
+              <url>http://opensource.org/licenses/mit-license</url>
+            </license>
+                  </licenses>
+      </dependency>
+          <dependency>
+        <packageName>codecov</packageName>
+        <version>0.5.1</version>
+        <licenses>
+                      <license>
+              <name>MIT</name>
+              <url>http://opensource.org/licenses/mit-license</url>
             </license>
                   </licenses>
       </dependency>
           <dependency>
         <packageName>coderay</packageName>
-        <version>1.1.2</version>
+        <version>1.1.3</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -73,7 +83,7 @@
       </dependency>
           <dependency>
         <packageName>concurrent-ruby</packageName>
-        <version>1.1.5</version>
+        <version>1.1.8</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -83,7 +93,7 @@
       </dependency>
           <dependency>
         <packageName>crack</packageName>
-        <version>0.4.3</version>
+        <version>0.4.5</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -93,7 +103,7 @@
       </dependency>
           <dependency>
         <packageName>cri</packageName>
-        <version>2.15.9</version>
+        <version>2.15.11</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -113,7 +123,7 @@
       </dependency>
           <dependency>
         <packageName>diff-lcs</packageName>
-        <version>1.3</version>
+        <version>1.4.4</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -128,10 +138,20 @@
               <url></url>
             </license>
                   </licenses>
+      </dependency>
+          <dependency>
+        <packageName>docile</packageName>
+        <version>1.3.5</version>
+        <licenses>
+                      <license>
+              <name>MIT</name>
+              <url>http://opensource.org/licenses/mit-license</url>
+            </license>
+                  </licenses>
       </dependency>
           <dependency>
         <packageName>dotenv</packageName>
-        <version>2.7.5</version>
+        <version>2.7.6</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -161,7 +181,7 @@
       </dependency>
           <dependency>
         <packageName>hashdiff</packageName>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -171,7 +191,7 @@
       </dependency>
           <dependency>
         <packageName>i18n</packageName>
-        <version>1.8.2</version>
+        <version>1.8.10</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -191,7 +211,7 @@
       </dependency>
           <dependency>
         <packageName>license_finder</packageName>
-        <version>5.10.2</version>
+        <version>5.11.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -201,7 +221,7 @@
       </dependency>
           <dependency>
         <packageName>method_source</packageName>
-        <version>0.9.2</version>
+        <version>1.0.0</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -211,7 +231,7 @@
       </dependency>
           <dependency>
         <packageName>mini_portile2</packageName>
-        <version>2.4.0</version>
+        <version>2.5.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -221,7 +241,7 @@
       </dependency>
           <dependency>
         <packageName>minitest</packageName>
-        <version>5.14.0</version>
+        <version>5.14.4</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -231,7 +251,7 @@
       </dependency>
           <dependency>
         <packageName>mustermann</packageName>
-        <version>1.0.3</version>
+        <version>1.1.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -241,7 +261,7 @@
       </dependency>
           <dependency>
         <packageName>mustermann-contrib</packageName>
-        <version>1.0.3</version>
+        <version>1.1.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -251,7 +271,7 @@
       </dependency>
           <dependency>
         <packageName>nokogiri</packageName>
-        <version>1.10.7</version>
+        <version>1.11.3</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -261,7 +281,7 @@
       </dependency>
           <dependency>
         <packageName>oas_parser</packageName>
-        <version>0.23.0</version>
+        <version>0.25.4</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -281,7 +301,7 @@
       </dependency>
           <dependency>
         <packageName>pry</packageName>
-        <version>0.12.2</version>
+        <version>0.13.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -291,27 +311,51 @@
       </dependency>
           <dependency>
         <packageName>public_suffix</packageName>
-        <version>4.0.1</version>
+        <version>4.0.6</version>
         <licenses>
                       <license>
               <name>MIT</name>
               <url>http://opensource.org/licenses/mit-license</url>
             </license>
                   </licenses>
+      </dependency>
+          <dependency>
+        <packageName>racc</packageName>
+        <version>1.5.2</version>
+        <licenses>
+                      <license>
+              <name>ruby</name>
+              <url>http://www.ruby-lang.org/en/LICENSE.txt</url>
+            </license>
+                      <license>
+              <name>Simplified BSD</name>
+              <url>http://opensource.org/licenses/bsd-license</url>
+            </license>
+                  </licenses>
       </dependency>
           <dependency>
         <packageName>rake</packageName>
-        <version>10.5.0</version>
+        <version>13.0.3</version>
         <licenses>
                       <license>
               <name>MIT</name>
               <url>http://opensource.org/licenses/mit-license</url>
             </license>
                   </licenses>
+      </dependency>
+          <dependency>
+        <packageName>rexml</packageName>
+        <version>3.2.5</version>
+        <licenses>
+                      <license>
+              <name>Simplified BSD</name>
+              <url>http://opensource.org/licenses/bsd-license</url>
+            </license>
+                  </licenses>
       </dependency>
           <dependency>
         <packageName>rspec</packageName>
-        <version>3.8.0</version>
+        <version>3.10.0</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -321,7 +365,7 @@
       </dependency>
           <dependency>
         <packageName>rspec-core</packageName>
-        <version>3.8.2</version>
+        <version>3.10.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -331,7 +375,7 @@
       </dependency>
           <dependency>
         <packageName>rspec-expectations</packageName>
-        <version>3.8.4</version>
+        <version>3.10.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -341,7 +385,7 @@
       </dependency>
           <dependency>
         <packageName>rspec-mocks</packageName>
-        <version>3.8.1</version>
+        <version>3.10.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -351,17 +395,31 @@
       </dependency>
           <dependency>
         <packageName>rspec-support</packageName>
-        <version>3.8.2</version>
+        <version>3.10.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
               <url>http://opensource.org/licenses/mit-license</url>
             </license>
                   </licenses>
+      </dependency>
+          <dependency>
+        <packageName>ruby2_keywords</packageName>
+        <version>0.0.4</version>
+        <licenses>
+                      <license>
+              <name>ruby</name>
+              <url>http://www.ruby-lang.org/en/LICENSE.txt</url>
+            </license>
+                      <license>
+              <name>Simplified BSD</name>
+              <url>http://opensource.org/licenses/bsd-license</url>
+            </license>
+                  </licenses>
       </dependency>
           <dependency>
         <packageName>rubyzip</packageName>
-        <version>2.0.0</version>
+        <version>2.3.0</version>
         <licenses>
                       <license>
               <name>Simplified BSD</name>
@@ -370,8 +428,8 @@
                   </licenses>
       </dependency>
           <dependency>
-        <packageName>safe_yaml</packageName>
-        <version>1.0.5</version>
+        <packageName>simplecov</packageName>
+        <version>0.21.2</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -380,8 +438,8 @@
                   </licenses>
       </dependency>
           <dependency>
-        <packageName>thor</packageName>
-        <version>0.20.3</version>
+        <packageName>simplecov-html</packageName>
+        <version>0.12.3</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -390,12 +448,22 @@
                   </licenses>
       </dependency>
           <dependency>
-        <packageName>thread_safe</packageName>
-        <version>0.3.6</version>
+        <packageName>simplecov_json_formatter</packageName>
+        <version>0.1.2</version>
         <licenses>
                       <license>
-              <name>Apache 2.0</name>
-              <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+              <name>MIT</name>
+              <url>http://opensource.org/licenses/mit-license</url>
+            </license>
+                  </licenses>
+      </dependency>
+          <dependency>
+        <packageName>thor</packageName>
+        <version>1.0.1</version>
+        <licenses>
+                      <license>
+              <name>MIT</name>
+              <url>http://opensource.org/licenses/mit-license</url>
             </license>
                   </licenses>
       </dependency>
@@ -411,7 +479,7 @@
       </dependency>
           <dependency>
         <packageName>tzinfo</packageName>
-        <version>1.2.6</version>
+        <version>2.0.4</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -421,7 +489,7 @@
       </dependency>
           <dependency>
         <packageName>webmock</packageName>
-        <version>3.7.5</version>
+        <version>3.11.1</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -441,17 +509,17 @@
       </dependency>
           <dependency>
         <packageName>xml-simple</packageName>
-        <version>1.1.5</version>
+        <version>1.1.8</version>
         <licenses>
                       <license>
-              <name>ruby</name>
-              <url>http://www.ruby-lang.org/en/LICENSE.txt</url>
+              <name>MIT</name>
+              <url>http://opensource.org/licenses/mit-license</url>
             </license>
                   </licenses>
       </dependency>
           <dependency>
         <packageName>zeitwerk</packageName>
-        <version>2.2.2</version>
+        <version>2.4.2</version>
         <licenses>
                       <license>
               <name>MIT</name>