dependabot-github_actions 0.388.0 → 0.389.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ea7c22fb2ab0e5997b573cae9a2b3c99aa5faea4c0a827914256cf104ec9132
-  data.tar.gz: ada08e07092d5019df0c05fa29a018fd0c05dd54c131c3a4df806347ac696fa8
+  metadata.gz: 28c1be16649f2941b1c6c5cb4f562eb1ef504dea136022b5a35519633dcf19a9
+  data.tar.gz: 56d1bd1e166613184652b00ede70f25ea9371285be99addc463e44fd28236a4b
 SHA512:
-  metadata.gz: 202a0c186b344d6cc058d0446351bf380a251f42e476c71d430105ac1527a7af68f733a8c19b88edf09a315e1857e35ca23cbfd72ffed53ebb6011ebb0ee8389
-  data.tar.gz: 9aa19b0b04f8a4e2313c1581c58c1b484679a5b82adc8a698c458ab4f476bae04962adc529d9029e36f1c4554c4a7839e0584847e50226bc2ce05f15c3320d13
+  metadata.gz: 8310d74f6bde92cc9f0d367751bb8ddfc075abb5e49aa281b5e0a6f6aadd6b8c1eea9f5f80e329afab340d30ab4189e15363c8be431f8bd9a8d28bbf16e1ec8d
+  data.tar.gz: 1f691fdd8dd686c860392abdeb7dadcb01771a197b48cba418a8a8555fa76a851255fa93d53f5eefc19ae3ffa3e0bb920584e19fcc15c6db96da1ee397a4545f

data/lib/dependabot/github_actions/containing_branch_finder.rb

@@ -0,0 +1,44 @@
+# typed: strong
+# frozen_string_literal: true
+
+require "sorbet-runtime"
+
+require "dependabot/shared_helpers"
+
+module Dependabot
+  module GithubActions
+    module ContainingBranchFinder
+      extend T::Sig
+
+      # A missing commit has no containing branch, so callers can handle it like
+      # an empty branch lookup without masking unrelated subprocess failures.
+      COMMIT_NOT_FOUND_REGEX = T.let(
+        /no such commit|malformed object name|bad object|not a valid object name/i,
+        Regexp
+      )
+
+      sig { params(sha: String).returns(T.nilable(String)) }
+      def self.find(sha)
+        branches_including_ref = SharedHelpers.run_shell_command(
+          "git branch --remotes --contains #{sha}",
+          fingerprint: "git branch --remotes --contains <sha>"
+        ).split("\n").map { |branch| branch.strip.gsub("origin/", "") }
+        return if branches_including_ref.empty?
+
+        current_branch = branches_including_ref.find { |branch| branch.start_with?("HEAD -> ") }
+
+        if current_branch
+          current_branch.delete_prefix("HEAD -> ")
+        elsif branches_including_ref.size > 1
+          raise "Multiple ambiguous branches (#{branches_including_ref.join(', ')}) include #{sha}!"
+        else
+          branches_including_ref.first
+        end
+      rescue SharedHelpers::HelperSubprocessFailed => e
+        raise unless e.message.match?(COMMIT_NOT_FOUND_REGEX)
+
+        nil
+      end
+    end
+  end
+end

data/lib/dependabot/github_actions/package/package_details_fetcher.rb

@@ -8,6 +8,7 @@ require "time"
 
 require "dependabot/errors"
 require "dependabot/git_tag_with_detail"
+require "dependabot/github_actions/containing_branch_finder"
 require "dependabot/github_actions/helpers"
 require "dependabot/github_actions/requirement"
 require "dependabot/github_actions/update_checker"
@@ -224,7 +225,9 @@ module Dependabot
                   SharedHelpers.run_shell_command("git clone --no-recurse-submodules #{url} #{repo_contents_path}")
 
                   Dir.chdir(repo_contents_path) do
-                    ref_branch = find_container_branch(T.must(git_commit_checker.dependency_source_details&.ref))
+                    ref_branch = ContainingBranchFinder.find(
+                      T.must(git_commit_checker.dependency_source_details&.ref)
+                    )
                     git_commit_checker.head_commit_for_local_branch(ref_branch) if ref_branch
                   end
                 end
@@ -234,27 +237,6 @@ module Dependabot
           )
         end
 
-        sig { params(sha: String).returns(T.nilable(String)) }
-        def find_container_branch(sha)
-          branches_including_ref = SharedHelpers.run_shell_command(
-            "git branch --remotes --contains #{sha}",
-            fingerprint: "git branch --remotes --contains <sha>"
-          ).split("\n").map { |branch| branch.strip.gsub("origin/", "") }
-          return if branches_including_ref.empty?
-
-          current_branch = branches_including_ref.find { |branch| branch.start_with?("HEAD -> ") }
-
-          if current_branch
-            current_branch.delete_prefix("HEAD -> ")
-          elsif branches_including_ref.size > 1
-            # If there are multiple non default branches including the pinned SHA,
-            # then it's unclear how we should proceed
-            raise "Multiple ambiguous branches (#{branches_including_ref.join(', ')}) include #{sha}!"
-          else
-            branches_including_ref.first
-          end
-        end
-
         sig do
           params(tags: T::Array[T::Hash[Symbol, T.untyped]]).returns(T.nilable(T::Hash[Symbol, T.untyped]))
         end

data/lib/dependabot/github_actions/update_checker/latest_version_finder.rb

@@ -345,7 +345,7 @@ module Dependabot
 
         sig { returns(T.nilable(T.any(Dependabot::Version, String))) }
         def current_version
-          return dependency.source_details(allowed_types: ["git"])&.fetch(:ref) if release_type_sha?
+          return dependency.source_string("ref", allowed_types: ["git"]) if release_type_sha?
 
           T.let(dependency.numeric_version, T.nilable(Dependabot::Version))
         end

data/lib/dependabot/github_actions/update_checker.rb

@@ -5,6 +5,7 @@ require "sorbet-runtime"
 
 require "dependabot/errors"
 require "dependabot/github_actions/constants"
+require "dependabot/github_actions/containing_branch_finder"
 require "dependabot/github_actions/requirement"
 require "dependabot/github_actions/version"
 require "dependabot/update_checkers"
@@ -130,7 +131,9 @@ module Dependabot
                 SharedHelpers.run_shell_command("git clone --no-recurse-submodules #{url} #{repo_contents_path}")
 
                 Dir.chdir(repo_contents_path) do
-                  ref_branch = find_container_branch(T.must(git_commit_checker.dependency_source_details&.ref))
+                  ref_branch = ContainingBranchFinder.find(
+                    T.must(git_commit_checker.dependency_source_details&.ref)
+                  )
                   git_commit_checker.head_commit_for_local_branch(ref_branch) if ref_branch
                 end
               end
@@ -198,26 +201,6 @@ module Dependabot
           dependency_source_details: nil
         )
       end
-
-      sig { params(sha: String).returns(T.nilable(String)) }
-      def find_container_branch(sha)
-        branches_including_ref = SharedHelpers.run_shell_command(
-          "git branch --remotes --contains #{sha}",
-          fingerprint: "git branch --remotes --contains <sha>"
-        ).split("\n").map { |branch| branch.strip.gsub("origin/", "") }
-        return if branches_including_ref.empty?
-
-        current_branch = branches_including_ref.find { |branch| branch.start_with?("HEAD -> ") }
-
-        if current_branch
-          current_branch.delete_prefix("HEAD -> ")
-        elsif branches_including_ref.size > 1
-          # If there are multiple non default branches including the pinned SHA, then it's unclear how we should proceed
-          raise "Multiple ambiguous branches (#{branches_including_ref.join(', ')}) include #{sha}!"
-        else
-          branches_including_ref.first
-        end
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-github_actions
 version: !ruby/object:Gem::Version
-  version: 0.388.0
+  version: 0.389.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.388.0
+        version: 0.389.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.388.0
+        version: 0.389.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +243,7 @@ extra_rdoc_files: []
 files:
 - lib/dependabot/github_actions.rb
 - lib/dependabot/github_actions/constants.rb
+- lib/dependabot/github_actions/containing_branch_finder.rb
 - lib/dependabot/github_actions/file_fetcher.rb
 - lib/dependabot/github_actions/file_parser.rb
 - lib/dependabot/github_actions/file_updater.rb
@@ -259,7 +260,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.388.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.389.0
 rdoc_options: []
 require_paths:
 - lib