shipit-engine 0.15.0 → 0.16.0

data/test/controllers/webhooks_controller_test.rb

@@ -42,12 +42,11 @@ module Shipit
       assert_equal status_payload['created_at'], status.created_at.iso8601
     end
 
-    test ":state with a unexisting commit trows ActiveRecord::RecordNotFound" do
+    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'}]}
-      assert_raises ActiveRecord::RecordNotFound do
-        post :state, params: {stack_id: @stack.id}.merge(params)
-      end
+      post :state, params: {stack_id: @stack.id}.merge(params)
+      assert_response :ok
     end
 
     test ":state in an untracked branche bails out" do

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

@@ -42,6 +42,8 @@ Rails.application.configure do
     Shipit::DeferredTouch.enabled = false
   end
   config.active_job.queue_adapter = :async
-  
+
   Pubsubstub.use_persistent_connections = false
+
+  Shipit.disable_api_authentication = true if ENV['PUBLIC_API']
 end

data/test/dummy/data/stacks/shopify/junk/production/git/README.md

@@ -0,0 +1,8 @@
+# junk
+For testing purposes. Feel free to delete if I forgot (byroot).
+
+PR 1
+PR 2
+PR 3
+PR 4
+PR 5

data/test/dummy/data/stacks/shopify/junk/production/git/circle.yml

@@ -0,0 +1,4 @@
+test:
+  override:
+    - "true"
+    - echo done

data/test/dummy/data/stacks/shopify/junk/production/git/shipit.yml

@@ -0,0 +1,4 @@
+deploy:
+  override:
+    - sleep 3
+    - echo done

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: 20161206105318) do
+ActiveRecord::Schema.define(version: 20170221130336) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text     "permissions", limit: 65535
@@ -44,18 +44,21 @@ ActiveRecord::Schema.define(version: 20161206105318) do
   end
 
   create_table "commits", force: :cascade do |t|
-    t.integer  "stack_id",     limit: 4,                     null: false
-    t.integer  "author_id",    limit: 4,                     null: false
-    t.integer  "committer_id", limit: 4,                     null: false
-    t.string   "sha",          limit: 40,                    null: false
-    t.text     "message",      limit: 65535,                 null: false
+    t.integer  "stack_id",            limit: 4,                     null: false
+    t.integer  "author_id",           limit: 4,                     null: false
+    t.integer  "committer_id",        limit: 4,                     null: false
+    t.string   "sha",                 limit: 40,                    null: false
+    t.text     "message",             limit: 65535,                 null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "detached",                   default: false, null: false
-    t.datetime "authored_at",                                null: false
-    t.datetime "committed_at",                               null: false
-    t.integer  "additions",    limit: 4
-    t.integer  "deletions",    limit: 4
+    t.boolean  "detached",                          default: false, null: false
+    t.datetime "authored_at",                                       null: false
+    t.datetime "committed_at",                                      null: false
+    t.integer  "additions",           limit: 4
+    t.integer  "deletions",           limit: 4
+    t.integer  "pull_request_number"
+    t.string   "pull_request_title",  limit: 1024
+    t.integer  "pull_request_id"
     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"
@@ -123,6 +126,33 @@ ActiveRecord::Schema.define(version: 20161206105318) do
     t.index ["task_id"], name: "index_output_chunks_on_task_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  "head_id"
+    t.boolean  "mergeable"
+    t.integer  "additions",                          default: 0, null: false
+    t.integer  "deletions",                          default: 0, null: false
+    t.string   "merge_status",          limit: 30,               null: false
+    t.string   "rejection_reason"
+    t.datetime "merge_requested_at",                             null: false
+    t.integer  "merge_requested_by_id"
+    t.datetime "created_at",                                     null: false
+    t.datetime "updated_at",                                     null: false
+    t.string   "branch"
+    t.datetime "revalidated_at"
+    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 ["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
+
   create_table "stacks", force: :cascade do |t|
     t.string   "repo_name",                         limit: 100,                          null: false
     t.string   "repo_owner",                        limit: 39,                           null: false
@@ -142,6 +172,7 @@ ActiveRecord::Schema.define(version: 20161206105318) do
     t.integer  "estimated_deploy_duration",                       default: 1,            null: false
     t.datetime "continuous_delivery_delayed_since"
     t.datetime "locked_since"
+    t.boolean  "merge_queue_enabled",                             default: false,        null: false
     t.index ["repo_owner", "repo_name", "environment"], name: "stack_unicity", unique: true
   end
 
@@ -181,6 +212,7 @@ ActiveRecord::Schema.define(version: 20161206105318) do
     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 ["type", "stack_id", "parent_id"], name: "index_tasks_by_stack_and_parent"
     t.index ["type", "stack_id", "status"], name: "index_tasks_by_stack_and_status"
     t.index ["until_commit_id"], name: "index_tasks_on_until_commit_id"
@@ -209,7 +241,9 @@ ActiveRecord::Schema.define(version: 20161206105318) do
     t.string   "avatar_url",                       limit: 255
     t.string   "encrypted_github_access_token"
     t.string   "encrypted_github_access_token_iv"
+    t.index ["github_id"], name: "index_users_on_github_id"
     t.index ["login"], name: "index_users_on_login"
+    t.index ["updated_at"], name: "index_users_on_updated_at"
   end
 
 end

data/test/dummy/db/seeds.rb

@@ -26,6 +26,11 @@ module Shipit
       deploy_url:  "https://#{Faker::Internet.domain_name.parameterize}.#{Faker::Internet.domain_suffix}/",
       cached_deploy_spec: DeploySpec.load(%(
         {
+          "ci": {
+            "hide": ["ci/hidden"],
+            "require": ["ci/travis"],
+            "allow_failures": ["ci/not-important"]
+          },
           "dependencies": {
             "bundler": {
               "without": [
@@ -103,16 +108,18 @@ module Shipit
         deletions: Faker::Number.number(3),
       )
 
-      Status.create!(
-        state: %w(pending success error failure).sample,
-        context: 'ci/travis',
-        description: "Your tests ran on travis-ci",
-        target_url: "https://example.com",
-        commit_id: commit.id,
-        stack_id: commit.stack_id,
-        created_at: Time.now,
-        updated_at: Time.now,
-      )
+      if (i % 4) != 0
+        Status.create!(
+          state: %w(pending success error failure).sample,
+          context: 'ci/travis',
+          description: "Your tests ran on travis-ci",
+          target_url: "https://example.com",
+          commit_id: commit.id,
+          stack_id: commit.stack_id,
+          created_at: Time.now,
+          updated_at: Time.now,
+        )
+      end
 
       if (i % 5) == 0
         Status.create!(
@@ -127,6 +134,22 @@ module Shipit
         )
       end
     end
+
+    stack.pull_requests.create!(
+      number: Faker::Number.number(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),
+      api_url: 'https://api.github.com/repos/shopify/shipit-engine/pulls/62',
+      state: 'open',
+      branch: "feature-#{Faker::Number.number(3)}",
+      head_id: nil,
+      mergeable: true,
+      additions: Faker::Number.number(3),
+      deletions: Faker::Number.number(3),
+    )
   end
 
   def create_chunks

data/test/fixtures/shipit/commits.yml

@@ -88,3 +88,17 @@ undeployed_stack_first:
   additions: 1
   deletions: 24
   updated_at: <%= 8.days.ago.to_s(:db) %>
+
+shipit_pending_pr_head:
+  id: 8
+  sha: 424278037b872fd9a6690523e411ecb3aa181355
+  message: "Super feature"
+  stack: shipit
+  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) %>
+  detached: true

data/test/fixtures/shipit/pull_requests.yml

@@ -0,0 +1,56 @@
+shipit_fetching:
+  stack: shipit
+  number: 63
+  merge_status: fetching
+  merge_requested_at: <%= 1.minute.ago.to_s(:db) %>
+  merge_requested_by: walrus
+
+shipit_pending:
+  stack: shipit
+  number: 62
+  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: 42424424242424
+  api_url: https://api.github.com/repos/shopify/shipit-engine/pulls/62
+  state: open
+  branch: feature-62
+  head_id: 8
+  mergeable: true
+  additions: 23
+  deletions: 43
+
+shipit_pending_unmergeable:
+  stack: shipit
+  number: 61
+  title: Other cool feature
+  merge_status: pending
+  merge_requested_at: <%= 4.minute.ago.to_s(:db) %>
+  revalidated_at: <%= 4.minute.ago.to_s(:db) %>
+  merge_requested_by: walrus
+  github_id: 43434434343434
+  api_url: https://api.github.com/repos/shopify/shipit-engine/pulls/61
+  state: open
+  branch: feature-61
+  head_id: 8
+  mergeable: false
+  additions: 23
+  deletions: 43
+
+shipit_pending_not_mergeable_yet:
+  stack: shipit
+  number: 64
+  merge_status: pending
+  merge_requested_by: walrus
+  merge_requested_at: <%= 3.minute.ago.to_s(:db) %>
+  revalidated_at: <%= 3.minute.ago.to_s(:db) %>
+  github_id: 45454454545454
+  api_url: https://api.github.com/repos/shopify/shipit-engine/pulls/64
+  state: open
+  branch: feature-64
+  head_id: 8
+  mergeable: null
+  additions: 23
+  deletions: 43

data/test/fixtures/shipit/stacks.yml

@@ -4,6 +4,7 @@ shipit:
   environment: "production"
   branch: master
   ignore_ci: false
+  merge_queue_enabled: true
   tasks_count: 3
   undeployed_commits_count: 1
   cached_deploy_spec: >
@@ -16,7 +17,7 @@ shipit:
         ]
       },
       "dependencies": {"override": []},
-      "deploy": {"override": null, "interval": 60, "variables": [{"name": "SAFETY_DISABLED", "title": "Set to 1 to do dangerous things", "default": 0}]},
+      "deploy": {"override": null, "interval": 60, "max_commits": 3, "variables": [{"name": "SAFETY_DISABLED", "title": "Set to 1 to do dangerous things", "default": 0}]},
       "rollback": {"override": ["echo 'Rollback!'"]},
       "fetch": ["echo '42'"],
       "tasks": {
@@ -40,6 +41,9 @@ shipit:
           "allow_concurrency": true
         }
       },
+      "merge": {
+        "revalidate_after": 900
+      },
       "ci": {
         "hide": ["ci/hidden"],
         "allow_failures": ["ci/ok_to_fail"]

data/test/fixtures/shipit/statuses.yml

@@ -90,3 +90,11 @@ cyclimse_success_travis:
   state: success
   target_url: "http://www.example.com"
 
+shipit_pending_pr_success_travis:
+  stack: shipit
+  commit_id: 8 # shipit_pending_pr_head
+  description: Super feature
+  context: ci/travis
+  created_at: <%= 9.days.ago.to_s(:db) %>
+  state: success
+  target_url: "http://www.example.com"

data/test/helpers/json_helper.rb

@@ -1,19 +1,24 @@
 module JSONHelper
-  def assert_json(path = nil, *args)
-    value = follow_path(path.to_s.split('.'))
+  UNDEFINED = Object.new.freeze
+  private_constant :UNDEFINED
+
+  def assert_json(path = nil, expected_value = UNDEFINED, document: response.body)
+    value = follow_path(path.to_s.split('.'), document: document)
     if block_given?
       yield value
-    elsif args.size == 1
-      assert_equal args.first, value
-    else
+    elsif expected_value == UNDEFINED
       raise ArgumentError, "Missing either expected_value or a block"
+    elsif expected_value.nil?
+      assert_nil value
+    else
+      assert_equal expected_value, value
     end
   end
 
-  def assert_json_keys(path, keys = nil)
+  def assert_json_keys(path, keys = nil, document: response.body)
     keys, path = path, nil if keys.nil?
 
-    value = follow_path(path.to_s.split('.'))
+    value = follow_path(path.to_s.split('.'), document: document)
     case value
     when Hash
       assert_equal keys.sort, value.keys.sort
@@ -22,10 +27,10 @@ module JSONHelper
     end
   end
 
-  def assert_no_json(path)
+  def assert_no_json(path, document: response.body)
     segments = path.to_s.split('.')
     last_segment = segments.pop
-    leaf = follow_path(segments)
+    leaf = follow_path(segments, document: document)
     case leaf
     when Hash
       refute leaf.key?(last_segment), "Expected #{leaf.inspect} not to include #{last_segment.inspect}"
@@ -38,7 +43,8 @@ module JSONHelper
 
   private
 
-  def follow_path(segments)
+  def follow_path(segments, document:)
+    parsed_json = ActiveSupport::JSON.decode(document)
     segments.inject(parsed_json) do |object, key|
       case object
       when Hash
@@ -52,8 +58,4 @@ module JSONHelper
       end
     end
   end
-
-  def parsed_json
-    @parsed_json ||= ActiveSupport::JSON.decode(response.body)
-  end
 end

data/test/jobs/merge_pull_requests_job_test.rb

@@ -0,0 +1,59 @@
+require 'test_helper'
+
+module Shipit
+  class MergePullRequestsJobTest < ActiveSupport::TestCase
+    setup do
+      @stack = shipit_stacks(:shipit)
+      @job = MergePullRequestsJob.new
+
+      @pending_pr = shipit_pull_requests(:shipit_pending)
+      @unmergeable_pr = shipit_pull_requests(:shipit_pending_unmergeable)
+      @not_ready_pr = shipit_pull_requests(:shipit_pending_not_mergeable_yet)
+    end
+
+    test "#perform rejects unmergeable PRs and merge the others" do
+      PullRequest.any_instance.stubs(:refresh!)
+      FakeWeb.register_uri(:put, "#{@pending_pr.api_url}/merge", status: %w(200 OK), body: {
+        sha: "6dcb09b5b57875f334f61aebed695e2e4193db5e",
+        merged: true,
+        message: "Pull Request successfully merged",
+      }.to_json)
+      branch_url = "https://api.github.com/repos/shopify/shipit-engine/git/refs/heads/feature-62"
+      FakeWeb.register_uri(:delete, branch_url, status: %w(204 No content))
+
+      @job.perform(@stack)
+
+      assert_predicate @pending_pr.reload, :merged?
+      assert_predicate @unmergeable_pr.reload, :rejected?
+    end
+
+    test "#perform rejects PRs if the merge attempt fails" do
+      PullRequest.any_instance.stubs(:refresh!)
+      FakeWeb.register_uri(:put, "#{@pending_pr.api_url}/merge", status: %w(405 Method not allowed), body: {
+        message: "Pull Request is not mergeable",
+        documentation_url: "https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button",
+      }.to_json)
+
+      @job.perform(@stack)
+
+      assert_predicate @pending_pr.reload, :rejected?
+    end
+
+    test "#perform rejects 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 @pending_pr.reload, :pending?
+    end
+
+    test "#perform schedules a new job if the first PR in the queue is not mergeable yet" do
+      PullRequest.any_instance.stubs(:refresh!)
+
+      @pending_pr.update!(mergeable: nil)
+      assert_enqueued_with(job: MergePullRequestsJob) do
+        @job.perform(@stack)
+      end
+      assert_predicate @pending_pr.reload, :pending?
+    end
+  end
+end