shipit-engine 0.32.0 → 0.35.1

data/app/models/shipit/webhooks/handlers/pull_request/review_stack_adapter.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module Shipit
+  module Webhooks
+    module Handlers
+      module PullRequest
+        class ReviewStackAdapter
+          delegate :archived?, to: :stack
+
+          def initialize(params, scope: Shipit::ReviewStack)
+            @params = params
+            @scope = scope
+          end
+
+          def stack
+            @stack ||= scope.find_by(environment: environment)
+          end
+
+          def find_or_create!
+            stack || create!
+          end
+
+          def archive!(*args, &block)
+            if stack.blank?
+              Rails.logger.info(
+                "Processing #{action} event for #{repo_name} PR #{pr_number} but no Stack exists. Ignoring."
+              )
+              return true
+            end
+            return if stack.archived?
+
+            stack.remove_from_provisioning_queue
+            stack.deprovision
+            stack.archive!(user, *args, &block)
+          end
+
+          def unarchive!(*args, &block)
+            if stack.blank?
+              Rails.logger.info(
+                "Processing #{action} event for #{repo_name} PR #{pr_number} but no ReviewStack exists. Creating."
+              )
+              return create!
+            end
+            return unless stack.archived?
+
+            stack.transaction do
+              Shipit::ReviewStackProvisioningQueue.add(stack)
+              stack.unarchive!(*args, &block)
+            end
+          end
+
+          def user
+            @user ||= Shipit::User.find_or_create_by_login!(params.sender["login"])
+          end
+
+          private
+
+          attr_reader :params, :scope
+
+          def action
+            params.action
+          end
+
+          def repo_name
+            params.repository["full_name"]
+          end
+
+          def pr_number
+            params.number
+          end
+
+          def create!
+            ReviewStack.transaction do
+              stack = scope.create!(stack_attributes)
+              stack
+                .build_pull_request
+                .update!(
+                  github_pull_request: params.pull_request
+                )
+            end
+
+            Shipit::ReviewStackProvisioningQueue.add(stack)
+
+            @stack = stack
+          end
+
+          def stack_attributes
+            {
+              branch: params.pull_request.head.ref,
+              environment: environment,
+              ignore_ci: false,
+              continuous_deployment: false,
+            }
+          end
+
+          def environment
+            "pr#{params.number}"
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/shipit/webhooks/handlers/pull_request/unlabeled_handler.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module Shipit
+  module Webhooks
+    module Handlers
+      module PullRequest
+        class UnlabeledHandler < Shipit::Webhooks::Handlers::Handler
+          params do
+            requires :action, String
+            requires :number, Integer
+            requires :pull_request do
+              requires :id, Integer
+              requires :number, Integer
+              requires :url, String
+              requires :title, String
+              requires :state, String
+              requires :additions, Integer
+              requires :deletions, Integer
+              requires :head do
+                requires :sha, String
+                requires :ref, String
+              end
+              requires :user do
+                requires :login, String
+              end
+              requires :assignees, Array do
+                requires :login, String
+              end
+              requires :labels, Array do
+                requires :name, String
+              end
+            end
+            requires :repository do
+              requires :full_name, String
+            end
+            requires :sender do
+              requires :login, String
+            end
+          end
+
+          def process
+            return unless respond_to_label_change?
+
+            handle
+          end
+
+          private
+
+          def handle
+            if archive?
+              stack.archive!
+            elsif unarchive?
+              stack.unarchive!
+            end
+
+            stack
+          end
+
+          def repository
+            @repository ||=
+              Shipit::Repository.from_github_repo_name(params.repository.full_name) ||
+              Shipit::NullRepository.new
+          end
+
+          def stack
+            @stack ||=
+              Shipit::Webhooks::Handlers::PullRequest::ReviewStackAdapter
+                .new(params, scope: repository.review_stacks)
+          end
+
+          def pull_request
+            params.pull_request
+          end
+
+          def pull_request_state
+            pull_request["state"]
+          end
+
+          def respond_to_label_change?
+            params.action == "unlabeled" &&
+              pull_request_state == "open" &&
+              repository.review_stacks_enabled &&
+              (archive? || unarchive?)
+          end
+
+          def archive?
+            (repository.provisioning_behavior_allow_with_label? && !pull_request_has_provisioning_label?) ||
+              (repository.provisioning_behavior_prevent_with_label? && pull_request_has_provisioning_label?)
+          end
+
+          def unarchive?
+            (repository.provisioning_behavior_allow_with_label? && pull_request_has_provisioning_label?) ||
+              (repository.provisioning_behavior_prevent_with_label? && !pull_request_has_provisioning_label?)
+          end
+
+          def pull_request_has_provisioning_label?
+            pull_request_label_names.include?(repository.provisioning_label_name)
+          end
+
+          def pull_request_label_names
+            Array.new(pull_request.labels).map(&:name)
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/shipit/webhooks/handlers/push_handler.rb

@@ -7,7 +7,10 @@ module Shipit
           requires :ref
         end
         def process
-          stacks.where(branch: branch).each(&:sync_github)
+          stacks
+            .not_archived
+            .where(branch: branch)
+            .find_each(&:sync_github)
         end
 
         private

data/app/models/shipit/webhooks.rb

@@ -5,6 +5,16 @@ module Shipit
       def default_handlers
         {
           'push' => [Handlers::PushHandler],
+          'pull_request' => [
+            Handlers::PullRequest::OpenedHandler,
+            Handlers::PullRequest::ClosedHandler,
+            Handlers::PullRequest::ReopenedHandler,
+            Handlers::PullRequest::EditedHandler,
+            Handlers::PullRequest::AssignedHandler,
+            Handlers::PullRequest::LabeledHandler,
+            Handlers::PullRequest::UnlabeledHandler,
+            Handlers::PullRequest::LabelCapturingHandler,
+          ],
           'status' => [Handlers::StatusHandler],
           'membership' => [Handlers::MembershipHandler],
           'check_suite' => [Handlers::CheckSuiteHandler],

data/app/serializers/shipit/deploy_serializer.rb

@@ -22,5 +22,11 @@ module Shipit
     def type
       :deploy
     end
+
+    def rollback_once_aborted_to
+      return nil unless object.rollback_once_aborted_to
+
+      DeploySerializer.new(object.rollback_once_aborted_to)
+    end
   end
 end

data/app/serializers/shipit/merge_request_serializer.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module Shipit
+  class MergeRequestSerializer < ActiveModel::Serializer
+    include GithubUrlHelper
+    include ConditionalAttributes
+
+    has_one :merge_requested_by
+    has_one :head, serializer: ShortCommitSerializer
+
+    attributes :id, :number, :title, :github_id, :additions, :deletions, :state, :merge_status, :mergeable,
+      :merge_requested_at, :rejection_reason, :html_url, :branch, :base_ref
+
+    def html_url
+      github_pull_request_url(object)
+    end
+
+    def include_rejection_reason?
+      object.rejection_reason?
+    end
+  end
+end

data/app/serializers/shipit/pull_request_serializer.rb

@@ -1,21 +1,18 @@
 # frozen_string_literal: true
+
 module Shipit
   class PullRequestSerializer < ActiveModel::Serializer
     include GithubUrlHelper
     include ConditionalAttributes
 
-    has_one :merge_requested_by
+    has_one :user
     has_one :head, serializer: ShortCommitSerializer
+    has_many :assignees, serializer: UserSerializer
 
-    attributes :id, :number, :title, :github_id, :additions, :deletions, :state, :merge_status, :mergeable,
-               :merge_requested_at, :rejection_reason, :html_url, :branch, :base_ref
+    attributes :id, :number, :title, :github_id, :additions, :deletions, :state, :html_url
 
     def html_url
-      github_pull_request_url(object)
-    end
-
-    def include_rejection_reason?
-      object.rejection_reason?
+      github_pull_request_url(object) if object.stack.present?
     end
   end
 end

data/app/serializers/shipit/review_stack_serializer.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Shipit
+  class ReviewStackSerializer < Shipit::StackSerializer
+    has_one :pull_request
+  end
+end

data/app/serializers/shipit/stack_serializer.rb

@@ -4,10 +4,11 @@ module Shipit
     include ConditionalAttributes
 
     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, :last_deployed_at, :branch, :merge_queue_enabled, :is_archived,
-               :archived_since
+
+    attributes :id, :repo_owner, :repo_name, :environment, :html_url, :url, :tasks_url, :deploy_url,
+      :merge_requests_url, :deploy_spec, :undeployed_commits_count, :is_locked, :lock_reason, :continuous_deployment,
+      :created_at, :updated_at, :locked_since, :last_deployed_at, :branch, :merge_queue_enabled, :is_archived,
+      :archived_since
 
     def url
       api_stack_url(object)
@@ -21,8 +22,8 @@ module Shipit
       api_stack_tasks_url(object)
     end
 
-    def pull_requests_url
-      api_stack_pull_requests_url(object)
+    def merge_requests_url
+      api_stack_merge_requests_url(object)
     end
 
     def is_locked

data/app/serializers/shipit/tail_task_serializer.rb

@@ -8,7 +8,7 @@ module Shipit
 
     def url
       return @url if defined? @url
-      @url = next_chunks_url(task)
+      @url = next_chunks_url(task, last_byte: next_offset)
     end
 
     def include_url?
@@ -16,7 +16,7 @@ module Shipit
     end
 
     def output
-      task.chunks.tail(context[:last_id]).pluck(:text).join
+      @output ||= task.tail_output(last_byte)
     end
 
     def rollback_url
@@ -32,6 +32,14 @@ module Shipit
     alias_method :task, :object
     delegate :stack, to: :object
 
+    def next_offset
+      last_byte + output.bytesize
+    end
+
+    def last_byte
+      context[:last_byte].to_i
+    end
+
     def rollback
       return @rollback if defined? @rollback
       @rollback = stack.rollbacks.where(parent_id: task.id).last

data/app/serializers/shipit/task_serializer.rb

@@ -6,7 +6,7 @@ module Shipit
     has_one :author
     has_one :revision, serializer: ShortCommitSerializer
 
-    attributes(:id, :url, :html_url, :output_url, :type, :status, :action, :title, :description, :started_at, :ended_at, :updated_at, :created_at, :env, :ignored_safeties)
+    attributes(:id, :url, :html_url, :output_url, :type, :status, :action, :title, :description, :started_at, :ended_at, :updated_at, :created_at, :env, :ignored_safeties, :max_retries, :retry_attempt)
 
     def revision
       object.until_commit

data/app/validators/subset_validator.rb

@@ -3,6 +3,6 @@ class SubsetValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     superset = options[:of]
     rest = value - superset
-    record.errors.add(attribute, :subset, options) unless rest.empty?
+    record.errors.add(attribute, :subset, **options) unless rest.empty?
   end
 end

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

@@ -4,7 +4,7 @@
     <%= stylesheet_link_tag *(params[:stylesheets] || []).select { |url| url.start_with?('https://assets-cdn.github.com/', 'https://github.githubassets.com/') } %>
     <%= stylesheet_link_tag 'merge_status' %>
   </head>
-  <body>
+  <body data-color-mode="<%= params[:mode] %>">
     <div class="merge-status-container" data-layout-content><%= yield %></div>
     <%= javascript_include_tag 'merge_status' %>
   </body>

data/app/views/shipit/merge_requests/_merge_request.html.erb

@@ -0,0 +1,29 @@
+<li class="pr" id="pr-<%= merge_request.id %>">
+  <%= render 'shipit/shared/author', author: merge_request.merge_requested_by %>
+  <div class="pr-details">
+    <span class="pr-number">
+      <%= pull_request_link(merge_request) %>
+    </span>
+    <span class="pr-title">
+      <%= render_pull_request_title_with_link merge_request %>
+    </span>
+    <p class="pr-meta">
+      <span class="code-additions">+<%= merge_request.additions %></span>
+      <span class="code-deletions">-<%= merge_request.deletions %></span>
+    </p>
+    <p class="pr-meta">
+      Enqueued <%= timeago_tag(merge_request.merge_requested_at, force: true) %>
+      <% if merge_request.revalidating? %>
+        <em class="warning">Need revalidation.</em>
+      <% end %>
+    </p>
+  </div>
+  <% if merge_request.revalidating? %>
+    <div class="commit-actions">
+      <%= button_to 'Confirm', stack_merge_requests_path(merge_request.stack, number_or_url: merge_request.number), class: 'btn btn--warning', method: 'post' %>
+    </div>
+  <% end %>
+  <div class="commit-actions">
+    <%= button_to 'Cancel', stack_merge_request_path(merge_request.stack, merge_request), class: 'btn btn--warning', method: 'delete' %>
+  </div>
+</li>

data/app/views/shipit/{pull_requests → merge_requests}/index.html.erb

@@ -5,7 +5,7 @@
 <div class="wrapper">
   <section>
     <header class="section-header">
-      <%= form_tag stack_pull_requests_path(@stack) do %>
+      <%= form_tag stack_merge_requests_path(@stack) do %>
         <div class="field-wrapper inline">
           <%= text_field_tag :number_or_url, '', placeholder: 'PR number or URL' %>
           <%= submit_tag 'Request merge', class: 'btn' %>
@@ -14,7 +14,7 @@
     </header>
 
     <ul class="pr-list">
-      <%= render @pull_requests %>
+      <%= render @merge_requests %>
     </ul>
   </section>
 </div>