shipit-engine 0.31.0 → 0.32.0

data/app/models/shipit/undeployed_commit.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class UndeployedCommit < DelegateClass(Commit)
     attr_reader :index

data/app/models/shipit/unlimited_api_client.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class UnlimitedApiClient
     def stack_id?

data/app/models/shipit/user.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Shipit
-  class User < ActiveRecord::Base
+  class User < Record
     DEFAULT_AVATAR = URI.parse('https://avatars.githubusercontent.com/u/583231?')
 
     has_many :memberships
@@ -23,9 +24,9 @@ module Shipit
     end
 
     def self.find_or_create_author_from_github_commit(github_commit)
-      if github_commit.commit.message =~ /^#{PullRequest::MERGE_REQUEST_FIELD}: ([\w\-\.]+)$/
+      if (match_info = github_commit.commit.message.match(/^#{PullRequest::MERGE_REQUEST_FIELD}: ([\w\-\.]+)$/))
         begin
-          return find_or_create_by_login!($1)
+          return find_or_create_by_login!(match_info[1])
         rescue Octokit::NotFound
           # Corner case where the merge-requested-by user cannot be found (renamed/deleted).
           # In this case we carry on and search for the commit author
@@ -68,7 +69,7 @@ module Shipit
     end
 
     def identifiers_for_ping
-      {github_id: github_id, name: name, email: email, github_login: login}
+      { github_id: github_id, name: name, email: email, github_login: login }
     end
 
     def logged_in?
@@ -137,11 +138,12 @@ module Shipit
 
       begin
         github_api.emails
-                  .sort_by { |e| e.primary ? 0 : 1 }
-                  .map(&:email)
-                  .find { |e| email_valid_and_preferred?(e) }
-      rescue Octokit::NotFound, Octokit::Forbidden
+          .sort_by { |e| e.primary ? 0 : 1 }
+          .map(&:email)
+          .find { |e| email_valid_and_preferred?(e) }
+      rescue Octokit::NotFound, Octokit::Forbidden, Octokit::Unauthorized
         # If the user hasn't agreed to the necessary permission, we can't access their private emails.
+        Rails.logger.warn("Failed to retrieve emails for user '#{github_user.name || github_user.login}'")
         nil
       end
     end

data/app/models/shipit/variable_definition.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class VariableDefinition
     attr_reader :name, :title, :default, :select

data/app/models/shipit/webhooks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Webhooks
     class << self

data/app/models/shipit/webhooks/handlers/check_suite_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Webhooks
     module Handlers

data/app/models/shipit/webhooks/handlers/handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Webhooks
     module Handlers

data/app/models/shipit/webhooks/handlers/membership_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Webhooks
     module Handlers

data/app/models/shipit/webhooks/handlers/push_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Webhooks
     module Handlers

data/app/models/shipit/webhooks/handlers/status_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Webhooks
     module Handlers

data/app/serializers/concerns/shipit/conditional_attributes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module ConditionalAttributes
     extend ActiveSupport::Concern

data/app/serializers/shipit/anonymous_user_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class AnonymousUserSerializer < UserSerializer
   end

data/app/serializers/shipit/command_line_user_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class CommandLineUserSerializer < UserSerializer
   end

data/app/serializers/shipit/commit_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class CommitSerializer < ShortCommitSerializer
     include GithubUrlHelper

data/app/serializers/shipit/deploy_serializer.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module Shipit
   class DeploySerializer < TaskSerializer
     include GithubUrlHelper
 
     has_many :commits
 
-    attributes :compare_url, :rollback_url, :additions, :deletions
+    attributes :compare_url, :rollback_url, :additions, :deletions, :rollback_once_aborted_to
 
     def html_url
       stack_deploy_url(object.stack, object)

data/app/serializers/shipit/hook_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class HookSerializer < ActiveModel::Serializer
     include ConditionalAttributes

data/app/serializers/shipit/pull_request_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class PullRequestSerializer < ActiveModel::Serializer
     include GithubUrlHelper

data/app/serializers/shipit/rollback_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class RollbackSerializer < DeploySerializer
     def type

data/app/serializers/shipit/short_commit_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class ShortCommitSerializer < ActiveModel::Serializer
     attributes :sha, :message

data/app/serializers/shipit/stack_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class StackSerializer < ActiveModel::Serializer
     include ConditionalAttributes

data/app/serializers/shipit/tail_task_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class TailTaskSerializer < ActiveModel::Serializer
     include ChunksHelper

data/app/serializers/shipit/task_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class TaskSerializer < ActiveModel::Serializer
     include ConditionalAttributes
@@ -5,23 +6,7 @@ module Shipit
     has_one :author
     has_one :revision, serializer: ShortCommitSerializer
 
-    attributes(*%i(
-      id
-      url
-      html_url
-      output_url
-      type
-      status
-      action
-      title
-      description
-      started_at
-      ended_at
-      updated_at
-      created_at
-      env
-      ignored_safeties
-    ))
+    attributes(:id, :url, :html_url, :output_url, :type, :status, :action, :title, :description, :started_at, :ended_at, :updated_at, :created_at, :env, :ignored_safeties)
 
     def revision
       object.until_commit

data/app/serializers/shipit/user_serializer.rb

@@ -1,5 +1,10 @@
+# frozen_string_literal: true
 module Shipit
   class UserSerializer < ActiveModel::Serializer
-    attributes :id, :name, :email, :login, :avatar_url, :created_at, :updated_at, :github_id
+    attributes :id, :name, :email, :login, :avatar_url, :created_at, :updated_at, :github_id, :anonymous
+
+    def anonymous
+      !object.logged_in?
+    end
   end
 end

data/app/validators/ascii_only_validator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class AsciiOnlyValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     if value && !value.ascii_only?

data/app/validators/subset_validator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class SubsetValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     superset = options[:of]

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

@@ -2,7 +2,7 @@
 <html lang="<%= I18n.locale %>" data-controller="<%= controller_name %>" data-action="<%= action_name %>">
 <head>
   <% if @stack %>
-    <title><%= Shipit.app_name %> - <%= @stack.repo_name %>/<%= @stack.environment %></title>
+    <title><%= @stack.repo_name %>/<%= @stack.environment %> - <%= Shipit.app_name %></title>
   <% else %>
   <title><%= Shipit.app_name %></title>
   <% end %>

data/app/views/shipit/_variables.html.erb

@@ -7,7 +7,7 @@
       <% variables.each do |variable| %>
         <p class="variables-fields">
           <% if variable.select %>
-            <%= field.select variable.name, options_for_select([["Please select...", { disabled: "disabled", selected: true }]] + variable.select) %>
+            <%= field.select variable.name, options_for_select([["Please select...", { disabled: "disabled" }]] + variable.select, variable.default || "Please select...") %>
           <% else %>
             <%= field.text_field variable.name, value: variable.default %>
           <% end %>

data/app/views/shipit/ccmenu/project.xml.builder

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 # Derived from http://timnew.me/blog/2013/04/07/multiple-project-summary-reporting-standard-cctray-xml-feed/
-status_map = {'backlogged' => 'failure', 'locked' => 'failure'}
+status_map = { 'backlogged' => 'failure', 'locked' => 'failure' }
 xml.instruct!
 xml.Projects do
   xml.Project(

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

@@ -1,8 +1,8 @@
 <% content_for :task_title do %>
   <% if @deploy.rollback? %>
-    rolling back to
+    <%= @deploy.active? ? "rolling back to" : "rolled back to" %>
   <% else %>
-    deploying
+    <%= @deploy.active? ? "deploying" : "deployed" %>
   <% end %>
   <span class="short-sha"><%= link_to_github_deploy(@deploy) %></span>
   <%= timeago_tag(@deploy.created_at, force: true) %>

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

@@ -38,6 +38,9 @@
               <%= link_to "#{definition.action}…", new_stack_tasks_path(stack, definition_id: definition.id), class: "trigger-deploy" %>
             </li>
           <% end %>
+          <li class="nav__list__sub__item">
+            <%= link_to "All tasks", stack_tasks_list_path(stack), class: "trigger-deploy" %>
+          </li>
         </ul>
       </li>
     <% end %>

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

@@ -0,0 +1,28 @@
+<% subscribe events_path(channels: ["stack.#{@stack.id}"]), '#layout-content' %>
+
+<%= render partial: 'shipit/stacks/header', locals: {stack: @stack} %>
+<%= render partial: 'shipit/stacks/banners', locals: {stack: @stack} %>
+
+<div class="wrapper">
+  <section>
+    <header class="section-header">
+      <h2>Available tasks</h2>
+    </header>
+    <ul class="task-list">
+      <% @stack.task_definitions.each do |definition| %>
+        <li class="task" id="task-<%= definition.id %>">
+          <%= link_to "#{definition.action}", new_stack_tasks_path(@stack, definition_id: definition.id), class: "trigger-deploy" %>
+        </li>
+      <% end %>
+    </ul>
+  </section>
+
+  <section>
+    <header class="section-header">
+      <h2>Previous Tasks</h2>
+    </header>
+    <ul class="commit-list">
+      <%= render @tasks %>
+    </ul>
+  </section>
+</div>

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

@@ -18,7 +18,7 @@
     </ul>
     <ul class="stack-lst">
       <% @stacks.each do |stack| %>
-        <li class="search-item <%= stack.archived? ? 'archived' : '' %> <%= stack.undeployed_commits? ? 'undeployed' : '' %> <%= @user_stacks.include?(stack.id) ? 'contributor' : 'not-matching' %>" data-search="<%= stack.repo_name %> <%= stack.environment %> <%= stack.deploy_url %>" data-stack-id="<%= stack.id %>">
+        <li class="stack search-item <%= stack.archived? ? 'archived' : '' %> <%= stack.undeployed_commits? ? 'undeployed' : '' %> <%= @user_stacks.include?(stack.id) ? 'contributor' : 'not-matching' %>" data-search="<%= stack.repo_name %> <%= stack.environment %> <%= stack.deploy_url %>" data-stack-id="<%= stack.id %>">
           <%= link_to stack_path(stack), class: 'commits-path' do %>
             <span class="col"><%= stack.repo_name %></span>
             <small class="col"><%= stack.environment.capitalize %></small>

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

@@ -1,5 +1,5 @@
 <% content_for :task_title do %>
-  executing <%= @task.definition.id %>
+  <%= @task.active? ? "executing" : "executed" %> <%= @task.definition.id %>
   <%= timeago_tag(@task.created_at, force: true) %>
 <% end %>
 

data/config/initializers/inflections.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveSupport::Inflector.inflections(:en) do |inflect|
-  inflect.acronym 'CCMenu'
+  inflect.acronym('CCMenu')
 end

data/config/locales/en.yml

@@ -32,9 +32,9 @@ en:
       links: More
       deploy_link: View website
   commit:
-    lock: This commit is safe to deploy. Click to mark it as unsafe.
-    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."
+    lock: Click to mark this commit as unsafe to deploy.
+    unlock: Click to mark this commit as safe to deploy.
+    unlock_with_author: "%{author} marked this commit as unsafe to deploy. Click to mark this commit as safe to deploy."
     confirm_unlock: Mark this commit as safe to deploy?
   release:
     validate: Mark the release as healthy

data/config/routes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Shipit::Engine.routes.draw do
   stack_id_format = %r{[^/]+/[^/]+/[^/]+}
   sha_format = /[\da-f]{6,40}/
@@ -17,6 +18,7 @@ Shipit::Engine.routes.draw do
     scope '/stacks/*id', id: stack_id_format, as: :stack do
       get '/' => 'stacks#show'
       delete '/' => 'stacks#destroy'
+      patch '/' => 'stacks#update'
     end
 
     scope '/stacks/*stack_id', stack_id: stack_id_format, as: :stack do
@@ -28,6 +30,7 @@ Shipit::Engine.routes.draw do
       resources :deploys, only: %i(index create) do
         resources :release_statuses, only: %i(create)
       end
+      resources :rollbacks, only: %i(create)
       resources :commits, only: %i(index)
       resources :pull_requests, only: %i(index show update destroy)
       post '/task/:task_name' => 'tasks#trigger', as: :trigger_task
@@ -62,6 +65,7 @@ Shipit::Engine.routes.draw do
     patch '/' => 'stacks#update'
     delete '/' => 'stacks#destroy'
     get :settings, controller: :stacks
+    get :all_tasks, controller: :stacks, as: :tasks_list
     get :statistics, controller: :stacks
     post :refresh, controller: :stacks
     get :refresh, controller: :stacks # For easier design, sorry :/
@@ -74,7 +78,7 @@ Shipit::Engine.routes.draw do
 
   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}
+    get '/commit/:sha/checks/tail' => 'commit_checks#tail', as: :tail_commit_checks, defaults: { format: :json }
 
     get '/stats' => 'stats#show', as: :stats
 
@@ -89,7 +93,7 @@ Shipit::Engine.routes.draw do
 
       member do
         post :abort
-        get :tail, defaults: {format: :json}
+        get :tail, defaults: { format: :json }
       end
     end
 
@@ -106,4 +110,8 @@ Shipit::Engine.routes.draw do
     resources :pull_requests, only: %i(index destroy create)
   end
   get '/stacks/:id' => 'stacks#lookup'
+
+  scope '/*repo', repo: %r{[^/]+/[^/]+}, as: :stack_search do
+    get '/' => 'stacks#index'
+  end
 end

data/db/migrate/20200226211925_add_index_to_tasks_status.rb

@@ -0,0 +1,5 @@
+class AddIndexToTasksStatus < ActiveRecord::Migration[6.0]
+  def change
+    add_index :tasks, :status
+  end
+end

data/db/migrate/20200427135152_add_pull_request_head_sha_to_commit.rb

@@ -0,0 +1,5 @@
+class AddPullRequestHeadShaToCommit < ActiveRecord::Migration[6.0]
+  def change
+    add_column :commits, :pull_request_head_sha, :string, limit: 40
+  end
+end

data/db/migrate/20200615181558_add_rollback_once_aborted_to.rb

@@ -0,0 +1,5 @@
+class AddRollbackOnceAbortedTo < ActiveRecord::Migration[6.0]
+  def change
+    add_column :tasks, :rollback_once_aborted_to_id, :integer
+  end
+end

data/lib/shipit.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support/all'
 require 'active_model_serializers'
 require 'state_machines-activerecord'
@@ -48,6 +49,7 @@ require 'shipit/rollback_commands'
 require 'shipit/environment_variables'
 require 'shipit/stat'
 require 'shipit/github_http_cache_middleware'
+require 'shipit/same_site_cookie_middleware'
 require 'shipit/cast_value'
 require 'shipit/line_buffer'
 
@@ -68,6 +70,10 @@ module Shipit
     ENV['SHIPIT_DISABLE_AUTH'].present?
   end
 
+  def enable_samesite_middleware?
+    ENV['SHIPIT_ENABLE_SAMESITE_NONE'].present?
+  end
+
   def app_name
     @app_name ||= secrets.app_name || Rails.application.class.name.split(':').first || 'Shipit'
   end
@@ -122,6 +128,10 @@ module Shipit
     secrets.default_merge_method || 'merge'
   end
 
+  def update_latest_deployed_ref
+    secrets.update_latest_deployed_ref
+  end
+
   def enforce_publish_config
     secrets.enforce_publish_config.presence
   end
@@ -147,7 +157,7 @@ module Shipit
   end
 
   def env
-    {'SHIPIT' => '1'}.merge(secrets.env || {})
+    { 'SHIPIT' => '1' }.merge(secrets.env || {})
   end
 
   def shell_paths
@@ -159,7 +169,7 @@ module Shipit
       if revision_file.exist?
         revision_file.read
       else
-        `git rev-parse HEAD`
+        %x(git rev-parse HEAD)
       end.strip
     end
   end