shipit-engine 0.30.0 → 0.34.0

data/app/controllers/concerns/shipit/authentication.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Authentication
     extend ActiveSupport::Concern
@@ -20,10 +21,10 @@ module Shipit
         unless current_user.authorized?
           team_handles = Shipit.github_teams.map(&:handle)
           team_list = team_handles.to_sentence(two_words_connector: ' or ', last_word_connector: ', or ')
-          render plain: "You must be a member of #{team_list} to access this application.", status: :forbidden
+          render(plain: "You must be a member of #{team_list} to access this application.", status: :forbidden)
         end
       else
-        redirect_to Shipit::Engine.routes.url_helpers.github_authentication_path(origin: request.original_url)
+        redirect_to(Shipit::Engine.routes.url_helpers.github_authentication_path(origin: request.original_url))
       end
     end
 

data/app/controllers/concerns/shipit/pagination.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Pagination
     extend ActiveSupport::Concern
@@ -9,7 +10,7 @@ module Shipit
 
       self.max_page_size = 100
       self.default_page_size = 30
-      self.default_order = {id: :desc}.freeze
+      self.default_order = { id: :desc }.freeze
     end
 
     private

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class BaseController < ActionController::Base
@@ -22,11 +23,15 @@ module Shipit
       before_action :authenticate_api_client
 
       def index
-        render json: {stacks_url: api_stacks_url}
+        render(json: { stacks_url: api_stacks_url })
       end
 
       private
 
+      def namespace_for_serializer
+        nil
+      end
+
       def authenticate_api_client
         @current_api_client = if Shipit.disable_api_authentication
           UnlimitedApiClient.new
@@ -38,7 +43,7 @@ module Shipit
         end
         return if @current_api_client
         headers['WWW-Authenticate'] = 'Basic realm="Authentication token"'
-        render status: :unauthorized, json: {message: 'Bad credentials'}
+        render(status: :unauthorized, json: { message: 'Bad credentials' })
       end
 
       attr_reader :current_api_client
@@ -65,19 +70,19 @@ module Shipit
       end
 
       def insufficient_permission(error)
-        render status: :forbidden, json: {message: error.message}
+        render(status: :forbidden, json: { message: error.message })
       end
 
       def validation_error(error)
-        render status: :unprocessable_entity, json: {message: error.message}
+        render(status: :unprocessable_entity, json: { message: error.message })
       end
 
       def not_found(_error)
-        render status: :not_found, json: {status: '404', error: 'Not Found'}
+        render(status: :not_found, json: { status: '404', error: 'Not Found' })
       end
 
       def conflict(_error)
-        render status: :conflict, json: {status: '409', error: 'Conflict'}
+        render(status: :conflict, json: { status: '409', error: 'Conflict' })
       end
     end
   end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class CCMenuController < BaseController
@@ -19,7 +20,7 @@ module Shipit
 
       def show
         latest_deploy = stack.deploys_and_rollbacks.last || NoDeploy.new
-        render 'shipit/ccmenu/project.xml.builder', formats: [:xml], locals: {stack: stack, deploy: latest_deploy}
+        render('shipit/ccmenu/project', formats: [:xml], locals: { stack: stack, deploy: latest_deploy })
       end
 
       private

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class CommitsController < BaseController
@@ -9,7 +10,7 @@ module Shipit
           commits = commits.newer_than(stack.last_deployed_commit)
         end
 
-        render_resources commits
+        render_resources(commits)
       end
     end
   end

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

@@ -1,22 +1,25 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class DeploysController < BaseController
       require_permission :deploy, :stack
 
       def index
-        render_resources stack.deploys_and_rollbacks
+        render_resources(stack.deploys_and_rollbacks)
       end
 
       params do
-        requires :sha, String, length: {in: 6..40}
+        requires :sha, String, length: { in: 6..40 }
         accepts :force, Boolean, default: false
+        accepts :require_ci, Boolean, default: false
         accepts :env, Hash, default: {}
       end
       def create
         commit = stack.commits.by_sha(params.sha) || param_error!(:sha, 'Unknown revision')
         param_error!(:force, "Can't deploy a locked stack") if !params.force && stack.locked?
+        param_error!(:require_ci, "Commit is not deployable") if params.require_ci && !commit.deployable?
         deploy = stack.trigger_deploy(commit, current_user, env: params.env, force: params.force)
-        render_resource deploy, status: :accepted
+        render_resource(deploy, status: :accepted)
       end
     end
   end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class HooksController < BaseController
@@ -5,11 +6,11 @@ module Shipit
       require_permission :write, :hook, only: %i(create update destroy)
 
       def index
-        render_resources hooks
+        render_resources(hooks)
       end
 
       def show
-        render json: hook
+        render(json: hook)
       end
 
       params do
@@ -18,7 +19,7 @@ module Shipit
         accepts :content_type, String
       end
       def create
-        render_resource hooks.create(params)
+        render_resource(hooks.create(params))
       end
 
       params do
@@ -28,11 +29,11 @@ module Shipit
       end
       def update
         hook.update(params)
-        render_resource hook
+        render_resource(hook)
       end
 
       def destroy
-        render_resource hook.destroy
+        render_resource(hook.destroy)
       end
 
       private

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class LocksController < BaseController
@@ -8,10 +9,10 @@ module Shipit
       end
       def create
         if stack.locked?
-          render json: {message: 'Already locked'}, status: :conflict
+          render(json: { message: 'Already locked' }, status: :conflict)
         else
           stack.lock(params.reason, current_user)
-          render_resource stack
+          render_resource(stack)
         end
       end
 
@@ -20,12 +21,12 @@ module Shipit
       end
       def update
         stack.lock(params.reason, current_user)
-        render_resource stack
+        render_resource(stack)
       end
 
       def destroy
         stack.unlock
-        render_resource stack
+        render_resource(stack)
       end
     end
   end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+module Shipit
+  module Api
+    class MergeRequestsController < BaseController
+      require_permission :read, :stack
+      require_permission :deploy, :stack, only: %i(update destroy)
+
+      def index
+        render_resources(stack.merge_requests.includes(:head).order(id: :desc))
+      end
+
+      def show
+        render_resource(stack.merge_requests.find_by!(number: params[:id]))
+      end
+
+      def update
+        merge_request = MergeRequest.request_merge!(stack, params[:id], current_user)
+        if merge_request.waiting?
+          head(:accepted)
+        elsif merge_request.merged?
+          render(status: :method_not_allowed, json: {
+            message: "This pull request was already merged.",
+          })
+        else
+          raise "Pull Request is neither waiting nor merged, this should be impossible"
+        end
+      end
+
+      def destroy
+        if merge_request = stack.merge_requests.where(number: params[:id]).first
+          merge_request.cancel! if merge_request.waiting?
+        end
+        head(:no_content)
+      end
+    end
+  end
+end

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

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class OutputsController < BaseController
       require_permission :read, :stack
 
       def show
-        render plain: task.chunk_output
+        render(plain: task.chunk_output)
       end
 
       private

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class ReleaseStatusesController < BaseController
@@ -5,7 +6,7 @@ module Shipit
 
       params do
         requires :status, String
-        validates :status, inclusion: {in: %w(success failure)}
+        validates :status, inclusion: { in: %w(success failure) }
       end
       def create
         deploy = stack.deploys_and_rollbacks.find(params[:deploy_id])
@@ -15,7 +16,7 @@ module Shipit
         when 'failure'
           deploy.report_faulty!(user: current_user)
         end
-        render_resource deploy, status: :created
+        render_resource(deploy, status: :created)
       end
     end
   end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+module Shipit
+  module Api
+    class RollbacksController < BaseController
+      require_permission :deploy, :stack
+
+      params do
+        requires :sha, String, length: { in: 6..40 }
+        accepts :force, Boolean, default: false
+        accepts :env, Hash, default: {}
+        accepts :lock, Boolean, default: true
+      end
+      def create
+        commit = stack.commits.by_sha(params.sha) || param_error!(:sha, 'Unknown revision')
+        param_error!(:force, "Can't rollback a locked stack") if !params.force && stack.locked?
+        deploy = stack.deploys.find_by(until_commit: commit) || param_error!(:sha, 'Cant find associated deploy')
+        deploy_env = stack.filter_deploy_envs(params.env)
+
+        response = nil
+        if !params.force && stack.active_task?
+          param_error!(:force, "Can't rollback, deploy in progress")
+        elsif stack.active_task?
+          active_task = stack.active_task
+          active_task.abort!(aborted_by: current_user, rollback_once_aborted_to: deploy)
+          response = active_task
+        else
+          response = deploy.trigger_rollback(current_user, env: deploy_env, force: params.force, lock: params.lock)
+        end
+
+        render_resource(response, status: :accepted)
+      end
+    end
+  end
+end

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

@@ -1,11 +1,25 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class StacksController < BaseController
       require_permission :read, :stack, only: %i(index show)
-      require_permission :write, :stack, only: %i(create destroy)
+      require_permission :write, :stack, only: %i(create update destroy)
 
+      params do
+        accepts :repo_owner, String
+        accepts :repo_name, String
+      end
       def index
-        render_resources stacks
+        @stacks = stacks
+        if params[:repo_owner] && params[:repo_name]
+          full_repo_name = [repo_owner, repo_name].join('/')
+          @stacks = if (repository = Repository.from_github_repo_name(full_repo_name))
+            stacks.where(repository: repository)
+          else
+            Stack.none
+          end
+        end
+        render_resources(@stacks)
       end
 
       params do
@@ -16,21 +30,34 @@ module Shipit
         accepts :deploy_url, String
         accepts :ignore_ci, Boolean
         accepts :merge_queue_enabled, Boolean
+        accepts :continuous_deployment, Boolean
       end
       def create
         stack = Stack.new(create_params)
         stack.repository = repository
         stack.save
-        render_resource stack
+        render_resource(stack)
+      end
+
+      params do
+        accepts :branch, String
+        accepts :deploy_url, String
+        accepts :ignore_ci, Boolean
+        accepts :merge_queue_enabled, Boolean
+        accepts :continuous_deployment, Boolean
+      end
+      def update
+        stack.update(params)
+        render_resource(stack)
       end
 
       def show
-        render_resource stack
+        render_resource(stack)
       end
 
       def destroy
         stack.schedule_for_destroy!
-        head :accepted
+        head(:accepted)
       end
 
       private

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class TasksController < BaseController
@@ -5,22 +6,22 @@ module Shipit
       require_permission :deploy, :stack, only: :trigger
 
       def index
-        render_resources stack.tasks
+        render_resources(stack.tasks)
       end
 
       def show
-        render_resource stack.tasks.find(params[:id])
+        render_resource(stack.tasks.find(params[:id]))
       end
 
       params do
         accepts :env, Hash, default: {}
       end
       def trigger
-        render_resource stack.trigger_task(params[:task_name], current_user, env: params.env), status: :accepted
+        render_resource(stack.trigger_task(params[:task_name], current_user, env: params.env), status: :accepted)
       rescue Shipit::Task::ConcurrentTaskRunning
-        render status: :conflict, json: {
+        render(status: :conflict, json: {
           message: 'A task is already running.',
-        }
+        })
       end
     end
   end

data/app/controllers/shipit/api_clients_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class ApiClientsController < ShipitController
     include Pagination
@@ -28,10 +29,10 @@ module Shipit
     def update
       @api_client = ApiClient.find(params[:id])
       options = if @api_client.update(update_params)
-        {flash: {success: 'Successfully updated'}}
+        { flash: { success: 'Successfully updated' } }
       else
-        {flash: {warning: @stack.errors.full_messages.to_sentence}}
-                end
+        { flash: { warning: @stack.errors.full_messages.to_sentence } }
+      end
 
       redirect_to(params[:return_to].presence || api_client_path(@api_client), options)
     end