shipit-engine 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e890159cf6f243a3dc808e4c3314015d56666c3e4881bfd890fe51ee3076861e
-  data.tar.gz: 2fec4f67b4b6811e98176572837ec484e5330500590a108cdf3f9a33c55b7040
+  metadata.gz: 98113cef0ad013fa29cb11fea22f09547c191310a601eb788a53fdc5fb3c7e40
+  data.tar.gz: 39c68de0e6356e1daab40942a817af86258ea8219726c1e4276a42bba5d79315
 SHA512:
-  metadata.gz: 50f8f9a3ec7ce508bd0f393cbb8da8011a0a312dccea98007eb5af50166e0943b43c5887728aba0d385e7bf623e545784f2c0bb6957c54dd0d2e3de0b9c8a777
-  data.tar.gz: 37696824d54d5bf8bd2da9c56b816eb2e6c896fbc53e9898641c2931f64e9bb84bcc05b2fc705bb67bd263a3ac044352da87acca7957b4ce8942b597e9711a23
+  metadata.gz: 29504e17c71d378485e8610edea95e25e215f5c391478244e609a95a847e3022b508bda95713db97e1f1de22f67c8eed310a562f82cf737e1425803e958341ce
+  data.tar.gz: a7ea41b8ddcf21803a1279cd74d53231c9e030165c06b2ff835f31db55b0cf2240ca802626fba50abaec6b0e5c09e1439900de22c9d3b7719f53b6e2fe524da8

data/README.md

@@ -35,7 +35,7 @@ This guide aims to help you [set up](#installation-and-setup), [use](#using-ship
 * [Configuring providers](#configuring-providers)
 * [Free samples](/examples/shipit.yml)
 
-**IV. INTERGRATING**
+**IV. INTEGRATING**
 
 * [Registering webhooks](#integrating-webhooks)
 
@@ -130,6 +130,8 @@ Also, if your repository is deployed different ways depending on the environment
 
 For example for a stack like: `my-org/my-repo/staging`, `shipit.staging.yml` will have priority over `shipit.yml`.
 
+Lastly, if you override the `app_name` configuration in your Shipit deployment, `yourapp.yml` and `yourapp.staging.yml` will work.
+
 * * *
 
 <h3 id="installing-dependencies">Installing dependencies</h3>
@@ -640,7 +642,7 @@ For Kubernetes, you have to provision Shipit environment with the following tool
 * `kubectl`
 * `kubernetes-deploy` [gem](https://github.com/Shopify/kubernetes-deploy)
 
-<h2 id="integrating">IV. INTERGRATING</h2>
+<h2 id="integrating">IV. INTEGRATING</h2>
 
 <h3 id="integrating-webhooks">Registering webhooks</h3>
 

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
@@ -8,7 +9,7 @@ rescue LoadError
 end
 
 APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
-load 'rails/tasks/engine.rake'
+load('rails/tasks/engine.rake')
 
 Bundler::GemHelper.install_tasks
 
@@ -19,6 +20,7 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.test_files = FileList.new('test/**/*_test.rb').exclude('test/dummy/**/*')
   t.verbose = false
+  t.warning = false
 end
 
-task default: :test
+task(default: :test)

data/app/assets/stylesheets/_pages/_stacks.scss

@@ -93,9 +93,6 @@
 
 .commits-path {
   font-size: 18px;
-  span {
-    text-transform: capitalize;
-  }
   small {
     font-size: 18px;
     color: #8D9EB0;

data/app/assets/stylesheets/merge_status.scss

@@ -1,3 +0,0 @@
-.merge-status-container {
-  max-width: 700px;
-}

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module ActiveModelSerializersPatch
     private

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     module Cacheable

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

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     module Paginable
       extend ActiveSupport::Concern
 
-      LINK = 'Link'.freeze
+      LINK = 'Link'
 
       included do
         class_attribute :max_page_size
@@ -12,7 +13,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/concerns/shipit/api/rendering.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     module Rendering
@@ -5,16 +6,16 @@ module Shipit
 
       def render_resources(resources, options = {})
         options[:json] = resources
-        render options
+        render(options)
       end
 
       def render_resource(resource, options = {})
         if resource.destroyed?
-          head :no_content, options.reverse_merge(content_type: 'application/json')
+          head(:no_content, options.reverse_merge(content_type: 'application/json'))
         elsif resource.errors.any?
-          render options.reverse_merge(status: :unprocessable_entity, json: {errors: resource.errors})
+          render(options.reverse_merge(status: :unprocessable_entity, json: { errors: resource.errors }))
         else
-          render options.reverse_merge(json: resource)
+          render(options.reverse_merge(json: resource))
         end
       end
     end

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.xml.builder', 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,14 +1,15 @@
+# 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 :env, Hash, default: {}
       end
@@ -16,7 +17,7 @@ module Shipit
         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?
         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/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/pull_requests_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class PullRequestsController < BaseController
@@ -5,21 +6,21 @@ module Shipit
       require_permission :deploy, :stack, only: %i(update destroy)
 
       def index
-        render_resources stack.pull_requests.includes(:head).order(id: :desc)
+        render_resources(stack.pull_requests.includes(:head).order(id: :desc))
       end
 
       def show
-        render_resource stack.pull_requests.find_by!(number: params[:id])
+        render_resource(stack.pull_requests.find_by!(number: params[:id]))
       end
 
       def update
         pull_request = PullRequest.request_merge!(stack, params[:id], current_user)
         if pull_request.waiting?
-          head :accepted
+          head(:accepted)
         elsif pull_request.merged?
-          render status: :method_not_allowed, json: {
+          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
@@ -29,7 +30,7 @@ module Shipit
         if pull_request = stack.pull_requests.where(number: params[:id]).first
           pull_request.cancel! if pull_request.waiting?
         end
-        head :no_content
+        head(:no_content)
       end
     end
   end

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,33 @@
+# 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: {}
+      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)
+        end
+
+        render_resource(response, status: :accepted)
+      end
+    end
+  end
+end