toxiproxy 1.0.2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2c94b91428b8f1e4b982ae184a2e022748eb7902
-  data.tar.gz: abe80ecccc2bb359a74f2614403316741a208c72
+SHA256:
+  metadata.gz: d135ce7e35507ad08017ae28db7f7543f9c0d0a29cd32042c9c61d072bee5eee
+  data.tar.gz: 8db56acdadcac8ac84b5b1be31a235cd7715422ff4cee1a36e3832eb983355f8
 SHA512:
-  metadata.gz: 84344059667bddf413e3521cb7cdd35ee99fdda1e9d80f50311ce5916dc5dfcf8117420fe7b89451df799905d731f8d7b67193bc8c83106871a274e830a5316b
-  data.tar.gz: bb9a1bec25d40ae9062823a72fd92b4a4e21ec9ffd869e9bbc0a6d3439324addaeeae0b29d59caeed7c9dde0cf8f7e0fd87bf6736c31f178edca510a2285885a
+  metadata.gz: adee5993b439b3227b67ec4ca28fecdb8c7194d9b640e369df77f60a754d42bf20d758eaa8ca2a11a553451d7bd63654d14b0a03781fcc07751a5f5e947d524b
+  data.tar.gz: 1d69a13027507acc7791ac0904e70b1a02bd6f5bd4bad55e2724b6cc6e0d9f19e0e949c05d49f5ef7313e80193cfe898c3b2950c5124c41277412254b5895144

data/README.md

@@ -1,6 +1,6 @@
 # toxiproxy-ruby
 
-`toxiproxy-ruby` `1.x` (latest) is compatible with the Toxiproxy `2.x` series.
+`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

data/lib/toxiproxy/toxic.rb

@@ -1,6 +1,6 @@
 class Toxiproxy
   class Toxic
-    attr_reader :name, :type, :attributes, :stream, :proxy
+    attr_reader :name, :type, :stream, :proxy
     attr_accessor :attributes, :toxicity
 
     def initialize(attrs)
@@ -15,6 +15,7 @@ class Toxiproxy
 
     def save
       request = Net::HTTP::Post.new("/proxies/#{proxy.name}/toxics")
+      request["Content-Type"] = "application/json"
 
       request.body = as_json
 

data/lib/toxiproxy/version.rb

@@ -1,3 +1,3 @@
 class Toxiproxy
-  VERSION = "1.0.2"
+  VERSION = "2.0.1"
 end

data/lib/toxiproxy.rb

@@ -31,6 +31,8 @@ class Toxiproxy
   # Re-enables all proxies and disables all toxics.
   def self.reset
     request = Net::HTTP::Post.new("/reset")
+    request["Content-Type"] = "application/json"
+
     response = http_request(request)
     assert_response(response)
     self
@@ -66,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.
@@ -96,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?
@@ -144,6 +157,7 @@ class Toxiproxy
   # Disables a Toxiproxy. This will drop all active connections and stop the proxy from listening.
   def disable
     request = Net::HTTP::Post.new("/proxies/#{name}")
+    request["Content-Type"] = "application/json"
 
     hash = {enabled: false}
     request.body = hash.to_json
@@ -156,6 +170,7 @@ class Toxiproxy
   # Enables a Toxiproxy. This will cause the proxy to start listening again.
   def enable
     request = Net::HTTP::Post.new("/proxies/#{name}")
+    request["Content-Type"] = "application/json"
 
     hash = {enabled: true}
     request.body = hash.to_json
@@ -170,6 +185,7 @@ class Toxiproxy
   # of this connection.
   def create
     request = Net::HTTP::Post.new("/proxies")
+    request["Content-Type"] = "application/json"
 
     hash = {upstream: upstream, name: name, listen: listen, enabled: enabled}
     request.body = hash.to_json
@@ -209,6 +225,15 @@ class Toxiproxy
     }
   end
 
+  def self.reset_http_client!
+    if defined? @http
+      @http.finish() if @http && @http.started?
+      @http = nil
+    end
+
+    @http
+  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.2
+  version: 2.0.1
 platform: ruby
 authors:
 - Simon Eskildsen
@@ -9,90 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 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-03-15 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
+  documentation_uri: https://github.com/Shopify/toxiproxy-ruby
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -108,9 +48,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.2.20
 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.0.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