Merge pull request #36 from travis-ci/kerrizor/set-queue-name-for-events-destined-for-sync

Set queue name for events destined for sync

Author: kerrizor

Gemfile

@@ -29,6 +29,7 @@ gem 'yajl-ruby',       '~> 1.3.1'
 gem 'unicorn',         '~> 4.6.2'
 
 group :development, :test do
+  gem 'pry'
   gem 'rspec',         '~> 2.9'
 end
 

Gemfile.lock

@@ -19,6 +19,7 @@ GEM
     avl_tree (1.2.1)
       atomic (~> 1.1)
     backports (2.4.0)
+    coderay (1.1.2)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     crack (0.4.3)
@@ -35,6 +36,7 @@ GEM
       concurrent-ruby (~> 1.0)
     json (1.8.6)
     kgio (2.11.0)
+    method_source (0.9.0)
     metriks (0.9.9.8)
       atomic (~> 1.0)
       avl_tree (~> 1.2.0)
@@ -44,6 +46,9 @@ GEM
     minitest (5.11.1)
     multi_json (1.12.1)
     multipart-post (2.0.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     public_suffix (2.0.5)
     rack (1.6.8)
     rack-protection (1.5.3)
@@ -101,6 +106,7 @@ DEPENDENCIES
   metriks
   metriks-librato_metrics
   multi_json
+  pry
   rack-test
   rake (~> 0.9.2.2)
   redis-namespace

lib/travis/listener/app.rb

@@ -17,7 +17,15 @@ class App < Sinatra::Base
       # see https://github.com/github/github-services/blob/master/lib/services/travis.rb#L1-2
       # https://github.com/travis-ci/travis-api/blob/255640fd4f191f1de6951081f0c5848324210fb5/lib/travis/github/services/set_hook.rb#L8
       # https://github.com/travis-ci/travis-api/blob/255640fd4f191f1de6951081f0c5848324210fb5/lib/travis/api/v3/github.rb#L41
-      set :events, %w[push pull_request create delete repository installation installation_repositories]
+      set :events, %w[
+        push
+        pull_request
+        create
+        delete
+        repository
+        integration_installation
+        installation_repositories
+      ]
 
       before do
         logger.level = 1
@@ -42,6 +50,7 @@ class App < Sinatra::Base
             204
           else
             Metriks.meter('listener.request.no_payload').mark
+
             422
           end
         else
@@ -82,20 +91,61 @@ def dispatch_event
         return unless handle_event?
         debug "Event payload for #{uuid}: #{payload.inspect}"
 
-        case event_type
-        when 'push', 'pull_request', 'create', 'delete', 'repository' then gatekeeper_event
-        when 'installation', 'installation_repositories'              then sync_event
+        if github_pr_event?
+          gatekeeper_event
+        elsif github_apps_event?
+          sync_event
         end
       end
 
+      def github_pr_event?
+        [
+          'push',
+          'pull_request',
+          'create',
+          'delete',
+          'repository',
+        ].include? event_type
+      end
+
+      def github_apps_event?
+        [
+          'integration_installation',
+          'installation_repositories',
+        ].include? event_type
+      end
+
       def gatekeeper_event
-        log_event(event_details, uuid: uuid, delivery_guid: delivery_guid, type: event_type, repository: slug)
+        log_event(
+          event_details,
+          uuid:          uuid,
+          delivery_guid: delivery_guid,
+          type:          event_type,
+          repository:    slug
+        )
+
+        Metriks.meter("listener.event.webhook_#{event_type}").mark
+
         Travis::Sidekiq::Gatekeeper.push(Travis.config.gator.queue, data)
       end
 
       def sync_event
-        log_event(event_details, uuid: uuid, delivery_guid: delivery_guid, type: event_type)
-        Travis::Sidekiq::GithubSync.push(data)
+        log_event(
+          event_details,
+          uuid:          uuid,
+          delivery_guid: delivery_guid,
+          type:          event_type
+        )
+
+        case event_type
+        when 'integration_installation'
+          Travis::Sidekiq::GithubSync.gh_app_install(data)
+        when 'installation_repositories'
+          Travis::Sidekiq::GithubSync.gh_app_repos(data)
+        else
+          logger.info "Unable to find a sync event for event_type: #{event_type}"
+          false
+        end
       end
 
       def handle_event?
@@ -108,11 +158,11 @@ def log_event(event_details, event_basics)
 
       def data
         {
-          :type => event_type,
-          :payload => payload,
-          :uuid => uuid,
-          :github_guid => delivery_guid,
-          :github_event => event_type
+          :type         => event_type,
+          :payload      => payload,
+          :uuid         => uuid,
+          :github_guid  => delivery_guid,
+          :github_event => event_type,
         }
       end
 
@@ -159,7 +209,15 @@ def delivery_guid
       end
 
       def payload
-        params[:payload]
+        if github_pr_event?
+          params[:payload]
+        elsif github_apps_event?
+          begin
+            @_parsed_json ||= JSON.parse(request.body.read)
+          rescue JSON::ParserError
+            nil
+          end
+        end
       end
 
       def slug

lib/travis/sidekiq.rb

@@ -14,17 +14,21 @@ def self.push(queue, *args)
         client.push(
           'queue' => queue,
           'class' => 'Travis::Gatekeeper::Worker',
-          'args' => args
+          'args'  => args
         )
       end
     end
 
     class GithubSync
       def self.gh_app_install(data)
+        Metriks.meter('listener.event.gh_apps_install').mark
+
         push('sync.gh_apps', :gh_app_install, data)
       end
 
       def self.gh_app_repos(data)
+        Metriks.meter('listener.event.gh_apps_repos').mark
+
         push('sync.gh_apps', :gh_app_repos, data)
       end
 
@@ -38,7 +42,7 @@ def self.push(queue, *args)
         client.push(
           'queue' => queue,
           'class' => 'Travis::GithubSync::Worker',
-          'args' => args
+          'args'  => args
         )
       end
     end

spec/payloads/installation.json renamed to spec/payloads/integration_installation.json

@@ -10,6 +10,8 @@
 
 require 'sidekiq/testing'
 
+require 'pry'
+
 Travis.logger = ::Logger.new(StringIO.new)
 
 Travis::Listener.setup

spec/spec_helper.rb

@@ -16,6 +16,7 @@ def create(opts = {})
     params  = { :payload => (opts[:payload] || payload) }
     headers = { 'HTTP_X_GITHUB_EVENT' => 'push', 'HTTP_X_GITHUB_GUID' => 'abc123' }
     headers.merge!(opts.delete(:headers) || {})
+
     post(opts[:url] || '/', params, headers)
   end
 

spec/travis/app_spec.rb

@@ -14,20 +14,22 @@
   before { create }
 
   def create(opts = {})
-    params  = { :payload => (opts[:payload] || payload) }
+    if ["integration_installation", "installation_repositories"].include? type
+      params = payload
+    else
+      params = { :payload => (opts[:payload] || payload) }
+    end
+
     headers = { 'HTTP_X_GITHUB_EVENT' => event, 'HTTP_X_GITHUB_GUID' => 'abc123' }
     headers.merge!(opts.delete(:headers) || {})
+
     post(opts[:url] || '/', params, headers)
   end
 
   shared_examples_for 'queues gatekeeper event' do |&block|
     it { expect(gatekeeper_queue).to have_received(:push).with('build_requests', hash_including(type: event)) }
   end
 
-  shared_examples_for 'queues gh sync event' do |&block|
-    it { expect(gh_sync_queue).to have_received(:push).with(hash_including(type: event)) }
-  end
-
   describe 'a push event' do
     let(:type)  { 'push' }
     let(:event) { 'push' }
@@ -88,15 +90,21 @@ def create(opts = {})
     include_examples 'queues gatekeeper event'
   end
 
-  describe 'an installation event' do
-    let(:type)  { 'installation' }
-    let(:event) { 'installation' }
-    include_examples 'queues gh sync event'
+  describe 'an integration_installation event' do
+    let(:type)  { 'integration_installation' }
+    let(:event) { 'integration_installation' }
+
+    it { expect(gh_sync_queue)
+      .to have_received(:push)
+      .with('sync.gh_apps', :gh_app_install, hash_including(type: event)) }
   end
 
   describe 'an installation_repositories event' do
     let(:type)  { 'installation_repositories' }
     let(:event) { 'installation_repositories' }
-    include_examples 'queues gh sync event'
+
+    it { expect(gh_sync_queue)
+      .to have_received(:push)
+      .with('sync.gh_apps', :gh_app_repos, hash_including(type: event)) }
   end
 end