dependabot-common 0.111.52 → 0.111.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 925cd9a1d7a6ec3a96b16b6ab9a0e43f4dc6feb40a17576510d55736be10d92e
-  data.tar.gz: 19f1e06d849adef6843a046e22d2e9facd9794e6857a40ffba9baa3554cc45bc
+  metadata.gz: 2fd99525114b6d76a071677e573b8bd90ecf54e8ae8f4fd7bb7479c2b217f5cb
+  data.tar.gz: 1dc48dc0faa587760e59b98f46b7c20c65970bf8931f551f758643485205de1d
 SHA512:
-  metadata.gz: d3c917a3e7efed516b150d15e1bca5a66d521ad36fb467ea672f7e3a93d75ead2cfdb9029f5e2fe54d69f92ea1d62269fab5d46e3c773318182cabae4bf056f1
-  data.tar.gz: ea16f6e8ef46938cf06079c3f7d36596cf507cc305856758e2dbeb8534b6ed5f554c5df8cdfac16bbad262381f7381e77c433feb997a2d53a9a6724f706a8498
+  metadata.gz: 9674fc031ca500653cbae288db5b84b794e787f9001b03524fd8ef9ecb11ca6e0bc2ef2014eb8c3a36fa1a4ba418670aa28ae8604cec8ddc10295f998bc35b26
+  data.tar.gz: 3466cb3357c8b7873c6d3af10fc0f33bed0536acad0236f578a32b2fa10ea182fbe6645b68821820588972099ad01c2c96cef761ec31e132113f14b014bdb453

data/lib/dependabot/pull_request_creator/github.rb

@@ -118,33 +118,40 @@ module Dependabot
       def create_commit
         tree = create_tree
 
-        options = author_details&.any? ? { author: author_details } : {}
-
-        if options[:author]&.any? && signature_key
-          options[:author][:date] = Time.now.utc.iso8601
-          options[:signature] = commit_signature(tree, options[:author])
-        end
-
         begin
           github_client_for_source.create_commit(
             source.repo,
             commit_message,
             tree.sha,
             base_commit,
-            options
+            commit_options(tree)
           )
         rescue Octokit::UnprocessableEntity => e
           raise unless e.message == "Tree SHA does not exist"
 
           # Sometimes a race condition on GitHub's side means we get an error
           # here. No harm in retrying if we do.
-          retry_count ||= 0
-          retry_count += 1
-          raise if retry_count > 10
-
+          raise_or_increment_retry_counter(counter: @commit_creation, limit: 3)
           sleep(rand(1..1.99))
           retry
         end
+      rescue Octokit::UnprocessableEntity => e
+        raise unless e.message == "Tree SHA does not exist"
+
+        raise_or_increment_retry_counter(counter: @tree_creation, limit: 1)
+        sleep(rand(1..1.99))
+        retry
+      end
+
+      def commit_options(tree)
+        options = author_details&.any? ? { author: author_details } : {}
+
+        if options[:author]&.any? && signature_key
+          options[:author][:date] = Time.now.utc.iso8601
+          options[:signature] = commit_signature(tree, options[:author])
+        end
+
+        options
       end
 
       def create_tree
@@ -336,6 +343,12 @@ module Dependabot
         ).signature
       end
 
+      def raise_or_increment_retry_counter(counter:, limit:)
+        counter ||= 0
+        counter += 1
+        raise if counter > limit
+      end
+
       # rubocop:disable Metrics/CyclomaticComplexity
       def handle_error(err)
         case err

data/lib/dependabot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.111.52"
+  VERSION = "0.111.53"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.111.52
+  version: 0.111.53
 platform: ruby
 authors:
 - Dependabot