shipit-engine 0.28.1 → 0.33.0

data/app/jobs/shipit/reap_dead_tasks_job.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module Shipit
+  class ReapDeadTasksJob < BackgroundJob
+    include BackgroundJob::Unique
+    queue_as :default
+
+    def perform
+      Rails.logger.info("Reaping #{zombie_tasks.size} running tasks.")
+      zombie_tasks.each do |task|
+        Rails.logger.info("Reaping task #{task.id}: #{task.title}")
+        task.report_dead!
+      end
+    end
+
+    private
+
+    def zombie_tasks
+      @zombie_tasks ||= Task.zombies
+    end
+  end
+end

data/app/jobs/shipit/refresh_check_runs_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class RefreshCheckRunsJob < BackgroundJob
     queue_as :default

data/app/jobs/shipit/refresh_github_user_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class RefreshGithubUserJob < BackgroundJob
     queue_as :default

data/app/jobs/shipit/refresh_merge_request_job.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+module Shipit
+  class RefreshMergeRequestJob < BackgroundJob
+    queue_as :default
+
+    def perform(merge_request)
+      merge_request.refresh!
+      ProcessMergeRequestsJob.perform_later(merge_request.stack)
+    end
+  end
+end

data/app/jobs/shipit/refresh_statuses_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class RefreshStatusesJob < BackgroundJob
     queue_as :default

data/app/jobs/shipit/setup_github_hook_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class SetupGithubHookJob < BackgroundJob
     queue_as :default

data/app/jobs/shipit/update_estimated_deploy_duration_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class UpdateEstimatedDeployDurationJob < BackgroundJob
     queue_as :default

data/app/jobs/shipit/update_github_last_deployed_ref_job.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module Shipit
   class UpdateGithubLastDeployedRefJob < BackgroundJob
     queue_as :default
 
     # We do not prefix 'refs/' because Octokit methods will do this automatically.
-    BRANCH_REF_PREFIX = 'heads'.freeze
-    DEPLOY_PREFIX = 'shipit-deploy'.freeze
+    BRANCH_REF_PREFIX = 'heads'
+    DEPLOY_PREFIX = "#{Shipit.app_name.downcase}-deploy"
 
     def perform(stack)
       stack_sha = stack.last_successful_deploy_commit&.sha
@@ -33,7 +34,7 @@ module Shipit
       client.update_ref(repo_name, ref, new_sha)
     rescue Octokit::UnprocessableEntity => e
       error_msg = e.message
-      if error_msg.include? "Reference does not exist"
+      if error_msg.include?("Reference does not exist")
         create_ref(client: client, repo_name: repo_name, ref: ref, sha: new_sha)
       else
         raise

data/app/models/concerns/shipit/deferred_touch.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module Shipit
   module DeferredTouch
     extend ActiveSupport::Concern
 
-    SET_KEY = 'shipit:deferred_touches'.freeze
-    TMP_KEY = "#{SET_KEY}:updating".freeze
-    CACHE_KEY = "#{SET_KEY}:scheduled".freeze
+    SET_KEY = 'shipit:deferred_touches'
+    TMP_KEY = "#{SET_KEY}:updating"
+    CACHE_KEY = "#{SET_KEY}:scheduled"
     THROTTLE_TTL = 1.second
 
     included do

data/app/models/shipit/anonymous_user.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class AnonymousUser
     def present?
@@ -34,6 +35,10 @@ module Shipit
       Shipit.authentication_disabled?
     end
 
+    def repositories_contributed_to
+      []
+    end
+
     def stacks_contributed_to
       []
     end
@@ -54,5 +59,9 @@ module Shipit
     def github_api
       Shipit.github.api
     end
+
+    def serializer_class
+      AnonymousUserSerializer
+    end
   end
 end

data/app/models/shipit/api_client.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Shipit
-  class ApiClient < ActiveRecord::Base
+  class ApiClient < Record
     InsufficientPermission = Class.new(StandardError)
 
     belongs_to :creator, class_name: 'User'
@@ -16,7 +17,7 @@ module Shipit
       read:hook
       write:hook
     ).freeze
-    validates :permissions, subset: {of: PERMISSIONS}
+    validates :permissions, subset: { of: PERMISSIONS }
 
     class << self
       def authenticate(token)

data/app/models/shipit/application_record.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Shipit
-  class ApplicationRecord < ActiveRecord::Base
+  class ApplicationRecord < Record
     self.abstract_class = true
   end
 end

data/app/models/shipit/check_run.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 module Shipit
   class CheckRun < ApplicationRecord
-    CONCLUSIONS = %w(success failure neutral cancelled timed_out action_required).freeze
+    CONCLUSIONS = %w(success failure neutral cancelled timed_out action_required stale skipped).freeze
     include DeferredTouch
     include Status::Common
 
@@ -9,7 +10,7 @@ module Shipit
 
     deferred_touch commit: :updated_at
 
-    validates :conclusion, inclusion: {in: CONCLUSIONS, allow_nil: true}
+    validates :conclusion, inclusion: { in: CONCLUSIONS, allow_nil: true }
 
     after_create :enable_ci_on_stack
 
@@ -43,9 +44,9 @@ module Shipit
       case conclusion
       when nil, 'action_required'
         'pending'
-      when 'success', 'neutral'
+      when 'success', 'neutral', 'skipped'
         'success'
-      when 'failure', 'cancelled'
+      when 'failure', 'cancelled', 'stale'
         'failure'
       when 'timed_out'
         'error'

data/app/models/shipit/command_line_user.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class CommandLineUser
     def present?
@@ -34,6 +35,10 @@ module Shipit
       Shipit.authentication_disabled?
     end
 
+    def repositories_contributed_to
+      []
+    end
+
     def stacks_contributed_to
       []
     end

data/app/models/shipit/commit.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
 module Shipit
-  class Commit < ActiveRecord::Base
+  class Commit < Record
     include DeferredTouch
 
+    RECENT_COMMIT_THRESHOLD = 10.seconds
+
     AmbiguousRevision = Class.new(StandardError)
 
     belongs_to :stack
@@ -10,11 +13,11 @@ module Shipit
     has_many :check_runs, -> { order(created_at: :desc) }, dependent: :destroy, inverse_of: :commit
     has_many :commit_deployments, dependent: :destroy
     has_many :release_statuses, dependent: :destroy
-    belongs_to :pull_request, inverse_of: :merge_commit, optional: true
+    belongs_to :merge_request, inverse_of: :merge_commit, optional: true
 
     deferred_touch stack: :updated_at
 
-    before_create :identify_pull_request
+    before_create :identify_merge_request
     after_commit { broadcast_update }
     after_create { stack.update_undeployed_commits_count }
 
@@ -90,7 +93,7 @@ module Shipit
       committer = User.find_or_create_committer_from_github_commit(commit)
       committer ||= Anonymous.new
 
-      new(
+      record = new(
         sha: commit.sha,
         message: commit.commit.message,
         author:  author,
@@ -100,6 +103,20 @@ module Shipit
         additions: commit.stats&.additions,
         deletions: commit.stats&.deletions,
       )
+
+      if record.pull_request?
+        record.pull_request_head_sha = commit.parents.last.sha
+      end
+
+      record
+    end
+
+    def message=(message)
+      limit = self.class.columns_hash['message'].limit
+      if limit && message && message.bytesize > limit
+        message = message.truncate_bytes(limit)
+      end
+      super(message)
     end
 
     def reload(*)
@@ -126,7 +143,9 @@ module Shipit
     end
 
     def refresh_statuses!
-      github_statuses = stack.handle_github_redirections { Shipit.github.api.statuses(github_repo_name, sha) }
+      github_statuses = stack.handle_github_redirections do
+        Shipit.github.api.statuses(github_repo_name, sha, per_page: 100)
+      end
       github_statuses.each do |status|
         create_status_from_github!(status)
       end
@@ -177,13 +196,7 @@ module Shipit
     def active?
       return false unless stack.active_task?
 
-      active_task = stack.active_task
-
-      if active_task.since_commit == active_task.until_commit
-        id == active_task.since_commit.id
-      else
-        id > active_task.since_commit.id && id <= active_task.until_commit.id
-      end
+      stack.active_task.includes_commit?(self)
     end
 
     def deployable?
@@ -242,7 +255,9 @@ module Shipit
 
     def schedule_continuous_delivery
       return unless deployable? && stack.continuous_deployment? && stack.deployable?
-      ContinuousDeliveryJob.perform_later(stack)
+      # This buffer is to allow for statuses and checks to be refreshed before evaluating if the commit is deployable
+      # - e.g. if the commit was fast-forwarded with already passing CI.
+      ContinuousDeliveryJob.set(wait: RECENT_COMMIT_THRESHOLD).perform_later(stack)
     end
 
     def github_commit
@@ -272,13 +287,13 @@ module Shipit
       stack.deploys.unsuccessful.where(until_commit_id: id).any?
     end
 
-    def identify_pull_request
+    def identify_merge_request
       return unless message_parser.pull_request?
-      if pull_request = stack.pull_requests.find_by(number: message_parser.pull_request_number)
-        self.pull_request = pull_request
-        self.pull_request_number = pull_request.number
-        self.pull_request_title = pull_request.title
-        self.author = pull_request.merge_requested_by if pull_request.merge_requested_by
+      if merge_request = stack.merge_requests.find_by(number: message_parser.pull_request_number)
+        self.merge_request = merge_request
+        self.pull_request_number = merge_request.number
+        self.pull_request_title = merge_request.title
+        self.author = merge_request.merge_requested_by if merge_request.merge_requested_by
       end
 
       self.pull_request_number = message_parser.pull_request_number unless self[:pull_request_number]
@@ -286,8 +301,8 @@ module Shipit
     end
 
     def deploy_requested_at
-      if pull_request&.merged?
-        pull_request.merge_requested_at
+      if merge_request&.merged?
+        merge_request.merge_requested_at
       else
         created_at
       end
@@ -311,6 +326,10 @@ module Shipit
       update!(locked: false, lock_author: nil)
     end
 
+    def recently_pushed?
+      created_at > RECENT_COMMIT_THRESHOLD.ago
+    end
+
     private
 
     def message_parser
@@ -326,7 +345,7 @@ module Shipit
       new_status = status
 
       unless already_deployed
-        payload = {commit: self, stack: stack, status: new_status.state}
+        payload = { commit: self, stack: stack, status: new_status.state }
         if previous_status != new_status
           Hook.emit(:commit_status, stack, payload.merge(commit_status: new_status))
         end

data/app/models/shipit/commit_checks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class CommitChecks < EphemeralCommitChecks
     OUTPUT_TTL = 10.minutes.to_i
@@ -5,6 +6,7 @@ module Shipit
 
     def initialize(commit)
       @commit = commit
+      super(commit)
     end
 
     def synchronize(&block)

data/app/models/shipit/commit_deployment.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 module Shipit
-  class CommitDeployment < ActiveRecord::Base
-    belongs_to :commit
+  class CommitDeployment < Record
     belongs_to :task
     has_many :statuses, dependent: :destroy, class_name: 'CommitDeploymentStatus'
 
@@ -9,11 +9,10 @@ module Shipit
     delegate :stack, :author, to: :task
 
     def create_on_github!
-      return unless commit.pull_request?
-
       create_deployment_on_github!
       statuses.order(id: :asc).each(&:create_on_github!)
-    rescue Octokit::NotFound, Octokit::Forbidden
+    rescue Octokit::NotFound, Octokit::Forbidden => error
+      Rails.logger.warn("Got #{error.class.name} creating deployment or statuses: #{error.message}")
       # If no one can create the deployment we can only give up
     end
 
@@ -34,25 +33,31 @@ module Shipit
       update!(github_id: response.id, api_url: response.url)
     end
 
-    def pull_request_head
-      pull_request = Shipit.github.api.pull_request(stack.github_repo_name, commit.pull_request_number)
-      pull_request.head.sha
-    end
-
     def schedule_create_on_github
       CreateOnGithubJob.perform_later(self)
     end
 
+    def short_sha
+      sha[0..9]
+    end
+
     private
 
     def create_deployment_on_github(client)
       client.create_deployment(
         stack.github_repo_name,
-        pull_request_head,
+        sha,
         auto_merge: false,
         required_contexts: [],
-        description: "Via Shipit",
+        description: "Via #{Shipit.app_name}",
         environment: stack.environment,
+        payload: {
+          shipit: {
+            task_id: task.id,
+            from_sha: task.since_commit.sha,
+            to_sha: task.until_commit.sha,
+          },
+        }.to_json,
       )
     end
   end

data/app/models/shipit/commit_deployment_status.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
 module Shipit
-  class CommitDeploymentStatus < ActiveRecord::Base
+  class CommitDeploymentStatus < Record
+    DESCRIPTION_CHARACTER_LIMIT_ON_GITHUB = 140
+
     belongs_to :commit_deployment
 
     after_commit :schedule_create_on_github, on: :create
@@ -25,7 +28,7 @@ module Shipit
     def description
       I18n.t(
         "deployment_description.#{task_type}.#{status}",
-        sha: task.until_commit.sha,
+        sha: task.until_commit.short_sha,
         author: task.author.login,
         stack: stack.to_param,
       )
@@ -45,8 +48,10 @@ module Shipit
       client.create_deployment_status(
         commit_deployment.api_url,
         status,
+        accept: 'application/vnd.github.flash-preview+json',
         target_url: url_helpers.stack_deploy_url(stack, task),
-        description: description,
+        description: description.truncate(DESCRIPTION_CHARACTER_LIMIT_ON_GITHUB),
+        environment_url: stack.deploy_url,
       )
     end