nonnative 1.21.0 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f32a99fc33eb1c0fd62360648c9b1de943c500ae674ae713b7c2ec56693ff165
-  data.tar.gz: c46a33b6451b3f69c4ae226106eaf58d2f54683627cde12217859179a396bc0e
+  metadata.gz: 12206912ca29ab82602d7d07fdc15f5b42124e890572d463ad1c4358c7de9f08
+  data.tar.gz: ee0393650b33d8a3c5b1d31019f717a3fb680f8872171c7fea1ac4892e186ad5
 SHA512:
-  metadata.gz: 965c0c84a1be47fd5d9cf05cf887ec9572dbdddf5ec579a29519800891b68727152d0f4559bb90e20870beaa7b27f3052ee2ea3edf2e31e40db6d04b46c6ef98
-  data.tar.gz: 583c38fafc5eb0d6b2762b9a23f83319ade0d381c5ab262825e78b1cf9a3b777e1828baf1f1e696bc8f2b2564ce291328c0bce515b92368404c634f776f93d3a
+  metadata.gz: 9bbd95d62ddf01d04fd7f6bc4a783276e65dcc7775fbc1844316ee5f12ce150cf06cb3536c77e98f2b600fa5126fd2ed6e2946466559a53a4444ea4e1448b62f
+  data.tar.gz: 4417fe28fb3f291a7ac81bab44cbf398fc897acbf815397bd58aba7a72548c0320faba7aeab15778f7037c05b9fb84e2429cbd0a19ec6daba2d0c4f9f646318e

data/.rubocop.yml

@@ -9,7 +9,7 @@ Metrics/MethodLength:
   Max: 20
 
 Metrics/BlockLength:
-  Max: 60
+  Max: 80
 
 Metrics/AbcSize:
   Max: 20

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    nonnative (1.21.0)
+    nonnative (1.26.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
-      cucumber (~> 3.1, >= 3.1.2)
+      cucumber (>= 4, < 5)
       grpc (>= 1, < 2)
       puma (~> 4.3, >= 4.3.3)
       rest-client (~> 2.1)
@@ -14,47 +14,57 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    amatch (0.4.0)
-      mize
-      tins (~> 1.0)
+    activesupport (6.0.3.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     ast (2.4.1)
     backport (1.1.2)
-    backports (3.18.1)
     benchmark (0.1.0)
     benchmark-malloc (0.2.0)
     benchmark-perf (0.6.0)
     benchmark-trend (0.4.0)
     builder (3.2.4)
-    chutney (2.0.3.1)
-      amatch (~> 0.4.0)
-      gherkin (~> 5.1.0)
-      i18n (~> 1.8.2)
-      pastel (~> 0.7)
-      tty-pie (~> 0.3)
     concurrent-ruby (1.1.6)
-    cucumber (3.2.0)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.2.0)
-      cucumber-expressions (~> 6.0.1)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 5.1.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (3.2.1)
-      backports (>= 3.8.0)
-      cucumber-tag_expressions (~> 1.1.0)
-      gherkin (~> 5.0)
-    cucumber-expressions (6.0.1)
-    cucumber-tag_expressions (1.1.1)
-    cucumber-wire (0.0.1)
-    diff-lcs (1.4.4)
+    cucumber (4.1.0)
+      builder (~> 3.2, >= 3.2.3)
+      cucumber-core (~> 7.1, >= 7.1.0)
+      cucumber-create-meta (~> 1.0.0, >= 1.0.0)
+      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
+      cucumber-gherkin (~> 14.0, >= 14.0.1)
+      cucumber-html-formatter (~> 7.0, >= 7.0.0)
+      cucumber-messages (~> 12.2, >= 12.2.0)
+      cucumber-wire (~> 3.1, >= 3.1.0)
+      diff-lcs (~> 1.3, >= 1.3, < 1.4)
+      multi_test (~> 0.1, >= 0.1.2)
+      sys-uname (~> 1.0, >= 1.0.2)
+    cucumber-core (7.1.0)
+      cucumber-gherkin (~> 14.0, >= 14.0.1)
+      cucumber-messages (~> 12.2, >= 12.2.0)
+      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
+    cucumber-create-meta (1.0.0)
+      cucumber-messages (~> 12.2, >= 12.2.0)
+      sys-uname (~> 1.2, >= 1.2.1)
+    cucumber-cucumber-expressions (10.2.1)
+    cucumber-gherkin (14.0.1)
+      cucumber-messages (~> 12.2, >= 12.2.0)
+    cucumber-html-formatter (7.0.0)
+      cucumber-messages (~> 12.2, >= 12.2.0)
+    cucumber-messages (12.2.0)
+      protobuf-cucumber (~> 3.10, >= 3.10.8)
+    cucumber-tag-expressions (2.0.4)
+    cucumber-wire (3.1.0)
+      cucumber-core (~> 7.1, >= 7.1.0)
+      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
+      cucumber-messages (~> 12.2, >= 12.2.0)
+    diff-lcs (1.3)
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     e2mmap (0.1.0)
-    equatable (0.6.1)
-    gherkin (5.1.0)
+    ffi (1.13.1)
     google-protobuf (3.12.2)
     googleapis-common-protos-types (1.0.5)
       google-protobuf (~> 3.11)
@@ -70,13 +80,12 @@ GEM
     jaro_winkler (1.5.4)
     json (2.3.0)
     maruku (0.7.3)
+    middleware (0.1.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
-    mize (0.4.0)
-      protocol (~> 2.0)
-    multi_json (1.14.1)
+    minitest (5.14.1)
     multi_test (0.1.2)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
@@ -87,11 +96,11 @@ GEM
     parallel (1.19.2)
     parser (2.7.1.4)
       ast (~> 2.4.1)
-    pastel (0.7.4)
-      equatable (~> 0.6)
-      tty-color (~> 0.5)
-    protocol (2.0.0)
-      ruby_parser (~> 3.0)
+    protobuf-cucumber (3.10.8)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
     puma (4.3.5)
       nio4r (~> 2.0)
     rack (2.2.3)
@@ -139,9 +148,6 @@ GEM
       parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.2)
-    ruby_parser (3.14.2)
-      sexp_processor (~> 4.9)
-    sexp_processor (4.15.0)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -166,28 +172,25 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    sync (0.5.0)
+    sys-uname (1.2.1)
+      ffi (>= 1.0.0)
     thor (1.0.1)
+    thread_safe (0.3.6)
     tilt (2.0.10)
-    tins (1.25.0)
-      sync
-    tty-color (0.5.1)
-    tty-cursor (0.7.1)
-    tty-pie (0.3.0)
-      pastel (~> 0.7.3)
-      tty-cursor (~> 0.7)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
     yard (0.9.25)
+    zeitwerk (2.3.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 2.1, >= 2.1.4)
-  chutney (~> 2.0, >= 2.0.3.1)
   grpc-tools (>= 1, < 2)
   nonnative!
   rake (~> 13.0, >= 13.0.1)

data/Makefile

@@ -11,7 +11,6 @@ features: clean
 
 analysis:
 	bundle exec rubocop
-	bundle exec chutney
 
 cleanup-analysis:
 	bundle exec rubocop -a

data/README.md

@@ -57,7 +57,7 @@ Nonnative.configure do |config|
     d.command = 'features/support/bin/start 12_321'
     d.timeout = 0.5
     d.port = 12_321
-    d.file = 'features/logs/12_321.log'
+    d.log = 'features/logs/12_321.log'
     d.signal = 'INT' # Possible values are described in Signal.list.keys
   end
 
@@ -66,7 +66,7 @@ Nonnative.configure do |config|
     d.command = 'features/support/bin/start 12_322'
     d.timeout = 0.5
     d.port = 12_322
-    d.file = 'features/logs/12_322.log'
+    d.log = 'features/logs/12_322.log'
   end
 end
 ```
@@ -82,14 +82,14 @@ processes:
     command: features/support/bin/start 12_321
     timeout: 5
     port: 12321
-    file: features/logs/12_321.log
+    log: features/logs/12_321.log
     signal: INT # Possible values are described in Signal.list.keys
   -
     name: start_2
     command: features/support/bin/start 12_322
     timeout: 5
     port: 12322
-    file: features/logs/12_322.log
+    log: features/logs/12_322.log
 ```
 
 Then load the file with
@@ -133,18 +133,20 @@ require 'nonnative'
 Nonnative.configure do |config|
   config.strategy = :manual
 
-  config.server do |d|
-    d.name = 'server_1'
-    d.klass = Nonnative::EchoServer
-    d.timeout = 1
-    d.port = 12_323
+  config.server do |s|
+    s.name = 'server_1'
+    s.klass = Nonnative::EchoServer
+    s.timeout = 1
+    s.port = 12_323
+    s.log = 'features/logs/server_1.log'
   end
 
-  config.server do |d|
-    d.name = 'server_2'
-    d.klass = Nonnative::EchoServer
-    d.timeout = 1
-    d.port = 12_324
+  config.server do |s|
+    s.name = 'server_2'
+    s.klass = Nonnative::EchoServer
+    s.timeout = 1
+    s.port = 12_324
+    s.log = 'features/logs/server_2.log'
   end
 end
 ```
@@ -160,11 +162,13 @@ servers:
     klass: Nonnative::EchoServer
     timeout: 1
     port: 12323
+    log: features/logs/server_1.log
   -
     name: server_2
     klass: Nonnative::EchoServer
     timeout: 1
     port: 12324
+    log: features/logs/server_2.log
 ```
 
 Then load the file with:
@@ -182,7 +186,11 @@ Define your server:
 ```ruby
 module Nonnative
   module Features
-    class Application < Sinatra::Base
+    class Application < Sinatra::Application
+      configure do
+        set :server_settings, log_requests: true
+      end
+
       get '/hello' do
         'Hello World!'
       end
@@ -205,11 +213,12 @@ require 'nonnative'
 Nonnative.configure do |config|
   config.strategy = :manual
 
-  config.server do |d|
-    d.name = 'http_server_1'
-    d.klass = Nonnative::Features::HTTPServer
-    d.timeout = 1
-    d.port = 4567
+  config.server do |s|
+    s.name = 'http_server_1'
+    s.klass = Nonnative::Features::HTTPServer
+    s.timeout = 1
+    s.port = 4567
+    s.log = 'features/logs/http_server_1.log'
   end
 end
 ```
@@ -225,6 +234,7 @@ servers:
     klass: Nonnative::Features::HTTPServer
     timeout: 1
     port: 4567
+    log: features/logs/http_server_1.log
 ```
 
 Then load the file with:
@@ -265,11 +275,12 @@ require 'nonnative'
 Nonnative.configure do |config|
   config.strategy = :manual
 
-  config.server do |d|
-    d.name = 'grpc_server_1'
-    d.klass = Nonnative::Features::GRPCServer
-    d.timeout = 1
-    d.port = 9002
+  config.server do |s|
+    s.name = 'grpc_server_1'
+    s.klass = Nonnative::Features::GRPCServer
+    s.timeout = 1
+    s.port = 9002
+    s.log = 'features/logs/grpc_server_1.log'
   end
 end
 ```
@@ -285,6 +296,7 @@ servers:
     klass: Nonnative::Features::GRPCServer
     timeout: 1
     port: 9002
+    log: features/logs/grpc_server_1.log
 ```
 
 Then load the file with:
@@ -297,8 +309,8 @@ Nonnative.load_configuration('configuration.yml')
 #### Proxies
 
 We allow different proxies to be configured. These proxies can be used to simulate all kind of situations. The proxies that can be configured are:
-- none (this is the default)
-- chaos
+- `none` (this is the default)
+- `fault_injection`
 
 Setup it up programmatically:
 
@@ -310,8 +322,12 @@ Nonnative.configure do |config|
 
   config.server do |d|
     d.proxy = {
-      type: 'chaos',
-      port: 20_000
+      type: 'fault_injection',
+      port: 20_000,
+      log: 'features/logs/proxy_server.log',
+      options: {
+        delay: 5
+      }
     }
   end
 end
@@ -325,6 +341,26 @@ strategy: manual
 servers:
   -
     proxy:
-      type: chaos
+      type: fault_injection
       port: 20000
+      log: features/logs/proxy_server.log
+      options:
+        delay: 5
+```
+
+##### Fault Injection
+
+The `fault_injection` proxy allows you to simulate failures by injecting them. We currently support the following:
+- `close_all` - Closes the socket as soon as it connects.
+- `delay` - This delays the communication between the connection. Default is 2 secs can be configured through options.
+- `invalid_data` - This takes the input and rearranges it to produce invalid data.
+
+Setup it up programmatically:
+
+```ruby
+name = 'name of server in configuration'
+server = Nonnative.pool.server_by_name(name)
+
+server.proxy.close_all # To use close_all.
+server.proxy.reset # To reset it back to a good state.
 ```

data/lib/nonnative.rb

@@ -34,7 +34,12 @@ require 'nonnative/observability'
 require 'nonnative/proxy_factory'
 require 'nonnative/proxy'
 require 'nonnative/no_proxy'
-require 'nonnative/chaos_proxy'
+require 'nonnative/fault_injection_proxy'
+require 'nonnative/socket_pair'
+require 'nonnative/close_all_socket_pair'
+require 'nonnative/delay_socket_pair'
+require 'nonnative/invalid_data_socket_pair'
+require 'nonnative/socket_pair_factory'
 
 module Nonnative
   class << self

data/lib/nonnative/close_all_socket_pair.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class CloseAllSocketPair < SocketPair
+    def connect(local_socket)
+      local_socket.close
+    end
+  end
+end

data/lib/nonnative/command.rb

@@ -38,7 +38,7 @@ module Nonnative
     end
 
     def command_spawn
-      spawn(service.command, %i[out err] => [service.file, 'a'])
+      spawn(service.command, %i[out err] => [service.log, 'a'])
     end
 
     def command_exists?

data/lib/nonnative/configuration.rb

@@ -24,7 +24,7 @@ module Nonnative
             d.command = fd['command']
             d.timeout = fd['timeout']
             d.port = fd['port']
-            d.file = fd['file']
+            d.log = fd['log']
             d.signal = fd['signal']
           end
         end
@@ -38,13 +38,16 @@ module Nonnative
             s.klass = Object.const_get(fd['klass'])
             s.timeout = fd['timeout']
             s.port = fd['port']
+            s.log = fd['log']
 
             proxy = fd['proxy']
 
             if proxy
               s.proxy = {
                 type: proxy['type'],
-                port: proxy['port']
+                port: proxy['port'],
+                log: proxy['log'],
+                options: proxy['options']
               }
             end
           end

data/lib/nonnative/configuration_process.rb

@@ -2,6 +2,6 @@
 
 module Nonnative
   class ConfigurationProcess
-    attr_accessor :name, :command, :timeout, :port, :file, :signal
+    attr_accessor :name, :command, :timeout, :port, :log, :signal
   end
 end

data/lib/nonnative/configuration_proxy.rb

@@ -2,11 +2,12 @@
 
 module Nonnative
   class ConfigurationProxy
-    attr_accessor :type, :port
+    attr_accessor :type, :port, :log, :options
 
     def initialize
       self.type = 'none'
       self.port = 0
+      self.options = {}
     end
   end
 end

data/lib/nonnative/configuration_server.rb

@@ -2,8 +2,7 @@
 
 module Nonnative
   class ConfigurationServer
-    attr_accessor :name, :klass, :timeout, :port
-
+    attr_accessor :name, :klass, :timeout, :port, :log
     attr_reader :proxy
 
     def initialize
@@ -13,6 +12,8 @@ module Nonnative
     def proxy=(value)
       proxy.type = value[:type]
       proxy.port = value[:port]
+      proxy.log = value[:log]
+      proxy.options = value[:options]
     end
   end
 end

data/lib/nonnative/delay_socket_pair.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class DelaySocketPair < SocketPair
+    def read(socket)
+      duration = proxy.options.dig(:delay) || 2
+      sleep duration
+
+      super socket
+    end
+  end
+end

data/lib/nonnative/fault_injection_proxy.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class FaultInjectionProxy < Nonnative::Proxy
+    def initialize(service)
+      @connections = Concurrent::Hash.new
+      @logger = Logger.new(service.proxy.log)
+      @mutex = Mutex.new
+      @state = :none
+
+      super service
+    end
+
+    def start
+      @tcp_server = ::TCPServer.new('0.0.0.0', service.port)
+      @thread = Thread.new { perform_start }
+    end
+
+    def stop
+      thread.terminate
+      tcp_server.close
+    end
+
+    def close_all
+      apply_state :close_all
+    end
+
+    def delay
+      apply_state :delay
+    end
+
+    def invalid_data
+      apply_state :invalid_data
+    end
+
+    def reset
+      apply_state :none
+    end
+
+    def port
+      service.proxy.port
+    end
+
+    private
+
+    attr_reader :tcp_server, :thread, :connections, :mutex, :state, :logger
+
+    def perform_start
+      loop do
+        thread = Thread.start(tcp_server.accept) do |local_socket|
+          id = Thread.current.object_id
+
+          logger.info "started connection for #{id} with socket #{local_socket.inspect}"
+
+          connect local_socket
+          connections.delete(id)
+
+          logger.info "finished connection for #{id} with socket #{local_socket.inspect}"
+        end
+
+        thread.report_on_exception = false
+        connections[thread.object_id] = thread
+      end
+    end
+
+    def connect(local_socket)
+      SocketPairFactory.create(read_state, service.proxy, logger).connect(local_socket)
+    end
+
+    def apply_state(state)
+      mutex.synchronize { @state = state }
+    end
+
+    def read_state
+      mutex.synchronize { state }
+    end
+  end
+end

data/lib/nonnative/grpc_server.rb

@@ -6,6 +6,11 @@ module Nonnative
       @server = GRPC::RpcServer.new
       server.handle(svc)
 
+      # Unfortunately gRPC has only one logger so the first server wins.
+      GRPC.define_singleton_method(:logger) do
+        @logger ||= Logger.new(service.log)
+      end
+
       super service
     end
 

data/lib/nonnative/http_client.rb

@@ -8,31 +8,33 @@ module Nonnative
 
     protected
 
-    def get(pathname, headers = {})
+    def get(pathname, headers = {}, timeout = 60)
       with_exception do
         uri = URI.join(host, pathname)
-        RestClient.get(uri.to_s, headers)
+        RestClient::Request.execute(method: :get, url: uri.to_s, headers: headers, timeout: timeout)
       end
     end
 
-    def post(pathname, payload, headers = {})
+    def post(pathname, payload, headers = {}, timeout = 60)
       with_exception do
         uri = URI.join(host, pathname)
-        RestClient.post(uri.to_s, payload.to_json, headers)
+        RestClient::Request.execute(method: :post, url: uri.to_s, payload: payload.to_json, headers: headers,
+                                    timeout: timeout)
       end
     end
 
-    def delete(pathname, headers = {})
+    def delete(pathname, headers = {}, timeout = 60)
       with_exception do
         uri = URI.join(host, pathname)
-        RestClient.delete(uri.to_s, headers)
+        RestClient::Request.execute(method: :delete, url: uri.to_s, headers: headers, timeout: timeout)
       end
     end
 
-    def put(pathname, payload, headers = {})
+    def put(pathname, payload, headers = {}, timeout = 60)
       with_exception do
         uri = URI.join(host, pathname)
-        RestClient.put(uri.to_s, payload.to_json, headers)
+        RestClient::Request.execute(method: :put, url: uri.to_s, payload: payload.to_json, headers: headers,
+                                    timeout: timeout)
       end
     end
 
@@ -42,6 +44,8 @@ module Nonnative
 
     def with_exception
       yield
+    rescue RestClient::Exceptions::ReadTimeout => e
+      raise e
     rescue RestClient::ExceptionWithResponse => e
       e.response
     end

data/lib/nonnative/http_server.rb

@@ -3,7 +3,9 @@
 module Nonnative
   class HTTPServer < Nonnative::Server
     def initialize(service)
-      @server = Puma::Server.new(app, Puma::Events.strings)
+      log = File.open(service.log, 'a')
+      events = Puma::Events.new(log, log)
+      @server = Puma::Server.new(app, events)
 
       super service
     end

data/lib/nonnative/invalid_data_socket_pair.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class InvalidDataSocketPair < SocketPair
+    def write(socket, data)
+      data = data.chars.shuffle.join
+
+      super socket, data
+    end
+  end
+end

data/lib/nonnative/proxy.rb

@@ -4,11 +4,10 @@ module Nonnative
   class Proxy
     def initialize(service)
       @service = service
-      @timeout = Nonnative::Timeout.new(service.timeout)
     end
 
     protected
 
-    attr_reader :service, :timeout
+    attr_reader :service
   end
 end

data/lib/nonnative/proxy_factory.rb

@@ -4,13 +4,14 @@ module Nonnative
   class ProxyFactory
     class << self
       def create(service)
-        case service.proxy.type
-        when 'chaos'
-          ChaosProxy.new(service)
-        else
-          # By default we want no proxy.
-          NoProxy.new(service)
-        end
+        proxy = case service.proxy.type
+                when 'fault_injection'
+                  FaultInjectionProxy
+                else
+                  NoProxy
+                end
+
+        proxy.new(service)
       end
     end
   end

data/lib/nonnative/socket_pair.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class SocketPair
+    def initialize(proxy, logger)
+      @proxy = proxy
+      @logger = logger
+    end
+
+    def connect(local_socket)
+      remote_socket = create_remote_socket
+
+      loop do
+        ready = select([local_socket, remote_socket], nil, nil)
+
+        break if pipe(ready, local_socket, remote_socket)
+        break if pipe(ready, remote_socket, local_socket)
+      end
+    rescue StandardError => e
+      logger.error e
+    ensure
+      local_socket.close
+      remote_socket&.close
+    end
+
+    protected
+
+    attr_reader :proxy, :logger
+
+    def create_remote_socket
+      ::TCPSocket.new('0.0.0.0', proxy.port)
+    end
+
+    def pipe(ready, socket1, socket2)
+      if ready[0].include?(socket1)
+        data = read(socket1)
+        return true if data.empty?
+
+        write socket2, data
+      end
+
+      false
+    end
+
+    def read(socket)
+      socket.recv(1024)
+    end
+
+    def write(socket, data)
+      socket.write(data)
+    end
+  end
+end

data/lib/nonnative/socket_pair_factory.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class SocketPairFactory
+    class << self
+      def create(type, proxy, logger)
+        pair = case type
+               when :close_all
+                 CloseAllSocketPair
+               when :delay
+                 DelaySocketPair
+               when :invalid_data
+                 InvalidDataSocketPair
+               else
+                 SocketPair
+               end
+
+        pair.new(proxy, logger)
+      end
+    end
+  end
+end

data/lib/nonnative/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nonnative
-  VERSION = '1.21.0'
+  VERSION = '1.26.0'
 end

data/nonnative.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'concurrent-ruby', '~> 1.0', '>= 1.0.5'
-  spec.add_dependency 'cucumber', '~> 3.1', '>= 3.1.2'
+  spec.add_dependency 'cucumber', ['>= 4', '< 5']
   spec.add_dependency 'grpc', ['>= 1', '< 2']
   spec.add_dependency 'puma', '~> 4.3', '>= 4.3.3'
   spec.add_dependency 'rest-client', '~> 2.1'
@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sinatra', '~> 2.0', '>= 2.0.8.1'
 
   spec.add_development_dependency 'bundler', '~> 2.1', '>= 2.1.4'
-  spec.add_development_dependency 'chutney', '~> 2.0', '>= 2.0.3.1'
   spec.add_development_dependency 'grpc-tools', ['>= 1', '< 2']
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.1'
   spec.add_development_dependency 'rubocop', '~> 0.87.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.26.0
 platform: ruby
 authors:
 - Alex Falkowski
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -34,22 +34,22 @@ dependencies:
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
@@ -178,26 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.4
-- !ruby/object:Gem::Dependency
-  name: chutney
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.3.1
 - !ruby/object:Gem::Dependency
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement
@@ -303,16 +283,19 @@ files:
 - bin/setup
 - lib/nonnative.rb
 - lib/nonnative/before.rb
-- lib/nonnative/chaos_proxy.rb
+- lib/nonnative/close_all_socket_pair.rb
 - lib/nonnative/command.rb
 - lib/nonnative/configuration.rb
 - lib/nonnative/configuration_process.rb
 - lib/nonnative/configuration_proxy.rb
 - lib/nonnative/configuration_server.rb
+- lib/nonnative/delay_socket_pair.rb
 - lib/nonnative/error.rb
+- lib/nonnative/fault_injection_proxy.rb
 - lib/nonnative/grpc_server.rb
 - lib/nonnative/http_client.rb
 - lib/nonnative/http_server.rb
+- lib/nonnative/invalid_data_socket_pair.rb
 - lib/nonnative/manual.rb
 - lib/nonnative/no_proxy.rb
 - lib/nonnative/observability.rb
@@ -322,6 +305,8 @@ files:
 - lib/nonnative/proxy_factory.rb
 - lib/nonnative/server.rb
 - lib/nonnative/service.rb
+- lib/nonnative/socket_pair.rb
+- lib/nonnative/socket_pair_factory.rb
 - lib/nonnative/start_error.rb
 - lib/nonnative/startup.rb
 - lib/nonnative/stop_error.rb
@@ -333,7 +318,7 @@ homepage: https://github.com/alexfalkowski/nonnative
 licenses:
 - Unlicense
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -348,8 +333,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.0.8
+signing_key: 
 specification_version: 4
 summary: Allows you to keep using the power of ruby to test other systems
 test_files: []

data/lib/nonnative/chaos_proxy.rb

@@ -1,94 +0,0 @@
-# frozen_string_literal: true
-
-module Nonnative
-  class ChaosProxy < Nonnative::Proxy
-    def initialize(service)
-      @connections = Concurrent::Hash.new
-      @mutex = Mutex.new
-      @state = :none
-
-      super service
-    end
-
-    def start
-      @tcp_server = ::TCPServer.new('0.0.0.0', service.port)
-      @thread = Thread.new { perform_start }
-    end
-
-    def stop
-      thread.terminate
-      tcp_server.close
-    end
-
-    def close_all
-      apply_state :close_all
-    end
-
-    def reset
-      apply_state :none
-    end
-
-    def port
-      service.proxy.port
-    end
-
-    private
-
-    attr_reader :tcp_server, :thread, :connections, :mutex, :state
-
-    def perform_start
-      loop do
-        thread = Thread.start(tcp_server.accept) { |local_socket| connect(local_socket) }
-        connections[thread.object_id] = thread
-      end
-    end
-
-    def connect(local_socket)
-      return local_socket.close if state?(:close_all)
-
-      remote_socket = create_remote_socket
-      return unless remote_socket
-
-      loop do
-        ready = select([local_socket, remote_socket], nil, nil)
-
-        break if write(ready, local_socket, remote_socket)
-        break if write(ready, remote_socket, local_socket)
-      end
-    rescue Errno::ECONNRESET
-      # Just ignore it.
-    ensure
-      local_socket.close
-      remote_socket&.close
-      connections.delete(Thread.current.object_id)
-    end
-
-    def create_remote_socket
-      timeout.perform do
-        ::TCPSocket.new('0.0.0.0', port)
-      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-        sleep 0.01
-        retry
-      end
-    end
-
-    def write(ready, socket1, socket2)
-      if ready[0].include?(socket1)
-        data = socket1.recv(1024)
-        return true if data.empty?
-
-        socket2.write(data)
-      end
-
-      false
-    end
-
-    def apply_state(state)
-      mutex.synchronize { @state = state }
-    end
-
-    def state?(state)
-      mutex.synchronize { @state == state }
-    end
-  end
-end