shipit-engine 0.29.0 → 0.30.0

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,7 @@ fourth:
   additions: 420
   deletions: 342
   updated_at: <%= 8.days.ago.to_s(:db) %>
+  created_at: <%= 1.day.ago.to_s(:db) %>
 
 fifth:
   id: 5
@@ -62,6 +66,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 +199,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 +213,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 +227,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 +241,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 +255,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 +360,16 @@ 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) %>

data/test/fixtures/shipit/repositories.yml

@@ -0,0 +1,23 @@
+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
+
+rails:
+  owner: rails
+  name: rails

data/test/fixtures/shipit/stacks.yml

@@ -1,8 +1,8 @@
 shipit:
-  repo_owner: "shopify"
-  repo_name: "shipit-engine"
+  repository: shipit
   environment: "production"
   branch: master
+  deploy_url: https://shipit.shopify.com
   ignore_ci: false
   merge_queue_enabled: true
   tasks_count: 8
@@ -54,8 +54,7 @@ shipit:
   updated_at: <%= 8.days.ago.to_s(:db) %>
 
 shipit_canaries:
-  repo_owner: "shopify"
-  repo_name: "shipit-engine"
+  repository: shipit
   environment: "canaries"
   branch: master
   ignore_ci: false
@@ -114,8 +113,7 @@ shipit_canaries:
   updated_at: <%= 8.days.ago.to_s(:db) %>
 
 cyclimse:
-  repo_owner: george
-  repo_name: cyclimse
+  repository: cyclimse
   environment: production
   branch: master
   ignore_ci: false
@@ -148,8 +146,7 @@ cyclimse:
   updated_at: <%= 8.days.ago.to_s(:db) %>
 
 undeployed_stack:
-  repo_owner: "shopify"
-  repo_name: "foo-bar"
+  repository: foo-bar
   environment: "production"
   branch: master
   ignore_ci: true
@@ -185,8 +182,7 @@ undeployed_stack:
   updated_at: <%= 8.days.ago.to_s(:db) %>
 
 soc:
-  repo_owner: "shopify"
-  repo_name: "soc"
+  repository: soc
   environment: "production"
   branch: master
   tasks_count: 0
@@ -220,16 +216,14 @@ soc:
   updated_at: <%= 8.days.ago.to_s(:db) %>
 
 check_runs:
-  repo_owner: shopify
-  repo_name: check_runs
+  repository: check_runs
   environment: production
   branch: master
   tasks_count: 0
   undeployed_commits_count: 1
 
 shipit_undeployed:
-  repo_owner: "shopify"
-  repo_name: "shipit-engine"
+  repository: shipit
   environment: "undeployed"
   branch: master
   ignore_ci: true
@@ -284,8 +278,7 @@ shipit_undeployed:
   updated_at: <%= 8.days.ago.to_s(:db) %>
 
 shipit_single:
-  repo_owner: "shopify"
-  repo_name: "shipit-engine"
+  repository: shipit
   environment: "single"
   branch: master
   ignore_ci: false
@@ -320,3 +313,94 @@ shipit_single:
     }
   updated_at: <%= 8.days.ago.to_s(:db) %>
   last_deployed_at: <%= 8.days.ago.to_s(:db) %>
+
+shipit_stats:
+  repository: shipit
+  environment: "stats"
+  branch: master
+  ignore_ci: false
+  merge_queue_enabled: true
+  tasks_count: 4
+  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},
+      "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) %>
+  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
+
+shipit_task_no_commits:
+  repository: shipit
+  environment: "task_no_commits"
+  branch: master
+  ignore_ci: true
+  merge_queue_enabled: true
+  tasks_count: 1
+  undeployed_commits_count: 1
+  continuous_deployment: true
+  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, "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"]
+      }
+    }
+  updated_at: <%= 8.days.ago.to_s(:db) %>

data/test/fixtures/shipit/tasks.yml

@@ -10,7 +10,7 @@ shipit:
   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) %>
+  ended_at: <%= (60 - 6).minutes.ago.to_s(:db) %>
 
 shipit2:
   id: 2
@@ -29,8 +29,6 @@ shipit2:
 shipit_restart:
   id: 3
   user: walrus
-  since_commit_id: 2 # second
-  until_commit_id: 2 # second
   type: Shipit::Task
   stack: shipit
   status: success
@@ -278,3 +276,68 @@ shipit_single:
   created_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
   started_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
   ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+
+shipit_stats:
+  id: 401
+  user: walrus
+  since_commit_id: 601
+  until_commit_id: 601
+  type: Shipit::Deploy
+  stack: shipit_stats
+  status: success
+  additions: 12
+  deletions: 64
+  created_at: <%= 60.minutes.ago.to_s(:db) %>
+  started_at: <%= 60.minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+
+shipit_stats_2:
+  id: 402
+  user: walrus
+  since_commit_id: 602
+  until_commit_id: 603
+  type: Shipit::Deploy
+  stack: shipit_stats
+  status: failed
+  additions: 12
+  deletions: 64
+  created_at: <%= (60 - 5).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 5).minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 11).minutes.ago.to_s(:db) %>
+
+shipit_stats_3:
+  id: 403
+  user: walrus
+  since_commit_id: 604
+  until_commit_id: 605
+  type: Shipit::Deploy
+  stack: shipit_stats
+  status: success
+  additions: 12
+  deletions: 64
+  created_at: <%= (60 - 10).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 12).minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 15).minutes.ago.to_s(:db) %>
+
+shipit_stats_4:
+  id: 404
+  user: walrus
+  since_commit_id: 606
+  until_commit_id: 608
+  type: Shipit::Deploy
+  stack: shipit_stats
+  status: success
+  additions: 12
+  deletions: 64
+  created_at: <%= (30 - 15).minutes.ago.to_s(:db) %>
+  started_at: <%= (30 - 15).minutes.ago.to_s(:db) %>
+  ended_at: <%= (30 - 17).minutes.ago.to_s(:db) %>
+
+shipit_nocommit_task:
+  id: 501
+  user: walrus
+  type: Shipit::Task
+  stack: shipit_task_no_commits
+  status: pending
+  created_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 2).minutes.ago.to_s(:db) %>

data/test/jobs/destroy_stack_job_test.rb

@@ -14,5 +14,14 @@ module Shipit
         @job.perform(@stack)
       end
     end
+
+    test "perform destroys the CommitDeployments of the received stack" do
+      stack = shipit_stacks(:shipit)
+      Shipit.legacy_github_api.stubs(:remove_hook)
+
+      assert_changes -> { CommitDeployment.count }, 'CommitDeployments not deleted' do
+        @job.perform(stack)
+      end
+    end
   end
 end

data/test/models/commit_deployment_status_test.rb

@@ -3,10 +3,9 @@ require 'test_helper'
 module Shipit
   class CommitDeploymentStatusTest < ActiveSupport::TestCase
     setup do
-      @status = shipit_commit_deployment_statuses(:shipit2_deploy_third_pending)
+      @status = shipit_commit_deployment_statuses(:shipit2_deploy_third_in_progress)
       @deployment = @status.commit_deployment
       @task = @deployment.task
-      @commit = @deployment.commit
       @author = @deployment.author
     end
 
@@ -14,14 +13,44 @@ module Shipit
       response = stub(id: 44, url: 'https://example.com')
       @author.github_api.expects(:create_deployment_status).with(
         @deployment.api_url,
-        'pending',
+        'in_progress',
+        accept: "application/vnd.github.flash-preview+json",
         target_url: "http://shipit.com/shopify/shipit-engine/production/deploys/#{@task.id}",
-        description: "walrus triggered the deploy of shopify/shipit-engine/production to #{@commit.sha}",
+        description: "walrus triggered the deploy of shopify/shipit-engine/production to #{@deployment.short_sha}",
+        environment_url: "https://shipit.shopify.com",
       ).returns(response)
 
       @status.create_on_github!
       assert_equal response.id, @status.github_id
       assert_equal response.url, @status.api_url
     end
+
+    test 'description is truncated to character limit' do
+      limit = CommitDeploymentStatus::DESCRIPTION_CHARACTER_LIMIT_ON_GITHUB
+      deployment = shipit_commit_deployments(:shipit_deploy_second)
+
+      status = deployment.statuses.create!(status: 'success')
+      status.stubs(:description).returns('desc' * limit)
+      create_status_response = stub(id: 'abcd', url: 'https://github.com/status/abcd')
+      status.author.github_api.expects(:create_deployment_status).with do |*_args, **kwargs|
+        kwargs[:description].size <= limit
+      end.returns(create_status_response)
+
+      status.create_on_github!
+    end
+
+    test 'includes deployment url when the deployment succeeds' do
+      deployment = shipit_commit_deployments(:shipit_deploy_second)
+
+      status = deployment.statuses.create!(status: 'success')
+      stack = status.stack
+      stack.deploy_url = "stack-deploy-url"
+      create_status_response = stub(id: 'abcd', url: 'https://github.com/status/abcd')
+      status.author.github_api.expects(:create_deployment_status).with do |*_args, **kwargs|
+        kwargs[:environment_url] == 'stack-deploy-url'
+      end.returns(create_status_response)
+
+      status.create_on_github!
+    end
   end
 end

data/test/models/commit_deployment_test.rb

@@ -4,30 +4,27 @@ module Shipit
   class CommitDeploymentTest < ActiveSupport::TestCase
     setup do
       @deployment = shipit_commit_deployments(:shipit_pending_fourth)
-      @commit = @deployment.commit
       @task = @deployment.task
       @stack = @task.stack
       @author = @deployment.author
     end
 
-    test "there can only be one record per deploy and commit pair" do
-      assert_raises ActiveRecord::RecordNotUnique do
-        CommitDeployment.create!(task: @deployment.task, commit: @deployment.commit)
-      end
-    end
-
     test "creation on GitHub" do
-      pull_request_response = stub(head: stub(sha: '6dcb09b5b57875f334f61aebed695e2e4193db5e'))
-      @author.github_api.expects(:pull_request).with('shopify/shipit-engine', 7).returns(pull_request_response)
-
       deployment_response = stub(id: 42, url: 'https://example.com')
       @author.github_api.expects(:create_deployment).with(
         'shopify/shipit-engine',
-        pull_request_response.head.sha,
+        @deployment.sha,
         auto_merge: false,
         required_contexts: [],
         description: "Via Shipit",
         environment: @stack.environment,
+        payload: {
+          shipit: {
+            task_id: 4,
+            from_sha: 'f890fd8b5f2be05d1fedb763a3605ee461c39074',
+            to_sha: '467578b362bf2b4df5903e1c7960929361c3435a',
+          },
+        },
       ).returns(deployment_response)
 
       @deployment.create_on_github!