shipit-engine 0.37.0 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 174fee8bf3ed460fa137cbe666f639fec2218d0617b4860dcede08d38ed6d93d
-  data.tar.gz: 739d8f122ead25b8f1053f954686e4ddd574bc17b544de9b69dce5af7635425c
+  metadata.gz: d14e4fec687523820d46bf58196894deb71b3acb79358059b743d33c31bf9305
+  data.tar.gz: e5d756e9bc4f452408f40d0a3f1f2d6f06cbeceb7544ae47d91b245acb1fc83b
 SHA512:
-  metadata.gz: 7b3118fb7bc39e0c8cddad0444d34c39e935bcc192010dec3b27b2bddd9947a770573a959b13fe26661eb8874963b10cdb8ab2382d6eec811ebd8cd87322cc41
-  data.tar.gz: cd173c7dc66f31a90e878ed9a2da9724132286c93f2a9c168a5593f81ffbfe3c6f25161095fafe7df1e9d7c2561339ca0c4051ae856c78d8698d382e8d65818c
+  metadata.gz: e4a7e88bdf8fe9c40fe6520054fad67a72af184524bb1a8f3a20c0bea07b858cf5d568b272ce0a95060c8bfa2c64b5cb1adec7487a877e23f37e6a8bf3f143ed
+  data.tar.gz: 6cab2f24a84a81251991dc20b23c4d9f966fa8b98f053b904b34227850efca196133ec2c395a5e0c8444b8c41d6672d1362058fd1c90e543e7b1c97d6f07732a

data/README.md

@@ -25,8 +25,8 @@ This guide aims to help you [set up](#installation-and-setup), [use](#using-ship
 **II. USING SHIPIT**
 
 * [Adding stacks](#adding-stacks)
-* [Working on stacks](#working-on-stacks),
-* [Configuring stacks](#configuring-stacks).
+* [Working on stacks](#working-on-stacks)
+* [Configuring stacks](#configuring-stacks)
 
 **III. REFERENCE**
 
@@ -357,6 +357,11 @@ For example:
 fetch:
   curl --silent https://app.example.com/services/ping/version
 ```
+
+**Note:** Currently, deployments in emergency mode are configured to occur concurrently via [the `build_deploy` method](https://github.com/Shopify/shipit-engine/blob/main/app/models/shipit/stack.rb),
+whose `allow_concurrency` keyword argument defaults to `force`, where `force` is true when emergency mode is enabled. 
+If you'd like to separate these two from one another, override this method as desired in your service.
+
 <h3 id="kubernetes">Kubernetes</h3>
 
 **<code>kubernetes</code>** allows to specify a Kubernetes namespace and context to deploy to.
@@ -641,7 +646,7 @@ Your deploy scripts have access to the following environment variables:
 * `GITHUB_REPO_OWNER`: The GitHub username of the repository owner for the current deploy/task.
 * `EMAIL`: Email of the user that triggered the deploy/task (if available)
 * `ENVIRONMENT`: The stack environment (e.g `production` / `staging`)
-* `BRANCH`: The stack branch (e.g `master`)
+* `BRANCH`: The stack branch (e.g `main`)
 * `LAST_DEPLOYED_SHA`: The git SHA of the last deployed commit
 * `DIFF_LINK`: URL to the diff on GitHub.
 * `TASK_ID`: ID of the task that is running

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

@@ -93,8 +93,8 @@ module Shipit
         render(status: :not_found, json: { status: '404', error: 'Not Found' })
       end
 
-      def conflict(_error)
-        render(status: :conflict, json: { status: '409', error: 'Conflict' })
+      def conflict(error)
+        render(status: :conflict, json: { status: '409', error: error.message })
       end
     end
   end

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

@@ -11,6 +11,7 @@ module Shipit
       params do
         requires :sha, String, length: { in: 6..40 }
         accepts :force, Boolean, default: false
+        accepts :allow_concurrency, Boolean
         accepts :require_ci, Boolean, default: false
         accepts :env, Hash, default: {}
       end
@@ -18,7 +19,10 @@ 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?
         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)
+
+        allow_concurrency = params.allow_concurrency.nil? ? params.force : params.allow_concurrency
+        deploy = stack.trigger_deploy(commit, current_user, env: params.env, force: params.force,
+          allow_concurrency: allow_concurrency)
         render_resource(deploy, status: :accepted)
       end
     end

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

@@ -46,9 +46,13 @@ module Shipit
         accepts :ignore_ci, Boolean
         accepts :merge_queue_enabled, Boolean
         accepts :continuous_deployment, Boolean
+        accepts :archived, Boolean
       end
       def update
-        stack.update(params)
+        stack.update(update_params)
+
+        update_archived
+
         render_resource(stack)
       end
 
@@ -78,6 +82,26 @@ module Shipit
         @stack ||= stacks.from_param!(params[:id])
       end
 
+      def update_archived
+        if key?(:archived)
+          if params[:archived]
+            stack.archive!(nil)
+          elsif stack.archived?
+            stack.unarchive!
+          end
+        end
+      end
+
+      def key?(key)
+        params.to_h.key?(key)
+      end
+
+      def update_params
+        params.select do |key, _|
+          %i(environment branch deploy_url ignore_ci merge_queue_enabled continuous_deployment).include?(key)
+        end
+      end
+
       def repository
         @repository ||= Repository.find_or_create_by(owner: repo_owner, name: repo_name)
       end

data/app/helpers/shipit/api_clients_helper.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Shipit
+  module ApiClientsHelper
+    def api_client_token(api_client)
+      if api_client.created_at >= 5.minutes.ago && current_user == api_client.creator
+        api_client.authentication_token
+      else
+        "#{api_client.authentication_token[0..5]}************************"
+      end
+    end
+  end
+end

data/app/jobs/shipit/continuous_delivery_job.rb

@@ -8,7 +8,10 @@ module Shipit
 
     def perform(stack)
       return unless stack.continuous_deployment?
-      return if stack.active_task?
+
+      # checks if there are any tasks running, including concurrent tasks
+      return if stack.occupied?
+
       stack.trigger_continuous_delivery
     end
   end

data/app/models/shipit/api_client.rb

@@ -8,7 +8,7 @@ module Shipit
 
     validates :creator, :name, presence: true
 
-    serialize :permissions, Shipit.serialized_column(:permissions, type: Array)
+    serialize :permissions, coder: Shipit.serialized_column(:permissions, type: Array)
     PERMISSIONS = %w(
       read:stack
       write:stack

data/app/models/shipit/commit_deployment_status.rb

@@ -48,7 +48,6 @@ module Shipit
       client.create_deployment_status(
         commit_deployment.api_url,
         status,
-        accept: 'application/vnd.github.flash-preview+json',
         target_url: url_helpers.stack_deploy_url(stack, task),
         description: description.truncate(DESCRIPTION_CHARACTER_LIMIT_ON_GITHUB),
         environment_url: stack.deploy_url,

data/app/models/shipit/delivery.rb

@@ -9,7 +9,7 @@ module Shipit
     validates :url, presence: true, url: { no_local: true, allow_blank: true }
     validates :content_type, presence: true
 
-    serialize :response_headers, SafeJSON
+    serialize :response_headers, coder: SafeJSON
 
     after_commit :purge_old_deliveries, on: :create
 

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

@@ -101,11 +101,23 @@ module Shipit
       end
 
       def shipit_file_names_in_priority_order
-        ["#{app_name}.#{@env}.yml", "#{app_name}.yml", "shipit.#{@env}.yml", "shipit.yml"].uniq
+        [
+          "#{app_name}.#{@env}.yml",
+          ".shipit/#{app_name}.#{@env}.yml",
+
+          "#{app_name}.yml",
+          ".shipit/#{app_name}.yml",
+
+          "shipit.#{@env}.yml",
+          ".shipit/#{@env}.yml",
+
+          "shipit.yml",
+          ".shipit/shipit.yml",
+        ].uniq
       end
 
       def bare_shipit_filenames
-        ["#{app_name}.yml", "shipit.yml"].uniq
+        ["#{app_name}.yml", "shipit.yml", ".shipit/#{app_name}.yml", ".shipit/shipit.yml"].uniq
       end
 
       def config_file_path

data/app/models/shipit/hook.rb

@@ -87,7 +87,7 @@ module Shipit
     validates :content_type, presence: true, inclusion: { in: CONTENT_TYPES.keys }
     validates :events, presence: true, subset: { of: EVENTS }
 
-    serialize :events, Shipit::CSVSerializer
+    serialize :events, coder: Shipit::CSVSerializer
 
     scope :global, -> { where(stack_id: nil) }
     scope :scoped_to, ->(stack) { where(stack_id: stack.id) }

data/app/models/shipit/pull_request.rb

@@ -11,7 +11,7 @@ module Shipit
     has_many :pull_request_assignments
     has_many :assignees, class_name: :User, through: :pull_request_assignments, source: :user
 
-    serialize :labels, Shipit.serialized_column(:labels, type: Array)
+    serialize :labels, coder: Shipit.serialized_column(:labels, type: Array)
 
     after_create_commit :emit_create_hooks
     after_update_commit :emit_update_hooks

data/app/models/shipit/stack.rb

@@ -101,7 +101,7 @@ module Shipit
 
     validates :lock_reason, length: { maximum: 4096 }
 
-    serialize :cached_deploy_spec, DeploySpec
+    serialize :cached_deploy_spec, coder: DeploySpec
     delegate(
       :provisioning_handler_name,
       :find_task_definition,
@@ -150,14 +150,14 @@ module Shipit
       task
     end
 
-    def build_deploy(until_commit, user, env: nil, force: false)
+    def build_deploy(until_commit, user, env: nil, force: false, allow_concurrency: force)
       since_commit = last_deployed_commit.presence || commits.first
       deploys.build(
         user_id: user.id,
         until_commit: until_commit,
         since_commit: since_commit,
         env: filter_deploy_envs(env&.to_h || {}),
-        allow_concurrency: force,
+        allow_concurrency: allow_concurrency,
         ignored_safeties: force || !until_commit.deployable?,
         max_retries: retries_on_deploy,
       )
@@ -226,8 +226,12 @@ module Shipit
 
     def next_commit_to_deploy
       commits_to_deploy = commits.order(id: :asc).newer_than(last_deployed_commit).reachable.preload(:statuses)
-      commits_to_deploy = commits_to_deploy.limit(maximum_commits_per_deploy) if maximum_commits_per_deploy
-      commits_to_deploy.to_a.reverse.find(&:deployable?)
+      if maximum_commits_per_deploy
+        commits_with_max_applied = commits_to_deploy.limit(maximum_commits_per_deploy)
+        deployable_commits(commits_with_max_applied) || deployable_commits(commits_to_deploy)
+      else
+        deployable_commits(commits_to_deploy)
+      end
     end
 
     def deployed_too_recently?
@@ -453,6 +457,14 @@ module Shipit
       @active_task ||= tasks.current
     end
 
+    def occupied?
+      !!occupied
+    end
+
+    def occupied
+      @occupied ||= tasks.active.last
+    end
+
     def locked?
       lock_reason.present?
     end
@@ -620,6 +632,10 @@ module Shipit
 
     private
 
+    def deployable_commits(commits)
+      commits.to_a.reverse.find(&:deployable?)
+    end
+
     def clear_cache
       remove_instance_variable(:@active_task) if defined?(@active_task)
     end

data/app/models/shipit/task.rb

@@ -3,7 +3,11 @@ module Shipit
   class Task < Record
     include DeferredTouch
 
-    ConcurrentTaskRunning = Class.new(StandardError)
+    class ConcurrentTaskRunning < StandardError
+      def message
+        "A task is already running."
+      end
+    end
 
     PRESENCE_CHECK_TIMEOUT = 30
     ACTIVE_STATUSES = %w(pending running aborting).freeze
@@ -54,8 +58,8 @@ module Shipit
       end
     end
 
-    serialize :definition, TaskDefinition
-    serialize :env, Shipit.serialized_column(:env, coder: EnvHash)
+    serialize :definition, coder: TaskDefinition
+    serialize :env, coder: Shipit.serialized_column(:env, coder: EnvHash)
 
     scope :success, -> { where(status: 'success') }
     scope :completed, -> { where(status: COMPLETED_STATUSES) }

data/app/models/shipit/task_execution_strategy/default.rb

@@ -70,7 +70,7 @@ module Shipit
           @task.acquire_git_cache_lock do
             @task.ping
             unless @commands.fetched?(@task.until_commit).tap(&:run).success?
-              capture!(@commands.fetch)
+              capture!(@commands.fetch_commit(@task.until_commit))
             end
           end
         end

data/app/models/shipit/user.rb

@@ -95,6 +95,8 @@ module Shipit
       update!(github_user: Shipit.github.api.user(github_id))
     rescue Octokit::NotFound
       identify_renamed_user!
+    rescue Octokit::Forbidden
+      Rails.logger.info("User #{name}, github_id #{github_id} has forbidden access to their GitHub, likely deleted.")
     end
 
     def github_user=(github_user)

data/app/views/shipit/_variables.html.erb

@@ -9,7 +9,7 @@
           <% if variable.select %>
             <%= field.select variable.name, options_for_select([["Please select...", { disabled: "disabled" }]] + variable.select, variable.default || "Please select...") %>
           <% else %>
-            <%= field.text_field variable.name, value: variable.default %>
+            <%= field.text_field variable.name, value: params[variable.name].presence || variable.default %>
           <% end %>
           <%= field.label variable.name, variable.title || variable.name %>
         </p>

data/app/views/shipit/api_clients/show.html.erb

@@ -10,7 +10,7 @@
   <section>
     <h3>Authentication token:</h3>
     <code style="background-color: yellow">
-      <b><%= @api_client.authentication_token %></b>
+      <b><%= api_client_token(@api_client) %></b>
     </code>
   </section>
 

data/app/views/shipit/merge_status/failure.html.erb

@@ -15,7 +15,7 @@
   </h4>
   <span class="status-meta">
     <%= link_to @stack.to_param, stack_url(@stack), target: '_blank', rel: 'noopener' %>
-    <strong>master branch is failing!</strong>
+    <strong>main branch is failing!</strong>
   </span>
   <%= render 'commit_count_warning' if display_commit_count_warning?(params[:commits].to_i) %>
 </div>

data/app/views/shipit/missing_settings.html.erb

@@ -22,7 +22,7 @@
 
     <p id="github_app">
       Config:
-    <% if Rails.application.secrets.github.present? %>
+    <% if Rails.application.credentials.github.present? %>
        Success!
     <% else %>
       <span class="missing">

data/config/secrets.development.example.yml

@@ -1,7 +1,7 @@
 host: 'localhost:3000'
 redis_url: 'redis://127.0.0.1:6379/0'
 
-# For creating an app see: https://github.com/Shopify/shipit-engine/blob/master/docs/setup.md#creating-the-github-app
+# For creating an app see: https://github.com/Shopify/shipit-engine/blob/main/docs/setup.md#creating-the-github-app
 # Can be obtained there: https://github.com/settings/apps
 # Set the "Authorization callback URL" as `<host>/github/auth/github/callback`
 

data/config/secrets.development.shopify.yml

@@ -1,7 +1,7 @@
 host: 'shipit-engine.myshopify.io'
 redis_url: 'redis://shipit-engine.railgun:6379'
 
-# For creating an app see: https://github.com/Shopify/shipit-engine/blob/master/docs/setup.md#creating-the-github-app
+# For creating an app see: https://github.com/Shopify/shipit-engine/blob/main/docs/setup.md#creating-the-github-app
 
 github:
   somegithuborg:

data/db/migrate/20230703181143_change_commit_deployment_statuses_github_id_to_big_int.rb

@@ -0,0 +1,5 @@
+class ChangeCommitDeploymentStatusesGithubIdToBigInt < ActiveRecord::Migration[7.0]
+  def change
+    change_column :commit_deployment_statuses, :github_id, :bigint
+  end
+end

data/lib/shipit/engine.rb

@@ -21,7 +21,7 @@ module Shipit
       Shipit::Engine.routes.default_url_options[:host] = Shipit.host
       Pubsubstub.redis_url = Shipit.redis_url.to_s
 
-      Rails.application.secrets.deep_symbolize_keys!
+      Rails.application.credentials.deep_symbolize_keys!
 
       app.config.assets.paths << Emoji.images_path
       app.config.assets.precompile += %w(

data/lib/shipit/github_app.rb

@@ -103,7 +103,6 @@ module Shipit
       ) do
         response = new_client(bearer_token: authentication_payload).create_app_installation_access_token(
           installation_id,
-          accept: 'application/vnd.github.machine-man-preview+json',
         )
         token = Token.from_github(response)
         raise AuthenticationFailed if token.blank?

data/lib/shipit/octokit_check_runs.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 module OctokitCheckRuns
   def check_runs(repo, sha, options = {})
-    paginate("#{Octokit::Repository.path(repo)}/commits/#{sha}/check-runs", options.reverse_merge(
-      accept: 'application/vnd.github.antiope-preview+json',
-    ))
+    paginate("#{Octokit::Repository.path(repo)}/commits/#{sha}/check-runs", options)
   end
 end
 

data/lib/shipit/octokit_iterator.rb

@@ -16,6 +16,8 @@ module Shipit
       response = @response
 
       loop do
+        return unless response.present?
+
         response.data.each(&block)
         return unless response.rels[:next]
         response = response.rels[:next].get

data/lib/shipit/stack_commands.rb

@@ -13,6 +13,16 @@ module Shipit
       super.merge(@stack.env)
     end
 
+    def fetch_commit(commit)
+      create_directories
+      if valid_git_repository?(@stack.git_path)
+        git('fetch', 'origin', '--quiet', '--tags', commit.sha, env: env, chdir: @stack.git_path)
+      else
+        @stack.clear_git_cache!
+        git_clone(@stack.repo_git_url, @stack.git_path, branch: @stack.branch, env: env, chdir: @stack.deploys_path)
+      end
+    end
+
     def fetch
       create_directories
       if valid_git_repository?(@stack.git_path)
@@ -96,7 +106,7 @@ module Shipit
         .success?
     end
 
-    def git_clone(url, path, branch: 'master', **kwargs)
+    def git_clone(url, path, branch: 'main', **kwargs)
       git('clone', '--quiet', *modern_git_args, '--recursive', '--branch', branch, url, path, **kwargs)
     end
 

data/lib/shipit/task_commands.rb

@@ -2,7 +2,7 @@
 # rubocop:disable Lint/MissingSuper
 module Shipit
   class TaskCommands < Commands
-    delegate :fetch, :fetched?, to: :stack_commands
+    delegate :fetch_commit, :fetch, :fetched?, to: :stack_commands
 
     def initialize(task)
       @task = task

data/lib/shipit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Shipit
-  VERSION = '0.37.0'
+  VERSION = '0.39.0'
 end

data/lib/shipit.rb

@@ -291,7 +291,7 @@ module Shipit
   end
 
   def secrets
-    Rails.application.secrets
+    Rails.application.credentials
   end
 end
 

data/test/controllers/api/base_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 module Shipit
   module Api
-    class BaseControllerTest < ActionController::TestCase
+    class BaseControllerTest < ApiControllerTestCase
       test "authentication is required" do
         get :index
         assert_response :unauthorized

data/test/controllers/api/ccmenu_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 module Shipit
   module Api
-    class CCMenuControllerTest < ActionController::TestCase
+    class CCMenuControllerTest < ApiControllerTestCase
       setup do
         authenticate!
         @stack = shipit_stacks(:shipit)

data/test/controllers/api/commits_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 module Shipit
   module Api
-    class CommitsControllerTest < ActionController::TestCase
+    class CommitsControllerTest < ApiControllerTestCase
       setup do
         @stack = shipit_stacks(:shipit)
         authenticate!

data/test/controllers/api/deploys_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 module Shipit
   module Api
-    class DeploysControllerTest < ActionController::TestCase
+    class DeploysControllerTest < ApiControllerTestCase
       setup do
         authenticate!
         @user = shipit_users(:walrus)
@@ -81,6 +81,7 @@ module Shipit
         end
 
         assert_response :conflict
+        assert_json 'error', 'A task is already running.'
       end
 
       test "#create refuses to deploy unsuccessful commits if the require_ci flag is passed" do
@@ -119,6 +120,29 @@ module Shipit
         assert_response :accepted
         assert_json 'status', 'pending'
       end
+
+      test "#create uses allow_concurrency param when provided" do
+        @stack.update!(lock_reason: 'Something broken')
+
+        assert_difference -> { @stack.deploys.count }, 1 do
+          post :create, params: { stack_id: @stack.to_param, sha: @commit.sha, force: 'true', allow_concurrency: 'false' }
+        end
+        assert_response :accepted
+        assert_json 'status', 'pending'
+        refute @stack.deploys.last.allow_concurrency
+      end
+
+      test "#create defaults allow_concurrency to force param when not provided" do
+        @stack.update!(lock_reason: 'Something broken')
+        expected_force = true
+
+        assert_difference -> { @stack.deploys.count }, 1 do
+          post :create, params: { stack_id: @stack.to_param, sha: @commit.sha, force: expected_force }
+        end
+        assert_response :accepted
+        assert_json 'status', 'pending'
+        assert_equal expected_force, @stack.deploys.last.allow_concurrency
+      end
     end
   end
 end

data/test/controllers/api/hooks_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 module Shipit
   module Api
-    class HooksControllerTest < ActionController::TestCase
+    class HooksControllerTest < ApiControllerTestCase
       setup do
         authenticate!
         @stack = shipit_stacks(:shipit)

data/test/controllers/api/locks_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 module Shipit
   module Api
-    class LocksControllerTest < ActionController::TestCase
+    class LocksControllerTest < ApiControllerTestCase
       setup do
         authenticate!
         @stack = shipit_stacks(:shipit)

data/test/controllers/api/merge_requests_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 module Shipit
   module Api
-    class MergeRequestsControllerTest < ActionController::TestCase
+    class MergeRequestsControllerTest < ApiControllerTestCase
       setup do
         @stack = shipit_stacks(:shipit)
         @merge_request = shipit_merge_requests(:shipit_pending)

data/test/controllers/api/outputs_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 module Shipit
   module Api
-    class OutputsControllerTest < ActionController::TestCase
+    class OutputsControllerTest < ApiControllerTestCase
       setup do
         @stack = shipit_stacks(:shipit)
         authenticate!

data/test/controllers/api/release_statuses_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 module Shipit
   module Api
-    class ReleaseStatusesControllerTest < ActionController::TestCase
+    class ReleaseStatusesControllerTest < ApiControllerTestCase
       setup do
         authenticate!
         @stack = shipit_stacks(:shipit_canaries)

data/test/controllers/api/rollback_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 module Shipit
   module Api
-    class RollbacksControllerTest < ActionController::TestCase
+    class RollbacksControllerTest < ApiControllerTestCase
       setup do
         authenticate!
         @user = shipit_users(:walrus)

data/test/controllers/api/stacks_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 module Shipit
   module Api
-    class StacksControllerTest < ActionController::TestCase
+    class StacksControllerTest < ApiControllerTestCase
       setup do
         authenticate!
         @stack = shipit_stacks(:shipit)
@@ -114,6 +114,57 @@ module Shipit
         refute @stack.continuous_deployment
       end
 
+      test "#update does not perform archive when key is not provided" do
+        refute_predicate @stack, :archived?
+        refute_predicate @stack, :locked?
+
+        patch :update, params: { id: @stack.to_param }
+
+        @stack.reload
+        refute_predicate @stack, :archived?
+        refute_predicate @stack, :locked?
+      end
+
+      test "#update does not perform unarchive when key is not provided" do
+        @stack.archive!(shipit_users(:walrus))
+        assert_predicate @stack, :locked?
+        assert_predicate @stack, :archived?
+
+        patch :update, params: { id: @stack.to_param }
+
+        @stack.reload
+        assert_predicate @stack, :locked?
+        assert_predicate @stack, :archived?
+      end
+
+      test "#update allows to archive the stack" do
+        refute_predicate @stack, :archived?
+        refute_predicate @stack, :locked?
+
+        patch :update, params: { id: @stack.to_param, archived: true }
+
+        @stack.reload
+        assert_predicate @stack, :locked?
+        assert_predicate @stack, :archived?
+        assert_instance_of AnonymousUser, @stack.lock_author
+        assert_equal "Archived", @stack.lock_reason
+      end
+
+      test "#update allows to unarchive the stack" do
+        @stack.archive!(shipit_users(:walrus))
+        assert_predicate @stack, :locked?
+        assert_predicate @stack, :archived?
+
+        patch :update, params: { id: @stack.to_param, archived: false }
+
+        @stack.reload
+        refute_predicate @stack, :archived?
+        refute_predicate @stack, :locked?
+        assert_nil @stack.locked_since
+        assert_nil @stack.lock_reason
+        assert_instance_of AnonymousUser, @stack.lock_author
+      end
+
       test "#index returns a list of stacks" do
         stack = Stack.last
         get :index

data/test/controllers/api/tasks_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 module Shipit
   module Api
-    class TasksControllerTest < ActionController::TestCase
+    class TasksControllerTest < ApiControllerTestCase
       setup do
         @stack = shipit_stacks(:shipit)
         @user = shipit_users(:walrus)

data/test/controllers/stacks_controller_test.rb

@@ -10,7 +10,7 @@ module Shipit
     end
 
     test "validates that Shipit.github is present" do
-      Rails.application.secrets.stubs(:github).returns(nil)
+      Rails.application.credentials.stubs(:github).returns(nil)
       get :index
       assert_select "#github_app .missing"
       assert_select ".missing", count: 1

data/test/controllers/tasks_controller_test.rb

@@ -11,9 +11,16 @@ module Shipit
       session[:user_id] = shipit_users(:walrus).id
     end
 
-    test "tasks defined in the shipit.yml can be displayed" do
+    test "tasks defined in the shipit.yml can be displayed with default variable values" do
       get :new, params: { stack_id: @stack, definition_id: @definition.id }
       assert_response :ok
+      assert_select 'input[name="task[env][FOO]"][value="1"]'
+    end
+
+    test "it is possible to provide a default value override for a task" do
+      get :new, params: { stack_id: @stack, definition_id: @definition.id, FOO: '42' }
+      assert_response :ok
+      assert_select 'input[name="task[env][FOO]"][value="42"]'
     end
 
     test "tasks defined in the shipit.yml can't be triggered if the stack is being deployed" do

data/test/dummy/config/application.rb

@@ -17,6 +17,7 @@ end
 
 module Shipit
   class Application < Rails::Application
-    config.load_defaults 7.0
+    config.load_defaults 7.1
+    config.active_record.encryption.support_sha1_for_non_deterministic_encryption = true
   end
 end

data/test/dummy/config/initializers/0_load_development_secrets.rb

@@ -2,8 +2,8 @@ local_secrets = Shipit::Engine.root.join('config/secrets.development.yml')
 if local_secrets.exist?
   secrets = YAML.load(local_secrets.read).deep_symbolize_keys
   if Rails.env.development?
-    Rails.application.secrets.deep_merge!(secrets)
+    Rails.application.credentials.deep_merge!(secrets)
   elsif Rails.env.test?
-    Rails.application.secrets.merge!(redis_url: secrets[:redis_url])
+    Rails.application.credentials.merge!(redis_url: secrets[:redis_url])
   end
 end

data/test/dummy/config/secrets.development.json

@@ -0,0 +1,3 @@
+{
+  "secret_key_base": "s3cr3ts3cr3ts3cr3ts3cr3ts3cr3ts3cr3t"
+}

data/test/dummy/config/secrets.test.json

@@ -0,0 +1,21 @@
+{
+  "host": "shipit.com",
+  "secret_key_base": "s3cr3ts3cr3ts3cr3ts3cr3ts3cr3ts3cr3t",
+  "github_api": {
+    "token": "t0k3n"
+  },
+  "github": {
+    "domain": null,
+    "app_id": 42,
+    "installation_id": 43,
+    "bot_login": "shipit[bot]",
+    "webhook_secret": null,
+    "private_key": "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA7iUQC2uUq/gtQg0gxtyaccuicYgmq1LUr1mOWbmwM1Cv63+S\n73qo8h87FX+YyclY5fZF6SMXIys02JOkImGgbnvEOLcHnImCYrWs03msOzEIO/pG\nM0YedAPtQ2MEiLIu4y8htosVxeqfEOPiq9kQgFxNKyETzjdIA9q1md8sofuJUmPv\nibacW1PecuAMnn+P8qf0XIDp7uh6noB751KvhCaCNTAPtVE9NZ18OmNG9GOyX/pu\npQHIrPgTpTG6KlAe3r6LWvemzwsMtuRGU+K+KhK9dFIlSE+v9rA32KScO8efOh6s\nGu3rWorV4iDu14U62rzEfdzzc63YL94sUbZxbwIDAQABAoIBADLJ8r8MxZtbhYN1\nu0zOFZ45WL6v09dsBfITvnlCUeLPzYUDIzoxxcBFittN6C744x3ARS6wjimw+EdM\nTZALlCSb/sA9wMDQzt7wchhz9Zh2H5RzDu+2f54sjDh38KqancdT8PO2fAFGxX/b\nqicOVyeZB9gv6MJtJc20olBbuXAeBNfcDABF9oxF+0i+Ssg7B4VXiqgcjtGbr/Og\nqRll7AqyTArVx2xEcVfZxeZ4zGnigzcJq4te7yYpxzwk+RxblkPh54Yt4WxZ+8DI\nRsn3r6ajlpwzpwvsJFU2Txq7xBTzGQMFmy/Pnjk83kP2cogxB2+tRyjITGqTwD8b\ngg9PFCkCgYEA+7u8A0l0Cz6p0SI6c7ftVePVRiIhpawWN7og/wEmI6zUjm/3rA+R\nhrhaVKuOD8QF/HdDsqTck5gjGAjTmJz6r33/cl1Tz+pr62znsrB4r0yMKvQbKN81\nWGaWOsi2+ZXqLNv5h5wpUF0MTKlXHeKnwP5kuEvGwVn6WURFCh6PhLMCgYEA8i5e\nJjulJVGyd5HuoY3xyO7E6DjidsqRnVRq+hYpORjnHvTmSwe4+tH4ha2p9Kv2Y6k3\nC1NYY/fSMQoYCCRaYyJleI+la/9tsZqAmtms4ZB8KhFmPHf9fW75i6G0xKWyZ8K+\nE2Ft/UaEiM282593cguV6+Kt5uExnyPxLLK4FlUCgYEAwRJ/JGI8/7bjFkTTYheq\nj5q75BufhOrU6471acAe2XPgXxLfefdC3Xodxh0CS3NESBvNL4Ikr4sbN37lk4Kq\n/th7iOKtuqUIeru/hZy2I3VpeDRbdGCmEJQ2GwYA2LKztg5Nd0Y9paaIHXAwIfrK\nQUqcQ4HTAk8ZpUeoUBeaaeMCgYANLmbjb9WiPVsYVPIHCwHA7PX8qbPxwT7BsGmO\nKQyfVfKmZa/vH4F67Vi4deZNMdrcO8aKMEQcVM2065a5QrlEsgeR00eupB1lUEJ1\nqylUsZeAdqf43JMIc7TTW77KATa/nQLZbTEeWus1wvTngztuEqFbUGAks9cOkVc8\nFpIcbQKBgQDVIL8gPLmn0f+4oLF8MBC+oxtKpz14X5iJ1saGFkzW5I+nIEskpS0S\nqtirnTCnJFGdCrFwctnxiuiCmyGwpBYdjIfHyvYAHnqAtMnESzCUyeSFZiquVW5W\nMvbMmDPoV27XOHU9kIq6NXtfrkpufiyo6/VEYWozXalxKLNuqLYfPQ==\n-----END RSA PRIVATE KEY-----\n",
+    "oauth": {
+      "id": "Iv1.bf2c2c45b449bfd9",
+      "secret": "ef694cd6e45223075d78d138ef014049052665f1",
+      "teams": null
+    }
+  },
+  "redis_url": "redis://127.0.0.1:6379/7"
+}

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_11_03_154121) do
+ActiveRecord::Schema.define(version: 2023_07_03_181143) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text "permissions", limit: 65535
@@ -42,7 +42,7 @@ ActiveRecord::Schema.define(version: 2021_11_03_154121) do
   create_table "commit_deployment_statuses", force: :cascade do |t|
     t.integer "commit_deployment_id"
     t.string "status"
-    t.integer "github_id"
+    t.bigint "github_id"
     t.string "api_url"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false

data/test/helpers/api_helper.rb

@@ -8,3 +8,16 @@ module ApiHelper
     request.headers['Authorization'] = "Basic #{Base64.encode64(client.authentication_token)}"
   end
 end
+
+module Shipit
+  class ApiControllerTestCase < ActionController::TestCase
+    private
+
+    def process(_action, **kwargs)
+      if kwargs[:method] != "GET"
+        kwargs[:as] ||= :json
+      end
+      super
+    end
+  end
+end

data/test/models/commit_deployment_status_test.rb

@@ -15,7 +15,6 @@ module Shipit
       @author.github_api.class.any_instance.expects(:create_deployment_status).with(
         @deployment.api_url,
         'in_progress',
-        accept: "application/vnd.github.flash-preview+json",
         target_url: "http://shipit.com/shopify/shipit-engine/production/deploys/#{@task.id}",
         description: "walrus triggered the deploy of shopify/shipit-engine/production to #{@deployment.short_sha}",
         environment_url: "https://shipit.shopify.com",

data/test/models/merge_request_test.rb

@@ -243,7 +243,10 @@ module Shipit
     end
 
     test "status transitions emit hooks" do
-      job = assert_enqueued_with(job: EmitEventJob) do
+      expected_args = ->(job_args) do
+        job_args.first[:event] == 'merge'
+      end
+      job = assert_enqueued_with(job: EmitEventJob, args: expected_args) do
         @pr.reject!('merge_conflict')
       end
       params = job.arguments.first

data/test/models/shipit/{stacks_test.rb → stack_test.rb}

@@ -3,7 +3,7 @@ require 'test_helper'
 require 'securerandom'
 
 module Shipit
-  class StacksTest < ActiveSupport::TestCase
+  class StackTest < ActiveSupport::TestCase
     def setup
       @stack = shipit_stacks(:shipit)
       @expected_base_path = Rails.root.join('data', 'stacks', @stack.to_param).to_s
@@ -278,6 +278,36 @@ module Shipit
       end
     end
 
+    test "#active_task? is false if stack has a concurrent deploy in active state" do
+      @stack.trigger_deploy(shipit_commits(:third), AnonymousUser.new, force: true)
+      refute @stack.active_task?
+    end
+
+    test "#occupied? is false if stack has no deploy in either pending or running state" do
+      @stack.deploys.active.destroy_all
+      refute @stack.occupied?
+    end
+
+    test "#occupied? is false if stack has no deploy at all" do
+      @stack.deploys.destroy_all
+      refute @stack.occupied?
+    end
+
+    test "occupied? is true if stack has a concurrent deploy in active state" do
+      @stack.trigger_deploy(shipit_commits(:third), AnonymousUser.new, force: true)
+      assert @stack.occupied?
+    end
+
+    test "occupied? is true if stack has a deploy in pending state" do
+      @stack.trigger_deploy(shipit_commits(:third), AnonymousUser.new)
+      assert @stack.occupied?
+    end
+
+    test "#occupied? is true if a rollback is ongoing" do
+      shipit_deploys(:shipit_complete).trigger_rollback(AnonymousUser.new)
+      assert @stack.occupied?
+    end
+
     test "#deployable? returns true if the stack is not locked, not awaiting provision, and is not deploying" do
       @stack.deploys.destroy_all
       @stack.update!(lock_reason: nil, awaiting_provision: false)
@@ -674,12 +704,12 @@ module Shipit
       assert_equal shipit_commits(:fifth), @stack.next_commit_to_deploy
     end
 
-    test "#next_commit_to_deploy respects the deploy.max_commits directive" do
+    test "#next_commit_to_deploy respects the deploy.max_commits directive given the commit is deployable" do
       @stack.tasks.destroy_all
 
-      fifth_commit = shipit_commits(:third)
-      fifth_commit.statuses.create!(stack_id: @stack.id, state: 'success', context: 'ci/travis')
-      assert_predicate fifth_commit, :deployable?
+      third_commit = shipit_commits(:third)
+      third_commit.statuses.create!(stack_id: @stack.id, state: 'success', context: 'ci/travis')
+      assert_predicate third_commit, :deployable?
 
       assert_equal shipit_commits(:third), @stack.next_commit_to_deploy
 
@@ -687,6 +717,19 @@ module Shipit
       assert_equal shipit_commits(:third), @stack.next_commit_to_deploy
     end
 
+    test "#next_commit_to_deploy deploys the first deployable commit when deploy.max_commits directive fails to find a deployable commit" do
+      @stack.tasks.destroy_all
+
+      third_commit = shipit_commits(:third)
+      third_commit.statuses.create!(stack_id: @stack.id, state: 'success', context: 'ci/travis')
+      assert_predicate third_commit, :deployable?
+
+      assert_equal shipit_commits(:third), @stack.next_commit_to_deploy
+
+      @stack.expects(:maximum_commits_per_deploy).returns(1).at_least_once
+      assert_equal shipit_commits(:third), @stack.next_commit_to_deploy
+    end
+
     test "setting #lock_reason also sets #locked_since" do
       assert_predicate @stack.locked_since, :nil?
 

data/test/models/users_test.rb

@@ -203,6 +203,14 @@ module Shipit
       assert_equal 'george@cyclim.se', user.email
     end
 
+    test "#refresh_from_github! logs deleted users" do
+      Shipit.github.api.expects(:user).with(@user.github_id).raises(Octokit::Forbidden)
+
+      Rails.logger.expects(:info).with("User #{@user.name}, github_id #{@user.github_id} has forbidden access to their GitHub, likely deleted.")
+
+      @user.refresh_from_github!
+    end
+
     test "#github_api uses the user's access token" do
       assert_equal @user.github_access_token, @user.github_api.access_token
     end

data/test/test_helper.rb

@@ -23,7 +23,7 @@ require 'spy/integration'
 
 # Load fixtures from the engine
 if ActiveSupport::TestCase.respond_to?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+  ActiveSupport::TestCase.fixture_paths << File.expand_path("../fixtures", __FILE__)
   ActiveSupport::TestCase.fixtures(:all)
 end
 
@@ -71,7 +71,7 @@ module ActiveSupport
       end
     end
 
-    ActiveRecord::Migration.check_pending!
+    ActiveRecord::Migration.check_all_pending!
 
     # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
     #

data/test/unit/deploy_commands_test.rb

@@ -21,6 +21,100 @@ module Shipit
       StackCommands.stubs(git_version: Gem::Version.new('1.8.4.3'))
     end
 
+    test "#fetch_commit calls git fetch if repository cache already exist" do
+      @stack.git_path.stubs(:exist?).returns(true)
+      @stack.git_path.stubs(:empty?).returns(false)
+
+      command = @commands.fetch_commit(@deploy.until_commit)
+
+      assert_equal %W(git fetch origin --quiet --tags #{@deploy.until_commit.sha}), command.args
+    end
+
+    test "#fetch_commit calls git fetch in git_path directory if repository cache already exist" do
+      @stack.git_path.stubs(:exist?).returns(true)
+      @stack.git_path.stubs(:empty?).returns(false)
+
+      command = @commands.fetch_commit(@deploy.until_commit)
+
+      assert_equal @stack.git_path.to_s, command.chdir
+    end
+
+    test "#fetch_commit calls git clone if repository cache do not exist" do
+      @stack.git_path.stubs(:exist?).returns(false)
+
+      command = @commands.fetch_commit(@deploy.until_commit)
+
+      expected = %W(git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      assert_equal expected, command.args.map(&:to_s)
+    end
+
+    test "#fetch_commit calls git clone if repository cache is empty" do
+      @stack.git_path.stubs(:exist?).returns(true)
+      @stack.git_path.stubs(:empty?).returns(true)
+
+      command = @commands.fetch_commit(@deploy.until_commit)
+
+      expected = %W(git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      assert_equal expected, command.args
+    end
+
+    test "#fetch_commit calls git clone if repository cache corrupt" do
+      @stack.git_path.stubs(:exist?).returns(true)
+      @stack.git_path.stubs(:empty?).returns(false)
+      StackCommands.any_instance.expects(:git_cmd_succeeds?)
+        .with(@stack.git_path)
+        .returns(false)
+
+      command = @commands.fetch_commit(@deploy.until_commit)
+
+      expected = %W(git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      assert_equal expected, command.args
+    end
+
+    test "#fetch_commit clears a corrupted git stash before cloning" do
+      @stack.expects(:clear_git_cache!)
+      @stack.git_path.stubs(:exist?).returns(true)
+      @stack.git_path.stubs(:empty?).returns(false)
+      StackCommands.any_instance.expects(:git_cmd_succeeds?)
+        .with(@stack.git_path)
+        .returns(false)
+
+      command = @commands.fetch_commit(@deploy.until_commit)
+
+      expected = %W(git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      assert_equal expected, command.args
+    end
+
+    test "#fetch_commit does not use --single-branch if git is outdated" do
+      @stack.git_path.stubs(:exist?).returns(false)
+      StackCommands.stubs(git_version: Gem::Version.new('1.7.2.30'))
+
+      command = @commands.fetch_commit(@deploy.until_commit)
+
+      expected = %W(git clone --quiet --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      assert_equal expected, command.args.map(&:to_s)
+    end
+
+    test "#fetch_commit calls git fetch in base_path directory if repository cache do not exist" do
+      @stack.git_path.stubs(:exist?).returns(false)
+
+      command = @commands.fetch_commit(@deploy.until_commit)
+
+      assert_equal @stack.deploys_path.to_s, command.chdir
+    end
+
+    test "#fetch_commit merges Shipit.env in ENVIRONMENT" do
+      Shipit.stubs(:env).returns("SPECIFIC_CONFIG" => 5)
+      command = @commands.fetch_commit(@deploy.until_commit)
+      assert_equal '5', command.env["SPECIFIC_CONFIG"]
+    end
+
+    test "#env uses the correct Github token for a stack" do
+      Shipit.github(organization: 'shopify').stubs(:token).returns('aS3cr3Tt0kEn')
+      command = @commands.fetch_commit(@deploy.until_commit)
+      assert_equal 'aS3cr3Tt0kEn', command.env["GITHUB_TOKEN"]
+    end
+
     test "#fetch calls git fetch if repository cache already exist" do
       @stack.git_path.stubs(:exist?).returns(true)
       @stack.git_path.stubs(:empty?).returns(false)
@@ -109,12 +203,6 @@ module Shipit
       assert_equal '5', command.env["SPECIFIC_CONFIG"]
     end
 
-    test "#env uses the correct Github token for a stack" do
-      Shipit.github(organization: 'shopify').stubs(:token).returns('aS3cr3Tt0kEn')
-      command = @commands.fetch
-      assert_equal 'aS3cr3Tt0kEn', command.env["GITHUB_TOKEN"]
-    end
-
     test "#clone clones the repository cache into the working directory" do
       commands = @commands.clone
       assert_equal 2, commands.size

data/test/unit/github_app_test.rb

@@ -202,7 +202,7 @@ module Shipit
     end
 
     def default_config
-      Rails.application.secrets.github.deep_dup
+      Rails.application.credentials.github.deep_dup
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.39.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2024-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.20'
+        version: 5.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.20'
+        version: 5.6.0
 - !ruby/object:Gem::Dependency
   name: omniauth-github
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.1
 - !ruby/object:Gem::Dependency
   name: rails-timeago
   requirement: !ruby/object:Gem::Requirement
@@ -507,6 +507,7 @@ files:
 - app/controllers/shipit/status_controller.rb
 - app/controllers/shipit/tasks_controller.rb
 - app/controllers/shipit/webhooks_controller.rb
+- app/helpers/shipit/api_clients_helper.rb
 - app/helpers/shipit/chunks_helper.rb
 - app/helpers/shipit/deploys_helper.rb
 - app/helpers/shipit/github_url_helper.rb
@@ -771,6 +772,7 @@ files:
 - db/migrate/20210504200438_add_github_updated_at_to_check_runs.rb
 - db/migrate/20210823075617_change_check_runs_github_updated_at_default.rb
 - db/migrate/20211103154121_increase_github_team_slug_size.rb
+- db/migrate/20230703181143_change_commit_deployment_statuses_github_id_to_big_int.rb
 - lib/shipit-engine.rb
 - lib/shipit.rb
 - lib/shipit/cast_value.rb
@@ -876,6 +878,8 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/config/secrets.development.json
+- test/dummy/config/secrets.test.json
 - test/dummy/config/secrets.yml
 - test/dummy/config/secrets_double_github_app.yml
 - test/dummy/db/schema.rb
@@ -972,7 +976,7 @@ files:
 - test/models/shipit/review_stack_provision_status_test.rb
 - test/models/shipit/review_stack_provisioning_queue_test.rb
 - test/models/shipit/review_stack_test.rb
-- test/models/shipit/stacks_test.rb
+- test/models/shipit/stack_test.rb
 - test/models/shipit/webhooks/handlers/pull_request/assigned_handler_test.rb
 - test/models/shipit/webhooks/handlers/pull_request/closed_handler_test.rb
 - test/models/shipit/webhooks/handlers/pull_request/edited_handler_test.rb
@@ -1039,7 +1043,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.7
 signing_key: 
 specification_version: 4
 summary: Application deployment software
@@ -1102,6 +1106,8 @@ test_files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/config/secrets.development.json
+- test/dummy/config/secrets.test.json
 - test/dummy/config/secrets.yml
 - test/dummy/config/secrets_double_github_app.yml
 - test/dummy/config.ru
@@ -1199,7 +1205,7 @@ test_files:
 - test/models/shipit/review_stack_provision_status_test.rb
 - test/models/shipit/review_stack_provisioning_queue_test.rb
 - test/models/shipit/review_stack_test.rb
-- test/models/shipit/stacks_test.rb
+- test/models/shipit/stack_test.rb
 - test/models/shipit/webhooks/handlers/pull_request/assigned_handler_test.rb
 - test/models/shipit/webhooks/handlers/pull_request/closed_handler_test.rb
 - test/models/shipit/webhooks/handlers/pull_request/edited_handler_test.rb