Skip to content

submodule cloning may not be important to the job, ignore errors #6228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jakecoffman merged 3 commits into from
Nov 29, 2022
+9 −3
Merged

submodule cloning may not be important to the job, ignore errors #6228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
345aabc
submodule cloning may not be important to the job, ignore errors
jakecoffman Nov 28, 2022
25442e4
improve names
jakecoffman Nov 29, 2022
9faf936
Merge branch 'main' into jakecoffman/ignore-submodule-failures-again-…
jakecoffman Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions common/lib/dependabot/file_fetchers/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@ class Base
Dependabot::Clients::CodeCommit::NotFound
].freeze

GIT_SUBMODULE_ERROR_REGEX =
GIT_SUBMODULE_INACCESSIBLE_ERROR =
/^fatal: unable to access '(?<url>.*)': The requested URL returned error: (?<code>\d+)$/
GIT_SUBMODULE_CLONE_ERROR =
/^fatal: clone of '(?<url>.*)' into submodule path '.*' failed$/
GIT_SUBMODULE_ERROR_REGEX = /(#{GIT_SUBMODULE_INACCESSIBLE_ERROR})|(#{GIT_SUBMODULE_CLONE_ERROR})/

def self.required_files_in?(_filename_array)
raise NotImplementedError
Expand Down Expand Up @@ -604,7 +607,7 @@ def _clone_repo_contents(target_directory:)
CMD
)
rescue SharedHelpers::HelperSubprocessFailed => e
raise unless e.message.match?(GIT_SUBMODULE_ERROR_REGEX) && e.message.include?("submodule")
raise unless GIT_SUBMODULE_ERROR_REGEX && e.message.downcase.include?("submodule")

submodule_cloning_failed = true
match = e.message.match(GIT_SUBMODULE_ERROR_REGEX)
Expand All @@ -613,7 +616,7 @@ def _clone_repo_contents(target_directory:)

# Submodules might be in the repo but unrelated to dependencies,
# so ignoring this error to try the update anyway since the base repo exists.
Dependabot.logger.error("Cloning of submodule failed: #{url} error: #{code}")
Dependabot.logger.error("Cloning of submodule failed: #{url} error: #{code || 'unknown'}")
end

if source.commit
Expand Down
3 changes: 3 additions & 0 deletions common/spec/dependabot/file_fetchers/base_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1569,6 +1569,9 @@ def fetch_files
let(:repo) do
"dependabot-fixtures/go-modules-app-with-inaccessible-submodules"
end
let(:branch) do
"with-git-urls"
end

it "does not raise an error" do
clone_repo_contents
Expand Down