synapse 0.13.1 → 0.13.5

data/lib/synapse/service_watcher/dns.rb

@@ -85,6 +85,7 @@ class Synapse::ServiceWatcher
             'host' => address,
             'port' => server['port'],
             'name' => server['name'],
+            'labels' => server['labels'],
           }
         end
       end

data/lib/synapse/service_watcher/zookeeper_dns.rb

@@ -129,11 +129,11 @@ class Synapse::ServiceWatcher
 
     def start
       dns_discovery_opts = @discovery.select do |k,_|
-        k == 'nameserver'
+        k == 'nameserver' || k == 'label_filter'
       end
 
       zookeeper_discovery_opts = @discovery.select do |k,_|
-        k == 'hosts' || k == 'path'
+        k == 'hosts' || k == 'path' || k == 'label_filter'
       end
 
       @check_interval = @discovery['check_interval'] || 30.0

data/lib/synapse/version.rb

@@ -1,3 +1,3 @@
 module Synapse
-  VERSION = "0.13.1"
+  VERSION = "0.13.5"
 end

data/spec/lib/synapse/file_output_spec.rb

@@ -35,7 +35,7 @@ describe Synapse::FileOutput do
   it 'manages correct files' do
     subject.update_config([mockwatcher_1, mockwatcher_2])
     FileUtils.cd(config['file_output']['output_directory']) do
-      expect(Dir.glob('*.json')).to eql(['example_service.json', 'foobar_service.json'])
+      expect(Dir.glob('*.json').sort).to eql(['example_service.json', 'foobar_service.json'])
     end
     # Should clean up after itself
     subject.update_config([mockwatcher_1])

data/spec/lib/synapse/haproxy_spec.rb

@@ -16,31 +16,182 @@ describe Synapse::Haproxy do
 
   let(:mockwatcher_with_server_options) do
     mockWatcher = double(Synapse::ServiceWatcher)
-    allow(mockWatcher).to receive(:name).and_return('example_service')
+    allow(mockWatcher).to receive(:name).and_return('example_service2')
     backends = [{ 'host' => 'somehost', 'port' => 5555, 'haproxy_server_options' => 'backup'}]
     allow(mockWatcher).to receive(:backends).and_return(backends)
     allow(mockWatcher).to receive(:haproxy).and_return({'server_options' => "check inter 2000 rise 3 fall 2"})
     mockWatcher
   end
 
+  let(:mockwatcher_with_cookie_value_method_hash) do
+    mockWatcher = double(Synapse::ServiceWatcher)
+    allow(mockWatcher).to receive(:name).and_return('example_service3')
+    backends = [{ 'host' => 'somehost', 'port' => 5555}]
+    allow(mockWatcher).to receive(:backends).and_return(backends)
+    allow(mockWatcher).to receive(:haproxy).and_return({'server_options' => "check inter 2000 rise 3 fall 2", 'cookie_value_method' => 'hash'})
+    mockWatcher
+  end
+
   let(:mockwatcher_frontend) do
     mockWatcher = double(Synapse::ServiceWatcher)
-    allow(mockWatcher).to receive(:name).and_return('example_service')
+    allow(mockWatcher).to receive(:name).and_return('example_service4')
     allow(mockWatcher).to receive(:haproxy).and_return('port' => 2200)
     mockWatcher
   end
 
   let(:mockwatcher_frontend_with_bind_address) do
     mockWatcher = double(Synapse::ServiceWatcher)
-    allow(mockWatcher).to receive(:name).and_return('example_service')
+    allow(mockWatcher).to receive(:name).and_return('example_service5')
     allow(mockWatcher).to receive(:haproxy).and_return('port' => 2200, 'bind_address' => "127.0.0.3")
     mockWatcher
   end
 
+  describe '#name' do
+    it 'returns haproxy' do
+      expect(subject.name).to eq('haproxy')
+    end
+  end
+
+  describe '#update_config' do
+    let(:watchers) { [mockwatcher_frontend, mockwatcher_frontend_with_bind_address] }
+
+    shared_context 'generate_config is stubbed out' do
+      let(:new_config) { 'this is a new config!' }
+      before { expect(subject).to receive(:generate_config).and_return(new_config) }
+    end
+
+    it 'always updates the config' do
+      expect(subject).to receive(:generate_config).with(watchers)
+      subject.update_config(watchers)
+    end
+
+    context 'when we support socket updates' do
+      include_context 'generate_config is stubbed out'
+      before do
+        config['haproxy']['do_socket'] = true
+        config['haproxy']['socket_file_path'] = 'socket_file_path'
+      end
+
+      it 'updates backends via the socket' do
+        expect(subject).to receive(:update_backends).with(watchers)
+        subject.update_config(watchers)
+      end
+    end
+
+    context 'when we do not support socket updates' do
+      include_context 'generate_config is stubbed out'
+      before { config['haproxy']['do_socket'] = false }
+
+      it 'does not update the backends' do
+        expect(subject).to_not receive(:update_backends)
+        subject.update_config(watchers)
+      end
+    end
+
+    context 'if we support config writes' do
+      include_context 'generate_config is stubbed out'
+      before { config['haproxy']['do_writes'] = true }
+
+      it 'writes the new config' do
+        expect(subject).to receive(:write_config).with(new_config)
+        subject.update_config(watchers)
+      end
+    end
+
+    context 'if we do not support config writes' do
+      include_context 'generate_config is stubbed out'
+      before { config['haproxy']['do_writes'] = false }
+
+      it 'does not write the config' do
+        expect(subject).to_not receive(:write_config)
+        subject.update_config(watchers)
+      end
+    end
 
-  it 'updating the config' do
-    expect(subject).to receive(:generate_config)
-    subject.update_config([mockwatcher])
+    context 'when we support config writes and reloads but not socket updates' do
+      include_context 'generate_config is stubbed out'
+
+      before do
+        config['haproxy']['do_writes'] = true
+        config['haproxy']['do_reloads'] = true
+        config['haproxy']['do_socket'] = false
+      end
+
+      it 'always does a reload' do
+        expect(subject).to receive(:write_config).with(new_config)
+        expect(subject).to receive(:restart)
+        subject.update_config(watchers)
+      end
+    end
+  end
+
+  describe '#tick' do
+    it 'updates the state file at regular intervals' do
+      expect(subject).to receive(:update_state_file).twice
+      (described_class::STATE_FILE_UPDATE_INTERVAL + 1).times do
+        subject.tick({})
+      end
+    end
+  end
+
+  describe '#update_state_file' do
+    let(:watchers) { [mockwatcher, mockwatcher_with_server_options] }
+    let(:state_file_ttl) { 60 } # seconds
+
+    before do
+      config['haproxy']['state_file_path'] = '/statefile'
+      config['haproxy']['state_file_ttl'] = state_file_ttl
+      allow(subject).to receive(:write_data_to_state_file)
+    end
+
+    it 'adds backends along with timestamps' do
+      subject.update_state_file(watchers)
+      data = subject.send(:seen)
+
+      watcher_names = watchers.map{ |w| w.name }
+      expect(data.keys).to contain_exactly(*watcher_names)
+
+      watchers.each do |watcher|
+        backend_names = watcher.backends.map{ |b| subject.construct_name(b) }
+        expect(data[watcher.name].keys).to contain_exactly(*backend_names)
+
+        backend_names.each do |backend_name|
+          expect(data[watcher.name][backend_name]).to include('timestamp')
+        end
+      end
+    end
+
+    context 'when the state file contains backends not in the watcher' do
+      it 'keeps them in the config' do
+        subject.update_state_file(watchers)
+
+        expect do
+          watchers.each do |watcher|
+            allow(watcher).to receive(:backends).and_return([])
+          end
+          subject.update_state_file(watchers)
+        end.to_not change { subject.send(:seen) }
+      end
+
+      context 'if those backends are stale' do
+        it 'removes those backends' do
+          subject.update_state_file(watchers)
+
+          watchers.each do |watcher|
+            allow(watcher).to receive(:backends).and_return([])
+          end
+
+          # the final +1 puts us over the expiry limit
+          Timecop.travel(Time.now + state_file_ttl + 1) do
+            subject.update_state_file(watchers)
+            data = subject.send(:seen)
+            watchers.each do |watcher|
+              expect(data[watcher.name]).to be_empty
+            end
+          end
+        end
+      end
+    end
   end
 
   it 'generates backend stanza' do
@@ -51,16 +202,39 @@ describe Synapse::Haproxy do
   describe 'generate backend stanza in correct order' do
     let(:multiple_backends_stanza_map) do
       {
-        'asc' => ["\nbackend example_service", [], ["\tserver somehost1:5555 somehost1:5555 cookie somehost1:5555 check inter 2000 rise 3 fall 2", "\tserver somehost2:5555 somehost2:5555 cookie somehost2:5555 check inter 2000 rise 3 fall 2", "\tserver somehost3:5555 somehost3:5555 cookie somehost3:5555 check inter 2000 rise 3 fall 2"]],
-        'desc' => ["\nbackend example_service", [], ["\tserver somehost3:5555 somehost3:5555 cookie somehost3:5555 check inter 2000 rise 3 fall 2", "\tserver somehost2:5555 somehost2:5555 cookie somehost2:5555 check inter 2000 rise 3 fall 2", "\tserver somehost1:5555 somehost1:5555 cookie somehost1:5555 check inter 2000 rise 3 fall 2"]],
-        'no_shuffle' => ["\nbackend example_service", [], ["\tserver somehost1:5555 somehost1:5555 cookie somehost1:5555 check inter 2000 rise 3 fall 2", "\tserver somehost3:5555 somehost3:5555 cookie somehost3:5555 check inter 2000 rise 3 fall 2", "\tserver somehost2:5555 somehost2:5555 cookie somehost2:5555 check inter 2000 rise 3 fall 2"]]
+        'asc' => [
+          "\nbackend example_service",
+          [],
+          ["\tserver somehost1_10.11.11.11:5555 10.11.11.11:5555 cookie somehost1_10.11.11.11:5555 check inter 2000 rise 3 fall 2",
+           "\tserver somehost2_10.10.10.10:5555 10.10.10.10:5555 cookie somehost2_10.10.10.10:5555 check inter 2000 rise 3 fall 2",
+           "\tserver somehost3_10.22.22.22:5555 10.22.22.22:5555 cookie somehost3_10.22.22.22:5555 check inter 2000 rise 3 fall 2"
+          ]
+        ],
+        'desc' => [
+          "\nbackend example_service",
+          [],
+          ["\tserver somehost3_10.22.22.22:5555 10.22.22.22:5555 cookie somehost3_10.22.22.22:5555 check inter 2000 rise 3 fall 2",
+           "\tserver somehost2_10.10.10.10:5555 10.10.10.10:5555 cookie somehost2_10.10.10.10:5555 check inter 2000 rise 3 fall 2",
+           "\tserver somehost1_10.11.11.11:5555 10.11.11.11:5555 cookie somehost1_10.11.11.11:5555 check inter 2000 rise 3 fall 2"
+          ]
+        ],
+        'no_shuffle' => [
+          "\nbackend example_service",
+          [],
+          ["\tserver somehost1_10.11.11.11:5555 10.11.11.11:5555 cookie somehost1_10.11.11.11:5555 check inter 2000 rise 3 fall 2",
+           "\tserver somehost3_10.22.22.22:5555 10.22.22.22:5555 cookie somehost3_10.22.22.22:5555 check inter 2000 rise 3 fall 2",
+           "\tserver somehost2_10.10.10.10:5555 10.10.10.10:5555 cookie somehost2_10.10.10.10:5555 check inter 2000 rise 3 fall 2"
+          ]
+        ]
       }
     end
 
     let(:mockwatcher_with_multiple_backends) do
       mockWatcher = double(Synapse::ServiceWatcher)
       allow(mockWatcher).to receive(:name).and_return('example_service')
-      backends = [{ 'host' => 'somehost1', 'port' => 5555}, {'host' => 'somehost3', 'port' => 5555}, { 'host' => 'somehost2', 'port' => 5555}]
+      backends = [{ 'host' => '10.11.11.11', 'port' => 5555, 'name' => 'somehost1'},
+                  { 'host' => '10.22.22.22',   'port' => 5555, 'name' => 'somehost3'},
+                  { 'host' => '10.10.10.10',   'port' => 5555, 'name' => 'somehost2'}]
       allow(mockWatcher).to receive(:backends).and_return(backends)
       mockWatcher
     end
@@ -76,6 +250,11 @@ describe Synapse::Haproxy do
     end
   end
 
+  it 'hashes backend name as cookie value' do
+    mockConfig = []
+    expect(subject.generate_backend_stanza(mockwatcher_with_cookie_value_method_hash, mockConfig)).to eql(["\nbackend example_service3", [], ["\tserver somehost:5555 somehost:5555 cookie 9e736eef2f5a1d441e34ade3d2a8eb1e3abb1c92 check inter 2000 rise 3 fall 2"]])
+  end
+
   it 'generates backend stanza without cookies for tcp mode' do
     mockConfig = ['mode tcp']
     expect(subject.generate_backend_stanza(mockwatcher, mockConfig)).to eql(["\nbackend example_service", ["\tmode tcp"], ["\tserver somehost:5555 somehost:5555 check inter 2000 rise 3 fall 2"]])
@@ -83,17 +262,17 @@ describe Synapse::Haproxy do
 
   it 'respects haproxy_server_options' do
     mockConfig = []
-    expect(subject.generate_backend_stanza(mockwatcher_with_server_options, mockConfig)).to eql(["\nbackend example_service", [], ["\tserver somehost:5555 somehost:5555 cookie somehost:5555 check inter 2000 rise 3 fall 2 backup"]])
+    expect(subject.generate_backend_stanza(mockwatcher_with_server_options, mockConfig)).to eql(["\nbackend example_service2", [], ["\tserver somehost:5555 somehost:5555 cookie somehost:5555 check inter 2000 rise 3 fall 2 backup"]])
   end
 
   it 'generates frontend stanza ' do
     mockConfig = []
-    expect(subject.generate_frontend_stanza(mockwatcher_frontend, mockConfig)).to eql(["\nfrontend example_service", [], "\tbind localhost:2200", "\tdefault_backend example_service"])
+    expect(subject.generate_frontend_stanza(mockwatcher_frontend, mockConfig)).to eql(["\nfrontend example_service4", [], "\tbind localhost:2200", "\tdefault_backend example_service4"])
   end
 
   it 'respects frontend bind_address ' do
     mockConfig = []
-    expect(subject.generate_frontend_stanza(mockwatcher_frontend_with_bind_address, mockConfig)).to eql(["\nfrontend example_service", [], "\tbind 127.0.0.3:2200", "\tdefault_backend example_service"])
+    expect(subject.generate_frontend_stanza(mockwatcher_frontend_with_bind_address, mockConfig)).to eql(["\nfrontend example_service5", [], "\tbind 127.0.0.3:2200", "\tdefault_backend example_service5"])
   end
 
 end

data/spec/spec_helper.rb

@@ -9,6 +9,10 @@ require 'pry'
 require 'support/configuration'
 require 'webmock/rspec'
 
+# configure timecop
+require 'timecop'
+Timecop.safe_mode = true
+
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus

data/spec/support/minimum.conf.yaml

@@ -1,8 +1,6 @@
 # list the services to connect
 services:
-  - name: test
-    local_port: 3210
-    server_options: test_option
+  test:
     default_servers:
       - { name: default1, host: localhost, port: 8080}
     discovery:
@@ -10,9 +8,13 @@ services:
       path: /airbnb/service/logging/event_collector
       hosts:
         - localhost:2181
-    listen:
-      - test_option
-
+    haproxy:
+      port: 3219
+      bind_address: 'localhost'
+      server_options:
+        - some_haproxy_server_option
+      listen:
+        - some_haproxy_listen_option
 
 # settings for haproxy including the global config
 haproxy:

data/synapse.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "pry"
   gem.add_development_dependency "pry-nav"
   gem.add_development_dependency "webmock"
+  gem.add_development_dependency "timecop"
 end

metadata

@@ -1,142 +1,177 @@
 --- !ruby/object:Gem::Specification
 name: synapse
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.5
+  prerelease: 
 platform: ruby
 authors:
 - Martin Rhoads
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.39'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.39'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: zk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.9.4
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ": Write a gem description"
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ': Write a gem description'
 email:
 - martin.rhoads@airbnb.com
 executables:
@@ -144,10 +179,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".mailmap"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .mailmap
+- .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -189,27 +224,28 @@ files:
 - synapse.gemspec
 homepage: ''
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
-summary: ": Write a gem summary"
+specification_version: 3
+summary: ': Write a gem summary'
 test_files:
 - spec/lib/synapse/file_output_spec.rb
 - spec/lib/synapse/haproxy_spec.rb