Skip to content

maven: stop querying repositories once one returns a result #5872

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 4 commits into from
Oct 12, 2022
Merged

maven: stop querying repositories once one returns a result #5872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2907e5a
stop querying repositories once one returns a result
jakecoffman Oct 11, 2022
3912e67
assert order since that is important
jakecoffman Oct 11, 2022
dbec4b2
easier to understand
jakecoffman Oct 11, 2022
6f7ed68
Merge branch 'main' into jakecoffman/maven-find-then-stop
jakecoffman Oct 12, 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
11 changes: 7 additions & 4 deletions maven/lib/dependabot/maven/update_checker/version_finder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ def versions
version_details =
repositories.map do |repository_details|
url = repository_details.fetch("url")
dependency_metadata(repository_details).
css("versions > version").
xml = dependency_metadata(repository_details)
next [] if xml.blank?

break xml.css("versions > version").
select { |node| version_class.correct?(node.content) }.
map { |node| version_class.new(node.content) }.
map { |version| { version: version, source_url: url } }
Expand Down Expand Up @@ -166,15 +168,16 @@ def fetch_dependency_metadata(repository_details)
headers: repository_details.fetch("auth_headers")
)
check_response(response, repository_details.fetch("url"))
return unless response.status < 400

Nokogiri::XML(response.body)
rescue URI::InvalidURIError
Nokogiri::XML("")
nil
rescue Excon::Error::Socket, Excon::Error::Timeout,
Excon::Error::TooManyRedirects
raise if central_repo_urls.include?(repository_details["url"])

Nokogiri::XML("")
nil
end

def check_response(response, repository_url)
Expand Down
4 changes: 4 additions & 0 deletions maven/lib/dependabot/maven/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ def initialize(version)
super(version.to_s.tr("_", "-"))
end

def inspect
"#<#{self.class} #{@version_string}>"
end

def to_s
@version_string
end
Expand Down
48 changes: 24 additions & 24 deletions maven/spec/dependabot/maven/file_parser/repositories_finder_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
let(:base_pom_fixture_name) { "custom_repositories_pom.xml" }

it "includes the additional declarations" do
expect(repository_urls).to match_array(
expect(repository_urls).to eq(
%w(
https://repo.maven.apache.org/maven2
http://repository.jboss.org/maven2
http://scala-tools.org/repo-releases
http://repository.jboss.org/maven2
http://plugin-repository.jboss.org/maven2
https://repo.maven.apache.org/maven2
)
)
end
Expand All @@ -43,16 +43,16 @@
let(:base_pom_fixture_name) { "property_repo_pom.xml" }

it "handles the property interpolation" do
expect(repository_urls).to match_array(
expect(repository_urls).to eq(
%w(
http://download.eclipse.org/technology/m2e/releases
http://download.eclipse.org/releases/neon
http://eclipse-cs.sf.net/update
https://dl.bintray.com/pmd/pmd-eclipse-plugin/updates
http://findbugs.cs.umd.edu/eclipse
http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository
https://repo.maven.apache.org/maven2
http://repository.sonatype.org/content/groups/sonatype-public-grid
https://repo.maven.apache.org/maven2
)
)
end
Expand All @@ -70,12 +70,12 @@

context "checking the parent's repositories" do
it "doesn't include the declarations from the child" do
expect(repository_urls).to match_array(
expect(repository_urls).to eq(
%w(
https://repo.maven.apache.org/maven2
http://repository.jboss.org/maven2
http://scala-tools.org/repo-releases
http://repository.jboss.org/maven2
http://plugin-repository.jboss.org/maven2
https://repo.maven.apache.org/maven2
)
)
end
Expand All @@ -85,21 +85,21 @@
let(:pom) { child_pom }

it "includes the declarations from the parent and the child" do
expect(repository_urls).to match_array(
expect(repository_urls).to eq(
%w(
https://repo.maven.apache.org/maven2
http://repository.jboss.org/maven2
http://child-repository.jboss.org/maven2
http://scala-tools.org/repo-releases
http://repository.jboss.org/maven2
http://plugin-repository.jboss.org/maven2
http://child-repository.jboss.org/maven2
https://repo.maven.apache.org/maven2
)
)
end

context "when asked to exclude inherited repos" do
it "excludes the declarations in the parent" do
expect(finder.repository_urls(pom: pom, exclude_inherited: true)).
to match_array(
to eq(
%w(
http://child-repository.jboss.org/maven2
https://repo.maven.apache.org/maven2
Expand Down Expand Up @@ -130,7 +130,7 @@
end

it "returns the repositories relevant to the child" do
expect(repository_urls).to match_array(
expect(repository_urls).to eq(
%w(
http://child-repository.jboss.org/maven2
https://repo.maven.apache.org/maven2
Expand All @@ -145,7 +145,7 @@
end

it "returns the repositories relevant to the child" do
expect(repository_urls).to match_array(
expect(repository_urls).to eq(
%w(
http://child-repository.jboss.org/maven2
https://repo.maven.apache.org/maven2
Expand All @@ -163,13 +163,13 @@
end

it "includes the declarations from the parent and the child" do
expect(repository_urls).to match_array(
expect(repository_urls).to eq(
%w(
https://repo.maven.apache.org/maven2
http://repository.jboss.org/maven2
http://child-repository.jboss.org/maven2
http://scala-tools.org/repo-releases
http://repository.jboss.org/maven2
http://plugin-repository.jboss.org/maven2
http://child-repository.jboss.org/maven2
https://repo.maven.apache.org/maven2
)
)
end
Expand All @@ -191,7 +191,7 @@
end

it "returns the repositories relevant to the child" do
expect(repository_urls).to match_array(
expect(repository_urls).to eq(
%w(
http://child-repository.jboss.org/maven2
https://repo.maven.apache.org/maven2
Expand All @@ -210,13 +210,13 @@
end

it "includes the declarations from the parent and the child" do
expect(repository_urls).to match_array(
expect(repository_urls).to eq(
%w(
https://repo.maven.apache.org/maven2
http://repository.jboss.org/maven2
http://child-repository.jboss.org/maven2
http://scala-tools.org/repo-releases
http://repository.jboss.org/maven2
http://plugin-repository.jboss.org/maven2
http://child-repository.jboss.org/maven2
https://repo.maven.apache.org/maven2
)
)
end
Expand Down
5 changes: 4 additions & 1 deletion maven/spec/dependabot/maven/update_checker/version_finder_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,9 +707,12 @@
fixture("maven_central_metadata", "with_date_releases.xml")
stub_request(:get, maven_central_metadata_url).
to_return(status: 200, body: body)
# 404 causes Dependabot to fall back to the central repo
stub_request(:get, jboss_metadata_url).
to_return(status: 404)
end

its(:count) { is_expected.to eq(87) }
its(:count) { is_expected.to eq(17) }
Comment on lines -712 to +715
Copy link
Copy Markdown
Contributor

@landongrindheim landongrindheim Oct 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤯


describe "the first version" do
subject { versions.first }
Expand Down