shipit-engine 0.31.0 → 0.32.0

data/test/controllers/webhooks_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -54,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
@@ -79,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
@@ -87,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'
@@ -116,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
@@ -132,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
@@ -148,7 +149,7 @@ 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
@@ -167,15 +168,15 @@ module Shipit
     private
 
     def pull_request_params
-      {action: 'opened', number: 2, pull_request: 'foobar'}
+      { 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/environments/development.rb

@@ -64,4 +64,6 @@ Rails.application.configure do
   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

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_01_09_132519) do
+ActiveRecord::Schema.define(version: 2020_06_15_181558) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text "permissions", limit: 65535
@@ -78,6 +78,7 @@ ActiveRecord::Schema.define(version: 2020_01_09_132519) 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"
@@ -260,11 +261,13 @@ ActiveRecord::Schema.define(version: 2020_01_09_132519) 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/fixtures/shipit/commits.yml

@@ -53,6 +53,7 @@ fourth:
   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
@@ -373,3 +374,17 @@ task_no_commits:
   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

@@ -18,6 +18,10 @@ check_runs:
   owner: shopify
   name: check_runs
 
+check_deploy_spec:
+  owner: shopify
+  name: check_deploy_spec
+
 rails:
   owner: rails
   name: rails

data/test/fixtures/shipit/stacks.yml

@@ -7,27 +7,70 @@ shipit:
   merge_queue_enabled: true
   tasks_count: 8
   undeployed_commits_count: 2
-  cached_deploy_spec: >
+  cached_deploy_spec: |-
     {
-      "machine": {"environment": {}},
+      "machine": {
+        "environment": {
+        }
+      },
       "review": {
-        "checklist": ["foo", "bar", "baz"],
+        "checklist": [
+          "foo",
+          "bar",
+          "baz"
+        ],
         "monitoring": [
-          {"image": "https://example.com/monitor.png", "width": 200, "height": 300}
+          {
+            "image": "https://example.com/monitor.png",
+            "width": 200,
+            "height": 300
+          }
         ]
       },
-      "dependencies": {"override": []},
-      "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'"],
+      "dependencies": {
+        "override": [
+
+        ]
+      },
+      "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": {
         "restart": {
           "action": "Restart application",
           "description": "Restart app and job servers",
           "variables": [
-            {"name": "FOO", "title": "Set to 0 to foo", "default": 1},
-            {"name": "BAR", "title": "Set to 1 to bar", "default": 0},
-            {"name": "WALRUS", "title": "Walrus without a default value"}
+            {
+              "name": "FOO",
+              "title": "Set to 0 to foo",
+              "default": 1
+            },
+            {
+              "name": "BAR",
+              "title": "Set to 1 to bar",
+              "default": 0
+            },
+            {
+              "name": "WALRUS",
+              "title": "Walrus without a default value"
+            }
           ],
           "steps": [
             "cap $ENVIRONMENT deploy:restart"
@@ -46,8 +89,12 @@ shipit:
         "revalidate_after": 900
       },
       "ci": {
-        "hide": ["ci/hidden"],
-        "allow_failures": ["ci/ok_to_fail"]
+        "hide": [
+          "ci/hidden"
+        ],
+        "allow_failures": [
+          "ci/ok_to_fail"
+        ]
       }
     }
   last_deployed_at: <%= 8.days.ago.to_s(:db) %>
@@ -241,7 +288,23 @@ shipit_undeployed:
         ]
       },
       "dependencies": {"override": []},
-      "deploy": {"override": null, "interval": 60, "max_commits": 3, "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},
+          {
+            "name": "DEPLOY_REGION",
+            "title": "Region to deploy to",
+            "default": "us-central",
+            "select": [
+              "us-central",
+              "us-east"
+            ]
+          }
+        ]
+      },
       "rollback": {"override": ["echo 'Rollback!'"]},
       "fetch": ["echo '42'"],
       "tasks": {
@@ -404,3 +467,16 @@ shipit_task_no_commits:
       }
     }
   updated_at: <%= 8.days.ago.to_s(:db) %>
+
+check_deploy_spec:
+  repository: check_deploy_spec
+  environment: production
+  branch: master
+  ignore_ci: true
+  merge_queue_enabled: true
+  tasks_count: 0
+  undeployed_commits_count: 1
+  continuous_deployment: true
+  cached_deploy_spec: "{}"
+  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
+  updated_at: <%= 8.days.ago.to_s(:db) %>

data/test/fixtures/timeout

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 trap('INT') do
   puts "Recieved SIGINT, aborting."
@@ -11,5 +12,5 @@ trap('TERM') do
 end
 
 puts "Sleeping for 10 seconds"
-sleep 10
+sleep(10)
 puts "I wasn't killed? WTF"

data/test/helpers/api_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ApiHelper
   private
 

data/test/helpers/fixture_aliases_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module FixtureAliasesHelper
   def shipit_deploys(*args)
     shipit_tasks(*args)

data/test/helpers/hooks_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module HooksHelper
   def expect_hook(event, stack = nil, payload = nil)
     spy_on_hook
@@ -24,7 +25,7 @@ module HooksHelper
     end
     matcher = args.map(&:inspect).join(', ')
     got = called&.args&.map(&:inspect)&.join(', ')
-    refute called, "Expected no hook matching: (#{matcher})\n  got: (#{got})"
+    refute(called, "Expected no hook matching: (#{matcher})\n  got: (#{got})")
   end
 
   private

data/test/helpers/json_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JSONHelper
   UNDEFINED = Object.new.freeze
   private_constant :UNDEFINED
@@ -9,21 +10,24 @@ module JSONHelper
     elsif expected_value == UNDEFINED
       raise ArgumentError, "Missing either expected_value or a block"
     elsif expected_value.nil?
-      assert_nil value
+      assert_nil(value)
     else
-      assert_equal expected_value, value
+      assert_equal(expected_value, value)
     end
   end
 
   def assert_json_keys(path, keys = nil, document: response.body)
-    keys, path = path, nil if keys.nil?
+    if keys.nil?
+      keys = path
+      path = nil
+    end
 
     value = follow_path(path.to_s.split('.'), document: document)
     case value
     when Hash
-      assert_equal keys.sort, value.keys.sort
+      assert_equal(keys.sort, value.keys.sort)
     else
-      assert false, "Expected #{path} to be a Hash, was: #{value.inspect}"
+      assert(false, "Expected #{path} to be a Hash, was: #{value.inspect}")
     end
   end
 
@@ -33,11 +37,11 @@ module JSONHelper
     leaf = follow_path(segments, document: document)
     case leaf
     when Hash
-      refute leaf.key?(last_segment), "Expected #{leaf.inspect} not to include #{last_segment.inspect}"
+      refute(leaf.key?(last_segment), "Expected #{leaf.inspect} not to include #{last_segment.inspect}")
     when Array
-      refute leaf.size > last_segment.to_i, "Expected #{leaf.inspect} to not have element at index #{last_segment.to_i}"
+      refute(leaf.size > last_segment.to_i, "Expected #{leaf.inspect} to not have element at index #{last_segment.to_i}")
     else
-      assert false, "Expected #{leaf.inspect} to be a Hash or Array"
+      assert(false, "Expected #{leaf.inspect} to be a Hash or Array")
     end
   end
 
@@ -48,13 +52,13 @@ module JSONHelper
     segments.inject(parsed_json) do |object, key|
       case object
       when Hash
-        assert_includes object, key
+        assert_includes(object, key)
         object[key]
       when Array
-        assert object.size > key.to_i, "#{object.inspect} have no property #{key}"
+        assert(object.size > key.to_i, "#{object.inspect} have no property #{key}")
         object[key.to_i]
       else
-        assert false, "Expected #{object.inspect} to be a Hash or Array"
+        assert(false, "Expected #{object.inspect} to be a Hash or Array")
       end
     end
   end

data/test/helpers/links_helper.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
 module LinksHelper
   LINKS_PATTERN = /\<(.*?)\>; rel="(\w+)"/
 
   def assert_link(rel, url)
-    assert_includes response_links, rel
-    assert_equal url, response_links[rel], %(rel="#{rel}" is incorrect)
+    assert_includes(response_links, rel)
+    assert_equal(url, response_links[rel], %(rel="#{rel}" is incorrect))
   end
 
   def assert_no_link(rel)
-    assert_nil response_links[rel], %(expected rel="#{rel}" to be nil)
+    assert_nil(response_links[rel], %(expected rel="#{rel}" to be nil))
   end
 
   private

data/test/helpers/payloads_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module PayloadsHelper
   def payload(name)
     Shipit::Engine.root.join('test/fixtures/payloads', "#{name}.json").read

data/test/helpers/queries_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module QueriesHelper
   def assert_no_queries(ignored_sql = nil, &block)
     assert_queries(0, ignored_sql, &block)
@@ -8,7 +9,7 @@ module QueriesHelper
     subscriber = ActiveSupport::Notifications.subscribe('sql.active_record', counter)
     yield counter
     queries = counter.log.empty? ? '' : "\nQueries:\n#{counter.log.join("\n")}"
-    assert_equal num, counter.log.size, "#{counter.log.size} instead of #{num} queries were executed.#{queries}"
+    assert_equal(num, counter.log.size, "#{counter.log.size} instead of #{num} queries were executed.#{queries}")
   ensure
     ActiveSupport::Notifications.unsubscribe(subscriber)
   end
@@ -35,7 +36,7 @@ module QueriesHelper
 
     # FIXME: this needs to be refactored so specific database can add their own
     # ignored SQL.  This ignored SQL is for Oracle.
-    ignored_sql.concat [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im]
+    ignored_sql.concat([/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im])
 
     attr_reader :ignore
     attr_reader :log