shipit-engine 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef8f9d577b2985bc9e82fd48bcb930c12261aef6
-  data.tar.gz: 4bf4282862504a06c96b5563750dc8d742e8c7ef
+  metadata.gz: 71f403cb4167fb521f7a2c190e2d31504dc0dea8
+  data.tar.gz: e1b1a94eefcc449a882ced01fa8036cd9df8e072
 SHA512:
-  metadata.gz: 15cc3525496d566cc27b67cefde82a3833f2bac1801a026b3de73c59a2208dc43c6b563b231da39d61eab6d1cf97c9f959515db5e873f7e16c2dfa5021732703
-  data.tar.gz: ec850e528fa5625ec20c3ebe81418381876e46ac2016ca55651284e3cabe58a641d29e304532290a096ca1e0237064308d1f8495537fc3ed278cf9e16a49c46a
+  metadata.gz: 0a04e776ddb132ab89a89b80ba5f5a78dfb69a53e73e7300b495e38deaa947cf6c69a6fd3b14dd9ca769ed5aa5d18c47d41a6e3a79de6f02ce2655f3cf305293
+  data.tar.gz: 5e71eaea76929fb232b98197018bc029e32d1f8b4d7743b775c72a6c549082fc0bdc7d212f930d66d657322f7fc15a2b0d736ee519bab026ecc18c16f0ae756a

data/app/assets/javascripts/shipit/stacks.js.coffee

@@ -1,4 +1,6 @@
-$(document).on 'click', '.commit-lock a', (event) ->
+$document = $(document)
+
+$document.on 'click', '.commit-lock a', (event) ->
   event.preventDefault()
   $commit = $(event.target).closest('.commit')
   $link = $(event.target).closest('a')
@@ -8,6 +10,18 @@ $(document).on 'click', '.commit-lock a', (event) ->
 
   $.ajax($link.attr('href'), method: 'PATCH', data: {commit: {locked: !locked}})
 
+$document.on 'click', '.action-set-release-status', (event) ->
+  event.preventDefault()
+  $link = $(event.target).closest('a')
+  $deploy = $link.closest('.deploy')
+  newStatus = $link.data('status')
+
+  return if $deploy.attr('data-release-status') == newStatus
+
+  $.ajax($link.attr('href'), method: 'POST', data: {status: newStatus}).success((last_status) ->
+    $deploy.attr('data-release-status', last_status.state)
+  )
+
 jQuery ($) ->
   displayIgnoreCiMessage = ->
     ignoreCiMessage = $(".ignoring-ci")

data/app/assets/stylesheets/_base/_icons.scss

@@ -6,3 +6,21 @@
   height: 15px;
   width: 12px;
 }
+
+.icon--validate {
+  display: inline-block;
+  background-color: #000;
+  mask: asset-data-url("success-small.svg") no-repeat 50% 50%;
+//  background: asset-data-url("lock.svg") center center no-repeat;
+  height: 15px;
+  width: 12px;
+}
+
+.icon--reject {
+  display: inline-block;
+  background-color: #000;
+  mask: asset-data-url("error-small.svg") no-repeat 50% 50%;
+//  background: asset-data-url("lock.svg") center center no-repeat;
+  height: 15px;
+  width: 12px;
+}

data/app/assets/stylesheets/_base/_status-items.scss

@@ -136,3 +136,31 @@
     background-image: asset-data-url('failure-small.svg');
   }
 }
+
+// DEPLOY STATUS ICON
+// -----------------------------------------------------------------------------
+
+.deploy-status__icon {
+  width: 12px;
+  height: 12px;
+  display: inline-block;
+  background: transparent no-repeat center center;
+  vertical-align: -2px;
+
+  .deploy[data-release-status=success] & {
+    background-image: asset-data-url('success-small.svg');
+  }
+
+  .deploy[data-release-status=pending] &,
+  .deploy[data-release-status=unknown] & {
+    background-image: asset-data-url('pending-small.svg');
+  }
+
+  .deploy[data-release-status=error] & {
+    background-image: asset-data-url('error-small.svg');
+  }
+
+  .deploy[data-release-status=failure] & {
+    background-image: asset-data-url('failure-small.svg');
+  }
+}

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

@@ -136,10 +136,6 @@
   color: $grey;
   margin: 0;
 
-  @include media(desktop) {
-    @include truncate;
-  }
-
   .warning {
     color: $orange;
   }
@@ -166,7 +162,7 @@
 
   @include media(desktop) {
     margin-left: 1rem;
-    min-width: 10rem;
+    min-width: 12rem;
 
     .btn {
       float: right;

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

@@ -35,7 +35,11 @@
   margin: 0 0.5rem;
 
   display: none;
-  &[data-status="running"], &[data-status="aborting"] { display: inline-block; }
+  &[data-status="running"],
+  &[data-status="aborting"],
+  &[data-status="pending"] {
+    display: inline-block;
+  }
 
   .caption--pending {
     display: none;
@@ -114,6 +118,7 @@
     width: 100%;
   }
 
+  &[data-status="pending"] .deploy-banner-status,
   &[data-status="running"] .deploy-banner-status {
     background-color: $blue;
     width: 0%;
@@ -202,7 +207,7 @@
     border-color: $bright-red;
   }
 
-  &[data-status="scheduled"],
+  &[data-status="pending"],
   &[data-status="running"] {
     border-color: $dark-yellow;
   }
@@ -217,4 +222,56 @@
 
 .ignored-safeties {
   color: $orange;
-}
+}
+
+.deploy-actions {
+  flex-shrink: 0;
+
+  @include media(desktop) {
+    margin-left: 1rem;
+    min-width: 12rem;
+
+    .btn {
+      float: right;
+    }
+  }
+}
+
+.release-validation {
+  display: inline-block;
+  .icon {
+    background-color: #ddd;
+  }
+
+  &:hover .icon {
+    background-color: darken(#ddd, 20%);
+  }
+}
+
+.deploy[data-release-status="success"] .release-validation .action-validate-release,
+.deploy[data-release-status="failure"] .release-validation .action-reject-release {
+  &:before, &:after {
+    display: none; // Hide tooltips
+  }
+  .icon {
+    background-color: #ddd;
+  }
+}
+
+.deploy .commit-lock {
+  .icon {
+    background-color: $bright-red;
+  }
+
+  &:hover .icon {
+    background-color: darken($bright-red, 20%);
+  }
+
+  .action-lock-commit {
+    display: none;
+  }
+
+  .action-unlock-commit {
+    display: inline-block;
+  }
+}

data/app/controllers/concerns/shipit/authentication.rb

@@ -16,7 +16,7 @@ module Shipit
     private
 
     def force_github_authentication
-      if current_user.logged_in?
+      if Shipit.authentication_disabled? || current_user.logged_in?
         unless current_user.authorized?
           team_handles = Shipit.github_teams.map(&:handle)
           team_list = team_handles.to_sentence(two_words_connector: ' or ', last_word_connector: ', or ')

data/app/controllers/shipit/merge_status_controller.rb

@@ -17,6 +17,8 @@ module Shipit
       else
         render html: ''
       end
+    rescue ArgumentError
+      render html: ''
     end
 
     def enqueue

data/app/controllers/shipit/release_statuses_controller.rb

@@ -0,0 +1,36 @@
+module Shipit
+  class ReleaseStatusesController < ShipitController
+    before_action :load_stack
+    before_action :load_deploy
+
+    def create
+      case params[:status]
+      when 'success'
+        @deploy.append_release_status(
+          'success',
+          "@#{current_user.login} signaled this release as healthy.",
+          user: current_user,
+        )
+      when 'failure'
+        @deploy.append_release_status(
+          'failure',
+          "@#{current_user.login} signaled this release as faulty.",
+          user: current_user,
+        )
+      else
+        render status: :unprocessable_entity, json: {message: "Invalid `status` parameter"}
+      end
+      render status: :created, json: @deploy.last_release_status
+    end
+
+    private
+
+    def load_deploy
+      @deploy = @stack.deploys_and_rollbacks.find(params[:deploy_id])
+    end
+
+    def load_stack
+      @stack ||= Stack.from_param!(params[:stack_id])
+    end
+  end
+end

data/app/jobs/shipit/append_delayed_release_status_job.rb

@@ -0,0 +1,17 @@
+module Shipit
+  class AppendDelayedReleaseStatusJob < BackgroundJob
+    include BackgroundJob::Unique
+
+    queue_as :default
+
+    def lock_key(deploy, *)
+      super(deploy)
+    end
+
+    def perform(deploy, cursor:, status:, description:)
+      return unless cursor == deploy.until_commit.release_statuses.last
+
+      deploy.append_release_status(status, description)
+    end
+  end
+end

data/app/jobs/shipit/cache_deploy_spec_job.rb

@@ -2,6 +2,8 @@ module Shipit
   class CacheDeploySpecJob < BackgroundJob
     include BackgroundJob::Unique
 
+    queue_as :deploys
+
     def perform(stack)
       return if stack.inaccessible?
 

data/app/jobs/shipit/clear_git_cache_job.rb

@@ -1,6 +1,6 @@
 module Shipit
   class ClearGitCacheJob < BackgroundJob
-    queue_as :default
+    queue_as :deploys
 
     def perform(stack)
       stack.clear_git_cache!

data/app/jobs/shipit/create_release_statuses_job.rb

@@ -0,0 +1,11 @@
+module Shipit
+  class CreateReleaseStatusesJob < BackgroundJob
+    include BackgroundJob::Unique
+
+    queue_as :default
+
+    def perform(commit)
+      commit.release_statuses.to_be_created.each(&:create_status_on_github!)
+    end
+  end
+end

data/app/jobs/shipit/deferred_touch_job.rb

@@ -2,6 +2,8 @@ module Shipit
   class DeferredTouchJob < BackgroundJob
     include BackgroundJob::Unique
 
+    queue_as :default
+
     def perform
       DeferredTouch.touch_now!
     end

data/app/jobs/shipit/deliver_hook_job.rb

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

data/app/jobs/shipit/merge_pull_requests_job.rb

@@ -3,6 +3,8 @@ module Shipit
     include BackgroundJob::Unique
     on_duplicate :drop
 
+    queue_as :default
+
     def perform(stack)
       pull_requests = stack.pull_requests.to_be_merged.to_a
       pull_requests.each do |pull_request|

data/app/jobs/shipit/perform_commit_checks_job.rb

@@ -2,6 +2,8 @@ module Shipit
   class PerformCommitChecksJob < BackgroundJob
     include BackgroundJob::Unique
 
+    queue_as :deploys
+
     def perform(commit:)
       commit.checks.run
     end

data/app/jobs/shipit/perform_task_job.rb

@@ -55,10 +55,8 @@ module Shipit
     end
 
     def perform_task
-      Bundler.with_clean_env do
-        capture_all! @commands.install_dependencies
-        capture_all! @commands.perform
-      end
+      capture_all! @commands.install_dependencies
+      capture_all! @commands.perform
     end
 
     def checkout_repository

data/app/jobs/shipit/refresh_pull_request_job.rb

@@ -1,5 +1,7 @@
 module Shipit
   class RefreshPullRequestJob < BackgroundJob
+    queue_as :default
+
     def perform(pull_request)
       pull_request.refresh!
       MergePullRequestsJob.perform_later(pull_request.stack)

data/app/models/shipit/anonymous_user.rb

@@ -31,7 +31,7 @@ module Shipit
     end
 
     def authorized?
-      false
+      Shipit.authentication_disabled?
     end
 
     def stacks_contributed_to

data/app/models/shipit/commit.rb

@@ -8,6 +8,7 @@ module Shipit
     has_many :deploys
     has_many :statuses, -> { 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
 
     deferred_touch stack: :updated_at
@@ -21,6 +22,14 @@ module Shipit
     belongs_to :author, class_name: 'User', inverse_of: :authored_commits
     belongs_to :committer, class_name: 'User', inverse_of: :commits
 
+    def author
+      super || AnonymousUser.new
+    end
+
+    def committer
+      super || AnonymousUser.new
+    end
+
     scope :reachable, -> { where(detached: false) }
 
     delegate :broadcast_update, :github_repo_name, :hidden_statuses, :required_statuses, :blocking_statuses,
@@ -64,11 +73,16 @@ module Shipit
     end
 
     def self.from_github(commit)
+      author = User.find_or_create_author_from_github_commit(commit)
+      author ||= Anonymous.new
+      committer = User.find_or_create_committer_from_github_commit(commit)
+      committer ||= Anonymous.new
+
       new(
         sha: commit.sha,
         message: commit.commit.message,
-        author: User.find_or_create_from_github(commit.author || commit.commit.author),
-        committer: User.find_or_create_from_github(commit.committer || commit.commit.committer),
+        author:  author,
+        committer: committer,
         committed_at: commit.commit.committer.date,
         authored_at: commit.commit.author.date,
         additions: commit.stats&.additions,
@@ -104,6 +118,23 @@ module Shipit
       end
     end
 
+    def last_release_status
+      @last_release_status ||= release_statuses.last || Status::Unknown.new(self)
+    end
+
+    def create_release_status!(state, user: nil, target_url: nil, description: nil)
+      return unless stack.release_status?
+
+      @last_release_status = nil
+      release_statuses.create!(
+        stack: stack,
+        user: user,
+        state: state,
+        target_url: target_url,
+        description: description,
+      )
+    end
+
     def checks
       @checks ||= CommitChecks.new(self)
     end
@@ -233,7 +264,9 @@ module Shipit
 
       unless already_deployed
         payload = {commit: self, stack: stack, status: new_status.state}
-        Hook.emit(:commit_status, stack, payload.merge(commit_status: new_status)) if previous_status != new_status
+        if previous_status != new_status
+          Hook.emit(:commit_status, stack, payload.merge(commit_status: new_status))
+        end
       end
 
       if previous_status.simple_state != new_status.simple_state