synapse 0.13.8 → 0.14.0

data/spec/lib/synapse/service_watcher_ec2tags_spec.rb

@@ -30,7 +30,15 @@ class FakeAWSInstance
 end
 
 describe Synapse::ServiceWatcher::Ec2tagWatcher do
-  let(:mock_synapse) { double }
+  let(:mock_synapse) do
+    mock_synapse = instance_double(Synapse::Synapse)
+    mockgenerator = Synapse::ConfigGenerator::BaseGenerator.new()
+    allow(mock_synapse).to receive(:available_generators).and_return({
+      'haproxy' => mockgenerator
+    })
+    allow(mock_synapse).to receive(:reconfigure!).and_return(true)
+    mock_synapse
+  end
   subject { Synapse::ServiceWatcher::Ec2tagWatcher.new(basic_config, mock_synapse) }
 
   let(:basic_config) do
@@ -79,6 +87,12 @@ describe Synapse::ServiceWatcher::Ec2tagWatcher do
     args
   end
 
+  def munge_arg(name, new_value)
+    args = basic_config.clone
+    args[name] = new_value
+    args
+  end
+
   describe '#new' do
     let(:args) { basic_config }
 
@@ -102,19 +116,33 @@ describe Synapse::ServiceWatcher::Ec2tagWatcher do
           Synapse::ServiceWatcher::Ec2tagWatcher.new(remove_discovery_arg('aws_secret_access_key'), mock_synapse)
         }.not_to raise_error
       end
-      it 'complains if server_port_override is missing' do
+      it 'complains if server_port_override and backend_port_override are missing' do
         expect {
           Synapse::ServiceWatcher::Ec2tagWatcher.new(remove_haproxy_arg('server_port_override'), mock_synapse)
-        }.to raise_error(ArgumentError, /Missing server_port_override/)
+        }.to raise_error(ArgumentError, /Missing backend_port_override/)
+      end
+      it 'does not break if backend_port_override is set' do
+        expect {
+          Synapse::ServiceWatcher::Ec2tagWatcher.new(munge_arg('backend_port_override', 1234), mock_synapse)
+        }.not_to raise_error
       end
     end
 
     context 'invalid data' do
       it 'complains if the haproxy server_port_override is not a number' do
-          expect {
-            Synapse::ServiceWatcher::Ec2tagWatcher.new(munge_haproxy_arg('server_port_override', '80deadbeef'), mock_synapse)
-          }.to raise_error(ArgumentError, /Invalid server_port_override/)
+        expect {
+          Synapse::ServiceWatcher::Ec2tagWatcher.new(munge_haproxy_arg('server_port_override', '80deadbeef'), mock_synapse)
+        }.to raise_error(ArgumentError, /Invalid backend_port_override/)
+      end
+      it 'complains if the backend_port_override is not a number' do
+        config = remove_haproxy_arg('server_port_override')
+        expect(config['haproxy']['backend_port_override']).to eq(nil)
+        config = munge_arg('backend_port_override', '80deadbeef')
+        expect {
+          Synapse::ServiceWatcher::Ec2tagWatcher.new(config, mock_synapse)
+        }.to raise_error(ArgumentError, /Invalid backend_port_override/)
       end
+
     end
   end
 
@@ -182,9 +210,15 @@ describe Synapse::ServiceWatcher::Ec2tagWatcher do
       end
 
       it 'sets the backend port to server_port_override for all backends' do
-        backends = subject.send(:discover_instances)
+        discovered_backends = subject.send(:discover_instances)
+        expect(
+          discovered_backends.all? { |b| b['port'].nil? }
+        ).to be_truthy
+
+        # Set backends is responsible for actually populating ports
+        expect(subject.send(:set_backends, discovered_backends)).to eq(true)
         expect(
-          backends.all? { |b| b['port'] == basic_config['haproxy']['server_port_override'] }
+          subject.backends.all? { |b| b['port'] == basic_config['haproxy']['server_port_override'] }
         ).to be_truthy
       end
     end

data/spec/lib/synapse/service_watcher_marathon_spec.rb

@@ -2,7 +2,14 @@ require 'spec_helper'
 require 'synapse/service_watcher/marathon'
 
 describe Synapse::ServiceWatcher::MarathonWatcher do
-  let(:mocksynapse) { double() }
+  let(:mocksynapse) do
+    mock_synapse = instance_double(Synapse::Synapse)
+    mockgenerator = Synapse::ConfigGenerator::BaseGenerator.new()
+    allow(mock_synapse).to receive(:available_generators).and_return({
+      'haproxy' => mockgenerator
+    })
+    mock_synapse
+  end
   let(:marathon_host) { '127.0.0.1' }
   let(:marathon_port) { '8080' }
   let(:app_name) { 'foo' }

data/spec/lib/synapse/service_watcher_spec.rb

@@ -2,7 +2,14 @@ require 'spec_helper'
 require 'synapse/service_watcher'
 
 describe Synapse::ServiceWatcher do
-  let(:mock_synapse) { double }
+  let(:mock_synapse) do
+    mock_synapse = instance_double(Synapse::Synapse)
+    mockgenerator = Synapse::ConfigGenerator::BaseGenerator.new()
+    allow(mock_synapse).to receive(:available_generators).and_return({
+      'haproxy' => mockgenerator
+    })
+    mock_synapse
+  end
   subject { Synapse::ServiceWatcher }
   let(:config) do
     {

data/spec/lib/synapse/service_watcher_zookeeper_spec.rb

@@ -3,7 +3,14 @@ require 'synapse/service_watcher/zookeeper'
 require 'synapse/service_watcher/zookeeper_dns'
 
 describe Synapse::ServiceWatcher::ZookeeperWatcher do
-  let(:mock_synapse) { double }
+  let(:mock_synapse) do
+    mock_synapse = instance_double(Synapse::Synapse)
+    mockgenerator = Synapse::ConfigGenerator::BaseGenerator.new()
+    allow(mock_synapse).to receive(:available_generators).and_return({
+      'haproxy' => mockgenerator
+    })
+    mock_synapse
+  end
   let(:config) do
     {
       'name' => 'test',

data/spec/support/minimum.conf.yaml

@@ -22,6 +22,7 @@ haproxy:
   config_file_path: "/etc/haproxy/haproxy.cfg"
   do_writes: false
   do_reloads: false
+  do_socket: false
   global:
     - global_test_option
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synapse
 version: !ruby/object:Gem::Version
-  version: 0.13.8
+  version: 0.14.0
 platform: ruby
 authors:
 - Martin Rhoads
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -197,8 +197,11 @@ files:
 - config/synapse_services/service2.json
 - lib/synapse.rb
 - lib/synapse/base.rb
-- lib/synapse/file_output.rb
-- lib/synapse/haproxy.rb
+- lib/synapse/config_generator.rb
+- lib/synapse/config_generator/README.md
+- lib/synapse/config_generator/base.rb
+- lib/synapse/config_generator/file_output.rb
+- lib/synapse/config_generator/haproxy.rb
 - lib/synapse/log.rb
 - lib/synapse/service_watcher.rb
 - lib/synapse/service_watcher/README.md