Merge pull request #35 from travis-ci/jc-github-app

[WIP] Accept GH app events

Author: kerrizor

Procfile

@@ -1 +1,2 @@
 web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+console: bundle exec irb -I lib -r travis/listener

lib/travis/gatekeeper.rb

@@ -2,7 +2,6 @@
 require 'travis/support'
 require 'travis/listener/app'
 require 'logger'
-require 'sidekiq'
 
 $stdout.sync = true
 
@@ -15,23 +14,16 @@ def config
 
   module Listener
     class Config < Travis::Config
-      define  redis:            { url: 'redis://localhost:6379', namespace: 'sidekiq', network_timeout: 5 },
-              redis_gatekeeper: { url: ENV['REDIS_GATEKEEPER_URL'] || 'redis://localhost:6379', namespace: 'sidekiq', network_timeout: 5 },
-              gator:            { queue: ENV['SIDEKIQ_GATEKEEPER_QUEUE'] || 'build_requests' },
+      define  redis:            { url: ENV.fetch('REDIS_URL', 'redis://localhost:6379'), namespace: 'sidekiq', network_timeout: 5 },
+              redis_gatekeeper: { url: ENV.fetch('REDIS_GATEKEEPER_URL', 'redis://localhost:6379'), namespace: 'sidekiq', network_timeout: 5 },
+              gator:            { queue: ENV.fetch('SIDEKIQ_GATEKEEPER_QUEUE', 'build_requests') },
+              sync:             { queue: ENV.fetch('SIDEKIQ_SYNC_QUEUE', 'sync.gh_apps') },
               sentry:           { },
               metrics:          { reporter: 'librato' }
     end
 
     class << self
       def setup
-        ::Sidekiq.configure_client do |config|
-          if ENV['REDIS_GATEKEEPER_ENABLED'] == 'true'
-            config.redis = Travis.config.redis_gatekeeper.to_h
-          else
-            config.redis = Travis.config.redis.to_h
-          end
-        end
-
         if Travis.config.sentry.dsn
           require 'raven'
           ::Raven.configure do |config|

lib/travis/listener.rb

@@ -1,7 +1,7 @@
 require 'sinatra'
 require 'travis/support/logging'
 require 'sidekiq'
-require 'travis/gatekeeper'
+require 'travis/sidekiq'
 require 'multi_json'
 require 'ipaddr'
 require 'metriks'
@@ -17,7 +17,7 @@ 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]
+      set :events, %w[push pull_request create delete repository installation installation_repositories]
 
       before do
         logger.level = 1
@@ -37,7 +37,7 @@ class App < Sinatra::Base
         report_ip_validity
         if !ip_validation? || valid_ip?
           if valid_request?
-            handle_event
+            dispatch_event
 
             204
           else
@@ -78,11 +78,24 @@ def valid_ips
         (Travis.config.listener && Travis.config.listener.valid_ips) || []
       end
 
-      def handle_event
+      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
+        end
+      end
+
+      def gatekeeper_event
         log_event(event_details, uuid: uuid, delivery_guid: delivery_guid, type: event_type, repository: slug)
-        Travis::Gatekeeper.push(Travis.config.gator.queue, data)
+        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)
       end
 
       def handle_event?

lib/travis/listener/app.rb

@@ -0,0 +1,46 @@
+require 'redis'
+require 'sidekiq'
+
+module Travis
+  module Sidekiq
+    class Gatekeeper
+      def self.client
+        @@client ||= ::Sidekiq::Client.new(
+          ::Sidekiq::RedisConnection.create(Travis.config.redis_gatekeeper.to_h)
+        )
+      end
+
+      def self.push(queue, *args)
+        client.push(
+          'queue' => queue,
+          'class' => 'Travis::Gatekeeper::Worker',
+          'args' => args
+        )
+      end
+    end
+
+    class GithubSync
+      def self.gh_app_install(data)
+        push('sync.gh_apps', :gh_app_install, data)
+      end
+
+      def self.gh_app_repos(data)
+        push('sync.gh_apps', :gh_app_repos, data)
+      end
+
+      def self.client
+        @@client ||= ::Sidekiq::Client.new(
+          ::Sidekiq::RedisConnection.create(Travis.config.redis.to_h)
+        )
+      end
+
+      def self.push(queue, *args)
+        client.push(
+          'queue' => queue,
+          'class' => 'Travis::GithubSync::Worker',
+          'args' => args
+        )
+      end
+    end
+  end
+end

lib/travis/sidekiq.rb

@@ -0,0 +1,47 @@
+{
+  "action": "deleted",
+  "installation": {
+    "id": 2,
+    "account": {
+      "login": "octocat",
+      "id": 1,
+      "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/octocat",
+      "html_url": "https://github.com/octocat",
+      "followers_url": "https://api.github.com/users/octocat/followers",
+      "following_url": "https://api.github.com/users/octocat/following{/other_user}",
+      "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
+      "organizations_url": "https://api.github.com/users/octocat/orgs",
+      "repos_url": "https://api.github.com/users/octocat/repos",
+      "events_url": "https://api.github.com/users/octocat/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/octocat/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "repository_selection": "selected",
+    "access_tokens_url": "https://api.github.com/installations/2/access_tokens",
+    "repositories_url": "https://api.github.com/installation/repositories"
+  },
+  "sender": {
+    "login": "octocat",
+    "id": 1,
+    "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/octocat",
+    "html_url": "https://github.com/octocat",
+    "followers_url": "https://api.github.com/users/octocat/followers",
+    "following_url": "https://api.github.com/users/octocat/following{/other_user}",
+    "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
+    "organizations_url": "https://api.github.com/users/octocat/orgs",
+    "repos_url": "https://api.github.com/users/octocat/repos",
+    "events_url": "https://api.github.com/users/octocat/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/octocat/received_events",
+    "type": "User",
+    "site_admin": false
+  }
+}

spec/payloads/installation.json

@@ -0,0 +1,59 @@
+{
+  "action": "removed",
+  "installation": {
+    "id": 2,
+    "account": {
+      "login": "octocat",
+      "id": 1,
+      "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/octocat",
+      "html_url": "https://github.com/octocat",
+      "followers_url": "https://api.github.com/users/octocat/followers",
+      "following_url": "https://api.github.com/users/octocat/following{/other_user}",
+      "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
+      "organizations_url": "https://api.github.com/users/octocat/orgs",
+      "repos_url": "https://api.github.com/users/octocat/repos",
+      "events_url": "https://api.github.com/users/octocat/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/octocat/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "repository_selection": "selected",
+    "access_tokens_url": "https://api.github.com/installations/2/access_tokens",
+    "repositories_url": "https://api.github.com/installation/repositories",
+    "html_url": "https://github.com/settings/installations/2"
+  },
+  "repository_selection": "selected",
+  "repositories_added": [
+
+  ],
+  "repositories_removed": [
+    {
+      "id": 1296269,
+      "name": "Hello-World",
+      "full_name": "octocat/Hello-World"
+    }
+  ],
+  "sender": {
+    "login": "octocat",
+    "id": 1,
+    "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/octocat",
+    "html_url": "https://github.com/octocat",
+    "followers_url": "https://api.github.com/users/octocat/followers",
+    "following_url": "https://api.github.com/users/octocat/following{/other_user}",
+    "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
+    "organizations_url": "https://api.github.com/users/octocat/orgs",
+    "repos_url": "https://api.github.com/users/octocat/repos",
+    "events_url": "https://api.github.com/users/octocat/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/octocat/received_events",
+    "type": "User",
+    "site_admin": false
+  }
+}

spec/payloads/installation_repositories.json

@@ -5,7 +5,7 @@
   let(:auth)    { ['user', '12345'] }
   let(:payload) { GITHUB_PAYLOADS['gem-release'] }
   let(:redis)   { Redis.new }
-  let(:queue)   { Travis::Gatekeeper }
+  let(:queue)   { Travis::Sidekiq::Gatekeeper }
 
   before do
     authorize(*auth)

spec/travis/app_spec.rb

@@ -1,13 +1,15 @@
 require 'spec_helper'
 
 describe Travis::Listener::App do
-  let(:app)     { subject }
-  let(:auth)    { ['user', '12345'] }
-  let(:payload) { Payloads.load(type) }
-  let(:redis)   { Redis.new }
-  let(:queue)   { Travis::Gatekeeper }
+  let(:app)                { subject }
+  let(:auth)               { ['user', '12345'] }
+  let(:payload)            { Payloads.load(type) }
+  let(:redis)              { Redis.new }
+  let(:gatekeeper_queue)   { Travis::Sidekiq::Gatekeeper }
+  let(:gh_sync_queue)      { Travis::Sidekiq::GithubSync }
 
-  before { allow(queue).to receive(:push) }
+  before { allow(gatekeeper_queue).to receive(:push) }
+  before { allow(gh_sync_queue).to receive(:push) }
   before { authorize(*auth) }
   before { create }
 
@@ -18,67 +20,83 @@ def create(opts = {})
     post(opts[:url] || '/', params, headers)
   end
 
-  shared_examples_for 'queues the event' do |&block|
-    it { expect(queue).to have_received(:push).with('build_requests', hash_including(type: event)) }
+  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' }
-    include_examples 'queues the event'
+    include_examples 'queues gatekeeper event'
   end
 
   describe 'a pull_request event' do
     let(:type)  { 'pull_request' }
     let(:event) { 'pull_request' }
-    include_examples 'queues the event'
+    include_examples 'queues gatekeeper event'
   end
 
   describe 'a branch_created event' do
     let(:type)  { 'branch_created' }
     let(:event) { 'create' }
-    include_examples 'queues the event'
+    include_examples 'queues gatekeeper event'
   end
 
   describe 'a branch_deleted event' do
     let(:type)  { 'branch_deleted' }
     let(:event) { 'delete' }
-    include_examples 'queues the event'
+    include_examples 'queues gatekeeper event'
   end
 
   describe 'a tag_created event' do
     let(:type)  { 'tag_created' }
     let(:event) { 'create' }
-    include_examples 'queues the event'
+    include_examples 'queues gatekeeper event'
   end
 
   describe 'a tag_deleted event' do
     let(:type)  { 'tag_deleted' }
     let(:event) { 'delete' }
-    include_examples 'queues the event'
+    include_examples 'queues gatekeeper event'
   end
 
   describe 'a repo_created event' do
     let(:type)  { 'repo_created' }
     let(:event) { 'create' }
-    include_examples 'queues the event'
+    include_examples 'queues gatekeeper event'
   end
 
   describe 'a repo_deleted event' do
     let(:type)  { 'repo_deleted' }
     let(:event) { 'delete' }
-    include_examples 'queues the event'
+    include_examples 'queues gatekeeper event'
   end
 
   describe 'a repo_privatized event' do
     let(:type)  { 'repo_privatized' }
     let(:event) { 'repository' }
-    include_examples 'queues the event'
+    include_examples 'queues gatekeeper event'
   end
 
   describe 'a repo_publicized event' do
     let(:type)  { 'repo_publicized' }
     let(:event) { 'repository' }
-    include_examples 'queues the event'
+    include_examples 'queues gatekeeper event'
+  end
+
+  describe 'an installation event' do
+    let(:type)  { 'installation' }
+    let(:event) { 'installation' }
+    include_examples 'queues gh sync event'
+  end
+
+  describe 'an installation_repositories event' do
+    let(:type)  { 'installation_repositories' }
+    let(:event) { 'installation_repositories' }
+    include_examples 'queues gh sync event'
   end
 end