synapse 0.12.1 → 0.12.2

data/spec/lib/synapse/service_watcher_marathon_spec.rb

@@ -0,0 +1,191 @@
+require 'spec_helper'
+require 'synapse/service_watcher/marathon'
+
+describe Synapse::ServiceWatcher::MarathonWatcher do
+  let(:mocksynapse) { double() }
+  let(:marathon_host) { '127.0.0.1' }
+  let(:marathon_port) { '8080' }
+  let(:app_name) { 'foo' }
+  let(:check_interval) { 11 }
+  let(:marathon_request_uri) { "#{marathon_host}:#{marathon_port}/v2/apps/#{app_name}/tasks" }
+  let(:config) do
+    {
+      'name' => 'foo',
+      'discovery' => {
+        'method' => 'marathon',
+        'marathon_api_url' => "http://#{marathon_host}:#{marathon_port}",
+        'application_name' => app_name,
+        'check_interval' => check_interval,
+      },
+      'haproxy' => {},
+    }
+  end
+  let(:marathon_response) { { 'tasks' => [] } }
+
+  subject { described_class.new(config, mocksynapse) }
+
+  before do
+    allow(subject.log).to receive(:warn)
+    allow(subject.log).to receive(:info)
+
+    allow(Thread).to receive(:new).and_yield
+    allow(subject).to receive(:sleep)
+    allow(subject).to receive(:only_run_once?).and_return(true)
+    allow(subject).to receive(:splay).and_return(0)
+
+    stub_request(:get, marathon_request_uri).
+      with(:headers => { 'Accept' => 'application/json' }).
+      to_return(:body => JSON.generate(marathon_response))
+  end
+
+  context 'with a valid argument hash' do
+    it 'instantiates' do
+      expect(subject).to be_a(Synapse::ServiceWatcher::MarathonWatcher)
+    end
+  end
+
+  describe '#watch' do
+    context 'when synapse cannot connect to marathon' do
+      before do
+        allow(Net::HTTP).to receive(:new).
+          with(marathon_host, marathon_port.to_i).
+          and_raise(Errno::ECONNREFUSED)
+      end
+
+      it 'does not crash' do
+        expect { subject.start }.not_to raise_error
+      end
+    end
+
+    it 'requests the proper API endpoint one time' do
+      subject.start
+      expect(a_request(:get, marathon_request_uri)).to have_been_made.times(1)
+    end
+
+    context 'when the API path (marathon_api_path) is customized' do
+      let(:config) do
+        super().tap do |c|
+          c['discovery']['marathon_api_path'] = '/v3/tasks/%{app}'
+        end
+      end
+
+      let(:marathon_request_uri) { "#{marathon_host}:#{marathon_port}/v3/tasks/#{app_name}" }
+
+      it 'calls the customized path' do
+        subject.start
+        expect(a_request(:get, marathon_request_uri)).to have_been_made.times(1)
+      end
+    end
+
+    context 'with tasks returned from marathon' do
+      let(:marathon_response) do
+        {
+          'tasks' => [
+            {
+              'host' => 'agouti.local',
+              'id' => 'my-app_1-1396592790353',
+              'ports' => [
+                31336,
+                31337
+              ],
+              'stagedAt' => '2014-04-04T06:26:30.355Z',
+              'startedAt' => '2014-04-04T06:26:30.860Z',
+              'version' => '2014-04-04T06:26:23.051Z'
+            },
+          ]
+        }
+      end
+      let(:expected_backend_hash) do
+        {
+          'name' => 'agouti.local', 'host' => 'agouti.local', 'port' => 31336
+        }
+      end
+
+      it 'adds the task as a backend' do
+        expect(subject).to receive(:set_backends).with([expected_backend_hash])
+        subject.start
+      end
+
+      context 'with a custom port_index' do
+        let(:config) do
+          super().tap do |c|
+            c['discovery']['port_index'] = 1
+          end
+        end
+
+        let(:expected_backend_hash) do
+          {
+            'name' => 'agouti.local', 'host' => 'agouti.local', 'port' => 31337
+          }
+        end
+
+        it 'adds the task as a backend' do
+          expect(subject).to receive(:set_backends).with([expected_backend_hash])
+          subject.start
+        end
+
+        context 'when that port_index does not exist' do
+          let(:config) do
+            super().tap { |c| c['discovery']['port_index'] = 999 }
+          end
+
+          it 'does not include the backend' do
+            expect(subject).to receive(:set_backends).with([])
+            subject.start
+          end
+        end
+      end
+
+      context 'with a task that has not started yet' do
+        let(:marathon_response) do
+          super().tap do |resp|
+            resp['tasks'] << {
+              'host' => 'agouti.local',
+              'id' => 'my-app_2-1396592790353',
+              'ports' => [
+                31336,
+                31337
+              ],
+              'stagedAt' => '2014-04-04T06:26:30.355Z',
+              'startedAt' => nil,
+              'version' => '2014-04-04T06:26:23.051Z'
+            }
+          end
+        end
+
+        it 'filters tasks that have no startedAt value' do
+          expect(subject).to receive(:set_backends).with([expected_backend_hash])
+          subject.start
+        end
+      end
+
+      context 'when marathon returns invalid response' do
+        let(:marathon_response) { [] }
+        it 'does not blow up' do
+          expect { subject.start }.to_not raise_error
+        end
+      end
+
+      context 'when the job takes a long time for some reason' do
+        let(:job_duration) { 10 } # seconds
+
+        before do
+          actual_time = Time.now
+          time_offset = -1 * job_duration
+          allow(Time).to receive(:now) do
+            # on first run, return the right time
+            # subsequently, add in our job_duration offset
+            actual_time + (time_offset += job_duration)
+          end
+          allow(subject).to receive(:set_backends)
+        end
+
+        it 'only sleeps for the difference' do
+          expect(subject).to receive(:sleep).with(check_interval - job_duration)
+          subject.start
+        end
+      end
+    end
+  end
+end
+

data/spec/lib/synapse/service_watcher_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper'
+require 'synapse/service_watcher'
+
+describe Synapse::ServiceWatcher do
+  let(:mock_synapse) { double }
+  subject { Synapse::ServiceWatcher }
+  let(:config) do
+    {
+      'haproxy' => {
+        'port' => '8080',
+        'server_port_override' => '8081',
+      },
+      'discovery' => {
+        'method' => 'test'
+      }
+    }
+  end
+
+  def replace_discovery(new_value)
+    args = config.clone
+    args['discovery'] = new_value
+    args
+  end
+
+  context 'bogus arguments' do
+    it 'complains if discovery method is bogus' do
+      expect {
+        subject.create('test', config, mock_synapse)
+      }.to raise_error(ArgumentError)
+    end
+  end
+
+  context 'service watcher dispatch' do
+    let (:zookeeper_config) {{
+      'method' => 'zookeeper',
+      'hosts' => 'localhost:2181',
+      'path' => '/smartstack',
+    }}
+    let (:dns_config) {{
+      'method' => 'dns',
+      'servers' => ['localhost'],
+    }}
+    let (:docker_config) {{
+      'method' => 'docker',
+      'servers' => 'localhost',
+      'image_name' => 'servicefoo',
+      'container_port' => 1234,
+    }}
+    let (:ec2_config) {{
+      'method' => 'ec2tag',
+      'tag_name' => 'footag',
+      'tag_value' => 'barvalue',
+      'aws_access_key_id' => 'bogus',
+      'aws_secret_access_key' => 'morebogus',
+      'aws_region' => 'evenmorebogus',
+    }}
+    let (:zookeeper_dns_config) {{
+      'method' => 'zookeeper_dns',
+      'hosts' => 'localhost:2181',
+      'path' => '/smartstack',
+    }}
+    let (:marathon_config) {{
+      'method' => 'marathon',
+      'marathon_api_url' => 'localhost:12345',
+      'application_name' => 'foobar',
+    }}
+
+    it 'creates zookeeper correctly' do
+      expect {
+        subject.create('test', replace_discovery(zookeeper_config), mock_synapse)
+      }.not_to raise_error
+    end
+    it 'creates dns correctly' do
+      expect {
+        subject.create('test', replace_discovery(dns_config), mock_synapse)
+      }.not_to raise_error
+    end
+    it 'creates docker correctly' do
+      expect {
+        subject.create('test', replace_discovery(docker_config), mock_synapse)
+      }.not_to raise_error
+    end
+    it 'creates ec2tag correctly' do
+      expect {
+        subject.create('test', replace_discovery(ec2_config), mock_synapse)
+      }.not_to raise_error
+    end
+    it 'creates zookeeper_dns correctly' do
+      expect {
+        subject.create('test', replace_discovery(zookeeper_dns_config), mock_synapse)
+      }.not_to raise_error
+    end
+    it 'creates marathon correctly' do
+      expect {
+        subject.create('test', replace_discovery(marathon_config), mock_synapse)
+      }.not_to raise_error
+    end
+  end
+
+end
+
+

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@
 require "#{File.dirname(__FILE__)}/../lib/synapse"
 require 'pry'
 require 'support/configuration'
+require 'webmock/rspec'
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true

data/spec/support/minimum.conf.yaml

@@ -22,6 +22,11 @@ haproxy:
   do_reloads: false
   global:
     - global_test_option
-    
+
   defaults:
     - default_test_option
+
+
+# settings for the file output generator
+file_output:
+  output_directory: "/tmp/synapse_file_output_test"

data/synapse.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec", "~> 3.1.0"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "pry-nav"
+  gem.add_development_dependency "webmock"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synapse
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !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'
 email:
 - martin.rhoads@airbnb.com
@@ -153,17 +169,22 @@ files:
 - lib/synapse/haproxy.rb
 - lib/synapse/log.rb
 - lib/synapse/service_watcher.rb
+- lib/synapse/service_watcher/README.md
 - lib/synapse/service_watcher/base.rb
 - lib/synapse/service_watcher/dns.rb
 - lib/synapse/service_watcher/docker.rb
 - lib/synapse/service_watcher/ec2tag.rb
+- lib/synapse/service_watcher/marathon.rb
 - lib/synapse/service_watcher/zookeeper.rb
 - lib/synapse/service_watcher/zookeeper_dns.rb
 - lib/synapse/version.rb
+- spec/lib/synapse/file_output_spec.rb
 - spec/lib/synapse/haproxy_spec.rb
 - spec/lib/synapse/service_watcher_base_spec.rb
 - spec/lib/synapse/service_watcher_docker_spec.rb
 - spec/lib/synapse/service_watcher_ec2tags_spec.rb
+- spec/lib/synapse/service_watcher_marathon_spec.rb
+- spec/lib/synapse/service_watcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/configuration.rb
 - spec/support/minimum.conf.yaml
@@ -193,10 +214,13 @@ signing_key:
 specification_version: 3
 summary: ': Write a gem summary'
 test_files:
+- spec/lib/synapse/file_output_spec.rb
 - spec/lib/synapse/haproxy_spec.rb
 - spec/lib/synapse/service_watcher_base_spec.rb
 - spec/lib/synapse/service_watcher_docker_spec.rb
 - spec/lib/synapse/service_watcher_ec2tags_spec.rb
+- spec/lib/synapse/service_watcher_marathon_spec.rb
+- spec/lib/synapse/service_watcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/configuration.rb
 - spec/support/minimum.conf.yaml