shipit-engine 0.27.1 → 0.28.0

data/app/views/shipit/merge_status/_commit_count_warning.html.erb

@@ -1,8 +1,4 @@
 <p class="status-heading text-red">
   <%= render 'warning_icon' %>
-  Consider rebasing into a smaller number of commits containing atomic changes. Find out
-  <%= link_to 'why', 'https://docs.google.com/document/d/1lZlNo7ekugQDxug6Nc6pdY87VNobl3g2IQjY7R0YIIc',
-    target: '_blank',
-    rel: 'noopener'
-  %>.
+  Consider rebasing into a smaller number of commits containing atomic changes.
 </p>

data/app/views/shipit/merge_status/backlogged.html.erb

@@ -17,5 +17,5 @@
     <%= link_to @stack.to_param, stack_url(@stack), target: '_blank', rel: 'noopener' %>
     is <strong>backlogged</strong>
   </span>
-  <%= render 'commit_count_warning' if too_many_commits?(params[:commits].to_i) %>
+  <%= render 'commit_count_warning' if display_commit_count_warning?(params[:commits].to_i) %>
 </div>

data/app/views/shipit/merge_status/failure.html.erb

@@ -17,5 +17,5 @@
     <%= link_to @stack.to_param, stack_url(@stack), target: '_blank', rel: 'noopener' %>
     <strong>master branch is failing!</strong>
   </span>
-  <%= render 'commit_count_warning' if too_many_commits?(params[:commits].to_i) %>
+  <%= render 'commit_count_warning' if display_commit_count_warning?(params[:commits].to_i) %>
 </div>

data/app/views/shipit/merge_status/locked.html.erb

@@ -17,5 +17,5 @@
     <%= link_to @stack.to_param, stack_url(@stack), target: '_blank', rel: 'noopener' %>
     is <strong>locked</strong> because: <strong><%= auto_link(emojify(@stack.lock_reason), html: { target: '_blank' }) %></strong>
   </span>
-  <%= render 'commit_count_warning' if too_many_commits?(params[:commits].to_i) %>
+  <%= render 'commit_count_warning' if display_commit_count_warning?(params[:commits].to_i) %>
 </div>

data/app/views/shipit/merge_status/success.html.erb

@@ -20,5 +20,5 @@
     <%= link_to @stack.to_param, stack_url(@stack), target: '_blank', rel: 'noopener' %> is clear.
   </span>
 
-  <%= render 'commit_count_warning' if too_many_commits?(params[:commits].to_i) %>
+  <%= render 'commit_count_warning' if display_commit_count_warning?(params[:commits].to_i) %>
 </div>

data/app/views/shipit/stacks/show.html.erb

@@ -17,7 +17,16 @@
       </div>
     </header>
     <ul class="commit-list">
-      <%= render partial: 'shipit/commits/commit', collection: @commits %>
+      <%= render partial: 'shipit/commits/commit', collection: @undeployed_commits %>
+    </ul>
+  </section>
+
+  <section>
+    <header class="section-header">
+      <h2>Currently Deploying Commits</h2>
+    </header>
+    <ul class="commit-list">
+      <%= render partial: 'shipit/commits/commit', collection: @active_commits %>
     </ul>
   </section>
 

data/app/views/shipit/tasks/_task_output.html.erb

@@ -31,8 +31,8 @@
 
       <% if task.supports_rollback? %>
         <%= link_to abort_stack_task_path(@stack, task, rollback: true), class: "btn btn--delete action-button", data: { action: "abort", rollback: true, status: task.status } do %>
-          <span class="caption--ready">Abort and Rollback</span>
-          <span class="caption--pending">Aborting with Rollback...</span>
+          <span class="caption--ready">Abort and Rollback to <span class="short-sha-no-bg"><%= short_commit_sha(task) %></span></span>
+          <span class="caption--pending">Aborting with Rollback... to <span class="short-sha-no-bg"><%= short_commit_sha(task) %></span></span>
         <% end %>
       <% end %>
     </div>

data/config/locales/en.yml

@@ -22,7 +22,8 @@
 en:
   commit:
     lock: This commit is safe to deploy. Click to mark it as unsafe.
-    unlock: This commit is unsafe to deploy. Click to mark it as safe.
+    unlock: This commit was marked as unsafe to deploy. Click to mark it as safe.
+    unlock_with_author: "%{author} marked this commit as unsafe to deploy. Click to mark it as safe."
     confirm_unlock: Mark this commit as safe to deploy?
   release:
     validate: Mark the release as healthy

data/config/routes.rb

@@ -16,6 +16,7 @@ Shipit::Engine.routes.draw do
     resources :stacks, only: %i(index create)
     scope '/stacks/*id', id: stack_id_format, as: :stack do
       get '/' => 'stacks#show'
+      delete '/' => 'stacks#destroy'
     end
 
     scope '/stacks/*stack_id', stack_id: stack_id_format, as: :stack do
@@ -24,7 +25,9 @@ Shipit::Engine.routes.draw do
       resources :tasks, only: %i(index show) do
         resource :output, only: :show
       end
-      resources :deploys, only: %i(index create)
+      resources :deploys, only: %i(index create) do
+        resources :release_statuses, only: %i(create)
+      end
       resources :commits, only: %i(index)
       resources :pull_requests, only: %i(index show update destroy)
       post '/task/:task_name' => 'tasks#trigger', as: :trigger_task
@@ -63,6 +66,10 @@ Shipit::Engine.routes.draw do
     post :clear_git_cache, controller: :stacks
   end
 
+  scope '/task/:id', controller: :tasks do
+    get '/', action: :lookup
+  end
+
   scope '/*stack_id', stack_id: stack_id_format, as: :stack do
     get '/commit/:sha/checks' => 'commit_checks#show', as: :commit_checks
     get '/commit/:sha/checks/tail' => 'commit_checks#tail', as: :tail_commit_checks, defaults: {format: :json}

data/db/migrate/20190502020249_add_lock_author_id_to_commits.rb

@@ -0,0 +1,5 @@
+class AddLockAuthorIdToCommits < ActiveRecord::Migration[5.2]
+  def change
+    add_column(:commits, :lock_author_id, :integer, limit: 4)
+  end
+end

data/lib/shipit.rb

@@ -48,6 +48,8 @@ require 'shipit/rollback_commands'
 require 'shipit/environment_variables'
 require 'shipit/stat'
 require 'shipit/strip_cache_control'
+require 'shipit/cast_value'
+require 'shipit/line_buffer'
 
 SafeYAML::OPTIONS[:default_mode] = :safe
 SafeYAML::OPTIONS[:deserialize_symbols] = false
@@ -58,7 +60,7 @@ module Shipit
   delegate :table_name_prefix, to: :secrets
 
   attr_accessor :disable_api_authentication, :timeout_exit_codes
-  attr_writer :internal_hook_receivers
+  attr_writer :internal_hook_receivers, :task_logger
 
   self.timeout_exit_codes = [].freeze
 
@@ -75,7 +77,13 @@ module Shipit
   end
 
   def redis(namespace = nil)
-    @redis ||= Redis.new(url: redis_url.to_s.presence, logger: Rails.logger)
+    @redis ||= Redis.new(
+      url: redis_url.to_s.presence,
+      logger: Rails.logger,
+      reconnect_attempts: 3,
+      reconnect_delay: 0.5,
+      reconnect_delay_max: 1,
+    )
     return @redis unless namespace
     Redis::Namespace.new(namespace, redis: @redis)
   end
@@ -188,6 +196,10 @@ module Shipit
     @internal_hook_receivers ||= []
   end
 
+  def task_logger
+    @task_logger ||= Logger.new(nil)
+  end
+
   protected
 
   def revision_file

data/lib/shipit/cast_value.rb

@@ -0,0 +1,9 @@
+module Shipit
+  module CastValue
+    def to_boolean(value)
+      ActiveModel::Type::Boolean.new.serialize(value)
+    end
+
+    module_function :to_boolean
+  end
+end

data/lib/shipit/command.rb

@@ -23,13 +23,14 @@ module Shipit
       end
     end
 
-    attr_reader :out, :code, :chdir, :env, :args, :pid, :timeout
+    attr_reader :out, :chdir, :env, :args, :pid, :timeout
 
     def initialize(*args, default_timeout: Shipit.default_inactivity_timeout, env: {}, chdir:)
       @args, options = parse_arguments(args)
       @timeout = options['timeout'.freeze] || options[:timeout] || default_timeout
       @env = env
       @chdir = chdir.to_s
+      @timed_out = false
     end
 
     def with_timeout(new_timeout)
@@ -58,7 +59,7 @@ module Shipit
     end
 
     def exit_message
-      "#{self} exited with status #{@code}"
+      "#{self} #{termination_status}"
     end
 
     def run
@@ -107,16 +108,15 @@ module Shipit
       begin
         read_stream(@out, &block)
       rescue TimedOut => error
-        @code = 'timeout'
         yield red("No output received in the last #{timeout} seconds.") + "\n"
         terminate!(&block)
         raise error
       rescue Errno::EIO # Somewhat expected on Linux: http://stackoverflow.com/a/10306782
       end
 
-      _, status = Process.waitpid2(@pid)
-      @code = status.exitstatus
       self
+    ensure
+      reap_child!
     end
 
     def red(text)
@@ -130,6 +130,10 @@ module Shipit
     end
 
     def timed_out?
+      @timed_out
+    end
+
+    def output_timed_out?
       @last_output_at ||= Time.now.to_i
       (@last_output_at + timeout) < Time.now.to_i
     end
@@ -150,7 +154,10 @@ module Shipit
           yield io.read_nonblock(MAX_READ)
           touch_last_output_at
         rescue IO::WaitReadable
-          raise TimedOut if timed_out?
+          if output_timed_out?
+            @timed_out = true
+            raise TimedOut
+          end
           IO.select([io], nil, nil, 1)
           retry
         end
@@ -183,18 +190,18 @@ module Shipit
       rescue TimedOut
       rescue Errno::EIO # EIO is somewhat expected on Linux: http://stackoverflow.com/a/10306782
         # If we try to read the stream right after sending a signal, we often get an Errno::EIO.
-        if status = Process.wait(@pid, Process::WNOHANG)
-          return status
-        else
-          # If we let the child a little bit of time, it solves it.
-          retry_count -= 1
-          if retry_count > 0
-            sleep 0.05
-            retry
-          end
+        if reap_child!(block: false)
+          return true
+        end
+        # If we let the child a little bit of time, it solves it.
+        retry_count -= 1
+        if retry_count > 0
+          sleep 0.05
+          retry
         end
       end
-      Process.wait(@pid, Process::WNOHANG)
+      reap_child!(block: false)
+      true
     end
 
     def kill(sig)
@@ -215,5 +222,44 @@ module Shipit
       end
       return args, options
     end
+
+    def running?
+      !!pid && !@status
+    end
+
+    def code
+      @status&.exitstatus
+    end
+
+    def signaled?
+      @status.signaled?
+    end
+
+    def reap_child!(block: true)
+      return @status if @status
+      return unless running? # Command was never started e.g. permission denied, not found etc
+      if block
+        _, @status = Process.waitpid2(@pid)
+      elsif res = Process.waitpid2(@pid, Process::WNOHANG)
+        @status = res[1]
+      end
+      @status
+    end
+
+    def termination_status
+      if running?
+        "is running"
+      elsif success?
+        "terminated successfully"
+      elsif timed_out? && signaled?
+        "timed out and terminated with #{Signal.signame(@status.termsig)} signal"
+      elsif timed_out?
+        "timed out and terminated with exit status #{exitstatus}"
+      elsif signaled?
+        "terminated with #{Signal.signame(@status.termsig)} signal"
+      else
+        "terminated with exit status #{code}"
+      end
+    end
   end
 end

data/lib/shipit/line_buffer.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Shipit
+  class LineBuffer
+    SEPARATOR = "\n"
+
+    def initialize(queue = "")
+      @queue = queue.dup
+    end
+
+    def buffer(text, &block)
+      @queue << text
+      whole_lines.each(&block).tap { flush }
+    end
+
+    def empty?
+      @queue.empty?
+    end
+
+    private
+
+    def whole_lines
+      whole? ? lines : lines[0..-2]
+    end
+
+    def flush
+      whole? ? clear : @queue = lines.last
+    end
+
+    def whole?
+      @queue.end_with?(SEPARATOR)
+    end
+
+    def lines
+      @queue.split(SEPARATOR)
+    end
+
+    def clear
+      @queue.clear
+    end
+  end
+end

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.27.1'.freeze
+  VERSION = '0.28.0'.freeze
 end

data/lib/tasks/shipit.rake

@@ -0,0 +1,27 @@
+namespace :shipit do
+  desc "Deploy from a running instance. "
+  task deploy: :environment do
+    begin
+      stack = ENV['stack']
+      revision = ENV['revision']
+
+      raise ArgumentError.new('The first argument has to be a stack, e.g. shopify/shipit/production') if stack.nil?
+      raise ArgumentError.new('The second argument has to be a revision') if revision.nil?
+
+      module Shipit
+        class Task
+          def write(text)
+            p text
+            chunks.create!(text: text)
+          end
+        end
+      end
+
+      Shipit::Stack.run_deploy_in_foreground(stack: stack, revision: revision)
+    rescue ArgumentError
+      p "Use this command as follows:"
+      p "bundle exec rake shipit:deploy stack='shopify/shipit/production' revision='$SHA'"
+      raise
+    end
+  end
+end

data/test/controllers/api/release_statuses_controller_test.rb

@@ -0,0 +1,66 @@
+require 'test_helper'
+
+module Shipit
+  module Api
+    class ReleaseStatusesControllerTest < ActionController::TestCase
+      setup do
+        authenticate!
+        @stack = shipit_stacks(:shipit_canaries)
+        @deploy = shipit_deploys(:canaries_validating)
+      end
+
+      test "#create renders a 422 if status is not found" do
+        post :create, params: {stack_id: @stack.to_param, deploy_id: @deploy.id}
+        assert_response :unprocessable_entity
+        assert_json 'errors', 'status' => ['is required', 'is not included in the list']
+      end
+
+      test "#create renders a 422 if status is invalid" do
+        assert_no_difference -> { ReleaseStatus.count } do
+          post :create, params: {
+            stack_id: @stack.to_param,
+            deploy_id: @deploy.id,
+            status: 'foo',
+          }
+        end
+
+        assert_response :unprocessable_entity
+        assert_json 'errors', 'status' => ['is not included in the list']
+      end
+
+      test "#create allow users to append release statuses and mark the deploy as success" do
+        assert_difference -> { ReleaseStatus.count }, +1 do
+          post :create, params: {
+            stack_id: @stack.to_param,
+            deploy_id: @deploy.id,
+            status: 'success',
+          }
+          assert_response :created
+        end
+
+        status = ReleaseStatus.last
+        assert_equal 'success', status.state
+        assert_equal '@anonymous signaled this release as healthy.', status.description
+        assert_equal @deploy.permalink, status.target_url
+        assert_equal 'success', @deploy.reload.status
+      end
+
+      test "#create allow users to append release statuses and mark the deploy as faulty" do
+        assert_difference -> { ReleaseStatus.count }, +1 do
+          post :create, params: {
+            stack_id: @stack.to_param,
+            deploy_id: @deploy.id,
+            status: 'failure',
+          }
+          assert_response :created
+        end
+
+        status = ReleaseStatus.last
+        assert_equal 'failure', status.state
+        assert_equal '@anonymous signaled this release as faulty.', status.description
+        assert_equal @deploy.permalink, status.target_url
+        assert_equal 'faulty', @deploy.reload.status
+      end
+    end
+  end
+end