toxiproxy 1.0.3 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dd7714ade2b3e653fabba43c36dc025fd36a6377
-  data.tar.gz: bc0fa5de828b70a14da8797ce672245bfd91c760
+SHA256:
+  metadata.gz: 98c1cbde340b90f1da3d81bf0119ec97a161ffa3815eb06982dd88d807fcce18
+  data.tar.gz: 3a8e7e33d8add55ba5ab6fd77d1914faae65cefd4df3789c8dd3e2d5cf529b62
 SHA512:
-  metadata.gz: 0247200fb5ee43f9d46d3a73af053ba4b5bddd5ce238eec0d8cc6e32415363f14c6053abafc52b42d46bddc51ff0f6c74d0a0b4a86261e43c58ffc44d8f62ffe
-  data.tar.gz: c08a860ae38e8e375478df95d891b351614bf766dca25d582a076f8a55b871a1b2630d5cbe2678555f2a9b17d532ec8dcdb4cf22fafff57dd30b3d12a07eb67e
+  metadata.gz: 72d9c8ace67f5371eba624490da0933d9b6e6eeb5162f2963a8fb9ad581e45a8efc4ce243a28a042343abeede16897e37ba0e25674c10cd92a94d52facddf931
+  data.tar.gz: 717ac41a5767aecd2a77df7e355180f30622e0628dbed7c7662a931ef0a3a0280119e1f098f8b1ceb4f30995ea702136588b02b5b4ab82408b2bee0abf0bdbe0

data/README.md

@@ -1,6 +1,9 @@
 # toxiproxy-ruby
 
-`toxiproxy-ruby` `1.x` (latest) is compatible with the Toxiproxy `2.x` series.
+[![Gem Version](https://badge.fury.io/rb/toxiproxy.svg)](https://badge.fury.io/rb/toxiproxy)
+[![Test](https://github.com/Shopify/toxiproxy-ruby/actions/workflows/test.yml/badge.svg)](https://github.com/Shopify/toxiproxy-ruby/actions/workflows/test.yml)
+
+`toxiproxy-ruby` `>= 1.x` is compatible with the Toxiproxy `2.x` series.
 `toxiproxy-ruby` `0.x` is compatible with the Toxiproxy `1.x` series.
 
 [Toxiproxy](https://github.com/shopify/toxiproxy) is a proxy to simulate network
@@ -9,8 +12,8 @@ ensure your application behaves appropriately under harsh conditions. Before you
 can use the Ruby library, you need to read the [Usage section of the Toxiproxy
 README](https://github.com/shopify/toxiproxy#usage).
 
-```
-gem install toxiproxy
+```shell
+$ gem install toxiproxy
 ```
 
 Make sure the Toxiproxy server is already running.

data/lib/toxiproxy/version.rb

@@ -1,3 +1,3 @@
 class Toxiproxy
-  VERSION = "1.0.3"
+  VERSION = "2.0.2"
 end

data/lib/toxiproxy.rb

@@ -68,6 +68,8 @@ class Toxiproxy
   # Sets the toxiproxy host to use.
   def self.host=(host)
     @uri = host.is_a?(::URI) ? host : ::URI.parse(host)
+    reset_http_client!
+    @uri
   end
 
   # Convenience method to create a proxy.
@@ -98,14 +100,23 @@ class Toxiproxy
   def self.populate(*proxies)
     proxies = proxies.first if proxies.first.is_a?(Array)
 
-    proxies.map { |proxy|
-      existing = find_by_name(proxy[:name])
-      if existing && (existing.upstream != proxy[:upstream] || existing.listen != proxy[:listen])
-        existing.destroy
-        existing = false
-      end
-      self.create(proxy) unless existing
-    }.compact
+    request = Net::HTTP::Post.new("/populate")
+    request.body = proxies.to_json
+    request["Content-Type"] = "application/json"
+
+    response = http_request(request)
+    assert_response(response)
+
+    proxies = JSON.parse(response.body).fetch('proxies', []).map do |attrs|
+      self.new({
+        upstream: attrs["upstream"],
+        listen: attrs["listen"],
+        name: attrs["name"],
+        enabled: attrs["enabled"]
+      })
+    end
+
+    ProxyCollection.new(proxies)
   end
 
   def self.running?
@@ -214,6 +225,12 @@ class Toxiproxy
     }
   end
 
+  @http = nil
+  def self.reset_http_client!
+    @http.finish if @http&.started?
+    @http = nil
+  end
+
   private
 
   def self.http_request(request)

data/test/toxiproxy_test.rb

@@ -358,26 +358,31 @@ class ToxiproxyTest < MiniTest::Unit::TestCase
   end
 
   def test_populate_creates_proxies_update_upstream
-    proxies = [{
-        name: "test_toxiproxy_populate1",
+    proxy_name = "test_toxiproxy_populate1"
+    proxies_config = [{
+        name: proxy_name,
         upstream: "localhost:3306",
         listen: "localhost:22222",
       },
     ]
 
-    proxies = Toxiproxy.populate(proxies)
+    proxies = Toxiproxy.populate(proxies_config)
 
-    proxies = [{
-        name: "test_toxiproxy_populate1",
+    proxies_config = [{
+        name: proxy_name,
         upstream: "localhost:3307",
         listen: "localhost:22222",
       },
     ]
 
-    proxies2 = Toxiproxy.populate(proxies)
+    proxies2 = Toxiproxy.populate(proxies_config)
+
+    refute_equal proxies.find(name: proxy_name).first.upstream,
+      proxies2.find(name: proxy_name).first.upstream
 
-    assert_equal proxies.first[:upstream], proxies2.first.upstream
-    assert_proxy_available(proxies2.first)
+    proxies2.each do |proxy|
+      assert_proxy_available(proxy)
+    end
   end
 
   def test_running_helper
@@ -448,6 +453,15 @@ class ToxiproxyTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_invalidate_cache_http_on_host
+    old_value = Toxiproxy.uri
+    assert_equal 8474, Toxiproxy.http.port
+    Toxiproxy.host = "http://127.0.0.1:8475"
+    assert_equal 8475, Toxiproxy.http.port
+  ensure
+    Toxiproxy.host = old_value
+  end
+
   private
 
   def with_webmock_enabled

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toxiproxy
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.2
 platform: ruby
 authors:
 - Simon Eskildsen
@@ -9,90 +9,32 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2022-09-02 00:00:00.000000000 Z
+dependencies: []
 description: A Ruby library for controlling Toxiproxy. Can be used in resiliency testing.
-email: simon.eskildsen@shopify.com
+email: opensource@shopify.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- bin/start-toxiproxy.sh
-- circle.yml
 - lib/toxiproxy.rb
 - lib/toxiproxy/proxy_collection.rb
 - lib/toxiproxy/toxic.rb
 - lib/toxiproxy/toxic_collection.rb
 - lib/toxiproxy/version.rb
-- shipit.rubygems.yml
 - test/test_helper.rb
 - test/toxiproxy_test.rb
-- toxiproxy.gemspec
 homepage: https://github.com/Shopify/toxiproxy
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/Shopify/toxiproxy
+  source_code_uri: https://github.com/Shopify/toxiproxy-ruby
+  changelog_uri: https://github.com/Shopify/toxiproxy-ruby/blob/master/CHANGELOG.md
+  documentation_uri: https://github.com/Shopify/toxiproxy-ruby
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -108,9 +50,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Ruby library for Toxiproxy
-test_files: []
+test_files:
+- test/test_helper.rb
+- test/toxiproxy_test.rb

data/.gitignore

@@ -1,4 +0,0 @@
-vendor/
-.bundle
-Gemfile.lock
-*.gem

data/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-gemspec
-

data/Rakefile

@@ -1,12 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/*_test.rb'
-  t.verbose = true
-end

data/bin/start-toxiproxy.sh

@@ -1,17 +0,0 @@
-#!/bin/bash -e
-
-VERSION='v2.1.0'
-TOXIPROXY_LOG_DIR=${CIRCLE_ARTIFACTS:-'/tmp'}
-
-if [[ "$OSTYPE" == "linux"* ]]; then
-    DOWNLOAD_TYPE="linux-amd64"
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-    DOWNLOAD_TYPE="darwin-amd64"
-fi
-
-echo "[dowload toxiproxy for $DOWNLOAD_TYPE]"
-curl --silent -L https://github.com/Shopify/toxiproxy/releases/download/$VERSION/toxiproxy-server-$DOWNLOAD_TYPE -o ./bin/toxiproxy-server
-
-echo "[start toxiproxy]"
-chmod +x ./bin/toxiproxy-server
-nohup bash -c "./bin/toxiproxy-server > ${TOXIPROXY_LOG_DIR}/toxiproxy.log 2>&1 &"

data/circle.yml

@@ -1,11 +0,0 @@
-dependencies:
-  override:
-    - bundle install
-    - ./bin/start-toxiproxy.sh
-test:
-  override:
-    - bundle exec rake test
-
-machine:
-  ruby:
-    version: 2.4.0

data/shipit.rubygems.yml

@@ -1,2 +0,0 @@
-fetch:
-  - fetch-gem-version toxiproxy Shopify/toxiproxy-ruby

data/toxiproxy.gemspec

@@ -1,21 +0,0 @@
-require File.expand_path("../lib/toxiproxy/version", __FILE__)
-
-Gem::Specification.new do |spec|
-  spec.name = "toxiproxy"
-  spec.version = Toxiproxy::VERSION
-  spec.authors = ["Simon Eskildsen", "Jacob Wirth"]
-  spec.email = "simon.eskildsen@shopify.com"
-  spec.summary = "Ruby library for Toxiproxy"
-  spec.description = "A Ruby library for controlling Toxiproxy. Can be used in resiliency testing."
-  spec.homepage = "https://github.com/Shopify/toxiproxy"
-  spec.license = "MIT"
-
-  spec.files = `git ls-files`.split("\n")
-  spec.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "webmock"
-end