shipit-engine 0.28.1 → 0.33.0

data/db/migrate/20191209231045_create_shipit_repositories.rb

@@ -0,0 +1,12 @@
+class CreateShipitRepositories < ActiveRecord::Migration[6.0]
+  def change
+    create_table :repositories do |t|
+      t.string :owner, limit: 39, null: false
+      t.string :name, limit: 100, null: false
+
+      t.timestamps
+    end
+
+    add_index :repositories, ["owner", "name"], name: "repository_unicity", unique: true
+  end
+end

data/db/migrate/20191209231307_add_repository_reference_to_stacks.rb

@@ -0,0 +1,15 @@
+class AddRepositoryReferenceToStacks < ActiveRecord::Migration[6.0]
+  def up
+    change_table(:stacks) do |t|
+      t.references :repository
+    end
+  end
+
+  def down
+    change_column :stacks, :repo_name, :string, null: false
+    change_column :stacks, :repo_owner, :string, null: false
+    change_table(:stacks) do |t|
+      t.remove_references :repository
+    end
+  end
+end

data/db/migrate/20191216162728_backfill_repository_data.rb

@@ -0,0 +1,22 @@
+class BackfillRepositoryData < ActiveRecord::Migration[6.0]
+  def up
+    repositories = {}
+    Shipit::Stack.all.each do |stack|
+      repo_owner = stack[:repo_owner].downcase
+      repo_name = stack[:repo_name].downcase
+
+      repository = (repositories[[repo_owner, repo_name]] ||= Shipit::Repository.create_or_find_by!(
+        owner: repo_owner,
+        name: repo_name,
+      ))
+
+      stack.update_column(:repository_id, repository.id)
+    end
+  end
+
+  def down
+    Shipit::Repository.find_each do |repository|
+      repository.stacks.update_all(repo_owner: repository.owner, repo_name: repository.name)
+    end
+  end
+end

data/db/migrate/20191216163010_remove_repository_information_from_stacks.rb

@@ -0,0 +1,20 @@
+class RemoveRepositoryInformationFromStacks < ActiveRecord::Migration[6.0]
+  def up
+    change_column_null :stacks, :repository_id, false
+    change_table(:stacks) do |t|
+      t.remove_index ["repo_owner", "repo_name", "environment"]
+      t.remove :repo_owner
+      t.remove :repo_name
+      t.index ["repository_id", "environment"], name: "stack_unicity", unique: true
+    end
+  end
+
+  def down
+    change_table(:stacks) do |t|
+      t.column :repo_name, :string, limit: 100
+      t.column :repo_owner, :string, limit: 39
+      t.remove_index ["repository_id", "environment"]
+      t.index ["repo_owner", "repo_name", "environment"], name: "stack_unicity", unique: true
+    end
+  end
+end

data/db/migrate/20191219205202_add_archived_since_to_stacks.rb

@@ -0,0 +1,6 @@
+class AddArchivedSinceToStacks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :stacks, :archived_since, :datetime
+    add_index :stacks, :archived_since
+  end
+end

data/db/migrate/20200102175621_optional_task_commits.rb

@@ -0,0 +1,6 @@
+class OptionalTaskCommits < ActiveRecord::Migration[6.0]
+  def change
+    change_column_null :tasks, :since_commit_id, true
+    change_column_null :tasks, :until_commit_id, true
+  end
+end

data/db/migrate/20200109132519_add_sha_to_commit_deployments.rb

@@ -0,0 +1,5 @@
+class AddShaToCommitDeployments < ActiveRecord::Migration[6.0]
+  def change
+    add_column :commit_deployments, :sha, :string, limit: 40
+  end
+end

data/db/migrate/20200226211925_add_index_to_tasks_status.rb

@@ -0,0 +1,5 @@
+class AddIndexToTasksStatus < ActiveRecord::Migration[6.0]
+  def change
+    add_index :tasks, :status
+  end
+end

data/db/migrate/20200427135152_add_pull_request_head_sha_to_commit.rb

@@ -0,0 +1,5 @@
+class AddPullRequestHeadShaToCommit < ActiveRecord::Migration[6.0]
+  def change
+    add_column :commits, :pull_request_head_sha, :string, limit: 40
+  end
+end

data/db/migrate/20200615181558_add_rollback_once_aborted_to.rb

@@ -0,0 +1,5 @@
+class AddRollbackOnceAbortedTo < ActiveRecord::Migration[6.0]
+  def change
+    add_column :tasks, :rollback_once_aborted_to_id, :integer
+  end
+end

data/db/migrate/20200706145406_add_review_stacks.rb

@@ -0,0 +1,12 @@
+class AddReviewStacks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :stacks, :provision_status, :string, null: false, default: :deprovisioned
+    add_index :stacks, :provision_status
+
+    add_column :stacks, :type, :string, default: "Shipit::Stack"
+    add_index :stacks, :type
+
+    add_column :stacks, :awaiting_provision, :boolean, null: false, default: false
+    add_index :stacks, :awaiting_provision
+  end
+end

data/db/migrate/20200804144639_rename_pull_request_to_merge_request.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RenamePullRequestToMergeRequest < ActiveRecord::Migration[6.0]
+  def change
+    rename_table :pull_requests, :merge_requests
+  end
+end

data/db/migrate/20200804161512_rename_commits_pull_request_id_to_merge_request_id.rb

@@ -0,0 +1,5 @@
+class RenameCommitsPullRequestIdToMergeRequestId < ActiveRecord::Migration[6.0]
+  def change
+    rename_column :commits, :pull_request_id, :merge_request_id
+  end
+end

data/db/migrate/20200813134712_recreate_shipit_pull_requests.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+class RecreateShipitPullRequests < ActiveRecord::Migration[6.0]
+  def change
+    create_table :pull_requests do |t|
+      t.references :stack, null: false
+      t.integer :number, null: false
+      t.string :title, limit: 256
+      t.integer :github_id, limit: 8
+      t.string :api_url, limit: 1024
+      t.string :state
+      t.integer :additions, null: false, default: 0
+      t.integer :deletions, null: false, default: 0
+      t.integer :user_id
+      t.text :labels
+      t.references :head
+      t.timestamps
+
+      t.index [:stack_id, :number], unique: true
+      t.index [:stack_id, :github_id], unique: true
+    end
+  end
+end

data/db/migrate/20200813194056_create_pull_request_assignments.rb

@@ -0,0 +1,8 @@
+class CreatePullRequestAssignments < ActiveRecord::Migration[6.0]
+  def change
+    create_table :pull_request_assignments do |t|
+      t.references :pull_request
+      t.references :user
+    end
+  end
+end

data/db/migrate/20201001125502_add_provision_pr_stacks_flag_to_repositories.rb

@@ -0,0 +1,7 @@
+class AddProvisionPrStacksFlagToRepositories < ActiveRecord::Migration[6.0]
+  def change
+    add_column :repositories, :review_stacks_enabled, :boolean, default: false
+    add_column :repositories, :provisioning_behavior, :string, default: :allow_all
+    add_column :repositories, :provisioning_label_name, :string
+  end
+end

data/db/migrate/20201008145809_add_retry_attempt_to_tasks.rb

@@ -0,0 +1,5 @@
+class AddRetryAttemptToTasks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :tasks, :retry_attempt, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20201008152744_add_max_retries_to_tasks.rb

@@ -0,0 +1,5 @@
+class AddMaxRetriesToTasks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :tasks, :max_retries, :integer, null: true
+  end
+end

data/lib/shipit.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support/all'
 require 'active_model_serializers'
 require 'state_machines-activerecord'
@@ -42,12 +43,14 @@ require 'shipit/simple_message_verifier'
 require 'shipit/command'
 require 'shipit/commands'
 require 'shipit/stack_commands'
+require 'shipit/review_stack_commands'
 require 'shipit/task_commands'
 require 'shipit/deploy_commands'
 require 'shipit/rollback_commands'
 require 'shipit/environment_variables'
 require 'shipit/stat'
 require 'shipit/github_http_cache_middleware'
+require 'shipit/same_site_cookie_middleware'
 require 'shipit/cast_value'
 require 'shipit/line_buffer'
 
@@ -60,7 +63,16 @@ module Shipit
   delegate :table_name_prefix, to: :secrets
 
   attr_accessor :disable_api_authentication, :timeout_exit_codes
-  attr_writer :internal_hook_receivers, :task_logger, :preferred_org_emails
+  attr_writer(
+    :internal_hook_receivers,
+    :preferred_org_emails,
+    :task_execution_strategy,
+    :task_logger,
+  )
+
+  def task_execution_strategy
+    @task_execution_strategy ||= Shipit::TaskExecutionStrategy::Default
+  end
 
   self.timeout_exit_codes = [].freeze
 
@@ -68,6 +80,10 @@ module Shipit
     ENV['SHIPIT_DISABLE_AUTH'].present?
   end
 
+  def enable_samesite_middleware?
+    ENV['SHIPIT_ENABLE_SAMESITE_NONE'].present?
+  end
+
   def app_name
     @app_name ||= secrets.app_name || Rails.application.class.name.split(':').first || 'Shipit'
   end
@@ -122,6 +138,10 @@ module Shipit
     secrets.default_merge_method || 'merge'
   end
 
+  def update_latest_deployed_ref
+    secrets.update_latest_deployed_ref
+  end
+
   def enforce_publish_config
     secrets.enforce_publish_config.presence
   end
@@ -147,7 +167,7 @@ module Shipit
   end
 
   def env
-    {'SHIPIT' => '1'}.merge(secrets.env || {})
+    { 'SHIPIT' => '1' }.merge(secrets.env || {})
   end
 
   def shell_paths
@@ -159,7 +179,7 @@ module Shipit
       if revision_file.exist?
         revision_file.read
       else
-        `git rev-parse HEAD`
+        %x(git rev-parse HEAD)
       end.strip
     end
   end

data/lib/shipit/cast_value.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module CastValue
     def to_boolean(value)

data/lib/shipit/command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pty'
 require 'shellwords'
 require 'fileutils'
@@ -27,7 +28,7 @@ module Shipit
 
     def initialize(*args, default_timeout: Shipit.default_inactivity_timeout, env: {}, chdir:)
       @args, options = parse_arguments(args)
-      @timeout = options['timeout'.freeze] || options[:timeout] || default_timeout
+      @timeout = options['timeout'] || options[:timeout] || default_timeout
       @env = env
       @chdir = chdir.to_s
       @timed_out = false
@@ -48,10 +49,7 @@ module Shipit
     def interpolate_environment_variables(argument)
       return argument.map { |a| interpolate_environment_variables(a) } if argument.is_a?(Array)
 
-      argument.gsub(/(\$\w+)/) do |variable|
-        variable.sub!('$', '')
-        Shellwords.escape(@env.fetch(variable) { ENV[variable] })
-      end
+      EnvironmentVariables.with(env).interpolate(argument)
     end
 
     def success?
@@ -149,18 +147,16 @@ module Shipit
     def read_stream(io)
       touch_last_output_at
       loop do
-        begin
-          yield_control
-          yield io.read_nonblock(MAX_READ)
-          touch_last_output_at
-        rescue IO::WaitReadable
-          if output_timed_out?
-            @timed_out = true
-            raise TimedOut
-          end
-          IO.select([io], nil, nil, 1)
-          retry
+        yield_control
+        yield io.read_nonblock(MAX_READ)
+        touch_last_output_at
+      rescue IO::WaitReadable
+        if output_timed_out?
+          @timed_out = true
+          raise TimedOut
         end
+        IO.select([io], nil, nil, 1)
+        retry
       end
     rescue EOFError
     end
@@ -196,7 +192,7 @@ module Shipit
         # If we let the child a little bit of time, it solves it.
         retry_count -= 1
         if retry_count > 0
-          sleep 0.05
+          sleep(0.05)
           retry
         end
       end
@@ -220,7 +216,7 @@ module Shipit
           argument
         end
       end
-      return args, options
+      [args, options]
     end
 
     def running?

data/lib/shipit/commands.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class Commands
     class << self
@@ -6,13 +7,13 @@ module Shipit
       end
 
       def git_version
-        @git_version ||= parse_git_version(`git --version`)
+        @git_version ||= parse_git_version(%x(git --version))
       end
 
       def parse_git_version(raw_git_version)
-        raw_git_version =~ /(\d+\.\d+\.\d+)/
-        raise 'git command not found' unless $1
-        Gem::Version.new($1)
+        match_info = raw_git_version.match(/(\d+\.\d+\.\d+)/)
+        raise 'git command not found' unless match_info
+        Gem::Version.new(match_info[1])
       end
     end
 

data/lib/shipit/csv_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module CSVSerializer
     extend self

data/lib/shipit/deploy_commands.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class DeployCommands < TaskCommands
     def steps

data/lib/shipit/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class Engine < ::Rails::Engine
     isolate_namespace Shipit
@@ -32,11 +33,19 @@ module Shipit
       ActiveModel::Serializer.include(Engine.routes.url_helpers)
 
       if Shipit.github.oauth?
-        OmniAuth::Strategies::GitHub.configure path_prefix: '/github/auth'
-        app.middleware.use OmniAuth::Builder do
+        OmniAuth::Strategies::GitHub.configure(path_prefix: '/github/auth')
+        app.middleware.use(OmniAuth::Builder) do
           provider(:github, *Shipit.github.oauth_config)
         end
       end
+
+      if Shipit.enable_samesite_middleware?
+        app.config.middleware.insert_after(::Rack::Runtime, Shipit::SameSiteCookieMiddleware)
+      end
+
+      app.config.after_initialize do
+        ActionController::Base.include(Shipit::ActiveModelSerializersPatch)
+      end
     end
   end
 end

data/lib/shipit/environment_variables.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class EnvironmentVariables
     NotPermitted = Class.new(StandardError)
@@ -14,6 +15,15 @@ module Shipit
       sanitize_env_vars(variable_definitions)
     end
 
+    def interpolate(argument)
+      return argument unless @env
+
+      argument.gsub(/(\$\w+)/) do |variable|
+        variable.sub!('$', '')
+        Shellwords.escape(@env.fetch(variable) { ENV[variable] })
+      end
+    end
+
     private
 
     def initialize(env)
@@ -26,7 +36,7 @@ module Shipit
       allowed, disallowed = @env.partition { |k, _| allowed_variables.include?(k) }.map(&:to_h)
 
       error_message = "Variables #{disallowed.keys.to_sentence} have not been whitelisted"
-      raise NotPermitted.new(error_message) unless disallowed.empty?
+      raise NotPermitted, error_message unless disallowed.empty?
 
       allowed
     end