shipit-engine 0.20.0 → 0.21.0

data/test/controllers/tasks_controller_test.rb

@@ -70,6 +70,7 @@ module Shipit
       @task.reload
       assert_response :success
       assert_equal 'aborting', @task.reload.status
+      assert_equal shipit_users(:walrus).id, @task.aborted_by_id
       assert_equal false, @task.rollback_once_aborted?
     end
 
@@ -81,6 +82,7 @@ module Shipit
       @task.reload
       assert_response :success
       assert_equal 'aborting', @task.status
+      assert_equal shipit_users(:walrus).id, @task.aborted_by_id
       assert_equal true, @task.rollback_once_aborted?
     end
 

data/test/controllers/webhooks_controller_test.rb

@@ -150,13 +150,6 @@ module Shipit
       end
     end
 
-    test ":membership can append a user membership for an organization with capitals" do
-      assert_difference -> { Membership.count }, 1 do
-        post :membership, params: membership_params.merge(organization: {login: 'Shopify'}, member: {login: 'bob'})
-        assert_response :ok
-      end
-    end
-
     private
 
     def membership_params

data/test/dummy/config/secrets.yml

@@ -15,5 +15,3 @@ test:
     #   -
     #   -
   redis_url: "redis://127.0.0.1:6379/7"
-  # features:
-  #   - bootstrap

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170629141736) do
+ActiveRecord::Schema.define(version: 20180202220850) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text "permissions", limit: 65535
@@ -80,9 +80,8 @@ ActiveRecord::Schema.define(version: 20170629141736) do
     t.datetime "delivered_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["created_at"], name: "index_deliveries_on_created_at"
     t.index ["hook_id", "event", "status"], name: "index_deliveries_on_hook_id_and_event_and_status"
-    t.index ["status", "event"], name: "index_deliveries_on_status_and_event"
+    t.index ["hook_id", "status"], name: "index_deliveries_on_hook_id_and_status"
   end
 
   create_table "github_hooks", force: :cascade do |t|
@@ -148,6 +147,8 @@ ActiveRecord::Schema.define(version: 20170629141736) do
     t.string "branch"
     t.datetime "revalidated_at"
     t.datetime "merged_at"
+    t.string "base_ref", limit: 1024
+    t.integer "base_commit_id"
     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"
@@ -215,6 +216,7 @@ ActiveRecord::Schema.define(version: 20170629141736) do
     t.datetime "started_at"
     t.datetime "ended_at"
     t.boolean "ignored_safeties", default: false, null: false
+    t.integer "aborted_by_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"

data/test/fixtures/shipit/commits.yml

@@ -102,3 +102,56 @@ shipit_pending_pr_head:
   deletions: 24
   updated_at: <%= 8.days.ago.to_s(:db) %>
   detached: true
+
+cyclimse_merged:
+  id: 9
+  sha: 772b4795871e4a45aa17d53f02aa45d0
+  message: "Merge pull request #66 from cyclimse/yoloshipit\n\nyoloshipit!"
+  stack: cyclimse
+  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) %>
+  pull_request_id: 99
+
+soc_first:
+  id: 101
+  sha: 5e9278037b872fd9a6690523e411ecb3aa181355
+  message: "lets go"
+  stack: soc
+  author: walrus
+  committer: walrus
+  authored_at: <%= 10.days.ago.to_s(:db) %>
+  committed_at: <%= 9.days.ago.to_s(:db) %>
+  additions: 42
+  deletions: 24
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+
+soc_second:
+  id: 102
+  sha: e790fd8b5f2be05d1fedb763a3605ee461c39074
+  message: "sheep it!"
+  stack: soc
+  author: walrus
+  committer: walrus
+  authored_at: <%= 8.days.ago.to_s(:db) %>
+  committed_at: <%= 7.days.ago.to_s(:db) %>
+  additions: 1
+  deletions: 1
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+
+soc_third:
+  id: 103
+  sha: 477578b362bf2b4df5903e1c7960929361c39074
+  message: "fix it!"
+  stack: soc
+  author: walrus
+  committer: walrus
+  authored_at: <%= 6.days.ago.to_s(:db) %>
+  committed_at: <%= 5.days.ago.to_s(:db) %>
+  additions: 12
+  deletions: 64
+  updated_at: <%= 8.days.ago.to_s(:db) %>

data/test/fixtures/shipit/pull_requests.yml

@@ -87,3 +87,55 @@ shipit_pending_merged:
   mergeable: null
   additions: 23
   deletions: 43
+
+shipit_mergeable_pending_ci:
+  stack: shipit
+  number: 67
+  title: Super duper nice feature
+  merge_status: pending
+  merge_requested_at: <%= 5.minute.ago.to_s(:db) %>
+  revalidated_at: <%= 5.minute.ago.to_s(:db) %>
+  merge_requested_by: walrus
+  github_id: 424244242424241
+  api_url: https://api.github.com/repos/shopify/shipit-engine/pulls/67
+  state: open
+  branch: feature-67
+  head_id: 4
+  mergeable: true
+  additions: 23
+  deletions: 43
+
+shipit_pending_expired:
+  stack: shipit
+  number: 68
+  title: Noice !
+  merge_status: pending
+  merge_requested_at: <%= 50.minute.ago.to_s(:db) %>
+  revalidated_at: <%= 25.minute.ago.to_s(:db) %>
+  merge_requested_by: walrus
+  github_id: 48484848484848
+  api_url: https://api.github.com/repos/shopify/shipit-engine/pulls/68
+  state: open
+  branch: feature-68
+  head_id: 8
+  mergeable: true
+  additions: 23
+  deletions: 43
+
+cyclimse_pending_merged:
+  id: 99
+  stack: cyclimse
+  number: 66
+  merge_status: merged
+  merge_requested_by: walrus
+  merge_requested_at: <%= 3.minute.ago.to_s(:db) %>
+  merged_at: <%= 2.minute.ago.to_s(:db) %>
+  revalidated_at: <%= 3.minute.ago.to_s(:db) %>
+  github_id: 43243243243232
+  api_url: https://api.github.com/repos/shopify/cyclimse/pulls/66
+  state: closed
+  branch: feature-64
+  head_id: 8
+  mergeable: null
+  additions: 23
+  deletions: 43

data/test/fixtures/shipit/stacks.yml

@@ -123,3 +123,38 @@ undeployed_stack:
       }
     }
   updated_at: <%= 8.days.ago.to_s(:db) %>
+
+soc:
+  repo_owner: "shopify"
+  repo_name: "soc"
+  environment: "production"
+  branch: master
+  tasks_count: 0
+  undeployed_commits_count: 2
+  cached_deploy_spec: >
+    {
+      "machine": {"environment": {}},
+      "review": {
+        "checklist": ["foo", "bar", "baz"],
+        "monitoring": [
+          {"image": "https://example.com/monitor.png", "width": 200, "height": 300}
+        ]
+      },
+      "dependencies": {"override": []},
+      "deploy": {"override": null},
+      "rollback": {"override": ["echo 'Rollback!'"]},
+      "fetch": ["echo '42'"],
+      "tasks": {
+        "restart": {
+          "action": "Restart application",
+          "description": "Restart app and job servers",
+          "steps": [
+            "cap $ENVIRONMENT deploy:restart"
+          ]
+        }
+      },
+      "ci": {
+        "blocking": ["soc/compliance"]
+      }
+    }
+  updated_at: <%= 8.days.ago.to_s(:db) %>

data/test/fixtures/shipit/statuses.yml

@@ -98,3 +98,30 @@ shipit_pending_pr_success_travis:
   created_at: <%= 9.days.ago.to_s(:db) %>
   state: success
   target_url: "http://www.example.com"
+
+soc_first:
+  stack: soc
+  commit_id: 101 # soc_first
+  description: Woops
+  context: soc/compliance
+  created_at: <%= 9.days.ago.to_s(:db) %>
+  state: failure
+  target_url: "http://www.example.com"
+
+soc_second:
+  stack: soc
+  commit_id: 102 # soc_second
+  description: All good
+  context: soc/compliance
+  created_at: <%= 7.days.ago.to_s(:db) %>
+  state: success
+  target_url: "http://www.example.com"
+
+soc_third:
+  stack: soc
+  commit_id: 103 # soc_third
+  description: All good
+  context: soc/compliance
+  created_at: <%= 7.days.ago.to_s(:db) %>
+  state: success
+  target_url: "http://www.example.com"

data/test/fixtures/shipit/tasks.yml

@@ -120,3 +120,17 @@ shipit_rollback:
   created_at: <%= (60 - 8).minutes.ago.to_s(:db) %>
   started_at: <%= (60 - 8).minutes.ago.to_s(:db) %>
   ended_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
+
+soc_deploy:
+  id: 9
+  user: walrus
+  since_commit_id: 101 # soc_first
+  until_commit_id: 101 # soc_first
+  type: Shipit::Deploy
+  stack: soc
+  status: success
+  additions: 1
+  deletions: 1
+  created_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 3).minutes.ago.to_s(:db) %>

data/test/helpers/queries_helper.rb

@@ -50,7 +50,7 @@ module QueriesHelper
 
       # FIXME: this seems bad. we should probably have a better way to indicate
       # the query was cached
-      return if 'CACHE' == values[:name] || ignore.any? { |x| x =~ sql }
+      return if values[:name] == 'CACHE' || ignore.any? { |x| x =~ sql }
       log << sql
     end
   end

data/test/jobs/merge_pull_requests_job_test.rb

@@ -11,6 +11,8 @@ module Shipit
       @not_ready_pr = shipit_pull_requests(:shipit_pending_not_mergeable_yet)
       @closed_pr = shipit_pull_requests(:shipit_pending_closed)
       @merged_pr = shipit_pull_requests(:shipit_pending_merged)
+      @expired_pr = shipit_pull_requests(:shipit_pending_expired)
+      @mergable_pending_ci = shipit_pull_requests(:shipit_mergeable_pending_ci)
     end
 
     test "#perform rejects unmergeable PRs and merge the others" do
@@ -50,6 +52,13 @@ module Shipit
       assert_predicate @pending_pr.reload, :pending?
     end
 
+    test "#perform revalidate PRs but do not attempt to merge any if the stack doesn't allow merges" do
+      PullRequest.any_instance.stubs(:refresh!)
+      @stack.update!(lock_reason: 'Maintenance')
+      @job.perform(@stack)
+      assert_predicate @expired_pr.reload, :revalidating?
+    end
+
     test "#perform schedules a new job if the first PR in the queue is not mergeable yet" do
       PullRequest.any_instance.stubs(:refresh!)
 
@@ -67,11 +76,19 @@ module Shipit
       assert_predicate @closed_pr.reload, :canceled?
     end
 
-    test "#perform completes merge requests for already merged PRs" do
+    test "#perform cancels merge requests for manually merged PRs" do
+      @pending_pr.cancel!
+      PullRequest.any_instance.stubs(:refresh!)
+      @job.perform(@stack)
+      assert_predicate @merged_pr.reload, :canceled?
+    end
+
+    test "#perform does not reject pull requests with pending statuses" do
       @pending_pr.cancel!
       PullRequest.any_instance.stubs(:refresh!)
       @job.perform(@stack)
-      assert_predicate @merged_pr.reload, :merged?
+      refute_predicate @mergable_pending_ci.reload, :rejected?
+      refute_predicate @mergable_pending_ci.reload, :merged?
     end
   end
 end

data/test/jobs/perform_task_job_test.rb

@@ -67,15 +67,39 @@ module Shipit
       @job.perform(@deploy)
     end
 
-    test "mark deploy as error if a command timeout" do
-      Command.any_instance.expects(:stream!).at_least_once.raises(Command::TimedOut)
+    test "mark deploy as error an unexpected exception is raised" do
+      Command.any_instance.expects(:stream!).at_least_once.raises(Command::Denied)
 
       @job.perform(@deploy)
 
       assert_equal 'failed', @deploy.reload.status
+      assert_includes @deploy.chunk_output, 'Denied'
+    end
+
+    test "mark deploy as timedout if a command timeout" do
+      Command.any_instance.expects(:stream!).at_least_once.raises(Command::TimedOut)
+
+      @job.perform(@deploy)
+
+      assert_equal 'timedout', @deploy.reload.status
       assert_includes @deploy.chunk_output, 'TimedOut'
     end
 
+    test "mark deploy as timedout if a command exit in one of the codes in Shipit.timeout_exit_codes" do
+      previous_exit_codes = Shipit.timeout_exit_codes
+      begin
+        Shipit.timeout_exit_codes = [70].freeze
+
+        Command.any_instance.expects(:stream!).at_least_once.raises(Command::Failed.new('Blah', 70))
+
+        @job.perform(@deploy)
+
+        assert_equal 'timedout', @deploy.reload.status
+      ensure
+        Shipit.timeout_exit_codes = previous_exit_codes
+      end
+    end
+
     test "records stack support for rollbacks and fetching deployed revision" do
       @job.stubs(:capture!)
       @commands = stub(:commands)

data/test/models/commits_test.rb

@@ -148,8 +148,8 @@ module Shipit
         author: walrus,
         committer: walrus,
         sha: "ab12",
-        authored_at: DateTime.now,
-        committed_at: DateTime.now,
+        authored_at: Time.now,
+        committed_at: Time.now,
         message: "more fish!",
       )
     end
@@ -176,8 +176,8 @@ module Shipit
         author: walrus,
         committer: walrus,
         sha: "ab12",
-        authored_at: DateTime.now,
-        committed_at: DateTime.now,
+        authored_at: Time.now,
+        committed_at: Time.now,
         message: "more fish!",
       )
       @stack.reload
@@ -217,8 +217,8 @@ module Shipit
         author: walrus,
         committer: walrus,
         sha: "ab12",
-        authored_at: DateTime.now,
-        committed_at: DateTime.now,
+        authored_at: Time.now,
+        committed_at: Time.now,
         message: "more fish!",
       )
       stack.reload
@@ -306,6 +306,37 @@ module Shipit
       refute_predicate commit, :deployable?
     end
 
+    test "#deployable? is false if a blocking status is missing on a previous undeployed commit" do
+      blocking_commit = shipit_commits(:soc_second)
+      blocking_commit.statuses.delete_all
+
+      assert_predicate blocking_commit, :pending?
+      assert_predicate blocking_commit, :blocking?
+
+      commit = shipit_commits(:soc_third)
+      refute_predicate commit, :deployable?
+    end
+
+    test "#deployable? is false if a blocking status is failing on a previous undeployed commit" do
+      blocking_commit = shipit_commits(:soc_second)
+      blocking_commit.statuses.update_all(state: 'failure')
+
+      assert_predicate blocking_commit, :failure?
+      assert_predicate blocking_commit, :blocking?
+
+      commit = shipit_commits(:soc_third)
+      refute_predicate commit, :deployable?
+    end
+
+    test "#deployable? is true if no blocking status is failing or missing on a previous undeployed commit" do
+      blocking_commit = shipit_commits(:soc_second)
+      assert_predicate blocking_commit, :success?
+      refute_predicate blocking_commit, :blocking?
+
+      commit = shipit_commits(:soc_third)
+      assert_predicate commit, :deployable?
+    end
+
     expected_webhook_transitions = { # we expect deployable_status to fire on these transitions, and not on any others
       'unknown' => %w(pending success failure error),
       'pending' => %w(success failure error),
@@ -551,6 +582,24 @@ module Shipit
       assert revert.revert_of?(commit)
     end
 
+    test "deploy_requested_at defaults to commit created_at" do
+      assert_equal @commit.deploy_requested_at, @commit.created_at
+    end
+
+    test "when merged via the queue, deploy_requested_at is merge_requested_at" do
+      commit = shipit_commits(:cyclimse_merged)
+      assert_predicate commit, :pull_request?
+      assert_equal commit.pull_request, shipit_pull_requests(:cyclimse_pending_merged)
+      assert_equal commit.deploy_requested_at, commit.pull_request.merge_requested_at
+    end
+
+    test "when merged manually after being queued, deploy_requested_at is created_at" do
+      pr = shipit_pull_requests(:cyclimse_pending_merged)
+      pr.cancel!
+      commit = shipit_commits(:cyclimse_merged)
+      assert_equal commit.deploy_requested_at, commit.created_at
+    end
+
     private
 
     def expect_event(stack)