shipit-engine 0.26.0 → 0.27.0

data/test/controllers/api/deploys_controller_test.rb

@@ -10,6 +10,17 @@ module Shipit
         @commit = shipit_commits(:fifth)
       end
 
+      test "#deploys returns the deploys and revisions for a given stack" do
+        tasks = @stack.deploys_and_rollbacks.order(id: :desc)
+
+        get :index, params: {stack_id: @stack.to_param}
+        assert_response :ok
+
+        (0...tasks.length).each do |i|
+          assert_json "#{i}.id", tasks[i].id
+        end
+      end
+
       test "#create triggers a new deploy for the stack" do
         assert_difference -> { @stack.deploys.count }, 1 do
           post :create, params: {stack_id: @stack.to_param, sha: @commit.sha}

data/test/controllers/merge_status_controller_test.rb

@@ -36,6 +36,11 @@ module Shipit
 
     test "GET show prefers stacks with merge_queue_enabled" do
       existing = shipit_stacks(:shipit)
+      Shipit::Stack.where(
+        repo_owner: existing.repo_owner,
+        repo_name: existing.repo_name,
+      ).update_all(merge_queue_enabled: false)
+
       Shipit::Stack.create(
         repo_owner: existing.repo_owner,
         repo_name: existing.repo_name,
@@ -43,7 +48,7 @@ module Shipit
         branch: existing.branch,
         merge_queue_enabled: true,
       )
-      existing.update!(merge_queue_enabled: false)
+
       get :show, params: {referrer: 'https://github.com/Shopify/shipit-engine/pull/42', branch: 'master'}
       assert_response :ok
       assert_includes response.body, 'shipit-engine/foo'

data/test/controllers/release_statuses_controller_test.rb

@@ -3,12 +3,12 @@ require 'test_helper'
 module Shipit
   class ReleaseStatusesControllerTest < ActionController::TestCase
     setup do
-      @stack = shipit_stacks(:shipit)
-      @deploy = shipit_deploys(:shipit)
+      @stack = shipit_stacks(:shipit_canaries)
+      @deploy = shipit_deploys(:canaries_validating)
       session[:user_id] = shipit_users(:walrus).id
     end
 
-    test ":create allow users to append release statuses" do
+    test ":create allow users to append release statuses and mark the deploy as success" do
       assert_difference -> { ReleaseStatus.count }, +1 do
         post :create, params: {stack_id: @stack, deploy_id: @deploy.id, status: 'success'}
         assert_response :created
@@ -18,6 +18,20 @@ module Shipit
       assert_equal 'success', status.state
       assert_equal '@walrus signaled this release as healthy.', status.description
       assert_equal @deploy.permalink, status.target_url
+      assert_equal 'success', @deploy.reload.status
+    end
+
+    test ":create allow users to append release statuses and mark the deploy as faulty" do
+      assert_difference -> { ReleaseStatus.count }, +1 do
+        post :create, params: {stack_id: @stack, deploy_id: @deploy.id, status: 'failure'}
+        assert_response :created
+      end
+
+      status = ReleaseStatus.last
+      assert_equal 'failure', status.state
+      assert_equal '@walrus signaled this release as faulty.', status.description
+      assert_equal @deploy.permalink, status.target_url
+      assert_equal 'faulty', @deploy.reload.status
     end
   end
 end

data/test/controllers/stacks_controller_test.rb

@@ -51,6 +51,11 @@ module Shipit
       assert_response :ok
     end
 
+    test "#show with faulty and validating deploys is success" do
+      get :show, params: {id: shipit_stacks(:shipit_canaries).to_param}
+      assert_response :ok
+    end
+
     test "#show with a single CheckRun is successful" do
       @stack = shipit_stacks(:check_runs)
       assert_not_equal 0, CheckRun.where(stack_id: @stack.id).count

data/test/dummy/config/application.rb

@@ -12,19 +12,7 @@ end
 
 module Shipit
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    Rails.application.config.active_record.belongs_to_required_by_default = true
+    config.load_defaults 5.2
   end
 end
 

data/test/dummy/config/initializers/0_load_development_secrets.rb

@@ -1,9 +1,9 @@
 local_secrets = Shipit::Engine.root.join('config/secrets.development.yml')
 if local_secrets.exist?
-  secrets = YAML.load(local_secrets.read)
+  secrets = YAML.load(local_secrets.read).deep_symbolize_keys
   if Rails.env.development?
     Rails.application.secrets.deep_merge!(secrets)
   elsif Rails.env.test?
-    Rails.application.secrets.merge!(redis_url: secrets['redis_url'])
+    Rails.application.secrets.merge!(redis_url: secrets[:redis_url])
   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: 20181010150947) do
+ActiveRecord::Schema.define(version: 2018_10_10_150947) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text "permissions", limit: 65535

data/test/fixtures/shipit/commits.yml

@@ -181,3 +181,68 @@ check_runs_first:
   additions: 42
   deletions: 24
   updated_at: <%= 8.days.ago.to_s(:db) %>
+
+canaries_first:
+  id: 301
+  sha: 6d9278037b872fd9a6690523e411ecb3aa181355
+  message: "lets go"
+  stack: shipit_canaries
+  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) %>
+
+canaries_second:
+  id: 302
+  sha: f890fd8b5f2be05d1fedb763a3605ee461c39074
+  message: "sheep it!"
+  stack: shipit_canaries
+  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) %>
+
+canaries_third:
+  id: 303
+  sha: 367578b362bf2b4df5903e1c7960929361c39074
+  message: "fix it!"
+  stack: shipit_canaries
+  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) %>
+
+canaries_fourth:
+  id: 304
+  sha: 467578b362bf2b4df5903e1c7960929361c3435a
+  message: "Merge pull request #7 from shipit-engine/yoloshipit\n\nyoloshipit!"
+  stack: shipit_canaries
+  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) %>
+
+canaries_fifth:
+  id: 305
+  sha: 567578b362bf2b4df5903e1c7960929361c3abcd
+  message: "fix all the things"
+  stack: shipit_canaries
+  author: walrus
+  committer: walrus
+  authored_at: <%= 2.days.ago.to_s(:db) %>
+  committed_at: <%= 1.days.ago.to_s(:db) %>
+  additions: 1
+  deletions: 24
+  updated_at: <%= 8.days.ago.to_s(:db) %>

data/test/fixtures/shipit/release_statuses.yml

@@ -1,14 +1,14 @@
 to_be_created:
-  stack: shipit
-  commit_id: 4
+  stack: shipit_canaries
+  commit_id: 304
   user: walrus
   state: pending
   description: Deploy started
   target_url: https://example.com/deploys/42
 
 created:
-  stack: shipit
-  commit_id: 1
+  stack: shipit_canaries
+  commit_id: 301
   user: walrus
   state: pending
   description: Deploy started

data/test/fixtures/shipit/stacks.yml

@@ -20,9 +20,64 @@ shipit:
       "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"}
+          ],
+          "steps": [
+            "cap $ENVIRONMENT deploy:restart"
+          ]
+        },
+        "flush_cache": {
+          "action": "Flush cache",
+          "description": "Flush the application cache",
+          "steps": [
+            "cap $ENVIRONMENT cache:flush"
+          ],
+          "allow_concurrency": true
+        }
+      },
+      "merge": {
+        "revalidate_after": 900
+      },
+      "ci": {
+        "hide": ["ci/hidden"],
+        "allow_failures": ["ci/ok_to_fail"]
+      }
+    }
+  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+
+shipit_canaries:
+  repo_owner: "shopify"
+  repo_name: "shipit-engine"
+  environment: "canaries"
+  branch: master
+  ignore_ci: false
+  merge_queue_enabled: true
+  tasks_count: 3
+  undeployed_commits_count: 1
+  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, "max_commits": 3, "variables": [{"name": "SAFETY_DISABLED", "title": "Set to 1 to do dangerous things", "default": 0}]},
+      "rollback": {"override": ["echo 'Rollback!'"]},
+      "fetch": ["echo '42'"],
       "status": {
-        "context": "shipit/production",
-        "delay": 60
+        "context": "shipit/canaries",
+        "delay": 480
       },
       "tasks": {
         "restart": {

data/test/fixtures/shipit/statuses.yml

@@ -125,3 +125,12 @@ soc_third:
   created_at: <%= 7.days.ago.to_s(:db) %>
   state: success
   target_url: "http://www.example.com"
+
+canaries_fifth_success:
+  stack: shipit_canaries
+  commit_id: 305
+  description: All good
+  context: ci/travis
+  created_at: <%= 7.days.ago.to_s(:db) %>
+  state: success
+  target_url: "http://www.example.com"

data/test/fixtures/shipit/tasks.yml

@@ -161,3 +161,51 @@ shipit_rendered_failover:
   created_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
   started_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
   ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+
+canaries_success:
+  id: 101
+  stack: shipit_canaries
+  user: walrus
+  since_commit_id: 301
+  until_commit_id: 302
+  type: Shipit::Deploy
+  status: success
+  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) %>
+
+canaries_faulty:
+  id: 102
+  stack: shipit_canaries
+  user: walrus
+  since_commit_id: 302
+  until_commit_id: 303
+  type: Shipit::Deploy
+  status: faulty
+  created_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
+
+canaries_validating:
+  id: 103
+  stack: shipit_canaries
+  user: walrus
+  since_commit_id: 303
+  until_commit_id: 304
+  type: Shipit::Deploy
+  status: validating
+  created_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 10).minutes.ago.to_s(:db) %>
+
+canaries_running:
+  id: 104
+  stack: shipit_canaries
+  user: walrus
+  since_commit_id: 304
+  until_commit_id: 305
+  type: Shipit::Deploy
+  status: running
+  created_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 10).minutes.ago.to_s(:db) %>

data/test/jobs/mark_deploy_healthy_job_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+module Shipit
+  class MarkDeployHealthyJobTest < ActiveSupport::TestCase
+    setup do
+      @job = MarkDeployHealthyJob.new
+      @deploy = shipit_deploys(:canaries_validating)
+    end
+
+    test "#perform bails out if the deploy was marked as healthy or faulty" do
+      @deploy.report_faulty!
+      assert_no_difference -> { ReleaseStatus.count } do
+        @job.perform(@deploy)
+      end
+    end
+
+    test "#perform appends the new status if no other status was appended in the meantime" do
+      assert_difference -> { ReleaseStatus.count }, +1 do
+        @job.perform(@deploy)
+      end
+    end
+  end
+end

data/test/jobs/perform_task_job_test.rb

@@ -35,6 +35,7 @@ module Shipit
     end
 
     test "#perform enqueues a FetchDeployedRevisionJob" do
+      @deploy.stack.expects(:release_status?).at_least_once.returns(false)
       Dir.stubs(:chdir).yields
       DeployCommands.any_instance.expects(:perform).returns([])
       @job.stubs(:capture!)
@@ -45,10 +46,39 @@ module Shipit
     end
 
     test "marks deploy as successful" do
+      @deploy.stack.expects(:release_status?).at_least_once.returns(false)
       Dir.stubs(:chdir).yields
       DeployCommands.any_instance.expects(:perform).returns([])
       @job.stubs(:capture!)
 
+      assert_equal 'pending', @deploy.status
+      @job.perform(@deploy)
+      assert_equal 'success', @deploy.reload.status
+    end
+
+    test "marks deploy as validating when the stack has a positive release status delay" do
+      @deploy = shipit_tasks(:canaries_running)
+      @deploy.update_column(:status, 'pending')
+
+      Dir.stubs(:chdir).yields
+      DeployCommands.any_instance.expects(:perform).returns([])
+      @job.stubs(:capture!)
+
+      assert_equal 'pending', @deploy.status
+      @job.perform(@deploy)
+      assert_equal 'validating', @deploy.reload.status
+    end
+
+    test "marks deploy as successful when the stack has no release status delay" do
+      @deploy = shipit_tasks(:canaries_running)
+      @deploy.update_column(:status, 'pending')
+      @deploy.stack.expects(:release_status_delay).at_least_once.returns(Duration.parse(0))
+
+      Dir.stubs(:chdir).yields
+      DeployCommands.any_instance.expects(:perform).returns([])
+      @job.stubs(:capture!)
+
+      assert_equal 'pending', @deploy.status
       @job.perform(@deploy)
       assert_equal 'success', @deploy.reload.status
     end

data/test/models/commits_test.rb

@@ -277,7 +277,7 @@ module Shipit
     end
 
     test ".by_sha! can match sha prefixes" do
-      assert_equal @commit, Commit.by_sha!(@commit.sha[0..7])
+      assert_equal @commit, shipit_stacks(:shipit).commits.by_sha!(@commit.sha[0..7])
     end
 
     test ".by_sha! raises on ambigous sha prefixes" do

data/test/models/deploy_spec_test.rb

@@ -355,7 +355,7 @@ module Shipit
         'review' => {'checklist' => [], 'monitoring' => [], 'checks' => []},
         'status' => {
           'context' => nil,
-          'delay' => nil,
+          'delay' => 0,
         },
         'dependencies' => {'override' => []},
         'plugins' => {},
@@ -789,7 +789,7 @@ module Shipit
       @spec.stubs(:lerna?).returns(true)
       @spec.stubs(:lerna_version).returns('1.0.0')
       assert_equal 'assert-lerna-fixed-version-tag', @spec.deploy_steps[0]
-      assert_equal 'node_modules/.bin/lerna publish --yes --skip-git --repo-version 1.0.0 --force-publish=* --npm-tag latest', @spec.deploy_steps[1]
+      assert_equal 'node_modules/.bin/lerna publish --yes --skip-git --repo-version 1.0.0 --force-publish=* --npm-tag latest --npm-client=npm --skip-npm=false', @spec.deploy_steps[1]
     end
 
     test '#enforce_publish_config? is false when Shipit.enforce_publish_config is nil' do