shipit-engine 0.32.0 → 0.33.0

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

@@ -0,0 +1,8 @@
+<li class="search-item <%= stack.archived? ? 'archived' : '' %> <%= stack.undeployed_commits? ? 'undeployed' : '' %> <%= contributor_class(current_user.stacks_contributed_to, stack.id) %>" 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>
+    <small class="col"><%= stack.branch %></small>
+    <small class="col"><%= stack.deploy_url %></small>
+  <% end %>
+</li>

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

@@ -2,6 +2,7 @@
   <h1><%= Shipit.app_name %></h1>
 <% end %>
 <% content_for :primary_navigation do %>
+  <%= link_to 'Repositories', repositories_path, class: 'btn secondary' %>
   <%= link_to 'Add a stack', new_stack_path, class: 'btn secondary' %>
 <% end %>
 
@@ -21,7 +22,7 @@
         <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>
+            <small class="col"><%= stack.environment %></small>
             <small class="col"><%= stack.branch %></small>
             <small class="col"><%= stack.deploy_url %></small>
           <% end %>

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

@@ -7,7 +7,7 @@
     </header>
 
     <div class="setting-section">
-      <%= form_for @stack do |f| %>
+      <%= form_with scope: :stack, url: stack_path(@stack), method: :patch do |f| %>
         <div class="field-wrapper">
           <%= f.label :environment %>
           <%= f.text_field :environment, placeholder: 'production' %>
@@ -43,7 +43,7 @@
 
     <div class="setting-section">
       <h5>Lock deploys</h5>
-      <%= form_for @stack do |f| %>
+      <%= form_with scope: :stack, url: stack_path(@stack), method: :patch do |f| %>
         <div class="field-wrapper">
           <%= f.label :lock_reason, 'Reason for lock' %>
           <%= f.text_area :lock_reason %>
@@ -55,7 +55,7 @@
         <% end %>
       <% end %>
       <% if @stack.locked? %>
-        <%= form_for @stack do |f| %>
+        <%= form_with scope: :stack, url: stack_path(@stack), method: :patch do |f| %>
           <%= f.hidden_field :lock_reason, value: nil %>
           <%= f.submit class: "btn btn--primary", value: "Unlock" %>
         <%- end -%>
@@ -85,14 +85,14 @@
       <% 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| %>
+        <%= form_with scope: :stack, url: stack_path(@stack), method: :patch 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| %>
+        <%= form_with scope: :stack, url: stack_path(@stack), method: :patch do |f| %>
           <%= f.hidden_field :archived, value: true %>
           <%= f.submit class: "btn", value: "Archive" %>
         <% end %>

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

@@ -12,7 +12,7 @@
         <% if params[:force] %>
           <%= link_to t('emergency_mode.disable'), stack_path(@stack) %>
         <% else %>
-          <%= link_to t('emergency_mode.enable'), stack_path(@stack, force: 1), title: t('emergency_mode.enable_description') %>
+          <%= link_to t('emergency_mode.enable'), stack_path(@stack, force: 1, noredirect: 1), title: t('emergency_mode.enable_description') %>
         <% end %>
       </div>
     </header>

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

@@ -43,6 +43,6 @@
   </div>
 
   <div class="clusterize-scroll task-output-container task-output-container-main-page">
-    <pre class="nowrap" data-status="<%= task.status %>"><code class="clusterize-content" data-output="<%= task.chunk_output %>" data-next-chunks-url="<%= next_chunks_url(task) %>"></code></pre>
+    <pre class="nowrap" data-status="<%= task.status %>"><code class="clusterize-content" data-output="<%= task.chunk_output %>" data-next-chunks-url="<%= next_chunks_url(task, last_byte: task.chunk_output_size) %>"></code></pre>
   </div>
 </div>

data/config/routes.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 Shipit::Engine.routes.draw do
   stack_id_format = %r{[^/]+/[^/]+/[^/]+}
+  repository_id_format = %r{[^/]+/[^/]+}
   sha_format = /[\da-f]{6,40}/
   root to: 'stacks#index'
 
@@ -32,7 +33,7 @@ Shipit::Engine.routes.draw do
       end
       resources :rollbacks, only: %i(create)
       resources :commits, only: %i(index)
-      resources :pull_requests, only: %i(index show update destroy)
+      resources :merge_requests, only: %i(index show update destroy)
       post '/task/:task_name' => 'tasks#trigger', as: :trigger_task
       resources :hooks, only: %i(index create show update destroy)
     end
@@ -46,12 +47,20 @@ Shipit::Engine.routes.draw do
 
   # Browser extension
   get '/merge_status', action: :show, controller: :merge_status, as: :merge_status
-  put '/merge_status/*stack_id/pull/:number', action: :enqueue, controller: :merge_status, id: stack_id_format, as: :enqueue_pull_request
-  delete '/merge_status/*stack_id/pull/:number', action: :dequeue, controller: :merge_status, id: stack_id_format, as: :dequeue_pull_request
+  put '/merge_status/*stack_id/pull/:number', action: :enqueue, controller: :merge_status, id: stack_id_format, as: :enqueue_merge_request
+  delete '/merge_status/*stack_id/pull/:number', action: :dequeue, controller: :merge_status, id: stack_id_format, as: :dequeue_merge_request
 
   # Humans
   resources :api_clients
-  resources :stacks, only: %i(new create index)
+
+  resources :repositories, only: %i(new index create)
+  scope '/repositories/*id', id: repository_id_format, as: :repository do
+    get '/' => 'repositories#show'
+    patch '/' => 'repositories#update'
+    delete '/' => 'repositories#destroy'
+    get :settings, controller: :repositories
+    get 'stacks/new' => 'repositories#new_stack'
+  end
 
   scope '/github/auth/github', as: :github_authentication, controller: :github_authentication do
     get '/', action: :request
@@ -60,6 +69,7 @@ Shipit::Engine.routes.draw do
     get :logout
   end
 
+  resources :stacks, only: %i(new create index)
   scope '/*id', id: stack_id_format, as: :stack do
     get '/' => 'stacks#show'
     patch '/' => 'stacks#update'
@@ -107,7 +117,7 @@ Shipit::Engine.routes.draw do
       resources :release_statuses, only: %i(create)
     end
 
-    resources :pull_requests, only: %i(index destroy create)
+    resources :merge_requests, only: %i(index destroy create)
   end
   get '/stacks/:id' => 'stacks#lookup'
 

data/db/migrate/20200706145406_add_review_stacks.rb

@@ -0,0 +1,12 @@
+class AddReviewStacks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :stacks, :provision_status, :string, null: false, default: :deprovisioned
+    add_index :stacks, :provision_status
+
+    add_column :stacks, :type, :string, default: "Shipit::Stack"
+    add_index :stacks, :type
+
+    add_column :stacks, :awaiting_provision, :boolean, null: false, default: false
+    add_index :stacks, :awaiting_provision
+  end
+end

data/db/migrate/20200804144639_rename_pull_request_to_merge_request.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RenamePullRequestToMergeRequest < ActiveRecord::Migration[6.0]
+  def change
+    rename_table :pull_requests, :merge_requests
+  end
+end

data/db/migrate/20200804161512_rename_commits_pull_request_id_to_merge_request_id.rb

@@ -0,0 +1,5 @@
+class RenameCommitsPullRequestIdToMergeRequestId < ActiveRecord::Migration[6.0]
+  def change
+    rename_column :commits, :pull_request_id, :merge_request_id
+  end
+end

data/db/migrate/20200813134712_recreate_shipit_pull_requests.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+class RecreateShipitPullRequests < ActiveRecord::Migration[6.0]
+  def change
+    create_table :pull_requests do |t|
+      t.references :stack, null: false
+      t.integer :number, null: false
+      t.string :title, limit: 256
+      t.integer :github_id, limit: 8
+      t.string :api_url, limit: 1024
+      t.string :state
+      t.integer :additions, null: false, default: 0
+      t.integer :deletions, null: false, default: 0
+      t.integer :user_id
+      t.text :labels
+      t.references :head
+      t.timestamps
+
+      t.index [:stack_id, :number], unique: true
+      t.index [:stack_id, :github_id], unique: true
+    end
+  end
+end

data/db/migrate/20200813194056_create_pull_request_assignments.rb

@@ -0,0 +1,8 @@
+class CreatePullRequestAssignments < ActiveRecord::Migration[6.0]
+  def change
+    create_table :pull_request_assignments do |t|
+      t.references :pull_request
+      t.references :user
+    end
+  end
+end

data/db/migrate/20201001125502_add_provision_pr_stacks_flag_to_repositories.rb

@@ -0,0 +1,7 @@
+class AddProvisionPrStacksFlagToRepositories < ActiveRecord::Migration[6.0]
+  def change
+    add_column :repositories, :review_stacks_enabled, :boolean, default: false
+    add_column :repositories, :provisioning_behavior, :string, default: :allow_all
+    add_column :repositories, :provisioning_label_name, :string
+  end
+end

data/db/migrate/20201008145809_add_retry_attempt_to_tasks.rb

@@ -0,0 +1,5 @@
+class AddRetryAttemptToTasks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :tasks, :retry_attempt, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20201008152744_add_max_retries_to_tasks.rb

@@ -0,0 +1,5 @@
+class AddMaxRetriesToTasks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :tasks, :max_retries, :integer, null: true
+  end
+end

data/lib/shipit.rb

@@ -43,6 +43,7 @@ require 'shipit/simple_message_verifier'
 require 'shipit/command'
 require 'shipit/commands'
 require 'shipit/stack_commands'
+require 'shipit/review_stack_commands'
 require 'shipit/task_commands'
 require 'shipit/deploy_commands'
 require 'shipit/rollback_commands'
@@ -62,7 +63,16 @@ module Shipit
   delegate :table_name_prefix, to: :secrets
 
   attr_accessor :disable_api_authentication, :timeout_exit_codes
-  attr_writer :internal_hook_receivers, :task_logger, :preferred_org_emails
+  attr_writer(
+    :internal_hook_receivers,
+    :preferred_org_emails,
+    :task_execution_strategy,
+    :task_logger,
+  )
+
+  def task_execution_strategy
+    @task_execution_strategy ||= Shipit::TaskExecutionStrategy::Default
+  end
 
   self.timeout_exit_codes = [].freeze
 

data/lib/shipit/github_app.rb

@@ -52,7 +52,7 @@ module Shipit
       oauth = (@config[:oauth] || {}).with_indifferent_access
       @oauth_id = oauth[:id]
       @oauth_secret = oauth[:secret]
-      @oauth_teams = Array.wrap(oauth[:teams] || oauth[:teams])
+      @oauth_teams = Array.wrap(oauth[:teams])
     end
 
     def login

data/lib/shipit/review_stack_commands.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'shipit/stack_commands'
+
+module Shipit
+  class ReviewStackCommands < Shipit::StackCommands
+  end
+end

data/lib/shipit/stack_commands.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:disable Lint/MissingSuper
 require 'pathname'
 require 'fileutils'
 
@@ -8,6 +9,10 @@ module Shipit
       @stack = stack
     end
 
+    def env
+      super.merge(@stack.env)
+    end
+
     def fetch
       create_directories
       if Dir.exist?(@stack.git_path)
@@ -56,7 +61,7 @@ module Shipit
       Dir.mktmpdir do |dir|
         git(
           'clone', @stack.git_path, @stack.repo_name,
-          '--origin', 'cache',
+          '--recursive', '--origin', 'cache',
           chdir: dir
         ).run!
 

data/lib/shipit/task_commands.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:disable Lint/MissingSuper
 module Shipit
   class TaskCommands < Commands
     delegate :fetch, :fetched?, to: :stack_commands

data/lib/shipit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Shipit
-  VERSION = '0.32.0'
+  VERSION = '0.33.0'
 end

data/lib/tasks/cron.rake

@@ -5,11 +5,12 @@ namespace :cron do
     Shipit::Stack.refresh_deployed_revisions
     Shipit::Stack.schedule_continuous_delivery
     Shipit::GithubStatus.refresh_status
-    Shipit::PullRequest.schedule_merges
+    Shipit::MergeRequest.schedule_merges
     Shipit::ReapDeadTasksJob.perform_later
+    Shipit::ReviewStackProvisioningQueue.work
   end
 
-  task hourly: %i(rollup refresh_users)
+  task hourly: %i(rollup refresh_users clear_stale_caches delete_old_deployment_directories)
 
   desc "Rolls-up output chunks for completed deploys older than an hour"
   task rollup: :environment do
@@ -19,4 +20,12 @@ namespace :cron do
   task refresh_users: :environment do
     Shipit::User.refresh_shard(Time.now.hour % 24, 24)
   end
+
+  task clear_stale_caches: :environment do
+    Shipit::ReviewStack.clear_stale_caches
+  end
+
+  task delete_old_deployment_directories: :environment do
+    Shipit::ReviewStack.delete_old_deployment_directories
+  end
 end

data/test/controllers/api/{pull_requests_controller_test.rb → merge_requests_controller_test.rb}

@@ -3,52 +3,52 @@ require 'test_helper'
 
 module Shipit
   module Api
-    class PullRequestsControllerTest < ActionController::TestCase
+    class MergeRequestsControllerTest < ActionController::TestCase
       setup do
         @stack = shipit_stacks(:shipit)
-        @pull_request = shipit_pull_requests(:shipit_pending)
+        @merge_request = shipit_merge_requests(:shipit_pending)
         authenticate!
       end
 
       test "#index returns a list of pull requests" do
-        pull_request = @stack.pull_requests.last
+        merge_request = @stack.merge_requests.last
 
         get :index, params: { stack_id: @stack.to_param }
         assert_response :ok
-        assert_json '0.id', pull_request.id
+        assert_json '0.id', merge_request.id
       end
 
       test "#show returns a single pull requests" do
-        get :show, params: { stack_id: @stack.to_param, id: @pull_request.number.to_s }
+        get :show, params: { stack_id: @stack.to_param, id: @merge_request.number.to_s }
         assert_response :ok
-        assert_json 'id', @pull_request.id
+        assert_json 'id', @merge_request.id
       end
 
       test "#update responds with Accepted if the pull request was queued" do
-        assert_enqueued_with(job: RefreshPullRequestJob) do
+        assert_enqueued_with(job: RefreshMergeRequestJob) do
           put :update, params: { stack_id: @stack.to_param, id: '64' }
         end
         assert_response :accepted
       end
 
       test "#update responds with Accepted if the pull request was already queued" do
-        assert_enqueued_with(job: RefreshPullRequestJob) do
+        assert_enqueued_with(job: RefreshMergeRequestJob) do
           put :update, params: { stack_id: @stack.to_param, id: '65' }
         end
         assert_response :accepted
       end
 
       test "#update responds with method not allowed if the pull request was already merged" do
-        @pull_request.complete!
-        put :update, params: { stack_id: @stack.to_param, id: @pull_request.number.to_s }
+        @merge_request.complete!
+        put :update, params: { stack_id: @stack.to_param, id: @merge_request.number.to_s }
         assert_response :method_not_allowed
         assert_json 'message', 'This pull request was already merged.'
       end
 
       test "#destroy cancels the merge if the pull request was waiting" do
-        delete :destroy, params: { stack_id: @stack.to_param, id: @pull_request.number.to_s }
+        delete :destroy, params: { stack_id: @stack.to_param, id: @merge_request.number.to_s }
         assert_response :no_content
-        assert_predicate @pull_request.reload, :canceled?
+        assert_predicate @merge_request.reload, :canceled?
       end
 
       test "#destroy silently fail if the pull request was unknown" do

data/test/controllers/api/outputs_controller_test.rb

@@ -11,6 +11,7 @@ module Shipit
 
       test "#show returns the task output as plain text" do
         task = @stack.tasks.last
+        task.write("dummy output")
 
         get :show, params: { stack_id: @stack.to_param, task_id: task.id }
         assert_response :ok

data/test/controllers/api/rollback_controller_test.rb

@@ -106,7 +106,7 @@ module Shipit
         last_deploy.reload
         assert_response :accepted
         refute_predicate last_deploy, :active?
-        assert_json 'rollback_once_aborted_to.until_commit_id', @commit.id
+        assert_json 'rollback_once_aborted_to.revision.sha', @commit.sha
       end
     end
   end

data/test/controllers/api/stacks_controller_test.rb

@@ -84,7 +84,6 @@ module Shipit
 
       test "#index returns a list of stacks" do
         stack = Stack.last
-
         get :index
         assert_response :ok
         assert_json '0.id', stack.id
@@ -93,6 +92,27 @@ module Shipit
         end
       end
 
+      test "#index returns a list of stacks filtered by repo if name and owner given" do
+        repo = shipit_repositories(:shipit)
+        get :index, params: { repo_owner: repo.owner, repo_name: repo.name }
+        assert_response :ok
+        assert_json do |stacks|
+          assert_equal stacks.size, repo.stacks.size
+        end
+      end
+
+      test "#index returns a list of stacks filtered by repo and api client" do
+        authenticate!(:here_come_the_walrus)
+
+        repo = shipit_repositories(:soc)
+
+        get :index, params: { repo_owner: repo.owner, repo_name: repo.name }
+        assert_response :ok
+        assert_json do |stacks|
+          assert_equal 0, stacks.size
+        end
+      end
+
       test "#index is paginable" do
         get :index, params: { page_size: 1 }
         assert_json do |list|