shipit-engine 0.31.0 → 0.32.0

data/app/models/shipit/command_line_user.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class CommandLineUser
     def present?

data/app/models/shipit/commit.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Shipit
-  class Commit < ActiveRecord::Base
+  class Commit < Record
     include DeferredTouch
 
     RECENT_COMMIT_THRESHOLD = 10.seconds
@@ -92,7 +93,7 @@ module Shipit
       committer = User.find_or_create_committer_from_github_commit(commit)
       committer ||= Anonymous.new
 
-      new(
+      record = new(
         sha: commit.sha,
         message: commit.commit.message,
         author:  author,
@@ -102,12 +103,18 @@ module Shipit
         additions: commit.stats&.additions,
         deletions: commit.stats&.deletions,
       )
+
+      if record.pull_request?
+        record.pull_request_head_sha = commit.parents.last.sha
+      end
+
+      record
     end
 
     def message=(message)
       limit = self.class.columns_hash['message'].limit
       if limit && message && message.size > limit
-        message = message.slice(0, limit)
+        message = message.truncate_bytes(limit)
       end
       super(message)
     end
@@ -338,7 +345,7 @@ module Shipit
       new_status = status
 
       unless already_deployed
-        payload = {commit: self, stack: stack, status: new_status.state}
+        payload = { commit: self, stack: stack, status: new_status.state }
         if previous_status != new_status
           Hook.emit(:commit_status, stack, payload.merge(commit_status: new_status))
         end

data/app/models/shipit/commit_checks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class CommitChecks < EphemeralCommitChecks
     OUTPUT_TTL = 10.minutes.to_i

data/app/models/shipit/commit_deployment.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Shipit
-  class CommitDeployment < ActiveRecord::Base
+  class CommitDeployment < Record
     belongs_to :task
     has_many :statuses, dependent: :destroy, class_name: 'CommitDeploymentStatus'
 
@@ -56,7 +57,7 @@ module Shipit
             from_sha: task.since_commit.sha,
             to_sha: task.until_commit.sha,
           },
-        },
+        }.to_json,
       )
     end
   end

data/app/models/shipit/commit_deployment_status.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Shipit
-  class CommitDeploymentStatus < ActiveRecord::Base
+  class CommitDeploymentStatus < Record
     DESCRIPTION_CHARACTER_LIMIT_ON_GITHUB = 140
 
     belongs_to :commit_deployment

data/app/models/shipit/commit_message.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class CommitMessage
     GITHUB_MERGE_COMMIT_PATTERN = /\AMerge pull request #(?<pr_id>\d+) from \S+\n\n(?<pr_title>.*)/

data/app/models/shipit/delivery.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 module Shipit
-  class Delivery < ActiveRecord::Base
+  class Delivery < Record
     STATUSES = %w(pending scheduled sent).freeze
     enum status: STATUSES.zip(STATUSES).to_h
 
     belongs_to :hook
 
-    validates :url, presence: true, url: {no_local: true, allow_blank: true}
+    validates :url, presence: true, url: { no_local: true, allow_blank: true }
     validates :content_type, presence: true
 
     serialize :response_headers, JSON
@@ -36,7 +37,7 @@ module Shipit
     def http
       Faraday::Connection.new do |connection|
         connection.headers = headers
-        connection.adapter Faraday.default_adapter
+        connection.adapter(Faraday.default_adapter)
       end
     end
 

data/app/models/shipit/deploy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'fileutils'
 
 module Shipit
@@ -108,8 +109,8 @@ module Shipit
     end
 
     # Rolls the stack back to the most recent **previous** successful deploy
-    def trigger_revert(force: false)
-      previous_successful_commit = commit_to_rollback_to
+    def trigger_revert(force: false, rollback_to: nil)
+      previous_successful_commit = rollback_to&.until_commit || commit_to_rollback_to
 
       rollback = Rollback.create!(
         user_id: user_id,
@@ -248,24 +249,12 @@ module Shipit
 
       # Create one for each pull request in the batch, to give feedback on the PR timeline
       commits.select(&:pull_request?).each do |commit|
-        if (pull_request_head = pull_request_head_for_commit(commit))
-          commit_deployments.create!(sha: pull_request_head)
-        end
+        next if commit.pull_request_head_sha.blank? # This attribute was not always populated
+        commit_deployments.create!(sha: commit.pull_request_head_sha)
       end
 
       # Immediately update to publish the status to the commit deployments
       update_commit_deployments
-    rescue Octokit::ClientError => error
-      Rails.logger.warn("Got #{error.class.name} (#{error.message}) when creating CommitDeployments for Deploy##{id}")
-    end
-
-    def pull_request_head_for_commit(commit)
-      pull_request = Shipit.github.api.pull_request(commit.stack.github_repo_name, commit.pull_request_number)
-      pull_request.head.sha
-    rescue Octokit::ClientError => error
-      pr_ref = "#{commit.stack.github_repo_name}##{commit.pull_request_number}"
-      Rails.logger.warn("Got #{error.class.name} (#{error.message}) when loading pull request #{pr_ref}")
-      nil
     end
 
     def update_release_status
@@ -293,7 +282,7 @@ module Shipit
     def trigger_revert_if_required
       return unless rollback_once_aborted?
       return unless supports_rollback?
-      trigger_revert
+      trigger_revert(rollback_to: rollback_once_aborted_to)
     end
 
     def default_since_commit_id

data/app/models/shipit/deploy_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 
 module Shipit
@@ -5,20 +6,34 @@ module Shipit
     Error = Class.new(StandardError)
 
     class << self
+      attr_accessor :pretty_generate
+
       def load(json)
         config = json.blank? ? {} : JSON.parse(json)
         new(config)
       end
 
       def dump(spec)
-        JSON.dump(spec.cacheable.config) if spec
+        return unless spec
+
+        if pretty_generate?
+          JSON.pretty_generate(spec.cacheable.config)
+        else
+          JSON.dump(spec.cacheable.config)
+        end
       end
 
       def bundle_path
         Rails.root.join('data', 'bundler')
       end
+
+      def pretty_generate?
+        @pretty_generate
+      end
     end
 
+    self.pretty_generate = false
+
     def initialize(config)
       @config = config
     end
@@ -40,6 +55,10 @@ module Shipit
       end
     end
 
+    def blank?
+      config.empty?
+    end
+
     def supports_fetch_deployed_revision?
       fetch_deployed_revision_steps.present?
     end
@@ -255,11 +274,11 @@ module Shipit
     end
 
     def task_not_found!(id)
-      raise TaskDefinition::NotFound.new("No definition for task #{id.inspect}")
+      raise TaskDefinition::NotFound, "No definition for task #{id.inspect}"
     end
 
     def cant_detect!(type)
-      raise DeploySpec::Error.new(I18n.t("deploy_spec.hint.#{type}"))
+      raise DeploySpec::Error, I18n.t("deploy_spec.hint.#{type}")
     end
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class DeploySpec
     module BundlerDiscovery

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class DeploySpec
     module CapistranoDiscovery

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class DeploySpec
     class FileSystem < DeploySpec
@@ -61,14 +62,14 @@ module Shipit
             'context' => release_status_context,
             'delay' => release_status_delay,
           },
-          'dependencies' => {'override' => dependencies_steps},
+          'dependencies' => { 'override' => dependencies_steps },
           'deploy' => {
             'override' => deploy_steps,
             'variables' => deploy_variables.map(&:to_h),
             'max_commits' => maximum_commits_per_deploy,
             'interval' => pause_between_deploys,
           },
-          'rollback' => {'override' => rollback_steps},
+          'rollback' => { 'override' => rollback_steps },
           'fetch' => fetch_deployed_revision_steps,
           'tasks' => cacheable_tasks,
         )
@@ -84,10 +85,16 @@ module Shipit
       end
 
       def load_config
-        read_config(file("shipit.#{@env}.yml", root: true)) ||
+        read_config(file("#{app_name}.#{@env}.yml", root: true)) ||
+          read_config(file("#{app_name}.yml", root: true)) ||
+          read_config(file("shipit.#{@env}.yml", root: true)) ||
           read_config(file('shipit.yml', root: true))
       end
 
+      def app_name
+        @app_name ||= Shipit.app_name.downcase
+      end
+
       def read_config(path)
         SafeYAML.load(path.read) if path.exist?
       end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class DeploySpec
     module KubernetesDiscovery

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'json'
 
 module Shipit

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

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
 require 'json'
 
 module Shipit
   class DeploySpec
     module NpmDiscovery
       # https://docs.npmjs.com/cli/publish
-      PUBLIC = 'public'.freeze
-      PRIVATE = 'restricted'.freeze
+      PUBLIC = 'public'
+      PRIVATE = 'restricted'
       VALID_ACCESS = [PUBLIC, PRIVATE].freeze
-      NPM_REGISTRY = "https://registry.npmjs.org/".freeze
+      NPM_REGISTRY = "https://registry.npmjs.org/"
 
       def discover_dependencies_steps
         discover_package_json || super
@@ -57,7 +58,7 @@ module Shipit
         # are treated as 'next' npm dist-tags.
         # An 1.0.0-beta.1 would be installable using both:
         # `yarn add package@1.0.0-beta.1` and `yarn add package@next`
-        return 'next' if ['-beta', '-alpha', '-rc', '-next'].any? { |tag| version.include? tag }
+        return 'next' if ['-beta', '-alpha', '-rc', '-next'].any? { |tag| version.include?(tag) }
         'latest'
       end
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class DeploySpec
     module PypiDiscovery

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class DeploySpec
     module RubygemsDiscovery

data/app/models/shipit/deploy_stats.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module Shipit
   class DeployStats
     delegate :empty?, to: :@deploys
 
     def initialize(deploys)
       @deploys = deploys
-      @durations = @deploys.map { |d| d.duration.value }.compact
+      @durations = @deploys.map { |d| d.duration&.value }.compact
     end
 
     def count

data/app/models/shipit/duration.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
 module Shipit
   class Duration < ActiveSupport::Duration
     ParseError = Class.new(ArgumentError)
 
-    FORMAT = /
+    FORMAT = %r{
       \A
       (?<days>\d+d)?
       (?<hours>\d+h)?
       (?<minutes>\d+m)?
       (?<seconds>\d+s?)?
       \z
-    /x
+    }x
     UNITS = {
       's' => :seconds,
       'm' => :minutes,

data/app/models/shipit/ephemeral_commit_checks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class EphemeralCommitChecks
     FINAL_STATUSES = %w(failed error success).freeze

data/app/models/shipit/github_hook.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Shipit
-  class GithubHook < ActiveRecord::Base
+  class GithubHook < Record
     # TODO: app-migration, delete class
     belongs_to :stack, required: false # Required for fixtures
 

data/app/models/shipit/github_status.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 module Shipit
   module GithubStatus
-    CACHE_KEY = 'github::status'.freeze
+    CACHE_KEY = 'github::status'
 
     class << self
       def status

data/app/models/shipit/hook.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Shipit
-  class Hook < ActiveRecord::Base
+  class Hook < Record
     class DeliverySpec
       def initialize(event:, url:, content_type:, payload:)
         @event = event
@@ -19,7 +20,7 @@ module Shipit
       def http
         Faraday::Connection.new do |connection|
           connection.headers = headers
-          connection.adapter Faraday.default_adapter
+          connection.adapter(Faraday.default_adapter)
         end
       end
 
@@ -57,9 +58,9 @@ module Shipit
     belongs_to :stack, required: false
     has_many :deliveries
 
-    validates :delivery_url, presence: true, url: {no_local: true, allow_blank: true}
-    validates :content_type, presence: true, inclusion: {in: CONTENT_TYPES.keys}
-    validates :events, presence: true, subset: {of: EVENTS}
+    validates :delivery_url, presence: true, url: { no_local: true, allow_blank: true }
+    validates :content_type, presence: true, inclusion: { in: CONTENT_TYPES.keys }
+    validates :events, presence: true, subset: { of: EVENTS }
 
     serialize :events, Shipit::CSVSerializer
 

data/app/models/shipit/membership.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 module Shipit
-  class Membership < ActiveRecord::Base
+  class Membership < Record
     belongs_to :team, required: true
     belongs_to :user, required: true
 
-    validates :user_id, uniqueness: {scope: :team_id}
+    validates :user_id, uniqueness: { scope: :team_id }
   end
 end

data/app/models/shipit/output_chunk.rb

@@ -1,11 +1,16 @@
+# frozen_string_literal: true
 module Shipit
-  class OutputChunk < ActiveRecord::Base
+  class OutputChunk < Record
     belongs_to :task
 
     scope :tail, ->(start) { order(id: :asc).where('id > ?', start || 0) }
 
     def text=(string)
-      super(string.force_encoding(Encoding::UTF_8).scrub)
+      if string.frozen?
+        super(string)
+      else
+        super(string.force_encoding(Encoding::UTF_8).scrub)
+      end
     end
   end
 end