shipit-engine 0.16.0 → 0.17.0

data/app/assets/stylesheets/shipit.scss

@@ -3,12 +3,15 @@
 
 @import "_base/_media-queries";
 @import "_base/_utility";
+@import "_base/_spacing";
 @import "_base/_colors";
 @import "_base/_base";
 @import "_base/_forms";
+@import "_base/_icons";
 @import "_base/_buttons";
 @import "_base/_banner";
 @import "_structure/_layout";
+@import "_structure/_navigation";
 @import "_structure/_main";
 @import "_base/status-items";
 @import "_pages/_commits";

data/app/controllers/concerns/shipit/api/rendering.rb

@@ -10,15 +10,12 @@ module Shipit
 
       def render_resource(resource, options = {})
         if resource.destroyed?
-          options[:status] = :no_content
-          options[:text] = nil
+          head :no_content, options.reverse_merge(content_type: 'application/json')
         elsif resource.errors.any?
-          options[:json] = {errors: resource.errors}
-          options[:status] = :unprocessable_entity
+          render options.reverse_merge(status: :unprocessable_entity, json: {errors: resource.errors})
         else
-          options[:json] = resource
+          render options.reverse_merge(json: resource)
         end
-        render options
       end
     end
   end

data/app/controllers/shipit/api/ccmenu_controller.rb

@@ -11,6 +11,10 @@ module Shipit
         def ended_at
           Time.now.utc
         end
+
+        def running?
+          false
+        end
       end
 
       def show

data/app/controllers/shipit/commits_controller.rb

@@ -0,0 +1,18 @@
+module Shipit
+  class CommitsController < ShipitController
+    def update
+      commit.update(params.require(:commit).permit(:locked))
+      head :ok
+    end
+
+    private
+
+    def commit
+      @commit ||= stack.commits.find(params[:id])
+    end
+
+    def stack
+      @stack ||= Stack.from_param!(params[:stack_id])
+    end
+  end
+end

data/app/jobs/shipit/destroy_stack_job.rb

@@ -2,7 +2,32 @@ module Shipit
   class DestroyStackJob < BackgroundJob
     queue_as :default
 
+    # stack
+    # +-- api_clients
+    # +-- commits
+    # |   +-- commit_deployments
+    # |   |   +-- statuses
+    # |   +-- statuses
+    # +-- github_hooks
+    # +-- hooks
+    # +-- pull_requests
+    # +-- tasks
+    #     +-- chunks
+
     def perform(stack)
+      Shipit::ApiClient.where(stack_id: stack.id).delete_all
+      commits_ids = Shipit::Commit.where(stack_id: stack.id).pluck(:id)
+      commit_deployments_ids = Shipit::CommitDeployment.where(commit_id: commits_ids).pluck(:id)
+      Shipit::CommitDeploymentStatus.where(commit_deployment_id: commit_deployments_ids).delete_all
+      Shipit::CommitDeployment.where(id: commit_deployments_ids).delete_all
+      Shipit::Status.where(commit_id: commits_ids).delete_all
+      Shipit::Commit.where(id: commits_ids).delete_all
+      Shipit::GithubHook.where(stack_id: stack.id).destroy_all
+      Shipit::Hook.where(stack_id: stack.id).delete_all
+      Shipit::PullRequest.where(stack_id: stack.id).delete_all
+      tasks_ids = Shipit::Task.where(stack_id: stack.id).pluck(:id)
+      Shipit::OutputChunk.where(task_id: tasks_ids).delete_all
+      Shipit::Task.where(id: tasks_ids).delete_all
       stack.destroy!
     end
   end

data/app/jobs/shipit/github_sync_job.rb

@@ -17,13 +17,24 @@ module Shipit
         @stack.transaction do
           shared_parent.try!(:detach_children!)
           new_commits.each do |gh_commit|
-            @stack.commits.create_from_github!(gh_commit)
+            append_commit(gh_commit)
           end
         end
       end
       CacheDeploySpecJob.perform_later(@stack)
     end
 
+    def append_commit(gh_commit)
+      appended_commit = @stack.commits.create_from_github!(gh_commit)
+      if appended_commit.revert?
+        impacted_commits = @stack.undeployed_commits.reverse.drop_while { |c| !appended_commit.revert_of?(c) }
+        impacted_commits.pop # appended_commit
+        impacted_commits.each do |impacted_commit|
+          impacted_commit.update!(locked: true)
+        end
+      end
+    end
+
     def fetch_missing_commits(&block)
       commits = []
       iterator = Shipit::FirstParentCommitsIterator.new(&block)

data/app/jobs/shipit/merge_pull_requests_job.rb

@@ -8,6 +8,9 @@ module Shipit
       pull_requests.each do |pull_request|
         pull_request.refresh!
         pull_request.reject_unless_mergeable!
+        if pull_request.closed?
+          pull_request.merged_upstream? ? pull_request.complete! : pull_request.cancel!
+        end
       end
 
       return false unless stack.allows_merges?

data/app/models/shipit/commit.rb

@@ -106,7 +106,7 @@ module Shipit
     delegate :pending?, :success?, :error?, :failure?, :state, to: :status
 
     def deployable?
-      success? || stack.ignore_ci?
+      !locked? && (success? || stack.ignore_ci?)
     end
 
     def children
@@ -126,13 +126,25 @@ module Shipit
     end
 
     def title
-      pull_request_title || message
+      pull_request_title || message_header
+    end
+
+    def message_header
+      message.lines.first.strip
     end
 
     def pull_request_title # TODO: remove in a few versions when it is assumed the commits table was backfilled
       super || message_parser.pull_request_title
     end
 
+    def revert?
+      title.start_with?('Revert "') && title.end_with?('"')
+    end
+
+    def revert_of?(commit)
+      title == %(Revert "#{commit.title}") || title == %(Revert "#{commit.message_header}")
+    end
+
     def short_sha
       sha[0..9]
     end

data/app/models/shipit/deploy.rb

@@ -10,6 +10,7 @@ module Shipit
       after_transition to: :success, do: :update_undeployed_commits_count
       after_transition to: :aborted, do: :trigger_revert_if_required
       after_transition any => any, do: :update_commit_deployments
+      after_transition any => any, do: :update_last_deploy_time
     end
 
     has_many :commit_deployments, dependent: :destroy, inverse_of: :task, foreign_key: :task_id do
@@ -180,5 +181,9 @@ module Shipit
     def update_undeployed_commits_count
       stack.update_undeployed_commits_count(until_commit)
     end
+
+    def update_last_deploy_time
+      stack.update(last_deployed_at: ended_at)
+    end
   end
 end

data/app/models/shipit/deploy_spec.rb

@@ -108,21 +108,20 @@ module Shipit
     end
 
     def task_definitions
-      (config('tasks') || {}).map { |name, definition| TaskDefinition.new(name, coerce_task_definition(definition)) }
+      discover_task_definitions.merge(config('tasks') || {}).map do |name, definition|
+        TaskDefinition.new(name, coerce_task_definition(definition))
+      end
     end
 
     def find_task_definition(id)
-      TaskDefinition.new(id, coerce_task_definition(config('tasks', id)) || task_not_found!(id))
+      definition = config('tasks', id) || discover_task_definitions[id]
+      TaskDefinition.new(id, coerce_task_definition(definition) || task_not_found!(id))
     end
 
     def filter_deploy_envs(env)
       EnvironmentVariables.with(env).permit(deploy_variables)
     end
 
-    def filter_task_envs(id, env)
-      find_task_definition(id).filter_envs(env)
-    end
-
     def review_checklist
       (config('review', 'checklist') || discover_review_checklist || []).map(&:strip).select(&:present?)
     end
@@ -199,6 +198,10 @@ module Shipit
     def discover_review_checklist
     end
 
+    def discover_task_definitions
+      {}
+    end
+
     def discover_dependencies_steps
     end
 

data/app/models/shipit/deploy_spec/kubernetes_discovery.rb

@@ -9,6 +9,20 @@ module Shipit
         discover_kubernetes || super
       end
 
+      def discover_task_definitions
+        if kube_config.present?
+          {
+            'restart' => {
+              'action' => "Restart application",
+              'description' => "Simulates a rollout of Kubernetes deployments by using kubernetes-restart utility",
+              'steps' => [kubernetes_restart_cmd],
+            },
+          }
+        else
+          super
+        end
+      end
+
       private
 
       def discover_kubernetes
@@ -20,8 +34,8 @@ module Shipit
           cmd << kube_config['template_dir']
         end
 
-        cmd << kube_config['namespace']
-        cmd << kube_config['context']
+        cmd << kube_config.fetch('namespace')
+        cmd << kube_config.fetch('context')
 
         [Shellwords.join(cmd)]
       end
@@ -29,6 +43,14 @@ module Shipit
       def kube_config
         @kube_config ||= config('kubernetes') || {}
       end
+
+      def kubernetes_restart_cmd
+        Shellwords.join([
+          "kubernetes-restart",
+          kube_config.fetch('namespace'),
+          kube_config.fetch('context'),
+        ])
+      end
     end
   end
 end

data/app/models/shipit/pull_request.rb

@@ -95,6 +95,10 @@ module Shipit
       before_transition any => :pending do |pr|
         pr.revalidated_at = Time.now.utc
       end
+
+      before_transition %i(pending) => :merged do |pr|
+        Stack.increment_counter(:undeployed_commits_count, pr.stack_id)
+      end
     end
 
     def self.schedule_merges
@@ -164,7 +168,9 @@ module Shipit
         merge_method: 'merge',
       )
       begin
-        Shipit.github_api.delete_branch(stack.github_repo_name, branch)
+        if Shipit.github_api.pull_requests(stack.github_repo_name, base: branch).empty?
+          Shipit.github_api.delete_branch(stack.github_repo_name, branch)
+        end
       rescue Octokit::UnprocessableEntity
         # branch was already deleted somehow
       end
@@ -203,6 +209,14 @@ module Shipit
       RefreshPullRequestJob.perform_later(self)
     end
 
+    def closed?
+      state == "closed"
+    end
+
+    def merged_upstream?
+      closed? && merged_at
+    end
+
     def refresh!
       update!(github_pull_request: Shipit.github_api.pull_request(stack.github_repo_name, number))
       head.refresh_statuses!
@@ -219,6 +233,7 @@ module Shipit
       self.deletions = github_pull_request.deletions
       self.branch = github_pull_request.head.ref
       self.head = find_or_create_commit_from_github_by_sha!(github_pull_request.head.sha, detached: true)
+      self.merged_at = github_pull_request.merged_at
     end
 
     def merge_message

data/app/models/shipit/stack.rb

@@ -82,13 +82,20 @@ module Shipit
     end
 
     def trigger_task(definition_id, user, env: nil)
+      definition = find_task_definition(definition_id)
+      env = env.try!(:to_h) || {}
+
+      definition.variables_with_defaults.each do |variable|
+        env[variable.name] ||= variable.default
+      end
+
       commit = last_deployed_commit.presence || commits.first
       task = tasks.create(
         user_id: user.id,
-        definition: find_task_definition(definition_id),
+        definition: definition,
         until_commit_id: commit.id,
         since_commit_id: commit.id,
-        env: filter_task_envs(definition_id, (env.try!(:to_h) || {})),
+        env: definition.filter_envs(env),
       )
       task.enqueue
       task
@@ -372,8 +379,8 @@ module Shipit
 
     def update_undeployed_commits_count(after_commit = nil)
       after_commit ||= last_deployed_commit
-      undeployed_commits = commits.reachable.newer_than(after_commit).select('count(*) as count')
-      self.class.where(id: id).update_all("undeployed_commits_count = (#{undeployed_commits.to_sql})")
+      undeployed_commits = commits.reachable.newer_than(after_commit).count
+      update(undeployed_commits_count: undeployed_commits)
     end
 
     def broadcast_update

data/app/models/shipit/task_definition.rb

@@ -48,6 +48,10 @@ module Shipit
       EnvironmentVariables.with(env).permit(variables)
     end
 
+    def variables_with_defaults
+      @variables_with_defaults ||= variables.select(&:default_provided?)
+    end
+
     private
 
     def task_variables(config_variables)

data/app/models/shipit/team.rb

@@ -2,8 +2,8 @@ module Shipit
   class Team < ActiveRecord::Base
     REQUIRED_HOOKS = %i(membership).freeze
 
-    has_many :members, class_name: :User, through: :memberships, source: :user
     has_many :memberships
+    has_many :members, class_name: :User, through: :memberships, source: :user
 
     has_many :github_hooks,
       -> { where(event: REQUIRED_HOOKS) },

data/app/models/shipit/undeployed_commit.rb

@@ -11,7 +11,7 @@ module Shipit
       state = deployable? ? 'allowed' : status.state
       unless bypass_safeties
         state = 'deploying' if stack.active_task?
-        state = 'locked' if stack.locked?
+        state = 'locked' if locked?
       end
       state
     end
@@ -19,7 +19,6 @@ module Shipit
     def redeploy_state(bypass_safeties = false)
       state = 'allowed'
       unless bypass_safeties
-        state = 'locked' if stack.locked?
         state = 'deploying' if stack.active_task?
       end
       state

data/app/models/shipit/user.rb

@@ -2,8 +2,8 @@ module Shipit
   class User < ActiveRecord::Base
     DEFAULT_AVATAR = URI.parse('https://avatars.githubusercontent.com/u/583231?')
 
-    has_many :teams, through: :memberships
     has_many :memberships
+    has_many :teams, through: :memberships
     has_many :authored_commits, class_name: :Commit, foreign_key: :author_id, inverse_of: :author
     has_many :commits, foreign_key: :committer_id, inverse_of: :committer
     has_many :tasks

data/app/models/shipit/variable_definition.rb

@@ -6,9 +6,14 @@ module Shipit
       @name = attributes.fetch('name')
       @title = attributes['title']
       @default = attributes['default'].to_s
+      @default_provided = attributes.key?('default')
       @select = attributes['select'].presence
     end
 
+    def default_provided?
+      @default_provided
+    end
+
     def to_h
       {
         'name' => @name,

data/app/serializers/shipit/stack_serializer.rb

@@ -5,7 +5,7 @@ module Shipit
     has_one :lock_author
     attributes :id, :repo_owner, :repo_name, :environment, :html_url, :url, :tasks_url, :deploy_url, :pull_requests_url,
                :deploy_spec, :undeployed_commits_count, :is_locked, :lock_reason, :continuous_deployment, :created_at,
-               :updated_at, :locked_since
+               :updated_at, :locked_since, :last_deployed_at
 
     def url
       api_stack_url(object)

data/app/views/layouts/shipit.html.erb

@@ -1,7 +1,8 @@
 <!DOCTYPE html>
-<html data-controller="<%= controller_name %>" data-action="<%= action_name %>">
+<html lang="<%= I18n.locale %>" data-controller="<%= controller_name %>" data-action="<%= action_name %>">
 <head>
   <title><%= [Shipit.app_name, @stack.try!(:repo_name)].compact.join(' - ') %></title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <%= favicon_link_tag %>
   <%= stylesheet_link_tag :shipit, media: 'all' %>
   <%= javascript_include_tag :shipit %>