toxiproxy 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5162d845ab2d8f5b1e1b9af5bf6254957bf9730
-  data.tar.gz: 0390171e4205337d2c37987980abeffd3c748735
+  metadata.gz: 07ea894e2ec459737f6d98f2673e3049e683c4a6
+  data.tar.gz: 5310b2f902eef3c7b468fb1d88df000b287bc943
 SHA512:
-  metadata.gz: 6328fbcc0977e717ea1dfc596c9388865d86ad3913ca9f1671cd568418c3acf9c5f297bb45fe7b306065a5f232c4a2bc1bb8cb4aefc64c022e68bf6daedc027f
-  data.tar.gz: 28e150d00c44ff1cc25cece0c148d52d9e54538750045ed53b944baac01ac44b3a33d0737383d3c297b8d28769ef9f2f58e40862ba28f0e49ec7e89dba864c3c
+  metadata.gz: 27251df5e59a5144ed162a220f401b431e5e68ece5376f3b67e1ae4aa0594609d6b8dcb0b8d1724a7a4f736cc73564d37cc9bd0880e05ba638da2b47e308c01f
+  data.tar.gz: cd8ad0b67da109706aba5ca9c6a4e70313217379f0db35e5899edd45a3c4cd286d6385f03812efe3f2371b2abdc4a7987601e0e381d235228743838447c1df74

data/README.md

@@ -82,7 +82,7 @@ Toxiproxy.populate([{
 })
 ```
 
-This will create the proxies passed, if they don't already exist, in Toxiproxy.
+This will create the proxies passed, or replace the proxies if they already exist in Toxiproxy.
 It's recommended to do this early as early in boot as possible, see the
 [Toxiproxy README](https://github.com/shopify/toxiproxy#Usage). If you have many
 proxies, we recommend storing the Toxiproxy configs in a configuration file.

data/bin/start-toxiproxy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-VERSION='0eef7f44653b07ee0e0f8de1cc64b09a'
+VERSION='21a264cc75549c3ae837b606eb6e17ea'
 
 echo "[start toxiproxy]"
 curl --silent http://shopify-vagrant.s3.amazonaws.com/toxiproxy/toxiproxy-$VERSION -o ./bin/toxiproxy

data/lib/toxiproxy.rb

@@ -89,7 +89,12 @@ class Toxiproxy
     proxies = proxies.first if proxies.first.is_a?(Array)
 
     proxies.map { |proxy|
-      self.create(proxy) unless find_by_name(proxy[:name])
+      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
   end
 

data/lib/toxiproxy/version.rb

@@ -1,3 +1,3 @@
 class Toxiproxy
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/toxiproxy_test.rb

@@ -303,6 +303,53 @@ class ToxiproxyTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_populate_creates_proxies_update_listen
+    proxies = [{
+        name: "test_toxiproxy_populate1",
+        upstream: "localhost:3306",
+        listen: "localhost:22222",
+      },
+    ]
+
+    proxies = Toxiproxy.populate(proxies)
+
+    proxies = [{
+        name: "test_toxiproxy_populate1",
+        upstream: "localhost:3306",
+        listen: "localhost:22223",
+      },
+    ]
+
+    proxies = Toxiproxy.populate(proxies)
+
+    proxies.each do |proxy|
+      assert_proxy_available(proxy)
+    end
+  end
+
+  def test_populate_creates_proxies_update_upstream
+    proxies = [{
+        name: "test_toxiproxy_populate1",
+        upstream: "localhost:3306",
+        listen: "localhost:22222",
+      },
+    ]
+
+    proxies = Toxiproxy.populate(proxies)
+
+    proxies = [{
+        name: "test_toxiproxy_populate1",
+        upstream: "localhost:3307",
+        listen: "localhost:22222",
+      },
+    ]
+
+    proxies2 = Toxiproxy.populate(proxies)
+
+    assert_equal proxies.first[:upstream], proxies2.first.upstream
+    assert_proxy_available(proxies2.first)
+  end
+
   private
 
   def assert_proxy_available(proxy)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toxiproxy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Simon Eskildsen
@@ -31,7 +31,7 @@ cert_chain:
   fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
   TConQSX2BnZdhIEYW+cKzEC/bLc=
   -----END CERTIFICATE-----
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler