shipit-engine 0.21.0 → 0.22.0

data/test/dummy/config/secrets.yml

@@ -4,14 +4,44 @@ test:
   secret_key_base: s3cr3ts3cr3ts3cr3ts3cr3ts3cr3ts3cr3t
   host: shipit.com
   github_api:
-    access_token: t0kEn
-    # login:
-    # password:
-    # api_endpoint:
-  github_oauth:
-    id: 1d
-    secret: s3cr37
-    # teams:
-    #   -
-    #   -
+    token: t0k3n
+  github:
+    domain: # defaults to github.com
+    app_id: 42
+    installation_id: 43
+    bot_login: "shipit[bot]"
+    webhook_secret: # nil
+    # Randomly generated
+    private_key: |
+      -----BEGIN RSA PRIVATE KEY-----
+      MIIEpAIBAAKCAQEA7iUQC2uUq/gtQg0gxtyaccuicYgmq1LUr1mOWbmwM1Cv63+S
+      73qo8h87FX+YyclY5fZF6SMXIys02JOkImGgbnvEOLcHnImCYrWs03msOzEIO/pG
+      M0YedAPtQ2MEiLIu4y8htosVxeqfEOPiq9kQgFxNKyETzjdIA9q1md8sofuJUmPv
+      ibacW1PecuAMnn+P8qf0XIDp7uh6noB751KvhCaCNTAPtVE9NZ18OmNG9GOyX/pu
+      pQHIrPgTpTG6KlAe3r6LWvemzwsMtuRGU+K+KhK9dFIlSE+v9rA32KScO8efOh6s
+      Gu3rWorV4iDu14U62rzEfdzzc63YL94sUbZxbwIDAQABAoIBADLJ8r8MxZtbhYN1
+      u0zOFZ45WL6v09dsBfITvnlCUeLPzYUDIzoxxcBFittN6C744x3ARS6wjimw+EdM
+      TZALlCSb/sA9wMDQzt7wchhz9Zh2H5RzDu+2f54sjDh38KqancdT8PO2fAFGxX/b
+      qicOVyeZB9gv6MJtJc20olBbuXAeBNfcDABF9oxF+0i+Ssg7B4VXiqgcjtGbr/Og
+      qRll7AqyTArVx2xEcVfZxeZ4zGnigzcJq4te7yYpxzwk+RxblkPh54Yt4WxZ+8DI
+      Rsn3r6ajlpwzpwvsJFU2Txq7xBTzGQMFmy/Pnjk83kP2cogxB2+tRyjITGqTwD8b
+      gg9PFCkCgYEA+7u8A0l0Cz6p0SI6c7ftVePVRiIhpawWN7og/wEmI6zUjm/3rA+R
+      hrhaVKuOD8QF/HdDsqTck5gjGAjTmJz6r33/cl1Tz+pr62znsrB4r0yMKvQbKN81
+      WGaWOsi2+ZXqLNv5h5wpUF0MTKlXHeKnwP5kuEvGwVn6WURFCh6PhLMCgYEA8i5e
+      JjulJVGyd5HuoY3xyO7E6DjidsqRnVRq+hYpORjnHvTmSwe4+tH4ha2p9Kv2Y6k3
+      C1NYY/fSMQoYCCRaYyJleI+la/9tsZqAmtms4ZB8KhFmPHf9fW75i6G0xKWyZ8K+
+      E2Ft/UaEiM282593cguV6+Kt5uExnyPxLLK4FlUCgYEAwRJ/JGI8/7bjFkTTYheq
+      j5q75BufhOrU6471acAe2XPgXxLfefdC3Xodxh0CS3NESBvNL4Ikr4sbN37lk4Kq
+      /th7iOKtuqUIeru/hZy2I3VpeDRbdGCmEJQ2GwYA2LKztg5Nd0Y9paaIHXAwIfrK
+      QUqcQ4HTAk8ZpUeoUBeaaeMCgYANLmbjb9WiPVsYVPIHCwHA7PX8qbPxwT7BsGmO
+      KQyfVfKmZa/vH4F67Vi4deZNMdrcO8aKMEQcVM2065a5QrlEsgeR00eupB1lUEJ1
+      qylUsZeAdqf43JMIc7TTW77KATa/nQLZbTEeWus1wvTngztuEqFbUGAks9cOkVc8
+      FpIcbQKBgQDVIL8gPLmn0f+4oLF8MBC+oxtKpz14X5iJ1saGFkzW5I+nIEskpS0S
+      qtirnTCnJFGdCrFwctnxiuiCmyGwpBYdjIfHyvYAHnqAtMnESzCUyeSFZiquVW5W
+      MvbMmDPoV27XOHU9kIq6NXtfrkpufiyo6/VEYWozXalxKLNuqLYfPQ==
+      -----END RSA PRIVATE KEY-----
+    oauth:
+      id: Iv1.bf2c2c45b449bfd9
+      secret: ef694cd6e45223075d78d138ef014049052665f1
+      teams:
   redis_url: "redis://127.0.0.1:6379/7"

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: 20180202220850) do
+ActiveRecord::Schema.define(version: 20180417130436) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text "permissions", limit: 65535

data/test/dummy/db/seeds.rb

@@ -6,7 +6,6 @@ FakeWeb.register_uri(:post, %r{https://example\.com/}, status: %w(200 OK))
 
 # Cheap hack to allow rake db:seed to work
 module Shipit
-  Stack.send(:define_method, :setup_hooks) {}
   Stack.send(:define_method, :sync_github) {}
   Commit.send(:define_method, :fetch_stats!) {}
   Commit.send(:define_method, :refresh_statuses!) {}

data/test/fixtures/payloads/push_master.json

@@ -5,14 +5,14 @@
   "created": false,
   "deleted": false,
   "forced": false,
-  "compare": "https://github.com/byroot/junk/compare/16c259864de2...79d29e99cb83",
+  "compare": "https://github.com/Shopify/shipit-engine/compare/16c259864de2...79d29e99cb83",
   "commits": [
     {
       "id": "79d29e99cb83e0ba16c9e30c502a60995e711e5f",
       "distinct": true,
       "message": "modif",
       "timestamp": "2014-02-28T10:27:42-08:00",
-      "url": "https://github.com/byroot/junk/commit/79d29e99cb83e0ba16c9e30c502a60995e711e5f",
+      "url": "https://github.com/Shopify/shipit-engine/commit/79d29e99cb83e0ba16c9e30c502a60995e711e5f",
       "author": {
         "name": "Guillaume Malette",
         "email": "gmalette@gmail.com",
@@ -35,7 +35,7 @@
     "distinct": true,
     "message": "modif",
     "timestamp": "2014-02-28T10:27:42-08:00",
-    "url": "https://github.com/byroot/junk/commit/79d29e99cb83e0ba16c9e30c502a60995e711e5f",
+    "url": "https://github.com/Shopify/shipit-engine/commit/79d29e99cb83e0ba16c9e30c502a60995e711e5f",
     "author": {
       "name": "Guillaume Malette",
       "email": "gmalette@gmail.com",
@@ -54,8 +54,9 @@
   },
   "repository": {
     "id": 17266426,
-    "name": "junk",
-    "url": "https://github.com/byroot/junk",
+    "name": "shipit-engine",
+    "full_name": "Shopify/shipit-engine",
+    "url": "https://github.com/Shopify/shipit-engine",
     "description": "Pure test repo, look elsewhere please.",
     "watchers": 0,
     "stargazers": 0,
@@ -63,7 +64,7 @@
     "fork": false,
     "size": 0,
     "owner": {
-      "name": "byroot",
+      "name": "Shopify",
       "email": "jean.boussier@gmail.com"
     },
     "private": false,

data/test/fixtures/payloads/push_not_master.json

@@ -5,14 +5,14 @@
   "created": false,
   "deleted": false,
   "forced": false,
-  "compare": "https://github.com/byroot/junk/compare/16c259864de2...79d29e99cb83",
+  "compare": "https://github.com/Shopify/shipit-engine/compare/16c259864de2...79d29e99cb83",
   "commits": [
     {
       "id": "79d29e99cb83e0ba16c9e30c502a60995e711e5f",
       "distinct": true,
       "message": "modif",
       "timestamp": "2014-02-28T10:27:42-08:00",
-      "url": "https://github.com/byroot/junk/commit/79d29e99cb83e0ba16c9e30c502a60995e711e5f",
+      "url": "https://github.com/Shopify/shipit-engine/commit/79d29e99cb83e0ba16c9e30c502a60995e711e5f",
       "author": {
         "name": "Guillaume Malette",
         "email": "gmalette@gmail.com",
@@ -35,7 +35,7 @@
     "distinct": true,
     "message": "modif",
     "timestamp": "2014-02-28T10:27:42-08:00",
-    "url": "https://github.com/byroot/junk/commit/79d29e99cb83e0ba16c9e30c502a60995e711e5f",
+    "url": "https://github.com/Shopify/shipit-engine/commit/79d29e99cb83e0ba16c9e30c502a60995e711e5f",
     "author": {
       "name": "Guillaume Malette",
       "email": "gmalette@gmail.com",
@@ -54,8 +54,9 @@
   },
   "repository": {
     "id": 17266426,
-    "name": "junk",
-    "url": "https://github.com/byroot/junk",
+    "name": "shipit-engine",
+    "full_name": "Shopify/shipit-engine",
+    "url": "https://github.com/Shopify/shipit-engine",
     "description": "Pure test repo, look elsewhere please.",
     "watchers": 0,
     "stargazers": 0,
@@ -63,7 +64,7 @@
     "fork": false,
     "size": 0,
     "owner": {
-      "name": "byroot",
+      "name": "Shopify",
       "email": "jean.boussier@gmail.com"
     },
     "private": false,

data/test/fixtures/shipit/users.yml

@@ -18,8 +18,8 @@ anonymous:
 
 shipit:
   name: Shipit
-  email: shipit@example.com
-  login: shipit
+  github_id: 38352116
+  login: "shipit[bot]"
 
 legacy:
   name:  Legacy Walrussian

data/test/helpers/hooks_helper.rb

@@ -23,7 +23,7 @@ module HooksHelper
       args.map.with_index.all? { |value, index| value == call.args[index] }
     end
     matcher = args.map(&:inspect).join(', ')
-    got = called && called.args.map(&:inspect).join(', ')
+    got = called&.args&.map(&:inspect)&.join(', ')
     refute called, "Expected no hook matching: (#{matcher})\n  got: (#{got})"
   end
 

data/test/helpers/payloads_helper.rb

@@ -1,6 +1,5 @@
 module PayloadsHelper
   def payload(name)
-    file = Shipit::Engine.root.join('test/fixtures/payloads', "#{name}.json")
-    JSON.parse(file.read)
+    Shipit::Engine.root.join('test/fixtures/payloads', "#{name}.json").read
   end
 end

data/test/jobs/destroy_stack_job_test.rb

@@ -8,7 +8,7 @@ module Shipit
     end
 
     test "perform destroys the received stack" do
-      Shipit.github_api.expects(:remove_hook).times(@stack.github_hooks.count)
+      Shipit.github.api.expects(:remove_hook).times(@stack.github_hooks.count)
 
       assert_difference -> { Stack.count }, -1 do
         @job.perform(@stack)

data/test/models/commits_test.rb

@@ -16,9 +16,9 @@ module Shipit
     end
 
     test "#pull_request? detects pull requests with unusual branch names" do
-      @pr.message = "Merge pull request #7 from Shopify/bump-👉-v1.0.1\n\nBump 👉 v1.0.1"
+      @pr.message = "Merge pull request #7 from Shopify/bump--v1.0.1\n\nBump  v1.0.1"
       assert @pr.pull_request?
-      assert_equal "Bump 👉 v1.0.1", @pr.pull_request_title
+      assert_equal "Bump  v1.0.1", @pr.pull_request_title
     end
 
     test "#pull_request_number extract the pull request id from the message" do
@@ -162,7 +162,7 @@ module Shipit
         target_url: 'http://example.com',
         created_at: 1.day.ago,
       )
-      Shipit.github_api.expects(:statuses).with(@stack.github_repo_name, @commit.sha).returns([status])
+      Shipit.github.api.expects(:statuses).with(@stack.github_repo_name, @commit.sha).returns([status])
       assert_difference '@commit.statuses.count', 1 do
         @commit.refresh_statuses!
       end
@@ -186,7 +186,7 @@ module Shipit
 
     test "fetch_stats! pulls additions and deletions from github" do
       commit = stub(stats: stub(additions: 4242, deletions: 2424))
-      Shipit.github_api.expects(:commit).with(@stack.github_repo_name, @commit.sha).returns(commit)
+      Shipit.github.api.expects(:commit).with(@stack.github_repo_name, @commit.sha).returns(commit)
       @commit.fetch_stats!
       assert_equal 4242, @commit.additions
       assert_equal 2424, @commit.deletions
@@ -194,7 +194,7 @@ module Shipit
 
     test "fetch_stats! doesn't fail if the commits have no stats" do
       commit = stub(stats: nil)
-      Shipit.github_api.expects(:commit).with(@stack.github_repo_name, @commit.sha).returns(commit)
+      Shipit.github.api.expects(:commit).with(@stack.github_repo_name, @commit.sha).returns(commit)
       assert_nothing_raised do
         @commit.fetch_stats!
       end

data/test/models/deploy_spec_test.rb

@@ -123,6 +123,17 @@ module Shipit
           'context' => 'bar',
         },
       )
+      assert_equal ["kubernetes-deploy --max-watch-seconds 900 foo bar"], @spec.deploy_steps
+    end
+
+    test "#deploy_steps `kubernetes` respects timeout false" do
+      @spec.stubs(:load_config).returns(
+        'kubernetes' => {
+          'namespace' => 'foo',
+          'context' => 'bar',
+          'timeout' => false,
+        },
+      )
       assert_equal ["kubernetes-deploy foo bar"], @spec.deploy_steps
     end
 
@@ -135,7 +146,7 @@ module Shipit
           'context' => 'bar',
         },
       )
-      assert_equal ["kubernetes-deploy foo bar"], @spec.deploy_steps
+      assert_equal ["kubernetes-deploy --max-watch-seconds 900 foo bar"], @spec.deploy_steps
     end
 
     test "#deploy_steps returns kubernetes command if `kubernetes` is present and template_dir is set" do
@@ -146,7 +157,7 @@ module Shipit
           'template_dir' => 'k8s_templates/',
         },
       )
-      assert_equal ["kubernetes-deploy --template-dir k8s_templates/ foo bar"], @spec.deploy_steps
+      assert_equal ["kubernetes-deploy --max-watch-seconds 900 --template-dir k8s_templates/ foo bar"], @spec.deploy_steps
     end
 
     test "#deploy_steps prepend and append pre and post steps" do
@@ -188,7 +199,7 @@ module Shipit
           'context' => 'bar',
         },
       )
-      assert_equal ["kubernetes-deploy foo bar"], @spec.rollback_steps
+      assert_equal ["kubernetes-deploy --max-watch-seconds 900 foo bar"], @spec.rollback_steps
     end
 
     test "#rollback_steps returns kubernetes-deploy command when both capfile and `kubernetes` are present" do
@@ -200,7 +211,7 @@ module Shipit
           'context' => 'bar',
         },
       )
-      assert_equal ["kubernetes-deploy foo bar"], @spec.rollback_steps
+      assert_equal ["kubernetes-deploy --max-watch-seconds 900 foo bar"], @spec.rollback_steps
     end
 
     test '#machine_env returns an environment hash' do
@@ -344,13 +355,14 @@ module Shipit
         'kubernetes' => {
           'namespace' => 'foo',
           'context' => 'bar',
+          'timeout' => '20m',
         },
       )
       tasks = @spec.task_definitions
       assert_equal 2, tasks.size
 
       restart_task = tasks.find { |t| t.id == "restart" }
-      assert_equal ["kubernetes-restart foo bar"], restart_task.steps
+      assert_equal ["kubernetes-restart foo bar --max-watch-seconds 1200"], restart_task.steps
     end
 
     test "task definitions returns an array of VariableDefinition instances" do

data/test/models/github_hook_test.rb

@@ -7,47 +7,8 @@ module Shipit
       @hook = shipit_github_hooks(:shipit_push)
     end
 
-    test "#verify_signature is true if the signature matches" do
-      assert @hook.verify_signature('sha1=9fb52fecc2b97b7a912aca27685149d2ce571900', 'hello shipit')
-    end
-
-    test "#verify_signature is false if the signature doesn't match" do
-      refute @hook.verify_signature('sha1=9fb52fecc2b97b7a912aca27685149d2ce571900', 'hello toto')
-    end
-
-    test "#setup! create the hook on Github side" do
-      @hook = shipit_github_hooks(:cyclimse_push)
-
-      response = mock(id: 44, rels: {self: mock(href: 'https://api.github.com/somestuff')})
-      Shipit.github_api.expects(:create_hook).with(
-        @hook.github_repo_name,
-        'web',
-        includes(:url, :content_type, :secret),
-        includes(:events, :active),
-      ).returns(response)
-      @hook.setup!
-      @hook.reload
-      assert_equal 44, @hook.github_id
-      assert_equal 'https://api.github.com/somestuff', @hook.api_url
-    end
-
-    test "#setup! update the hook it it already exist" do
-      response = mock(id: 44, rels: {self: mock(href: 'https://api.github.com/somestuff')})
-      Shipit.github_api.expects(:edit_hook).with(
-        @hook.github_repo_name,
-        @hook.github_id,
-        'web',
-        includes(:url, :content_type, :secret),
-        includes(:events, :active),
-      ).returns(response)
-      @hook.setup!
-      @hook.reload
-      assert_equal 44, @hook.github_id
-      assert_equal 'https://api.github.com/somestuff', @hook.api_url
-    end
-
     test "#destroy starts by removing the hook" do
-      Shipit.github_api.expects(:remove_hook).with(@hook.github_repo_name, @hook.github_id)
+      Shipit.legacy_github_api.expects(:remove_hook).with(@hook.github_repo_name, @hook.github_id)
       assert_difference -> { GithubHook.count }, -1 do
         @hook.destroy!
       end

data/test/models/pull_request_test.rb

@@ -59,7 +59,7 @@ module Shipit
 
       assert_nil PullRequest.extract_number(@stack, 'https://github.com/ACME/shipit-engine/pull/42')
 
-      Shipit.expects(:github_domain).returns('github.acme.com').at_least_once
+      Shipit.github.expects(:domain).returns('github.acme.com').at_least_once
       assert_equal 42, PullRequest.extract_number(@stack, 'https://github.acme.com/Shopify/shipit-engine/pull/42')
       assert_nil PullRequest.extract_number(@stack, 'https://github.com/Shopify/shipit-engine/pull/42')
     end
@@ -69,7 +69,7 @@ module Shipit
 
       head_sha = '64b3833d39def7ec65b57b42f496eb27ab4980b6'
       base_sha = 'ba7ab50e02286f7d6c60c1ef75258133dd9ea763'
-      Shipit.github_api.expects(:pull_request).with(@stack.github_repo_name, pull_request.number).returns(
+      Shipit.github.api.expects(:pull_request).with(@stack.github_repo_name, pull_request.number).returns(
         stub(
           id: 4_857_578,
           url: 'https://api.github.com/repos/Shopify/shipit-engine/pulls/64',
@@ -98,7 +98,7 @@ module Shipit
       )
 
       [head_sha, base_sha].each do |sha|
-        Shipit.github_api.expects(:commit).with(@stack.github_repo_name, sha).returns(
+        Shipit.github.api.expects(:commit).with(@stack.github_repo_name, sha).returns(
           stub(
             sha: sha,
             author: author,
@@ -116,7 +116,7 @@ module Shipit
         )
       end
 
-      Shipit.github_api.expects(:statuses).with(@stack.github_repo_name, head_sha).returns([stub(
+      Shipit.github.api.expects(:statuses).with(@stack.github_repo_name, head_sha).returns([stub(
         state: 'success',
         description: nil,
         context: 'default',
@@ -213,16 +213,16 @@ module Shipit
     end
 
     test "#merge! doesnt delete the branch if there are open PRs against it" do
-      Shipit.github_api.expects(:merge_pull_request).once.returns(true)
-      Shipit.github_api.expects(:pull_requests).once.with(@stack.github_repo_name, base: @pr.branch).returns([1])
-      Shipit.github_api.expects(:delete_branch).never.returns(false)
+      Shipit.github.api.expects(:merge_pull_request).once.returns(true)
+      Shipit.github.api.expects(:pull_requests).once.with(@stack.github_repo_name, base: @pr.branch).returns([1])
+      Shipit.github.api.expects(:delete_branch).never.returns(false)
       assert_equal true, @pr.merge!
     end
 
     test "#merge! increments undeployed_commits_count" do
-      Shipit.github_api.expects(:merge_pull_request).once.returns(true)
-      Shipit.github_api.expects(:pull_requests).once.returns([])
-      Shipit.github_api.expects(:delete_branch).once.returns(true)
+      Shipit.github.api.expects(:merge_pull_request).once.returns(true)
+      Shipit.github.api.expects(:pull_requests).once.returns([])
+      Shipit.github.api.expects(:delete_branch).once.returns(true)
       assert_difference '@stack.undeployed_commits_count' do
         @pr.merge!
         @stack.reload
@@ -241,7 +241,7 @@ module Shipit
     test "#stale? returns true when the branch falls behind the maximum commits" do
       @pr.base_commit = shipit_commits(:second)
       @pr.base_ref = 'default-branch'
-      Shipit.github_api.expects(:compare).with(@stack.github_repo_name, @pr.base_ref, @pr.head.sha).returns(
+      Shipit.github.api.expects(:compare).with(@stack.github_repo_name, @pr.base_ref, @pr.head.sha).returns(
         stub(
           behind_by: 10,
         ),

data/test/models/stacks_test.rb

@@ -213,12 +213,6 @@ module Shipit
       @stack.update_deployed_revision(last_deploy.since_commit.sha)
     end
 
-    test "#create queues 2 GithubSetupWebhooksJob" do
-      assert_enqueued_with(job: SetupGithubHookJob) do
-        Stack.create!(repo_name: 'rails', repo_owner: 'rails')
-      end
-    end
-
     test "#create queues a GithubSyncJob" do
       assert_enqueued_with(job: GithubSyncJob) do
         Stack.create!(repo_name: 'rails', repo_owner: 'rails')
@@ -455,16 +449,16 @@ module Shipit
       repo_permalink = 'https://api.github.com/repositories/42'
 
       commits_redirection = stub(message: 'Moved Permanently', url: File.join(repo_permalink, '/commits'))
-      Shipit.github_api.expects(:commits).with(@stack.github_repo_name, sha: 'master').returns(commits_redirection)
+      Shipit.github.api.expects(:commits).with(@stack.github_repo_name, sha: 'master').returns(commits_redirection)
 
       repo_redirection = stub(message: 'Moved Permanently', url: repo_permalink)
-      Shipit.github_api.expects(:repo).with('shopify/shipit-engine').returns(repo_redirection)
+      Shipit.github.api.expects(:repo).with('shopify/shipit-engine').returns(repo_redirection)
 
       repo_resource = stub(name: 'shipster', owner: stub(login: 'george'))
-      Shipit.github_api.expects(:get).with(repo_permalink).returns(repo_resource)
+      Shipit.github.api.expects(:get).with(repo_permalink).returns(repo_resource)
 
       commits_resource = stub
-      Shipit.github_api.expects(:commits).with('george/shipster', sha: 'master').returns(commits_resource)
+      Shipit.github.api.expects(:commits).with('george/shipster', sha: 'master').returns(commits_resource)
 
       assert_equal 'shopify/shipit-engine', @stack.github_repo_name
       assert_equal commits_resource, @stack.github_commits