shipit-engine 0.28.0 → 0.32.0

data/test/fixtures/shipit/stacks.yml

@@ -1,33 +1,76 @@
 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
   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,16 +89,19 @@ 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) %>
   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 +160,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 +193,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 +229,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 +263,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
@@ -247,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": {
@@ -284,8 +341,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 +376,107 @@ 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) %>
+
+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/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/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