shipit-engine 0.24.0 → 0.25.0

data/app/models/shipit/deploy.rb

@@ -9,6 +9,7 @@ module Shipit
       after_transition to: :success, do: :schedule_merges
       after_transition to: :success, do: :update_undeployed_commits_count
       after_transition to: :aborted, do: :trigger_revert_if_required
+      after_transition any => any, do: :update_release_status
       after_transition any => any, do: :update_commit_deployments
       after_transition any => any, do: :update_last_deploy_time
     end
@@ -33,6 +34,7 @@ module Shipit
 
     before_create :denormalize_commit_stats
     after_create :create_commit_deployments
+    after_create :update_release_status
     after_commit :broadcast_update
 
     delegate :broadcast_update, :filter_deploy_envs, to: :stack
@@ -143,6 +145,21 @@ module Shipit
       confirmations.abs >= CONFIRMATIONS_REQUIRED
     end
 
+    delegate :last_release_status, to: :until_commit
+    def append_release_status(state, description, user: self.user)
+      status = until_commit.create_release_status!(
+        state,
+        user: user.presence,
+        target_url: permalink,
+        description: description,
+      )
+      status
+    end
+
+    def permalink
+      Shipit::Engine.routes.url_helpers.stack_deploy_url(stack, self)
+    end
+
     private
 
     def create_commit_deployments
@@ -151,6 +168,32 @@ module Shipit
       end
     end
 
+    def update_release_status
+      return unless stack.release_status?
+
+      case status
+      when 'pending'
+        append_release_status('pending', "A deploy was triggered on #{stack.environment}")
+      when 'failed', 'error', 'timedout'
+        append_release_status('error', "The deploy on #{stack.environment} did not succeed (#{status})")
+      when 'aborted', 'aborting'
+        append_release_status('failure', "The deploy on #{stack.environment} was canceled")
+      when 'success'
+        delay = stack.release_status_delay
+        if delay.zero?
+          append_release_status('success', "The deploy on #{stack.environment} succeeded")
+        elsif delay.positive?
+          append_release_status('pending', "The deploy on #{stack.environment} succeeded")
+          AppendDelayedReleaseStatusJob.set(wait: delay).perform_later(
+            self,
+            cursor: until_commit.release_statuses.last,
+            status: 'success',
+            description: "No issue were signaled after #{delay}",
+          )
+        end
+      end
+    end
+
     def update_commit_deployments
       commit_deployments.append_status(status)
     end

data/app/models/shipit/deploy_spec.rb

@@ -67,6 +67,20 @@ module Shipit
       config('deploy', 'max_commits') { 8 }
     end
 
+    def release_status?
+      !!release_status_context
+    end
+
+    def release_status_context
+      config('status', 'context')
+    end
+
+    def release_status_delay
+      if delay = config('status', 'delay') { config('deploy', 'interval') }
+        Duration.parse(delay)
+      end
+    end
+
     def pause_between_deploys
       Duration.parse(config('deploy', 'interval') { 0 })
     end
@@ -131,7 +145,7 @@ module Shipit
     end
 
     def hidden_statuses
-      Array.wrap(config('ci', 'hide'))
+      Array.wrap(config('ci', 'hide')) + [release_status_context].compact
     end
 
     def required_statuses
@@ -161,7 +175,7 @@ module Shipit
 
     def pull_request_ignored_statuses
       if config('merge', 'require') || config('merge', 'ignore')
-        Array.wrap(config('merge', 'ignore'))
+        Array.wrap(config('merge', 'ignore')) + [release_status_context].compact
       else
         soft_failing_statuses | hidden_statuses
       end

data/app/models/shipit/deploy_spec/bundler_discovery.rb

@@ -19,8 +19,12 @@ module Shipit
         end
       end
 
+      def discover_machine_env
+        super.merge('BUNDLE_PATH' => bundle_path.to_s)
+      end
+
       def bundle_install
-        bundle = %(bundle check --path=#{bundle_path} || bundle install #{frozen_flag} --path=#{bundle_path} --retry=2)
+        bundle = %(bundle install #{frozen_flag} --jobs 4 --path #{bundle_path} --retry 2)
         bundle += " --without=#{bundler_without.join(':')}" unless bundler_without.empty?
         [remove_ruby_version_from_gemfile, bundle]
       end

data/app/models/shipit/deploy_spec/file_system.rb

@@ -57,6 +57,10 @@ module Shipit
             'checks' => review_checks,
           },
           'plugins' => plugins,
+          'status' => {
+            'context' => release_status_context,
+            'delay' => release_status_delay,
+          },
           'dependencies' => {'override' => dependencies_steps},
           'deploy' => {
             'override' => deploy_steps,

data/app/models/shipit/deploy_spec/kubernetes_discovery.rb

@@ -17,7 +17,7 @@ module Shipit
               'description' => "Simulates a rollout of Kubernetes deployments by using kubernetes-restart utility",
               'steps' => [kubernetes_restart_cmd],
             },
-          }
+          }.merge!(super)
         else
           super
         end

data/app/models/shipit/ephemeral_commit_checks.rb

@@ -14,10 +14,8 @@ module Shipit
       commands = StackCommands.new(stack)
       commands.with_temporary_working_directory(commit: commit) do |directory|
         deploy_spec = DeploySpec::FileSystem.new(directory, stack.environment)
-        Bundler.with_clean_env do
-          capture_all(build_commands(deploy_spec.dependencies_steps, chdir: directory))
-          capture_all(build_commands(deploy_spec.review_checks, chdir: directory))
-        end
+        capture_all(build_commands(deploy_spec.dependencies_steps, chdir: directory))
+        capture_all(build_commands(deploy_spec.review_checks, chdir: directory))
       end
       self
     rescue Command::Error

data/app/models/shipit/hook.rb

@@ -1,5 +1,38 @@
 module Shipit
   class Hook < ActiveRecord::Base
+    class DeliverySpec
+      def initialize(event:, url:, content_type:, payload:)
+        @event = event
+        @url = url
+        @content_type = content_type
+        @payload = payload
+      end
+
+      def send!
+        http.post(url, payload)
+      end
+
+      private
+
+      attr_reader :event, :url, :content_type, :payload
+
+      def http
+        Faraday::Connection.new do |connection|
+          connection.headers = headers
+          connection.adapter Faraday.default_adapter
+        end
+      end
+
+      def headers
+        {
+          'User-Agent' => 'Shipit Webhook',
+          'Content-Type' => content_type,
+          'X-Shipit-Event' => event,
+          'Accept' => '*/*',
+        }
+      end
+    end
+
     default_scope { order :id }
 
     DELIVERIES_LOG_SIZE = 500
@@ -71,12 +104,12 @@ module Shipit
     end
 
     def deliver!(event, payload)
-      deliveries.create!(
-        event: event,
+      DeliverHookJob.perform_later(
+        event: event.to_s,
         url: delivery_url,
         content_type: CONTENT_TYPES[content_type],
         payload: serialize_payload(payload),
-      ).schedule!
+      )
     end
 
     def purge_old_deliveries!(keep: DELIVERIES_LOG_SIZE)

data/app/models/shipit/pull_request.rb

@@ -2,6 +2,8 @@ module Shipit
   class PullRequest < ApplicationRecord
     include DeferredTouch
 
+    MERGE_REQUEST_FIELD = 'Merge-Requested-By'.freeze
+
     WAITING_STATUSES = %w(fetching pending).freeze
     QUEUED_STATUSES = %w(pending revalidating).freeze
     REJECTION_REASONS = %w(ci_failing merge_conflict requires_rebase).freeze
@@ -188,7 +190,7 @@ module Shipit
 
     def any_status_checks_failed?
       status = StatusChecker.new(head, head.statuses, stack.cached_deploy_spec)
-      status.failure? || status.error?
+      status.failure? || status.error? || status.missing?
     end
 
     def waiting?
@@ -245,7 +247,7 @@ module Shipit
 
     def merge_message
       return title unless merge_requested_by
-      "#{title}\n\nMerge-Requested-By: #{merge_requested_by.login}\n"
+      "#{title}\n\n#{MERGE_REQUEST_FIELD}: #{merge_requested_by.login}\n"
     end
 
     def stale?

data/app/models/shipit/release_status.rb

@@ -0,0 +1,41 @@
+module Shipit
+  class ReleaseStatus < ActiveRecord::Base
+    MAX_DESCRIPTION_LENGTH = 140
+    include DeferredTouch
+
+    belongs_to :stack
+    belongs_to :commit
+    belongs_to :user, optional: true
+
+    deferred_touch stack: :updated_at, commit: :updated_at
+    after_commit :schedule_create_release_statuses, on: :create
+
+    scope :to_be_created, -> { where(github_id: nil).order(id: :asc) }
+
+    STATES = %w(pending success failure error).freeze
+    validates :state, presence: true, inclusion: {in: STATES}
+
+    def create_status_on_github!
+      return true if github_id?
+
+      update!(github_id: create_status_on_github.id)
+    end
+
+    private
+
+    def create_status_on_github
+      Shipit.github.api.create_status(
+        stack.github_repo_name,
+        commit.sha,
+        state,
+        context: stack.release_status_context,
+        target_url: target_url,
+        description: description&.truncate(MAX_DESCRIPTION_LENGTH),
+      )
+    end
+
+    def schedule_create_release_statuses
+      CreateReleaseStatusesJob.perform_later(commit)
+    end
+  end
+end

data/app/models/shipit/rollback.rb

@@ -34,6 +34,15 @@ module Shipit
 
     private
 
+    def update_release_status
+      return unless stack.release_status?
+
+      case status
+      when 'pending'
+        deploy.append_release_status('failure', "A rollback #{stack.to_param} was triggered")
+      end
+    end
+
     def lock_reverted_commits
       stack.lock_reverted_commits!
     end

data/app/models/shipit/stack.rb

@@ -73,8 +73,8 @@ module Shipit
     validates :lock_reason, length: {maximum: 4096}
 
     serialize :cached_deploy_spec, DeploySpec
-    delegate :find_task_definition, :supports_rollback?, :links,
-             :supports_fetch_deployed_revision?, to: :cached_deploy_spec, allow_nil: true
+    delegate :find_task_definition, :supports_rollback?, :links, :release_status?, :release_status_delay,
+             :release_status_context, :supports_fetch_deployed_revision?, to: :cached_deploy_spec, allow_nil: true
 
     def self.refresh_deployed_revisions
       find_each.select(&:supports_fetch_deployed_revision?).each(&:async_refresh_deployed_revision)
@@ -307,13 +307,8 @@ module Shipit
       File.join(base_path, "git")
     end
 
-    def acquire_git_cache_lock(timeout: 15, expiration: 60, &block)
-      Redis::Lock.new(
-        "stack:#{id}:git-cache-lock",
-        Shipit.redis,
-        timeout: timeout,
-        expiration: expiration,
-      ).lock(&block)
+    def acquire_git_cache_lock(timeout: 15, &block)
+      Flock.new(git_path.to_s + '.lock').lock(timeout: timeout, &block)
     end
 
     def clear_git_cache!

data/app/models/shipit/status/common.rb

@@ -21,6 +21,10 @@ module Shipit
         state == 'failure'.freeze
       end
 
+      def missing?
+        false
+      end
+
       def group?
         false
       end

data/app/models/shipit/status/group.rb

@@ -29,7 +29,8 @@ module Shipit
         @statuses = visible_statuses.sort_by!(&:context)
       end
 
-      delegate :pending?, :success?, :error?, :failure?, :unknown?, :state, :simple_state, to: :significant_status
+      delegate :pending?, :success?, :error?, :failure?, :unknown?, :missing?, :state, :simple_state,
+               to: :significant_status
       delegate :each, :size, :map, to: :statuses
       delegate :required_statuses, to: :commit
 

data/app/models/shipit/status/missing.rb

@@ -18,6 +18,10 @@ module Shipit
         'pending'.freeze
       end
 
+      def missing?
+        true
+      end
+
       def description
         I18n.t('missing_status.description', context: context)
       end

data/app/models/shipit/status/unknown.rb

@@ -1,18 +1,33 @@
 module Shipit
   class Status
     class Unknown
+      include GlobalID::Identification
       include Common
 
+      class << self
+        def find(id)
+          new(Commit.find(id))
+        end
+      end
+
       attr_reader :commit
 
       def initialize(commit)
         @commit = commit
       end
 
+      def id
+        commit.id
+      end
+
       def state
         'unknown'.freeze
       end
 
+      def missing?
+        true
+      end
+
       def target_url
         nil
       end

data/app/models/shipit/task.rb

@@ -289,6 +289,10 @@ module Shipit
       self.class.name.demodulize.underscore.to_sym
     end
 
+    def permalink
+      Shipit::Engine.routes.url_helpers.stack_task_url(stack, self)
+    end
+
     private
 
     def prevent_concurrency

data/app/models/shipit/user.rb

@@ -8,6 +8,8 @@ module Shipit
     has_many :commits, foreign_key: :committer_id, inverse_of: :committer
     has_many :tasks
 
+    validates :name, presence: true
+
     attr_encrypted :github_access_token, key: Shipit.user_access_tokens_key
 
     def self.find_or_create_by_login!(login)
@@ -16,8 +18,19 @@ module Shipit
       end
     end
 
+    def self.find_or_create_committer_from_github_commit(github_commit)
+      find_or_create_from_github(github_commit.committer.presence || github_commit.commit.committer.presence)
+    end
+
+    def self.find_or_create_author_from_github_commit(github_commit)
+      if github_commit.commit.message =~ /^#{PullRequest::MERGE_REQUEST_FIELD}: ([\w\-\.]+)$/
+        return find_or_create_by_login!($1)
+      end
+      find_or_create_from_github(github_commit.author.presence || github_commit.commit.author.presence)
+    end
+
     def self.find_or_create_from_github(github_user)
-      find_from_github(github_user) || create_from_github!(github_user)
+      find_from_github(github_user) || create_from_github(github_user)
     end
 
     def self.find_from_github(github_user)
@@ -25,8 +38,8 @@ module Shipit
       find_by(github_id: github_user.id)
     end
 
-    def self.create_from_github!(github_user)
-      create!(github_user: github_user)
+    def self.create_from_github(github_user)
+      create(github_user: github_user)
     end
 
     def self.refresh_shard(shard_index, shards_count)