shipit-engine 0.29.0 → 0.30.0

data/test/controllers/api_clients_controller_test.rb

@@ -0,0 +1,103 @@
+
+require 'test_helper'
+
+module Shipit
+  class ApiClientsControllerTest < ActionController::TestCase
+    setup do
+      @routes = Shipit::Engine.routes
+      @api_client = shipit_api_clients(:here_come_the_walrus)
+      session[:user_id] = shipit_users(:walrus).id
+    end
+
+    test "GitHub authentication is mandatory" do
+      session[:user_id] = nil
+      get :index
+      assert_redirected_to '/github/auth/github?origin=http%3A%2F%2Ftest.host%2Fapi_clients'
+    end
+
+    test "current_user must be a member of at least a Shipit.github_teams" do
+      session[:user_id] = shipit_users(:bob).id
+      Shipit.stubs(:github_teams).returns([shipit_teams(:cyclimse_cooks), shipit_teams(:shopify_developers)])
+      get :index
+      assert_response :forbidden
+      assert_equal(
+        'You must be a member of cyclimse/cooks or shopify/developers to access this application.',
+        response.body,
+      )
+    end
+
+    test "#index is successful with a valid user" do
+      get :index
+      assert_response :ok
+    end
+
+    test "#new is success" do
+      get :new
+      assert_response :ok
+    end
+
+    test "#create creates a new api_client" do
+      assert_difference "ApiClient.count", +1 do
+        post :create, params: {
+          api_client: {
+            name: 'walrus_app',
+            permissions: [
+             'read:stack',
+             'lock:stack',
+            ],
+          },
+        }
+      end
+
+      assert_redirected_to api_client_path(ApiClient.last)
+    end
+
+    test "#create attaches the current user to the created api client" do
+      post :create, params: {
+        api_client: {
+          name: 'walrus_app',
+          permissions: [
+            'read:stack',
+            'lock:stack',
+          ],
+        },
+      }
+
+      assert_equal shipit_users(:walrus).id, ApiClient.last.creator.id
+    end
+
+    test "#create when not valid renders new" do
+      assert_no_difference "Stack.count" do
+        post :create, params: {api_client: {name: 'walrus_app', permissions: ['invalid']}}
+      end
+
+      assert flash[:warning]
+      assert_response :success
+    end
+
+    test "#show is success" do
+      get :show, params: {id: @api_client.id}
+      assert_response :ok
+    end
+
+    test "#update updates an existing api_client" do
+      new_permissions = [
+        'read:stack',
+        'lock:stack',
+      ]
+
+      assert_difference "ApiClient.count", 0 do
+        patch :update, params: {
+          id: @api_client.id,
+          api_client: {
+            permissions: new_permissions,
+          },
+        }
+      end
+      @api_client.reload
+
+      assert_redirected_to api_client_path(@api_client)
+      assert_equal new_permissions, @api_client.permissions
+    end
+  end
+end

data/test/controllers/merge_status_controller_test.rb

@@ -37,13 +37,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,
+        repository: existing.repository,
       ).update_all(merge_queue_enabled: false)
 
       Shipit::Stack.create(
-        repo_owner: existing.repo_owner,
-        repo_name: existing.repo_name,
+        repository: existing.repository,
         environment: 'foo',
         branch: existing.branch,
         merge_queue_enabled: true,
@@ -53,5 +51,24 @@ module Shipit
       assert_response :ok
       assert_includes response.body, 'shipit-engine/foo'
     end
+
+    test "GET show prefers locked stacks above all else" do
+      existing = shipit_stacks(:shipit)
+      Shipit::Stack.where(
+        repository: existing.repository,
+      ).update_all(lock_reason: 'testing', merge_queue_enabled: false, locked_since: Time.now.utc)
+
+      # Shipit would otherwise prefer this, because it has the merge queue enabled
+      Shipit::Stack.create(
+        repository: existing.repository,
+        environment: 'foo',
+        branch: existing.branch,
+        merge_queue_enabled: true,
+      )
+
+      get :show, params: {referrer: 'https://github.com/Shopify/shipit-engine/pull/42', branch: 'master'}
+      assert_response :ok
+      assert_includes response.body, 'locked'
+    end
   end
 end

data/test/controllers/stacks_controller_test.rb

@@ -110,6 +110,17 @@ module Shipit
       assert_response :success
     end
 
+    test "#statistics is success" do
+      get :statistics, params: {id: @stack.to_param}
+      assert_response :success
+    end
+
+    test "#statistics redirects to #show if no deploys are present" do
+      @stack.deploys.destroy_all
+      get :statistics, params: {id: @stack.to_param}
+      assert_redirected_to stack_path(@stack)
+    end
+
     test "#update allows to lock the stack" do
       refute @stack.locked?
 
@@ -129,6 +140,30 @@ module Shipit
       assert_instance_of AnonymousUser, @stack.lock_author
     end
 
+    test "#update allows to archive the stack" do
+      refute @stack.archived?
+      refute @stack.locked?
+
+      patch :update, params: {id: @stack.to_param, stack: {archived: "true"}}
+      @stack.reload
+      assert @stack.archived?
+      assert @stack.locked?
+      assert_equal shipit_users(:walrus), @stack.lock_author
+      assert_equal "Archived", @stack.lock_reason
+    end
+
+    test "#update allows to dearchive the stack" do
+      @stack.archive!(shipit_users(:walrus))
+      assert @stack.locked?
+      assert @stack.archived?
+
+      patch :update, params: {id: @stack.to_param, stack: {archived: "false"}}
+      @stack.reload
+      refute @stack.archived?
+      refute @stack.locked?
+      assert_instance_of AnonymousUser, @stack.lock_author
+    end
+
     test "#refresh queues a RefreshStatusesJob and a GithubSyncJob" do
       request.env['HTTP_REFERER'] = stack_settings_path(@stack)
 

data/test/controllers/webhooks_controller_test.rb

@@ -7,6 +7,17 @@ module Shipit
       GithubHook.any_instance.stubs(:verify_signature).returns(true)
     end
 
+    test "create github repository which is not yet present in the datastore" do
+      request.headers['X-Github-Event'] = 'push'
+      unknown_repo_payload = JSON.parse(payload(:push_master))
+      unknown_repo_payload["repository"]["full_name"] = "owner/unknown-repository"
+      unknown_repo_payload = unknown_repo_payload.to_json
+
+      assert_nothing_raised do
+        post :create, body: unknown_repo_payload, as: :json
+      end
+    end
+
     test ":push with the target branch queues a GithubSyncJob" do
       request.headers['X-Github-Event'] = 'push'
 
@@ -142,8 +153,23 @@ module Shipit
       end
     end
 
+    test "other events trigger custom handlers" do
+      event = 'pull_request'
+      mock_handler = mock
+      mock_handler.expects(:call).with(pull_request_params.stringify_keys).once
+      Shipit::Webhooks.register_handler(event, mock_handler)
+
+      @request.headers['X-Github-Event'] = event
+      post :create, body: pull_request_params.to_json, as: :json
+      assert_response :ok
+    end
+
     private
 
+    def pull_request_params
+      {action: 'opened', number: 2, pull_request: 'foobar'}
+    end
+
     def membership_params
       {action: 'added', team: team_params, organization: {login: 'shopify'}, member: {login: 'walrus'}}
     end

data/test/dummy/config/environments/development.rb

@@ -9,9 +9,24 @@ Rails.application.configure do
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  # Run rails dev:cache to toggle caching.
+  if Shipit::Engine.root.join("tmp", "caching-dev.txt").exist?
+    config.action_controller.perform_caching = true
+    config.action_controller.enable_fragment_cache_logging = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      "Cache-Control" => "public, max-age=#{2.days.to_i}",
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
@@ -39,8 +54,11 @@ Rails.application.configure do
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
   if Rails.application.config_for(:database)['adapter'] == 'sqlite3'
-    Shipit::DeferredTouch.enabled = false
+    config.to_prepare do
+      Shipit::DeferredTouch.enabled = false
+    end
   end
+
   config.active_job.queue_adapter = :async
 
   Pubsubstub.use_persistent_connections = false

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: 2019_05_02_020249) do
+ActiveRecord::Schema.define(version: 2020_01_09_132519) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text "permissions", limit: 65535
@@ -55,6 +55,7 @@ ActiveRecord::Schema.define(version: 2019_05_02_020249) do
     t.string "api_url"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "sha", limit: 40
     t.index ["commit_id", "task_id"], name: "index_commit_deployments_on_commit_id_and_task_id", unique: true
     t.index ["task_id"], name: "index_commit_deployments_on_task_id"
   end
@@ -190,9 +191,15 @@ ActiveRecord::Schema.define(version: 2019_05_02_020249) do
     t.index ["user_id"], name: "index_deploy_statuses_on_user_id"
   end
 
+  create_table "repositories", force: :cascade do |t|
+    t.string "owner", limit: 39, null: false
+    t.string "name", limit: 100, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["owner", "name"], name: "repository_unicity", unique: true
+  end
+
   create_table "stacks", force: :cascade do |t|
-    t.string "repo_name", limit: 100, null: false
-    t.string "repo_owner", limit: 39, null: false
     t.string "environment", limit: 50, default: "production", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -211,7 +218,11 @@ ActiveRecord::Schema.define(version: 2019_05_02_020249) do
     t.datetime "locked_since"
     t.boolean "merge_queue_enabled", default: false, null: false
     t.datetime "last_deployed_at"
-    t.index ["repo_owner", "repo_name", "environment"], name: "stack_unicity", unique: true
+    t.integer "repository_id", null: false
+    t.datetime "archived_since"
+    t.index ["archived_since"], name: "index_stacks_on_archived_since"
+    t.index ["repository_id", "environment"], name: "stack_unicity", unique: true
+    t.index ["repository_id"], name: "index_stacks_on_repository_id"
   end
 
   create_table "statuses", force: :cascade do |t|
@@ -228,8 +239,8 @@ ActiveRecord::Schema.define(version: 2019_05_02_020249) do
 
   create_table "tasks", force: :cascade do |t|
     t.integer "stack_id", limit: 4, null: false
-    t.integer "since_commit_id", limit: 4, null: false
-    t.integer "until_commit_id", limit: 4, null: false
+    t.integer "since_commit_id", limit: 4
+    t.integer "until_commit_id", limit: 4
     t.string "status", limit: 10, default: "pending", null: false
     t.datetime "created_at"
     t.datetime "updated_at"

data/test/dummy/db/seeds.rb

@@ -14,6 +14,8 @@ module Shipit
   Commit.send(:define_method, :refresh_statuses!) {}
   Commit.send(:define_method, :refresh_check_runs!) {}
   ReleaseStatus.send(:define_method, :create_status_on_github!) {}
+  CommitDeployment.send(:define_method, :schedule_create_on_github) {}
+  CommitDeploymentStatus.send(:define_method, :schedule_create_on_github) {}
 
   users = 3.times.map do
     User.create!(
@@ -25,8 +27,10 @@ module Shipit
 
   stacks = 3.times.map do
     Stack.create!(
-      repo_name:  Faker::Internet.domain_name.parameterize,
-      repo_owner: Faker::Company.name.parameterize,
+      repository: Repository.find_or_create_by(
+        name:  Faker::Internet.domain_name.parameterize,
+        owner: Faker::Company.name.parameterize
+      ),
       deploy_url:  "https://#{Faker::Internet.domain_name.parameterize}.#{Faker::Internet.domain_suffix}/",
       cached_deploy_spec: DeploySpec.load(%(
         {
@@ -195,9 +199,19 @@ module Shipit
     )
     write_output(rollback)
 
-    task = stack.tasks.create!(
-      since_commit_id: stack.last_deployed_commit.id,
-      until_commit_id: stack.last_deployed_commit.id,
+    provision_task = stack.tasks.create!(
+      status: "pending",
+      user: users.sample,
+      definition: TaskDefinition.new('provision',
+        'action' => 'Provision some resources',
+        'description' => 'Provisions servers for the application to be deployed to',
+        'steps' => ['./provision.sh'],
+      ),
+      started_at: Random.rand(15.minutes.to_i).seconds.ago,
+    )
+    write_output(provision_task)
+
+    restart_task = stack.tasks.create!(
       status: "success",
       user: users.sample,
       definition: TaskDefinition.new('restart',
@@ -208,6 +222,6 @@ module Shipit
       started_at: Random.rand(15.minutes.to_i).seconds.ago,
       ended_at: Time.now.utc,
     )
-    write_output(rollback)
+    write_output(restart_task)
   end
 end

data/test/fixtures/shipit/commit_deployment_statuses.yml

@@ -1,6 +1,6 @@
-shipit_deploy_second_pending:
+shipit_deploy_second_in_progress:
   commit_deployment: shipit_deploy_second
-  status: pending
+  status: in_progress
   github_id: 42
   api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/1/statuses/42
 
@@ -10,9 +10,9 @@ shipit_deploy_second_success:
   github_id: 43
   api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/1/statuses/43
 
-shipit2_deploy_third_pending:
+shipit2_deploy_third_in_progress:
   commit_deployment: shipit2_deploy_third
-  status: pending
+  status: in_progress
 
 shipit2_deploy_third_failure:
   commit_deployment: shipit2_deploy_third

data/test/fixtures/shipit/commit_deployments.yml

@@ -1,37 +1,37 @@
 shipit_deploy_second:
-  commit_id: 2 # second
+  sha: f890fd8b5f2be05d1fedb763a3605ee461c39074 # second
   task_id: 1 # shipit
   api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/1
   github_id: 1
 
 shipit2_deploy_third:
-  commit_id: 3 # third
+  sha: 367578b362bf2b4df5903e1c7960929361c39074 # third
   task_id: 2 # shipit2
   api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/2
   github_id: 2
 
 shipit_pending_third:
-  commit_id: 3 # third
+  sha: 367578b362bf2b4df5903e1c7960929361c39074 # third
   task_id: 4 # shipit_pending
   api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/3
   github_id: 3
 
 shipit_pending_fourth:
-  commit_id: 4 # fourth
+  sha: 467578b362bf2b4df5903e1c7960929361c3435a # fourth
   task_id: 4 # shipit_pending
 
 shipit_running_fourth:
-  commit_id: 4 # fourth
+  sha: 467578b362bf2b4df5903e1c7960929361c3435a # fourth
   task_id: 5 # shipit_running
 
 shipit_complete_fourth:
-  commit_id: 4 # fourth
+  sha: 467578b362bf2b4df5903e1c7960929361c3435a # fourth
   task_id: 6 # shipit_complete
 
 shipit_aborted_fourth:
-  commit_id: 4 # fourth
+  sha: 467578b362bf2b4df5903e1c7960929361c3435a # fourth
   task_id: 7 # shipit_aborted
 
 shipit_rollback_fourth:
-  commit_id: 4 # fourth
+  sha: 467578b362bf2b4df5903e1c7960929361c3435a # fourth
   task_id: 8 # shipit_rollback