shipit-engine 0.28.0 → 0.32.0

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

@@ -0,0 +1 @@
+<%# Placeholder to be used by the host application %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <h1>Shipit</h1>
+  <h1><%= Shipit.app_name %></h1>
 <% end %>
 <% content_for :primary_navigation do %>
   <%= link_to 'Add a stack', new_stack_path, class: 'btn secondary' %>
@@ -18,7 +18,7 @@
     </ul>
     <ul class="stack-lst">
       <% @stacks.each do |stack| %>
-        <li class="search-item <%= 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>
@@ -30,6 +30,11 @@
     </ul>
 
     <%= link_to 'show all stacks', '#', class: 'btn secondary show-all-stacks' %></p>
+    <% if @show_archived %>
+      <%= link_to 'hide archived stacks', '?', class: 'btn secondary' %></p>
+    <% else %>
+      <%= link_to 'show archived stacks', '?show_archived=1', class: 'btn secondary' %></p>
+    <% end %>
   </section>
 
 </div>

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

@@ -61,6 +61,7 @@
         <%- end -%>
       <% end %>
     </div>
+
     <div class="setting-section">
       <h5>Resynchronize this stack</h5>
       <table>
@@ -80,6 +81,24 @@
       <%= button_to "Fetch URL", "", class: 'btn', data: {remote: ccmenu_url_url(stack_id: @stack.to_param)} %>
     </div>
 
+    <div class="setting-section">
+      <% if @stack.archived? %>
+        <h5>Restore Stack</h5>
+        <p>This action will de-archive the Stack, restoring it in the stack list and unlocking it.</p>
+        <%= form_for @stack do |f| %>
+          <%= f.hidden_field :archived, value: false %>
+          <%= f.submit class: "btn", value: "Restore" %>
+        <% end %>
+      <% else %>
+        <h5>Archive Stack</h5>
+        <p>This action will archive the Stack, hiding it from the stack list and locking it. It can still be found if you know the URL and de-archived.</p>
+        <%= form_for @stack do |f| %>
+          <%= f.hidden_field :archived, value: true %>
+          <%= f.submit class: "btn", value: "Archive" %>
+        <% end %>
+      <% end %>
+    </div>
+
     <div class="setting-section">
       <h5>Delete this stack</h5>
       <p>This action will delete the stack from Ship it permanently. Be careful.</p>

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

@@ -0,0 +1,82 @@
+<%= 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>Statistics &ndash; Past 7 Days</h2>
+    </header>
+
+    <div class="row">
+      <div class="box">
+        <div class="box__body">
+          <div class="stats">
+            <div class="stats__amount"><%= @deploy_stats.count %></div>
+            <div class="stats__caption">Deploys</div>
+            <div class="stats__change">
+              <div class="stats__value stats__value--<%=positive_negative_class(@diffs[:count])%>"><%= number_to_percentage(@diffs[:count], precision: 1) %></div>
+              <div class="stats__period">this week</div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="box">
+        <div class="box__body">
+          <div class="stats">
+            <div class="stats__amount"><%= number_to_percentage(@deploy_stats.success_rate, precision: 1) %></div>
+            <div class="stats__caption">Deploys success rate</div>
+          </div>
+        </div>
+      </div>
+
+      <div class="box">
+        <div class="box__body">
+          <div class="stats">
+            <div class="stats__amount"><%= Shipit::Duration.new @deploy_stats.average_duration %></div>
+            <div class="stats__caption">Average deploy time</div>
+            <div class="stats__change">
+              <div class="stats__value stats__value--<%=positive_negative_class(@diffs[:average_duration])%>"><%= number_to_percentage(@diffs[:average_duration], precision: 1) %></div>
+              <div class="stats__period">this week</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="box">
+        <div class="box__body">
+          <div class="stats">
+            <div class="stats__amount"><%= Shipit::Duration.new @deploy_stats.min_duration %></div>
+            <div class="stats__caption">Min deploy time</div>
+          </div>
+        </div>
+      </div>
+
+      <div class="box">
+        <div class="box__body">
+          <div class="stats">
+            <div class="stats__amount"><%= Shipit::Duration.new @deploy_stats.median_duration %></div>
+            <div class="stats__caption">Median deploy time</div>
+            <div class="stats__change">
+              <div class="stats__value stats__value--<%=positive_negative_class(@diffs[:median_duration])%>"><%= number_to_percentage(@diffs[:median_duration], precision: 1) %></div>
+              <div class="stats__period">this week</div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="box">
+        <div class="box__body">
+          <div class="stats">
+            <div class="stats__amount"><%= Shipit::Duration.new @deploy_stats.max_duration %></div>
+            <div class="stats__caption">Max deploy time</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </section>
+
+</div>

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

@@ -20,10 +20,21 @@
 # available at http://guides.rubyonrails.org/i18n.html.
 
 en:
+  stack:
+    nav:
+      refresh: Refresh statuses & commits
+      commits: Commits & Deploys
+      settings: Settings
+      timeline: Timeline
+      statistics: Stats
+      merge_queue: "Merge Queue (%{count})"
+      view_on_github: View on GitHub
+      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
@@ -72,12 +83,14 @@ en:
       ascii: "contains non-ASCII characters"
   deployment_description:
     deploy:
-      pending: "%{author} triggered the deploy of %{stack} to %{sha}"
+      in_progress: "%{author} triggered the deploy of %{stack} to %{sha}"
+      pending: "%{author} created the deploy of %{stack} to %{sha}"
       success: "%{author} deployed %{stack} to %{sha}"
       failure: "Deploy of %{stack} to %{sha} by %{author} failed"
       error: "Deploy of %{stack} to %{sha} by %{author} failed"
     rollback:
-      pending: "%{author} triggered the rollback of %{stack} to %{sha}"
+      in_progress: "%{author} triggered the deploy of %{stack} to %{sha}"
+      pending: "%{author} created the rollback of %{stack} to %{sha}"
       success: "%{author} rolled back %{stack} to %{sha}"
       failure: "Rollback of %{stack} to %{sha} by %{author} failed"
       error: "Rollback of %{stack} to %{sha} by %{author} failed"

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
@@ -47,6 +50,7 @@ Shipit::Engine.routes.draw do
   delete '/merge_status/*stack_id/pull/:number', action: :dequeue, controller: :merge_status, id: stack_id_format, as: :dequeue_pull_request
 
   # Humans
+  resources :api_clients
   resources :stacks, only: %i(new create index)
 
   scope '/github/auth/github', as: :github_authentication, controller: :github_authentication do
@@ -61,6 +65,8 @@ 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 :/
     post :clear_git_cache, controller: :stacks
@@ -72,7 +78,9 @@ 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
 
     resources :rollbacks, only: %i(create)
     resources :commits, only: %i(update)
@@ -85,7 +93,7 @@ Shipit::Engine.routes.draw do
 
       member do
         post :abort
-        get :tail, defaults: {format: :json}
+        get :tail, defaults: { format: :json }
       end
     end
 
@@ -102,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/20191209231045_create_shipit_repositories.rb

@@ -0,0 +1,12 @@
+class CreateShipitRepositories < ActiveRecord::Migration[6.0]
+  def change
+    create_table :repositories do |t|
+      t.string :owner, limit: 39, null: false
+      t.string :name, limit: 100, null: false
+
+      t.timestamps
+    end
+
+    add_index :repositories, ["owner", "name"], name: "repository_unicity", unique: true
+  end
+end

data/db/migrate/20191209231307_add_repository_reference_to_stacks.rb

@@ -0,0 +1,15 @@
+class AddRepositoryReferenceToStacks < ActiveRecord::Migration[6.0]
+  def up
+    change_table(:stacks) do |t|
+      t.references :repository
+    end
+  end
+
+  def down
+    change_column :stacks, :repo_name, :string, null: false
+    change_column :stacks, :repo_owner, :string, null: false
+    change_table(:stacks) do |t|
+      t.remove_references :repository
+    end
+  end
+end

data/db/migrate/20191216162728_backfill_repository_data.rb

@@ -0,0 +1,22 @@
+class BackfillRepositoryData < ActiveRecord::Migration[6.0]
+  def up
+    repositories = {}
+    Shipit::Stack.all.each do |stack|
+      repo_owner = stack[:repo_owner].downcase
+      repo_name = stack[:repo_name].downcase
+
+      repository = (repositories[[repo_owner, repo_name]] ||= Shipit::Repository.create_or_find_by!(
+        owner: repo_owner,
+        name: repo_name,
+      ))
+
+      stack.update_column(:repository_id, repository.id)
+    end
+  end
+
+  def down
+    Shipit::Repository.find_each do |repository|
+      repository.stacks.update_all(repo_owner: repository.owner, repo_name: repository.name)
+    end
+  end
+end

data/db/migrate/20191216163010_remove_repository_information_from_stacks.rb

@@ -0,0 +1,20 @@
+class RemoveRepositoryInformationFromStacks < ActiveRecord::Migration[6.0]
+  def up
+    change_column_null :stacks, :repository_id, false
+    change_table(:stacks) do |t|
+      t.remove_index ["repo_owner", "repo_name", "environment"]
+      t.remove :repo_owner
+      t.remove :repo_name
+      t.index ["repository_id", "environment"], name: "stack_unicity", unique: true
+    end
+  end
+
+  def down
+    change_table(:stacks) do |t|
+      t.column :repo_name, :string, limit: 100
+      t.column :repo_owner, :string, limit: 39
+      t.remove_index ["repository_id", "environment"]
+      t.index ["repo_owner", "repo_name", "environment"], name: "stack_unicity", unique: true
+    end
+  end
+end

data/db/migrate/20191219205202_add_archived_since_to_stacks.rb

@@ -0,0 +1,6 @@
+class AddArchivedSinceToStacks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :stacks, :archived_since, :datetime
+    add_index :stacks, :archived_since
+  end
+end

data/db/migrate/20200102175621_optional_task_commits.rb

@@ -0,0 +1,6 @@
+class OptionalTaskCommits < ActiveRecord::Migration[6.0]
+  def change
+    change_column_null :tasks, :since_commit_id, true
+    change_column_null :tasks, :until_commit_id, true
+  end
+end

data/db/migrate/20200109132519_add_sha_to_commit_deployments.rb

@@ -0,0 +1,5 @@
+class AddShaToCommitDeployments < ActiveRecord::Migration[6.0]
+  def change
+    add_column :commit_deployments, :sha, :string, limit: 40
+  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'
@@ -47,7 +48,8 @@ require 'shipit/deploy_commands'
 require 'shipit/rollback_commands'
 require 'shipit/environment_variables'
 require 'shipit/stat'
-require 'shipit/strip_cache_control'
+require 'shipit/github_http_cache_middleware'
+require 'shipit/same_site_cookie_middleware'
 require 'shipit/cast_value'
 require 'shipit/line_buffer'
 
@@ -60,7 +62,7 @@ module Shipit
   delegate :table_name_prefix, to: :secrets
 
   attr_accessor :disable_api_authentication, :timeout_exit_codes
-  attr_writer :internal_hook_receivers, :task_logger
+  attr_writer :internal_hook_receivers, :task_logger, :preferred_org_emails
 
   self.timeout_exit_codes = [].freeze
 
@@ -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
@@ -106,22 +112,6 @@ module Shipit
     end
   end
 
-  def new_faraday_stack
-    Faraday::RackBuilder.new do |builder|
-      builder.use(
-        Faraday::HttpCache,
-        shared_cache: false,
-        store: Rails.cache,
-        logger: Rails.logger,
-        serializer: NullSerializer,
-      )
-      builder.use StripCacheControl
-      builder.use Octokit::Response::RaiseError
-      builder.adapter Faraday.default_adapter
-      yield builder if block_given?
-    end
-  end
-
   def api_clients_secret
     secrets.api_clients_secret.presence || secrets.secret_key_base
   end
@@ -138,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
@@ -163,7 +157,7 @@ module Shipit
   end
 
   def env
-    {'SHIPIT' => '1'}.merge(secrets.env || {})
+    { 'SHIPIT' => '1' }.merge(secrets.env || {})
   end
 
   def shell_paths
@@ -175,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
@@ -196,6 +190,10 @@ module Shipit
     @internal_hook_receivers ||= []
   end
 
+  def preferred_org_emails
+    @preferred_org_emails ||= []
+  end
+
   def task_logger
     @task_logger ||= Logger.new(nil)
   end