shipit-engine 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 84e2ecaebc907d7522d77553a552bafefa65cc7f
-  data.tar.gz: 59cd29bbf69566d7a0c2fa82ed3ad0f0086d307b
+SHA256:
+  metadata.gz: 762ae4d018877b6f41fb8da260308546bd12575052091eff89613ed2eec03c39
+  data.tar.gz: 16d840d7d162baf954b1c2df8c710c404af74e3963f98e9a3a65db92ad7e2e51
 SHA512:
-  metadata.gz: fa96c8e445ac42b2b3138d6fbc00b3f61a290f06d491547ee6e1a83c09bf5f322a716af4539cf138bbc586d31e19944fc43438338722fc144ec0ce4113c11ae3
-  data.tar.gz: dab317ea37e1211b7cc765a2e30521bc7ca2054880f3df11402570d86fcc0326baf1e832e7182d647dc9c2f7f56f52f85ddc1e1b317546170862e077b4ae0eaa
+  metadata.gz: 15d549a32fafc05268f2f3a07d4794d76804ba1e3c5349a6ff5340579460b01f048ee9535a026dbc03fb8893734563b451ef7f2e0dbd16b3d0f18ec39c5c1505
+  data.tar.gz: 60abb9fdf8e2257b6dc7aaa5c1b13a804242cc795fd3173ce55ece79ea328db1eb885e02b99af6d3484bf76eaf05a3f0d5ec500f87a3e546e49cd0b859dcf1f5

data/app/assets/images/faulty.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="19px" height="14px" viewBox="0 0 19 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs></defs>
+    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g stroke-width="2" stroke="#FFC66C">
+            <path d="M0.699,6.254 L6.369,11.79 L17.737,0.716"></path>
+        </g>
+    </g>
+</svg>

data/app/assets/images/validating.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.0.2 (7799) - http://www.bohemiancoding.com/sketch -->
+    <title>unknown</title>
+    <description>Created with Sketch.</description>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="unknown" sketch:type="MSArtboardGroup" fill="#25C351">
+            <path d="M15.0013334,17.28 L16.8713334,17.28 C16.8713334,16.7666641 16.9299994,16.2900022 17.0473334,15.85 C17.1646673,15.4099978 17.3516654,15.0286683 17.6083334,14.706 C17.8650013,14.3833317 18.1839981,14.1266676 18.5653334,13.936 C18.9466686,13.7453324 19.4013307,13.65 19.9293334,13.65 C20.7213373,13.65 21.348331,13.8773311 21.8103334,14.332 C22.2723357,14.7866689 22.5326664,15.4173293 22.5913334,16.224 C22.6206668,16.7666694 22.5546675,17.2286648 22.3933334,17.61 C22.2319992,17.9913352 22.015668,18.3396651 21.7443334,18.655 C21.4729987,18.9703349 21.1796683,19.2709986 20.8643334,19.557 C20.5489984,19.8430014 20.2483348,20.154665 19.9623334,20.492 C19.6763319,20.829335 19.4343343,21.2143312 19.2363334,21.647 C19.0383324,22.0796688 18.9246668,22.6039969 18.8953334,23.22 L18.8953334,24.254 L20.7653334,24.254 L20.7653334,23.396 C20.7653334,23.0146648 20.8203328,22.6736682 20.9303334,22.373 C21.0403339,22.0723318 21.1869991,21.7936679 21.3703334,21.537 C21.5536676,21.280332 21.7589989,21.0383345 21.9863334,20.811 C22.2136678,20.5836655 22.4446655,20.3600011 22.6793334,20.14 C22.9140012,19.9053322 23.1449989,19.6633346 23.3723334,19.414 C23.5996678,19.1646654 23.8013325,18.8933348 23.9773334,18.6 C24.1533342,18.3066652 24.2963328,17.9803351 24.4063334,17.621 C24.5163339,17.2616649 24.5713334,16.8546689 24.5713334,16.4 C24.5713334,15.6959965 24.4576678,15.0726694 24.2303334,14.53 C24.0029989,13.9873306 23.6840021,13.5290019 23.2733334,13.155 C22.8626646,12.7809981 22.3750028,12.495001 21.8103334,12.297 C21.2456639,12.098999 20.6186701,12 19.9293334,12 C19.1666629,12 18.4773364,12.1319987 17.8613334,12.396 C17.2453303,12.6600013 16.7246688,13.030331 16.2993334,13.507 C15.8739979,13.9836691 15.5476678,14.5446634 15.3203334,15.19 C15.0929989,15.8353366 14.9866666,16.5319963 15.0013334,17.28 L15.0013334,17.28 Z" id="?" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-4" stroke="#CCCCCC" sketch:type="MSShapeGroup" cx="20" cy="28" r="1"></circle>
+        </g>
+    </g>
+</svg>

data/app/assets/stylesheets/_pages/_commits.scss

@@ -256,6 +256,24 @@
   }
 }
 
+.status--validating,
+[data-deploy-status='validating'] {
+  border-color: $green;
+
+  .status__icon {
+    background-image: asset-data-url("validating.svg");
+  }
+}
+
+.status--faulty,
+[data-deploy-status='faulty'] {
+  border-color: $yellow;
+
+  .status__icon {
+    background-image: asset-data-url("faulty.svg");
+  }
+}
+
 .status--success,
 [data-deploy-status='success'] {
   border-color: $green;

data/app/controllers/shipit/api/commits_controller.rb

@@ -4,7 +4,12 @@ module Shipit
       require_permission :read, :stack
 
       def index
-        render_resources stack.commits.reachable.includes(:statuses)
+        commits = stack.commits.reachable.includes(:statuses)
+        if params[:undeployed]
+          commits = commits.newer_than(stack.last_deployed_commit)
+        end
+
+        render_resources commits
       end
     end
   end

data/app/controllers/shipit/api/deploys_controller.rb

@@ -3,6 +3,10 @@ module Shipit
     class DeploysController < BaseController
       require_permission :deploy, :stack
 
+      def index
+        render_resources stack.deploys_and_rollbacks
+      end
+
       params do
         requires :sha, String, length: {in: 6..40}
         accepts :force, Boolean, default: false

data/app/controllers/shipit/release_statuses_controller.rb

@@ -6,17 +6,9 @@ module Shipit
     def create
       case params[:status]
       when 'success'
-        @deploy.append_release_status(
-          'success',
-          "@#{current_user.login} signaled this release as healthy.",
-          user: current_user,
-        )
+        @deploy.report_healthy!(user: current_user)
       when 'failure'
-        @deploy.append_release_status(
-          'failure',
-          "@#{current_user.login} signaled this release as faulty.",
-          user: current_user,
-        )
+        @deploy.report_faulty!(user: current_user)
       else
         render status: :unprocessable_entity, json: {message: "Invalid `status` parameter"}
       end

data/app/jobs/shipit/mark_deploy_healty_job.rb

@@ -0,0 +1,13 @@
+module Shipit
+  class MarkDeployHealthyJob < BackgroundJob
+    include BackgroundJob::Unique
+
+    queue_as :default
+
+    def perform(deploy)
+      return unless deploy.validating?
+
+      deploy.report_healthy!(description: "No issues were signalled after #{deploy.stack.release_status_delay}")
+    end
+  end
+end

data/app/jobs/shipit/perform_task_job.rb

@@ -18,7 +18,7 @@ module Shipit
       @task.run!
       checkout_repository
       perform_task
-      @task.complete!
+      @task.report_complete!
     rescue Command::TimedOut => error
       @task.write("\n#{error.message}\n")
       @task.report_timeout!(error)

data/app/models/shipit/check_run.rb

@@ -11,6 +11,8 @@ module Shipit
 
     validates :conclusion, inclusion: {in: CONCLUSIONS, allow_nil: true}
 
+    after_create :enable_ci_on_stack
+
     class << self
       def create_or_update_by!(selector:, attributes: {})
         create!(selector.merge(attributes))
@@ -67,5 +69,11 @@ module Shipit
     def to_partial_path
       'shipit/statuses/status'
     end
+
+    private
+
+    def enable_ci_on_stack
+      commit.stack.enable_ci!
+    end
   end
 end

data/app/models/shipit/deploy.rb

@@ -66,13 +66,14 @@ module Shipit
     end
 
     # Rolls the stack back to the **previous** deploy
-    def trigger_revert
+    def trigger_revert(force: false)
       rollback = Rollback.create!(
         user_id: user_id,
         stack_id: stack_id,
         parent_id: id,
         since_commit: until_commit,
         until_commit: since_commit,
+        allow_concurrency: force,
       )
       rollback.enqueue
       lock_reason = "A rollback for #{until_commit.sha} has been triggered. " \
@@ -160,6 +161,36 @@ module Shipit
       Shipit::Engine.routes.url_helpers.stack_deploy_url(stack, self)
     end
 
+    def report_complete!
+      if stack.release_status? && stack.release_status_delay.positive?
+        enter_validation!
+      else
+        super
+      end
+    end
+
+    def report_healthy!(user: self.user, description: "@#{user.login} signaled this release as healthy.")
+      transaction do
+        complete! if can_complete?
+        append_release_status(
+          'success',
+          description,
+          user: user,
+        )
+      end
+    end
+
+    def report_faulty!(user: self.user, description: "@#{user.login} signaled this release as faulty.")
+      transaction do
+        mark_faulty! if can_mark_faulty?
+        append_release_status(
+          'failure',
+          description,
+          user: user,
+        )
+      end
+    end
+
     private
 
     def create_commit_deployments
@@ -178,18 +209,14 @@ module Shipit
         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 'validating'
+        if stack.release_status_delay.positive?
+          append_release_status('pending', "The deploy on #{stack.environment} succeeded")
+          MarkDeployHealthyJob.set(wait: stack.release_status_delay).perform_later(self)
+        end
       when 'success'
-        delay = stack.release_status_delay
-        if delay.zero?
+        if stack.release_status_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
@@ -206,7 +233,7 @@ module Shipit
 
     def default_since_commit_id
       return unless stack
-      @default_since_commit_id ||= last_successful_deploy&.until_commit_id
+      @default_since_commit_id ||= stack.last_completed_deploy&.until_commit_id
     end
 
     def denormalize_commit_stats
@@ -223,10 +250,6 @@ module Shipit
       ContinuousDeliveryJob.perform_later(stack)
     end
 
-    def last_successful_deploy
-      stack.deploys.where(status: "success").last
-    end
-
     def update_undeployed_commits_count
       stack.update_undeployed_commits_count(until_commit)
     end

data/app/models/shipit/deploy_spec.rb

@@ -76,7 +76,7 @@ module Shipit
     end
 
     def release_status_delay
-      if delay = config('status', 'delay') { config('deploy', 'interval') }
+      if delay = config('status', 'delay') { config('deploy', 'interval') { 0 } }
         Duration.parse(delay)
       end
     end

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

@@ -70,13 +70,16 @@ module Shipit
         check_tags = 'assert-lerna-fixed-version-tag'
         # `yarn publish` requires user input, so always use npm.
         version = lerna_version
-        publish =
-          "node_modules/.bin/lerna publish " \
-          "--yes " \
-          "--skip-git " \
-          "--repo-version #{version} " \
-          "--force-publish=* " \
-          "--npm-tag #{dist_tag(version)}"
+        publish = %W(
+          node_modules/.bin/lerna publish
+          --yes
+          --skip-git
+          --repo-version #{version}
+          --force-publish=*
+          --npm-tag #{dist_tag(version)}
+          --npm-client=npm
+          --skip-npm=false
+        ).join(" ")
 
         [check_tags, publish]
       end

data/app/models/shipit/rollback.rb

@@ -39,7 +39,16 @@ module Shipit
 
       case status
       when 'pending'
-        deploy.append_release_status('failure', "A rollback #{stack.to_param} was triggered")
+        if deploy.rollback_once_aborted?
+          deploy.report_faulty!(description: "A rollback of #{stack.to_param} was triggered")
+        else
+          since_commit.create_release_status!(
+            'failure',
+            user: user.presence,
+            target_url: permalink,
+            description: "A rollback of #{stack.to_param} was triggered",
+          )
+        end
       end
     end
 

data/app/models/shipit/stack.rb

@@ -141,7 +141,7 @@ module Shipit
     end
 
     def continuous_delivery_delayed!
-      touch(:continuous_delivery_delayed_since, :updated_at) unless continuous_delivery_delayed?
+      touch(:continuous_delivery_delayed_since) unless continuous_delivery_delayed?
     end
 
     def trigger_continuous_delivery
@@ -175,6 +175,8 @@ module Shipit
 
     def deployed_too_recently?
       if task = last_active_task
+        return true if task.validating?
+
         task.ended_at? && (task.ended_at + pause_between_deploys).future?
       end
     end
@@ -255,8 +257,8 @@ module Shipit
       scope.map.with_index { |c, i| UndeployedCommit.new(c, i) }.reverse
     end
 
-    def last_successful_deploy
-      deploys_and_rollbacks.last_successful
+    def last_completed_deploy
+      deploys_and_rollbacks.last_completed
     end
 
     def last_active_task
@@ -264,7 +266,7 @@ module Shipit
     end
 
     def last_deployed_commit
-      last_successful_deploy&.until_commit || NoDeployedCommit
+      last_completed_deploy&.until_commit || NoDeployedCommit
     end
 
     def deployable?
@@ -426,7 +428,7 @@ module Shipit
 
     def ci_enabled?
       Rails.cache.fetch(ci_enabled_cache_key) do
-        commits.joins(:statuses).any?
+        commits.joins(:statuses).any? || commits.joins(:check_runs).any?
       end
     end
 

data/app/models/shipit/task.rb

@@ -6,8 +6,8 @@ module Shipit
 
     PRESENCE_CHECK_TIMEOUT = 15
     ACTIVE_STATUSES = %w(pending running aborting).freeze
-    COMPLETED_STATUSES = %w(success error failed flapping aborted).freeze
-    UNSUCCESSFUL_STATUSES = %w(error failed aborted flapping timedout).freeze
+    COMPLETED_STATUSES = %w(success flapping faulty validating).freeze
+    UNSUCCESSFUL_STATUSES = %w(error failed aborted flapping timedout faulty).freeze
 
     attr_accessor :pid
 
@@ -43,8 +43,8 @@ module Shipit
         pluck(:started_at, :ended_at).select { |s, e| s && e }.map { |s, e| e - s }
       end
 
-      def last_successful
-        success.last
+      def last_completed
+        completed.last
       end
 
       def current
@@ -57,7 +57,7 @@ module Shipit
         task.started_at ||= Time.now.utc
       end
 
-      before_transition any => %i(success failed error timedout) do |task|
+      before_transition any => %i(success failed error timedout validating) do |task|
         task.ended_at ||= Time.now.utc
       end
 
@@ -82,7 +82,15 @@ module Shipit
       end
 
       event :complete do
-        transition %i(running flapping) => :success
+        transition %i(running flapping validating faulty) => :success
+      end
+
+      event :enter_validation do
+        transition %i(running flapping) => :validating
+      end
+
+      event :mark_faulty do
+        transition %i(validating success) => :faulty
       end
 
       event :error do
@@ -107,6 +115,8 @@ module Shipit
 
       state :pending
       state :running
+      state :validating
+      state :faulty
       state :failed
       state :success
       state :error
@@ -120,6 +130,10 @@ module Shipit
       status.in?(ACTIVE_STATUSES)
     end
 
+    def report_complete!
+      complete!
+    end
+
     def report_failure!(error)
       reload
       if aborting?

data/app/views/layouts/merge_status.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <%= stylesheet_link_tag *(params[:stylesheets] || []).select { |url| url.start_with?('https://assets-cdn.github.com/') } %>
+    <%= stylesheet_link_tag *(params[:stylesheets] || []).select { |url| url.start_with?('https://assets-cdn.github.com/', 'https://github.githubassets.com/') } %>
     <%= stylesheet_link_tag 'merge_status' %>
   </head>
   <body>

data/config/routes.rb

@@ -24,7 +24,7 @@ Shipit::Engine.routes.draw do
       resources :tasks, only: %i(index show) do
         resource :output, only: :show
       end
-      resources :deploys, only: %i(create)
+      resources :deploys, only: %i(index create)
       resources :commits, only: %i(index)
       resources :pull_requests, only: %i(index show update destroy)
       post '/task/:task_name' => 'tasks#trigger', as: :trigger_task

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.26.0'.freeze
+  VERSION = '0.27.0'.freeze
 end

data/test/controllers/api/commits_controller_test.rb

@@ -15,6 +15,16 @@ module Shipit
         assert_response :ok
         assert_json '0.sha', commit.sha
       end
+
+      test "#index with undeployed=1 returns a list of undeployed commits" do
+        commits = @stack.undeployed_commits.pluck(:sha)
+
+        get :index, params: {stack_id: @stack.to_param, undeployed: 1}
+        assert_response :ok
+        JSON.parse(response.body).each do |commit|
+          assert commits.include?(commit.fetch("sha"))
+        end
+      end
     end
   end
 end