shipit-engine 0.28.1 → 0.33.0

data/test/controllers/status_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit

data/test/controllers/tasks_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -11,7 +12,7 @@ module Shipit
     end
 
     test "tasks defined in the shipit.yml can be displayed" do
-      get :new, params: {stack_id: @stack, definition_id: @definition.id}
+      get :new, params: { stack_id: @stack, definition_id: @definition.id }
       assert_response :ok
     end
 
@@ -20,7 +21,7 @@ module Shipit
 
       assert_predicate @stack, :active_task?
       assert_no_difference -> { @stack.tasks.count } do
-        post :create, params: {stack_id: @stack, definition_id: @definition.id}
+        post :create, params: { stack_id: @stack, definition_id: @definition.id }
       end
       assert_redirected_to new_stack_tasks_path(@stack, @definition)
     end
@@ -30,7 +31,7 @@ module Shipit
 
       assert_predicate @stack, :active_task?
       assert_difference -> { @stack.tasks.count } do
-        post :create, params: {stack_id: @stack, definition_id: @definition.id, force: 'true'}
+        post :create, params: { stack_id: @stack, definition_id: @definition.id, force: 'true' }
       end
       assert_redirected_to stack_task_path(@stack, Task.last)
     end
@@ -38,34 +39,34 @@ module Shipit
     test "tasks defined in the shipit.yml can be triggered while the stack is being deployed if specified as such" do
       @definition = @stack.find_task_definition('flush_cache')
       assert_difference -> { @stack.tasks.count } do
-        post :create, params: {stack_id: @stack, definition_id: @definition.id}
+        post :create, params: { stack_id: @stack, definition_id: @definition.id }
       end
       assert_redirected_to stack_task_path(@stack, Task.last)
     end
 
     test "tasks with variables defined in the shipit.yml can be triggered with their variables set" do
-      env = {"FOO" => "0"}
+      env = { "FOO" => "0" }
 
-      post :create, params: {stack_id: @stack, definition_id: @definition.id, task: {env: env}, force: 'true'}
+      post :create, params: { stack_id: @stack, definition_id: @definition.id, task: { env: env }, force: 'true' }
 
       assert_redirected_to stack_tasks_path(@stack, Task.last)
     end
 
     test "triggered tasks can be observed" do
-      get :show, params: {stack_id: @stack, id: @task.id}
+      get :show, params: { stack_id: @stack, id: @task.id }
       assert_response :ok
     end
 
     test "triggered tasks can be observed as raw text" do
-      get :show, params: {stack_id: @stack, id: @task.id}, format: 'txt'
+      get :show, params: { stack_id: @stack, id: @task.id }, format: 'txt'
       assert_response :success
-      assert_equal("text/plain", @response.content_type)
+      assert_equal("text/plain", @response.media_type)
     end
 
     test ":abort call abort! on the deploy" do
       @task = shipit_deploys(:shipit_running)
       @task.ping
-      post :abort, params: {stack_id: @stack.to_param, id: @task.id}
+      post :abort, params: { stack_id: @stack.to_param, id: @task.id }
 
       @task.reload
       assert_response :success
@@ -77,7 +78,7 @@ module Shipit
     test ":abort schedule the rollback if `rollback` is present" do
       @task = shipit_deploys(:shipit_running)
       @task.ping
-      post :abort, params: {stack_id: @stack.to_param, id: @task.id, rollback: 'true'}
+      post :abort, params: { stack_id: @stack.to_param, id: @task.id, rollback: 'true' }
 
       @task.reload
       assert_response :success
@@ -87,31 +88,43 @@ module Shipit
     end
 
     test ":index list the stack deploys" do
-      get :index, params: {stack_id: @stack.to_param}
+      get :index, params: { stack_id: @stack.to_param }
       assert_response :success
       assert_select '.task-list .task', @stack.tasks.count
     end
 
     test ":index paginates with the `since` parameter" do
-      get :index, params: {stack_id: @stack.to_param, since: @stack.tasks.last.id}
+      get :index, params: { stack_id: @stack.to_param, since: @stack.tasks.last.id }
       assert_response :success
       assert_select '.task-list .task', @stack.tasks.count - 1
     end
 
     test ":tail returns the task status, output, and next url" do
       @task = shipit_deploys(:shipit_running)
-      last_chunk = @task.chunks.last
+      @task.write("dummy output")
+      last_chunk = @task.chunk_output.bytesize
 
-      get :tail, params: {stack_id: @stack.to_param, id: @task.id, last_id: last_chunk.id}, format: :json
+      get :tail, params: { stack_id: @stack.to_param, id: @task.id }, format: :json
       assert_response :success
       assert_json_keys %w(url status output)
       assert_json 'status', @task.status
+      assert_json 'output', @task.chunk_output
+      assert_json 'url', "/shopify/shipit-engine/production/tasks/#{@task.id}/tail?last_byte=#{last_chunk}"
+    end
+
+    test ":tail can handle last_byte as string" do
+      @task = shipit_deploys(:shipit_running)
+      @task.write("dummy output")
+
+      get :tail, params: { stack_id: @stack.to_param, id: @task.id, last_byte: "50" }, format: :json
+      assert_response :success
+      assert_json_keys %w(url status output)
     end
 
     test ":tail doesn't returns the next url if the task is finished" do
       @task = shipit_deploys(:shipit)
 
-      get :tail, params: {stack_id: @stack.to_param, id: @task.id}, format: :json
+      get :tail, params: { stack_id: @stack.to_param, id: @task.id }, format: :json
       assert_response :success
       assert_no_json 'url'
     end
@@ -119,7 +132,7 @@ module Shipit
     test ":tail returns the rollback url if the task have been aborted" do
       @task = shipit_deploys(:shipit_aborted)
 
-      get :tail, params: {stack_id: @stack.to_param, id: @task.id}, format: :json
+      get :tail, params: { stack_id: @stack.to_param, id: @task.id }, format: :json
       assert_response :success
       assert_json_keys %w(status output rollback_url)
     end
@@ -127,7 +140,7 @@ module Shipit
     test ":lookup returns stack task url if the task is an instance of Task" do
       @task = shipit_tasks(:shipit_restart)
 
-      get :lookup, params: {id: @task.id}
+      get :lookup, params: { id: @task.id }
 
       assert_redirected_to stack_task_path(@task.stack, @task)
     end
@@ -135,7 +148,7 @@ module Shipit
     test ":lookup returns stack deploy url if the task is an instance of Deploy" do
       @task = shipit_tasks(:shipit)
 
-      get :lookup, params: {id: @task.id}
+      get :lookup, params: { id: @task.id }
 
       assert_redirected_to stack_deploy_path(@task.stack, @task)
     end
@@ -143,7 +156,7 @@ module Shipit
     test ":lookup returns stack deploy url if the task is an instance of Rollback" do
       @task = shipit_tasks(:shipit_rollback)
 
-      get :lookup, params: {id: @task.id}
+      get :lookup, params: { id: @task.id }
 
       assert_redirected_to stack_deploy_path(@task.stack, @task)
     end

data/test/controllers/webhooks_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -7,6 +8,17 @@ module Shipit
       GithubHook.any_instance.stubs(:verify_signature).returns(true)
     end
 
+    test "create github repository which is not yet present in the datastore" do
+      request.headers['X-Github-Event'] = 'push'
+      unknown_repo_payload = JSON.parse(payload(:push_master))
+      unknown_repo_payload["repository"]["full_name"] = "owner/unknown-repository"
+      unknown_repo_payload = unknown_repo_payload.to_json
+
+      assert_nothing_raised do
+        post :create, body: unknown_repo_payload, as: :json
+      end
+    end
+
     test ":push with the target branch queues a GithubSyncJob" do
       request.headers['X-Github-Event'] = 'push'
 
@@ -43,14 +55,14 @@ module Shipit
 
     test ":state with a unexisting commit respond with 200 OK" do
       request.headers['X-Github-Event'] = 'status'
-      params = {'sha' => 'notarealcommit', 'state' => 'pending', 'branches' => [{'name' => 'master'}]}.to_json
+      params = { 'sha' => 'notarealcommit', 'state' => 'pending', 'branches' => [{ 'name' => 'master' }] }.to_json
       post :create, body: params, as: :json
       assert_response :ok
     end
 
     test ":state in an untracked branche bails out" do
       request.headers['X-Github-Event'] = 'status'
-      params = {'sha' => 'notarealcommit', 'state' => 'pending', 'branches' => []}.to_json
+      params = { 'sha' => 'notarealcommit', 'state' => 'pending', 'branches' => [] }.to_json
       post :create, body: params, as: :json
       assert_response :ok
     end
@@ -68,7 +80,7 @@ module Shipit
       @request.headers['X-Github-Event'] = 'ping'
 
       assert_no_enqueued_jobs do
-        post :create, body: {zen: 'Git is beautiful'}.to_json, as: :json
+        post :create, body: { zen: 'Git is beautiful' }.to_json, as: :json
         assert_response :ok
       end
     end
@@ -76,7 +88,7 @@ module Shipit
     test "verifies webhook signature" do
       commit = shipit_commits(:first)
 
-      payload = {"sha" => commit.sha, "state" => "pending", "target_url" => "https://ci.example.com/1000/output"}.to_json
+      payload = { "sha" => commit.sha, "state" => "pending", "target_url" => "https://ci.example.com/1000/output" }.to_json
       signature = 'sha1=4848deb1c9642cd938e8caa578d201ca359a8249'
 
       @request.headers['X-Github-Event'] = 'push'
@@ -105,7 +117,7 @@ module Shipit
       @request.headers['X-Github-Event'] = 'membership'
       Shipit.github.api.expects(:user).with('george').returns(george)
       assert_difference -> { User.count }, 1 do
-        post :create, body: membership_params.merge(member: {login: 'george'}).to_json, as: :json
+        post :create, body: membership_params.merge(member: { login: 'george' }).to_json, as: :json
         assert_response :ok
       end
     end
@@ -121,7 +133,7 @@ module Shipit
     test ":membership can append an user membership" do
       @request.headers['X-Github-Event'] = 'membership'
       assert_difference -> { Membership.count }, 1 do
-        post :create, body: membership_params.merge(member: {login: 'bob'}).to_json, as: :json
+        post :create, body: membership_params.merge(member: { login: 'bob' }).to_json, as: :json
         assert_response :ok
       end
     end
@@ -137,19 +149,34 @@ module Shipit
     test ":membership can delete an user twice" do
       @request.headers['X-Github-Event'] = 'membership'
       assert_no_difference -> { Membership.count } do
-        post :create, body: membership_params.merge(action: 'removed', member: {login: 'bob'}).to_json, as: :json
+        post :create, body: membership_params.merge(action: 'removed', member: { login: 'bob' }).to_json, as: :json
         assert_response :ok
       end
     end
 
+    test "other events trigger custom handlers" do
+      event = 'pull_request'
+      mock_handler = mock
+      mock_handler.expects(:call).with(pull_request_params.stringify_keys).once
+      Shipit::Webhooks.handlers["pull_request"] = [mock_handler]
+
+      @request.headers['X-Github-Event'] = event
+      post :create, body: pull_request_params.to_json, as: :json
+      assert_response :ok
+    end
+
     private
 
+    def pull_request_params
+      { action: 'opened', number: 2, pull_request: 'foobar' }
+    end
+
     def membership_params
-      {action: 'added', team: team_params, organization: {login: 'shopify'}, member: {login: 'walrus'}}
+      { action: 'added', team: team_params, organization: { login: 'shopify' }, member: { login: 'walrus' } }
     end
 
     def team_params
-      {id: shipit_teams(:shopify_developers).id, slug: 'developers', name: 'Developers', url: 'http://example.com'}
+      { id: shipit_teams(:shopify_developers).id, slug: 'developers', name: 'Developers', url: 'http://example.com' }
     end
 
     def george

data/test/dummy/config/application.rb

@@ -1,6 +1,11 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
+require 'active_record/railtie'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'active_job/railtie'
+require 'rails/test_unit/railtie'
+require 'sprockets/railtie'
 
 Bundler.require(*Rails.groups)
 require "shipit"
@@ -12,7 +17,7 @@ end
 
 module Shipit
   class Application < Rails::Application
-    config.load_defaults 5.2
+    config.load_defaults 6.0
   end
 end
 

data/test/dummy/config/environments/development.rb

@@ -9,12 +9,24 @@ Rails.application.configure do
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports
+  config.consider_all_requests_local = true
 
-  # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
+  # Enable/disable caching. By default caching is disabled.
+  # Run rails dev:cache to toggle caching.
+  if Shipit::Engine.root.join("tmp", "caching-dev.txt").exist?
+    config.action_controller.perform_caching = true
+    config.action_controller.enable_fragment_cache_logging = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      "Cache-Control" => "public, max-age=#{2.days.to_i}",
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
@@ -39,11 +51,16 @@ Rails.application.configure do
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
   if Rails.application.config_for(:database)['adapter'] == 'sqlite3'
-    Shipit::DeferredTouch.enabled = false
+    config.to_prepare do
+      Shipit::DeferredTouch.enabled = false
+    end
   end
+
   config.active_job.queue_adapter = :async
 
   Pubsubstub.use_persistent_connections = false
 
   Shipit.disable_api_authentication = true if ENV['PUBLIC_API']
+
+  config.hosts << "shipit-engine.myshopify.io"
 end

data/test/dummy/config/environments/test.rb

@@ -26,11 +26,6 @@ Rails.application.configure do
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
-
   # Randomize the order test cases are executed.
   config.active_support.test_order = :random
 
@@ -42,5 +37,7 @@ Rails.application.configure do
 
   config.to_prepare do
     Shipit::DeferredTouch.enabled = false
+    # The deploy specs in fixtures are pretty printed, we should do the same to avoid marking stacks as dirty
+    Shipit::DeploySpec.pretty_generate = true
   end
 end

data/test/dummy/db/schema.rb

@@ -2,15 +2,15 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_05_02_020249) do
+ActiveRecord::Schema.define(version: 2020_10_08_152744) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text "permissions", limit: 65535
@@ -55,6 +55,7 @@ ActiveRecord::Schema.define(version: 2019_05_02_020249) do
     t.string "api_url"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "sha", limit: 40
     t.index ["commit_id", "task_id"], name: "index_commit_deployments_on_commit_id_and_task_id", unique: true
     t.index ["task_id"], name: "index_commit_deployments_on_task_id"
   end
@@ -74,9 +75,10 @@ ActiveRecord::Schema.define(version: 2019_05_02_020249) do
     t.integer "deletions", limit: 4
     t.integer "pull_request_number"
     t.string "pull_request_title", limit: 1024
-    t.integer "pull_request_id"
+    t.integer "merge_request_id"
     t.boolean "locked", default: false, null: false
     t.integer "lock_author_id", limit: 4
+    t.string "pull_request_head_sha", limit: 40
     t.index ["author_id"], name: "index_commits_on_author_id"
     t.index ["committer_id"], name: "index_commits_on_committer_id"
     t.index ["created_at"], name: "index_commits_on_created_at"
@@ -136,15 +138,7 @@ ActiveRecord::Schema.define(version: 2019_05_02_020249) do
     t.index ["user_id"], name: "index_memberships_on_user_id"
   end
 
-  create_table "output_chunks", force: :cascade do |t|
-    t.integer "task_id", limit: 4
-    t.text "text", limit: 16777215
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.index ["task_id"], name: "index_output_chunks_on_task_id"
-  end
-
-  create_table "pull_requests", force: :cascade do |t|
+  create_table "merge_requests", force: :cascade do |t|
     t.integer "stack_id", null: false
     t.integer "number", null: false
     t.string "title", limit: 256
@@ -166,11 +160,46 @@ ActiveRecord::Schema.define(version: 2019_05_02_020249) do
     t.datetime "merged_at"
     t.string "base_ref", limit: 1024
     t.integer "base_commit_id"
+    t.index ["head_id"], name: "index_merge_requests_on_head_id"
+    t.index ["merge_requested_by_id"], name: "index_merge_requests_on_merge_requested_by_id"
+    t.index ["merge_status"], name: "index_merge_requests_on_merge_status"
+    t.index ["stack_id", "github_id"], name: "index_merge_requests_on_stack_id_and_github_id", unique: true
+    t.index ["stack_id", "merge_status"], name: "index_merge_requests_on_stack_id_and_merge_status"
+    t.index ["stack_id", "number"], name: "index_merge_requests_on_stack_id_and_number", unique: true
+    t.index ["stack_id"], name: "index_merge_requests_on_stack_id"
+  end
+
+  create_table "output_chunks", force: :cascade do |t|
+    t.integer "task_id", limit: 4
+    t.text "text", limit: 16777215
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.index ["task_id"], name: "index_output_chunks_on_task_id"
+  end
+
+  create_table "pull_request_assignments", force: :cascade do |t|
+    t.integer "pull_request_id"
+    t.integer "user_id"
+    t.index ["pull_request_id"], name: "index_pull_request_assignments_on_pull_request_id"
+    t.index ["user_id"], name: "index_pull_request_assignments_on_user_id"
+  end
+
+  create_table "pull_requests", force: :cascade do |t|
+    t.integer "stack_id", 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", default: 0, null: false
+    t.integer "deletions", default: 0, null: false
+    t.integer "user_id"
+    t.text "labels"
+    t.integer "head_id"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.index ["head_id"], name: "index_pull_requests_on_head_id"
-    t.index ["merge_requested_by_id"], name: "index_pull_requests_on_merge_requested_by_id"
-    t.index ["merge_status"], name: "index_pull_requests_on_merge_status"
     t.index ["stack_id", "github_id"], name: "index_pull_requests_on_stack_id_and_github_id", unique: true
-    t.index ["stack_id", "merge_status"], name: "index_pull_requests_on_stack_id_and_merge_status"
     t.index ["stack_id", "number"], name: "index_pull_requests_on_stack_id_and_number", unique: true
     t.index ["stack_id"], name: "index_pull_requests_on_stack_id"
   end
@@ -190,9 +219,18 @@ ActiveRecord::Schema.define(version: 2019_05_02_020249) do
     t.index ["user_id"], name: "index_deploy_statuses_on_user_id"
   end
 
+  create_table "repositories", force: :cascade do |t|
+    t.string "owner", limit: 39, null: false
+    t.string "name", limit: 100, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.boolean "review_stacks_enabled", default: false
+    t.string "provisioning_behavior", default: "allow_all"
+    t.string "provisioning_label_name"
+    t.index ["owner", "name"], name: "repository_unicity", unique: true
+  end
+
   create_table "stacks", force: :cascade do |t|
-    t.string "repo_name", limit: 100, null: false
-    t.string "repo_owner", limit: 39, null: false
     t.string "environment", limit: 50, default: "production", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -211,7 +249,17 @@ ActiveRecord::Schema.define(version: 2019_05_02_020249) do
     t.datetime "locked_since"
     t.boolean "merge_queue_enabled", default: false, null: false
     t.datetime "last_deployed_at"
-    t.index ["repo_owner", "repo_name", "environment"], name: "stack_unicity", unique: true
+    t.integer "repository_id", null: false
+    t.datetime "archived_since"
+    t.string "provision_status", default: "deprovisioned", null: false
+    t.string "type", default: "Shipit::Stack"
+    t.boolean "awaiting_provision", default: false, null: false
+    t.index ["archived_since"], name: "index_stacks_on_archived_since"
+    t.index ["awaiting_provision"], name: "index_stacks_on_awaiting_provision"
+    t.index ["provision_status"], name: "index_stacks_on_provision_status"
+    t.index ["repository_id", "environment"], name: "stack_unicity", unique: true
+    t.index ["repository_id"], name: "index_stacks_on_repository_id"
+    t.index ["type"], name: "index_stacks_on_type"
   end
 
   create_table "statuses", force: :cascade do |t|
@@ -228,8 +276,8 @@ ActiveRecord::Schema.define(version: 2019_05_02_020249) do
 
   create_table "tasks", force: :cascade do |t|
     t.integer "stack_id", limit: 4, null: false
-    t.integer "since_commit_id", limit: 4, null: false
-    t.integer "until_commit_id", limit: 4, null: false
+    t.integer "since_commit_id", limit: 4
+    t.integer "until_commit_id", limit: 4
     t.string "status", limit: 10, default: "pending", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -249,11 +297,15 @@ ActiveRecord::Schema.define(version: 2019_05_02_020249) do
     t.datetime "ended_at"
     t.boolean "ignored_safeties", default: false, null: false
     t.integer "aborted_by_id"
+    t.integer "rollback_once_aborted_to_id"
+    t.integer "retry_attempt", default: 0, null: false
+    t.integer "max_retries"
     t.index ["rolled_up", "created_at", "status"], name: "index_tasks_on_rolled_up_and_created_at_and_status"
     t.index ["since_commit_id"], name: "index_tasks_on_since_commit_id"
     t.index ["stack_id", "allow_concurrency", "status"], name: "index_active_tasks"
     t.index ["stack_id", "allow_concurrency"], name: "index_tasks_on_stack_id_and_allow_concurrency"
     t.index ["stack_id", "status", "type"], name: "index_tasks_by_stack_and_status"
+    t.index ["status"], name: "index_tasks_on_status"
     t.index ["type", "stack_id", "parent_id"], name: "index_tasks_by_stack_and_parent"
     t.index ["until_commit_id"], name: "index_tasks_on_until_commit_id"
     t.index ["user_id"], name: "index_tasks_on_user_id"