shipit-engine 0.28.0 → 0.32.0

data/test/dummy/config/application.rb

@@ -12,7 +12,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,9 +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
+
+  # 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
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
@@ -39,11 +54,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

@@ -42,5 +42,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_06_15_181558) 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
@@ -77,6 +78,7 @@ ActiveRecord::Schema.define(version: 2019_05_02_020249) do
     t.integer "pull_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"
@@ -190,9 +192,15 @@ 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.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 +219,11 @@ 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.index ["archived_since"], name: "index_stacks_on_archived_since"
+    t.index ["repository_id", "environment"], name: "stack_unicity", unique: true
+    t.index ["repository_id"], name: "index_stacks_on_repository_id"
   end
 
   create_table "statuses", force: :cascade do |t|
@@ -228,8 +240,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 +261,13 @@ 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.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"

data/test/dummy/db/seeds.rb

@@ -1,8 +1,11 @@
 require 'faker'
-require 'fakeweb'
+require 'webmock'
+include WebMock::API
+WebMock.enable!
+WebMock.allow_net_connect!
 
 # Sometimes on Travis the background job runs immediately so provide a response to fake hooks
-FakeWeb.register_uri(:post, %r{https://example\.com/}, status: %w(200 OK))
+stub_request(:post, %r{https://example\.com/}).to_return(status: %w(200 OK))
 
 # Cheap hack to allow rake db:seed to work
 module Shipit
@@ -11,6 +14,8 @@ module Shipit
   Commit.send(:define_method, :refresh_statuses!) {}
   Commit.send(:define_method, :refresh_check_runs!) {}
   ReleaseStatus.send(:define_method, :create_status_on_github!) {}
+  CommitDeployment.send(:define_method, :schedule_create_on_github) {}
+  CommitDeploymentStatus.send(:define_method, :schedule_create_on_github) {}
 
   users = 3.times.map do
     User.create!(
@@ -22,8 +27,10 @@ module Shipit
 
   stacks = 3.times.map do
     Stack.create!(
-      repo_name:  Faker::Internet.domain_name.parameterize,
-      repo_owner: Faker::Company.name.parameterize,
+      repository: Repository.find_or_create_by(
+        name:  Faker::Internet.domain_name.parameterize,
+        owner: Faker::Company.name.parameterize
+      ),
       deploy_url:  "https://#{Faker::Internet.domain_name.parameterize}.#{Faker::Internet.domain_suffix}/",
       cached_deploy_spec: DeploySpec.load(%(
         {
@@ -109,8 +116,8 @@ module Shipit
         message:      Faker::Company.catch_phrase,
         authored_at:  Time.now,
         committed_at: Time.now,
-        additions: Faker::Number.number(3),
-        deletions: Faker::Number.number(3),
+        additions: Faker::Number.number(digits: 3),
+        deletions: Faker::Number.number(digits: 3),
       )
 
       if (i % 4) != 0
@@ -141,19 +148,19 @@ module Shipit
     end
 
     stack.pull_requests.create!(
-      number: Faker::Number.number(3),
+      number: Faker::Number.number(digits: 3),
       title: Faker::Company.catch_phrase,
       merge_status: 'pending',
       merge_requested_at: 5.minute.ago,
       merge_requested_by: users.sample,
-      github_id: Faker::Number.number(8),
+      github_id: Faker::Number.number(digits: 8),
       api_url: 'https://api.github.com/repos/shopify/shipit-engine/pulls/62',
       state: 'open',
-      branch: "feature-#{Faker::Number.number(3)}",
+      branch: "feature-#{Faker::Number.number(digits: 3)}",
       head_id: nil,
       mergeable: true,
-      additions: Faker::Number.number(3),
-      deletions: Faker::Number.number(3),
+      additions: Faker::Number.number(digits: 3),
+      deletions: Faker::Number.number(digits: 3),
     )
   end
 
@@ -170,8 +177,8 @@ module Shipit
         since_commit_id: commits.first.id,
         until_commit_id: commits.last.id,
         status:          "success",
-        additions: Faker::Number.number(3),
-        deletions: Faker::Number.number(3),
+        additions: Faker::Number.number(digits: 3),
+        deletions: Faker::Number.number(digits: 3),
         started_at: Random.rand(15.minutes.to_i).seconds.ago,
         ended_at: Time.now.utc,
         user: users.sample,
@@ -192,9 +199,19 @@ module Shipit
     )
     write_output(rollback)
 
-    task = stack.tasks.create!(
-      since_commit_id: stack.last_deployed_commit.id,
-      until_commit_id: stack.last_deployed_commit.id,
+    provision_task = stack.tasks.create!(
+      status: "pending",
+      user: users.sample,
+      definition: TaskDefinition.new('provision',
+        'action' => 'Provision some resources',
+        'description' => 'Provisions servers for the application to be deployed to',
+        'steps' => ['./provision.sh'],
+      ),
+      started_at: Random.rand(15.minutes.to_i).seconds.ago,
+    )
+    write_output(provision_task)
+
+    restart_task = stack.tasks.create!(
       status: "success",
       user: users.sample,
       definition: TaskDefinition.new('restart',
@@ -205,6 +222,6 @@ module Shipit
       started_at: Random.rand(15.minutes.to_i).seconds.ago,
       ended_at: Time.now.utc,
     )
-    write_output(rollback)
+    write_output(restart_task)
   end
 end

data/test/fixtures/shipit/commit_deployment_statuses.yml

@@ -1,6 +1,6 @@
-shipit_deploy_second_pending:
+shipit_deploy_second_in_progress:
   commit_deployment: shipit_deploy_second
-  status: pending
+  status: in_progress
   github_id: 42
   api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/1/statuses/42
 
@@ -10,9 +10,9 @@ shipit_deploy_second_success:
   github_id: 43
   api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/1/statuses/43
 
-shipit2_deploy_third_pending:
+shipit2_deploy_third_in_progress:
   commit_deployment: shipit2_deploy_third
-  status: pending
+  status: in_progress
 
 shipit2_deploy_third_failure:
   commit_deployment: shipit2_deploy_third

data/test/fixtures/shipit/commit_deployments.yml

@@ -1,37 +1,37 @@
 shipit_deploy_second:
-  commit_id: 2 # second
+  sha: f890fd8b5f2be05d1fedb763a3605ee461c39074 # second
   task_id: 1 # shipit
   api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/1
   github_id: 1
 
 shipit2_deploy_third:
-  commit_id: 3 # third
+  sha: 367578b362bf2b4df5903e1c7960929361c39074 # third
   task_id: 2 # shipit2
   api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/2
   github_id: 2
 
 shipit_pending_third:
-  commit_id: 3 # third
+  sha: 367578b362bf2b4df5903e1c7960929361c39074 # third
   task_id: 4 # shipit_pending
   api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/3
   github_id: 3
 
 shipit_pending_fourth:
-  commit_id: 4 # fourth
+  sha: 467578b362bf2b4df5903e1c7960929361c3435a # fourth
   task_id: 4 # shipit_pending
 
 shipit_running_fourth:
-  commit_id: 4 # fourth
+  sha: 467578b362bf2b4df5903e1c7960929361c3435a # fourth
   task_id: 5 # shipit_running
 
 shipit_complete_fourth:
-  commit_id: 4 # fourth
+  sha: 467578b362bf2b4df5903e1c7960929361c3435a # fourth
   task_id: 6 # shipit_complete
 
 shipit_aborted_fourth:
-  commit_id: 4 # fourth
+  sha: 467578b362bf2b4df5903e1c7960929361c3435a # fourth
   task_id: 7 # shipit_aborted
 
 shipit_rollback_fourth:
-  commit_id: 4 # fourth
+  sha: 467578b362bf2b4df5903e1c7960929361c3435a # fourth
   task_id: 8 # shipit_rollback

data/test/fixtures/shipit/commits.yml

@@ -10,6 +10,7 @@ first:
   additions: 42
   deletions: 24
   updated_at: <%= 8.days.ago.to_s(:db) %>
+  created_at: <%= 1.day.ago.to_s(:db) %>
 
 second:
   id: 2
@@ -23,6 +24,7 @@ second:
   additions: 1
   deletions: 1
   updated_at: <%= 8.days.ago.to_s(:db) %>
+  created_at: <%= 1.day.ago.to_s(:db) %>
 
 third:
   id: 3
@@ -36,6 +38,7 @@ third:
   additions: 12
   deletions: 64
   updated_at: <%= 8.days.ago.to_s(:db) %>
+  created_at: <%= 1.day.ago.to_s(:db) %>
 
 fourth:
   id: 4
@@ -49,6 +52,8 @@ fourth:
   additions: 420
   deletions: 342
   updated_at: <%= 8.days.ago.to_s(:db) %>
+  created_at: <%= 1.day.ago.to_s(:db) %>
+  pull_request_head_sha: '6dcb09b5b57875f334f61aebed695e2e4193db5e'
 
 fifth:
   id: 5
@@ -62,6 +67,7 @@ fifth:
   additions: 1
   deletions: 24
   updated_at: <%= 8.days.ago.to_s(:db) %>
+  created_at: <%= 1.day.ago.to_s(:db) %>
 
 cyclimse_first:
   id: 6
@@ -194,6 +200,7 @@ canaries_first:
   additions: 42
   deletions: 24
   updated_at: <%= 8.days.ago.to_s(:db) %>
+  created_at: <%= 1.day.ago.to_s(:db) %>
 
 canaries_second:
   id: 302
@@ -207,6 +214,7 @@ canaries_second:
   additions: 1
   deletions: 1
   updated_at: <%= 8.days.ago.to_s(:db) %>
+  created_at: <%= 1.day.ago.to_s(:db) %>
 
 canaries_third:
   id: 303
@@ -220,6 +228,7 @@ canaries_third:
   additions: 12
   deletions: 64
   updated_at: <%= 8.days.ago.to_s(:db) %>
+  created_at: <%= 1.day.ago.to_s(:db) %>
 
 canaries_fourth:
   id: 304
@@ -233,6 +242,7 @@ canaries_fourth:
   additions: 420
   deletions: 342
   updated_at: <%= 8.days.ago.to_s(:db) %>
+  created_at: <%= 1.day.ago.to_s(:db) %>
 
 canaries_fifth:
   id: 305
@@ -246,6 +256,7 @@ canaries_fifth:
   additions: 1
   deletions: 24
   updated_at: <%= 8.days.ago.to_s(:db) %>
+  created_at: <%= 1.day.ago.to_s(:db) %>
 
 undeployed_1:
   id: 401
@@ -350,3 +361,30 @@ single:
   additions: 420
   deletions: 342
   updated_at: <%= 8.days.ago.to_s(:db) %>
+
+task_no_commits:
+  id: 601
+  sha: 547578b362bf2b4df5903e1c7960929361c3435a
+  message: "first commit"
+  stack: shipit_task_no_commits
+  author: walrus
+  committer: walrus
+  authored_at: <%= 4.days.ago.to_s(:db) %>
+  committed_at: <%= 3.days.ago.to_s(:db) %>
+  additions: 420
+  deletions: 342
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+
+check_deploy_spec_first:
+  id: 701
+  sha: 547578b362bf2b4df5903e1c7960929361c3435a
+  message: "Removing deploy spec"
+  stack: check_deploy_spec
+  author: walrus
+  committer: walrus
+  authored_at: <%= 4.days.ago.to_s(:db) %>
+  committed_at: <%= 3.days.ago.to_s(:db) %>
+  additions: 420
+  deletions: 342
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+  

data/test/fixtures/shipit/repositories.yml

@@ -0,0 +1,27 @@
+shipit:
+  owner: shopify
+  name: shipit-engine
+
+cyclimse:
+  owner: george
+  name: cyclimse
+
+foo-bar:
+  owner: shopify
+  name: foo-bar
+
+soc:
+  owner: "shopify"
+  name: "soc"
+
+check_runs:
+  owner: shopify
+  name: check_runs
+
+check_deploy_spec:
+  owner: shopify
+  name: check_deploy_spec
+
+rails:
+  owner: rails
+  name: rails