shipit-engine 0.32.0 → 0.35.1

data/app/controllers/shipit/merge_requests_controller.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Shipit
+  class MergeRequestsController < ShipitController
+    def index
+      @merge_requests = stack.merge_requests.queued
+    end
+
+    def create
+      if pr_number = MergeRequest.extract_number(stack, params[:number_or_url])
+        merge_request = MergeRequest.request_merge!(stack, pr_number, current_user)
+        flash[:success] = "Pull request ##{merge_request.number} added to the queue."
+      else
+        flash[:warning] = "Invalid or missing pull request number."
+      end
+      redirect_to(stack_merge_requests_path)
+    end
+
+    def destroy
+      merge_request = stack.merge_requests.find(params[:id])
+      merge_request.cancel!
+      flash[:success] = 'Merge canceled'
+      redirect_to(stack_merge_requests_path)
+    end
+
+    private
+
+    def stack
+      @stack ||= Stack.from_param!(params[:stack_id])
+    end
+  end
+end

data/app/controllers/shipit/merge_status_controller.rb

@@ -12,7 +12,7 @@ module Shipit
 
       if stack
         return render('logged_out') unless current_user.logged_in?
-        if stale?(last_modified: [stack.updated_at, pull_request.updated_at].max, template: false)
+        if stale?(last_modified: [stack.updated_at, merge_request.updated_at].max, template: false)
           render(stack_status, layout: !request.xhr?)
         end
       else
@@ -23,13 +23,13 @@ module Shipit
     end
 
     def enqueue
-      PullRequest.request_merge!(stack, params[:number], current_user)
+      MergeRequest.request_merge!(stack, params[:number], current_user)
       render(stack_status, layout: !request.xhr?)
     end
 
     def dequeue
-      if pull_request = stack.pull_requests.find_by_number(params[:number])
-        pull_request.cancel! if pull_request.waiting?
+      if merge_request = stack.merge_requests.find_by_number(params[:number])
+        merge_request.cancel! if merge_request.waiting?
       end
       render(stack_status, layout: !request.xhr?)
     end
@@ -38,12 +38,12 @@ module Shipit
       respond_to do |format|
         format.html do
           if stack_status == 'success'
-            render plain: 'ok'
+            render(plain: 'ok')
           else
-            render plain: stack_status, status: 503
+            render(plain: stack_status, status: 503)
           end
         end
-        format.json { render json: { stack_status: stack_status } }
+        format.json { render(json: { stack_status: stack_status }) }
       end
     end
 
@@ -82,10 +82,10 @@ module Shipit
       @referrer_parser ||= ReferrerParser.new(params[:referrer])
     end
 
-    def pull_request
-      return @pull_request if defined?(@pull_request)
-      @pull_request = pull_request_number && stack.pull_requests.find_by_number(pull_request_number)
-      @pull_request ||= UnknownPullRequest.new
+    def merge_request
+      return @merge_request if defined?(@merge_request)
+      @merge_request = pull_request_number && stack.merge_requests.find_by_number(pull_request_number)
+      @merge_request ||= UnknownMergeRequest.new
     end
 
     def pull_request_number
@@ -98,14 +98,14 @@ module Shipit
     end
 
     helper_method :pull_request_number
-    helper_method :pull_request
+    helper_method :merge_request
     helper_method :queue_enabled?
     helper_method :stack
     helper_method :stack_status
 
     # FIXME: for some reason if invoked in the view, those path helpers will link to /events?...
-    helper_method :enqueue_pull_request_path
-    helper_method :dequeue_pull_request_path
+    helper_method :enqueue_merge_request_path
+    helper_method :dequeue_merge_request_path
 
     class ReferrerParser
       URL_PATTERN = %r{\Ahttps://github\.com/([^/]+)/([^/]+)/pull/(\d+)}
@@ -123,7 +123,7 @@ module Shipit
       end
     end
 
-    class UnknownPullRequest
+    class UnknownMergeRequest
       attr_reader :updated_at
 
       def initialize

data/app/controllers/shipit/repositories_controller.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module Shipit
+  class RepositoriesController < ShipitController
+    before_action :load_repository, only: %i(destroy settings update new_stack)
+
+    def index
+      @user_repositories = current_user.repositories_contributed_to
+
+      @repositories = Repository.order(:owner, :name).to_a
+    end
+
+    def show
+      @repository = Repository.from_param!(params[:id])
+
+      @stacks = @repository.stacks
+
+      @show_archived = params[:show_archived]
+      @stacks = @stacks.not_archived unless @show_archived
+    end
+
+    def create
+      @repository = Repository.new(create_params)
+      unless @repository.save
+        flash[:warning] = @repository.errors.full_messages.to_sentence
+      end
+      respond_with(@repository)
+    end
+
+    def new
+      @repository = Repository.new
+    end
+
+    def destroy
+      @repository.schedule_for_destroy!
+      redirect_to(repositories_url)
+    end
+
+    def update
+      options = {}
+      unless @repository.update(update_params)
+        options = { flash: { warning: @repository.errors.full_messages.to_sentence } }
+      end
+
+      redirect_to(params[:return_to].presence || repository_settings_path(@repository), options)
+    end
+
+    def settings
+    end
+
+    def new_stack
+      @stack = @repository.stacks.new
+      render("shipit/stacks/new")
+    end
+
+    private
+
+    def create_params
+      params.require(:repository).permit(:owner, :name)
+    end
+
+    def update_params
+      params.require(:repository).permit(
+        :review_stacks_enabled,
+        :provisioning_behavior,
+        :provisioning_label_name,
+      )
+    end
+
+    def load_repository
+      @repository = Repository.from_param!(params[:id])
+    end
+  end
+end

data/app/controllers/shipit/stacks_controller.rb

@@ -154,7 +154,7 @@ module Shipit
     end
 
     def create_params
-      params.require(:stack).permit(:environment, :branch, :deploy_url, :ignore_ci)
+      params.require(:stack).permit(:repo_owner, :repo_name, :environment, :branch, :deploy_url, :ignore_ci)
     end
 
     def update_params
@@ -180,7 +180,7 @@ module Shipit
     end
 
     def repository_params
-      params.require(:stack).permit(:repo_owner, :repo_name)
+      params.require(:stack).permit(:repo_owner, :repo_name, :branch, :environment, :deploy_url, :ignore_ci)
     end
   end
 end

data/app/controllers/shipit/tasks_controller.rb

@@ -22,7 +22,7 @@ module Shipit
       task
       respond_to do |format|
         format.html
-        format.text { render plain: @task.chunk_output }
+        format.text { render(plain: @task.chunk_output) }
       end
     end
 
@@ -48,7 +48,7 @@ module Shipit
     end
 
     def tail
-      render(json: TailTaskSerializer.new(task, context: params))
+      render(json: TailTaskSerializer.new(task, context: { last_byte: params[:last_byte].to_i }))
     end
 
     def lookup

data/app/controllers/shipit/webhooks_controller.rb

@@ -2,7 +2,7 @@
 module Shipit
   class WebhooksController < ActionController::Base
     skip_before_action :verify_authenticity_token, raise: false
-    before_action :check_if_ping, :verify_signature
+    before_action :check_if_ping, :drop_unhandled_event, :verify_signature
 
     respond_to :json
 
@@ -15,8 +15,26 @@ module Shipit
 
     private
 
+    def drop_unhandled_event
+      # Acknowledge, but do nothing
+      head(204) unless Shipit::Webhooks.for_event(event).present?
+    end
+
     def verify_signature
-      head(422) unless Shipit.github.verify_webhook_signature(request.headers['X-Hub-Signature'], request.raw_post)
+      github_app = Shipit.github(organization: repository_owner)
+      verified = github_app.verify_webhook_signature(
+        request.headers['X-Hub-Signature'],
+        request.raw_post
+      )
+      head(422) unless verified
+
+      Rails.logger.info([
+        'WebhookController#verify_signature',
+        "event=#{event}",
+        "repository_owner=#{repository_owner}",
+        "signature=#{request.headers['X-Hub-Signature']}",
+        "status=#{status}",
+      ].join(' '))
     end
 
     def check_if_ping
@@ -27,8 +45,9 @@ module Shipit
       request.headers.fetch('X-Github-Event')
     end
 
-    def stack
-      @stack ||= Stack.find(params[:stack_id])
+    def repository_owner
+      # Fallback to the organization sub-object if repository isn't included in the payload
+      params.dig('repository', 'owner', 'login') || params.dig('organization', 'login')
     end
   end
 end

data/app/helpers/shipit/chunks_helper.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 module Shipit
   module ChunksHelper
-    def next_chunks_url(task)
+    def next_chunks_url(task, last_byte: 0)
       return if task.finished?
-      tail_stack_task_path(task.stack, task, last_id: task.chunks.last)
+      tail_stack_task_path(task.stack, task, last_byte: last_byte)
     end
   end
 end

data/app/helpers/shipit/github_url_helper.rb

@@ -51,6 +51,14 @@ module Shipit
       github_repo_url(stack.repo_owner, stack.repo_name, 'pull', number)
     end
 
+    def stack_github_url(stack)
+      if stack.respond_to?(:pull_request) && stack.pull_request
+        github_pull_request_url(stack.pull_request)
+      else
+        github_repo_url(stack.repo_owner, stack.repo_name)
+      end
+    end
+
     def link_to_github_deploy(deploy)
       url = github_commit_range_url(deploy.stack, *deploy.commit_range)
       text = deploy.commit_range.map(&:short_sha).join('...')

data/app/helpers/shipit/shipit_helper.rb

@@ -43,7 +43,6 @@ module Shipit
     end
 
     def missing_github_app_message
-      # TODO: Document how to create an app
       <<-MESSAGE.html_safe
         Shipit requires a GitHub App to authenticate users and perform API calls.
       MESSAGE

data/app/helpers/shipit/stacks_helper.rb

@@ -91,5 +91,9 @@ module Shipit
     def positive_negative_class(value)
       value.to_f >= 0 ? 'positive' : 'negative'
     end
+
+    def contributor_class(stacks_contributed_to, stack_id)
+      stacks_contributed_to.include?(stack_id) ? "contributor" : "not-matching"
+    end
   end
 end

data/app/jobs/shipit/create_on_github_job.rb

@@ -4,6 +4,7 @@ module Shipit
     include BackgroundJob::Unique
 
     queue_as :default
+    on_duplicate :drop
 
     # We observe that some objects regularly take longer than the default 10 seconds to create, e.g. deployments
     self.timeout = 40

data/app/jobs/shipit/deliver_hook_job.rb

@@ -4,7 +4,7 @@ module Shipit
     queue_as :hooks
 
     def perform(delivery)
-      delivery = Hook::DeliverySpec.new(delivery) if delivery.is_a?(Hash)
+      delivery = Hook::DeliverySpec.new(**delivery) if delivery.is_a?(Hash)
       delivery.send!
     end
   end

data/app/jobs/shipit/destroy_repository_job.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+module Shipit
+  class DestroyRepositoryJob < BackgroundJob
+    queue_as :default
+
+    # repository
+    # +-- stacks
+    #     +-- api_clients
+    #     +-- commits
+    #     |   +-- commit_deployments
+    #     |   |   +-- statuses
+    #     |   +-- statuses
+    #     +-- github_hooks
+    #     +-- hooks
+    #     +-- pull_requests
+    #     +-- tasks
+    #         +-- chunks
+
+    def perform(repository)
+      repository.stacks.each { |stack| DestroyStackJob.perform_now(stack) }
+      repository.destroy!
+    end
+  end
+end

data/app/jobs/shipit/destroy_stack_job.rb

@@ -11,7 +11,7 @@ module Shipit
     # |   +-- statuses
     # +-- github_hooks
     # +-- hooks
-    # +-- pull_requests
+    # +-- merge_requests
     # +-- tasks
     #     +-- chunks
 
@@ -26,7 +26,7 @@ module Shipit
       Shipit::Commit.where(id: commits_ids).delete_all
       Shipit::GithubHook.where(stack_id: stack.id).destroy_all
       Shipit::Hook.where(stack_id: stack.id).delete_all
-      Shipit::PullRequest.where(stack_id: stack.id).delete_all
+      Shipit::MergeRequest.where(stack_id: stack.id).delete_all
       tasks_ids.each_slice(100) do |ids|
         Shipit::OutputChunk.where(task_id: ids).delete_all
         Shipit::Task.where(id: ids).delete_all

data/app/jobs/shipit/github_sync_job.rb

@@ -3,8 +3,11 @@ module Shipit
   class GithubSyncJob < BackgroundJob
     include BackgroundJob::Unique
 
+    attr_reader :stack
+
     MAX_FETCHED_COMMITS = 25
     queue_as :default
+    on_duplicate :drop
 
     self.timeout = 60
     self.lock_timeout = 20
@@ -13,26 +16,27 @@ module Shipit
       @stack = Stack.find(params[:stack_id])
 
       handle_github_errors do
-        new_commits, shared_parent = fetch_missing_commits { @stack.github_commits }
+        new_commits, shared_parent = fetch_missing_commits { stack.github_commits }
 
-        @stack.transaction do
+        stack.transaction do
           shared_parent&.detach_children!
           appended_commits = new_commits.map do |gh_commit|
             append_commit(gh_commit)
           end
-          @stack.lock_reverted_commits! if appended_commits.any?(&:revert?)
+          stack.lock_reverted_commits! if appended_commits.any?(&:revert?)
         end
       end
-      CacheDeploySpecJob.perform_later(@stack)
+      CacheDeploySpecJob.perform_later(stack)
     end
 
     def append_commit(gh_commit)
-      @stack.commits.create_from_github!(gh_commit)
+      stack.commits.create_from_github!(gh_commit)
     end
 
     def fetch_missing_commits(&block)
       commits = []
-      iterator = Shipit::FirstParentCommitsIterator.new(&block)
+      github_api = stack&.github_api
+      iterator = Shipit::FirstParentCommitsIterator.new(github_api: github_api, &block)
       iterator.each_with_index do |commit, index|
         break if index >= MAX_FETCHED_COMMITS
 
@@ -49,13 +53,13 @@ module Shipit
     def handle_github_errors
       yield
     rescue Octokit::NotFound
-      @stack.mark_as_inaccessible!
+      stack.mark_as_inaccessible!
     else
-      @stack.mark_as_accessible!
+      stack.mark_as_accessible!
     end
 
     def lookup_commit(sha)
-      @stack.commits.find_by(sha: sha)
+      stack.commits.find_by(sha: sha)
     end
   end
 end