Merge pull request #13478 from dependabot/markhallen/add-maven-install-json-for-bazel

Enable the inclusion of maven_install.json files in the temporary folder during Bazel sync operations.

Author: markhallen

bazel/lib/dependabot/bazel/file_fetcher.rb

@@ -11,7 +11,7 @@ class FileFetcher < Dependabot::FileFetchers::Base
 
       WORKSPACE_FILES = T.let(%w(WORKSPACE WORKSPACE.bazel).freeze, T::Array[String])
       MODULE_FILES = T.let(%w(MODULE.bazel).freeze, T::Array[String])
-      CONFIG_FILES = T.let(%w(.bazelrc MODULE.bazel.lock).freeze, T::Array[String])
+      CONFIG_FILES = T.let(%w(.bazelrc MODULE.bazel.lock .bazelversion maven_install.json).freeze, T::Array[String])
       SKIP_DIRECTORIES = T.let(%w(.git .bazel-* bazel-* node_modules .github).freeze, T::Array[String])
 
       sig { override.returns(String) }
@@ -86,14 +86,11 @@ def module_files
       def config_files
         files = T.let([], T::Array[DependencyFile])
 
-        CONFIG_FILES.each do |filename|
+        CONFIG_FILES.map do |filename|
           file = fetch_file_if_present(filename)
           files << file if file
         end
 
-        bazelversion = fetch_file_if_present(".bazelversion")
-        files << bazelversion if bazelversion
-
         files
       end
 

bazel/spec/dependabot/bazel/file_fetcher_spec.rb

@@ -113,6 +113,29 @@
       it "fetches the MODULE.bazel file" do
         expect(fetched_files.map(&:name)).to include("MODULE.bazel")
       end
+
+      context "with a maven_install.json file" do
+        before do
+          stub_request(:get, url + "?ref=sha")
+            .to_return(
+              status: 200,
+              body: fixture("github", "contents_bazel_with_maven_install.json"),
+              headers: { "content-type" => "application/json" }
+            )
+
+          stub_request(:get, url + "maven_install.json?ref=sha")
+            .to_return(
+              status: 200,
+              body: fixture("github", "contents_bazel_maven_install.json"),
+              headers: { "content-type" => "application/json" }
+            )
+        end
+
+        it "includes maven_install.json" do
+          puts "files: #{fetched_files.map(&:name)}"
+          expect(fetched_files.map(&:name)).to include("maven_install.json")
+        end
+      end
     end
 
     context "when beta ecosystems are not allowed" do

bazel/spec/fixtures/github/contents_bazel_maven_install.json

@@ -0,0 +1,13 @@
+{
+  "name": "maven_install.json",
+  "path": "maven_install.json",
+  "sha": "abc123",
+  "size": 1234,
+  "url": "https://api.github.com/repos/example/repo/contents/maven_install.json?ref=sha",
+  "html_url": "https://github.com/example/repo/blob/sha/maven_install.json",
+  "git_url": "https://api.github.com/repos/example/repo/git/blobs/abc123",
+  "download_url": "https://raw.githubusercontent.com/example/repo/sha/maven_install.json",
+  "type": "file",
+  "content": "bW9kdWxlKG5hbWUgPSAiZXhhbXBsZSIsIHZlcnNpb24gPSAiMS4wLjAiKQ==\n",
+  "encoding": "base64"
+}

bazel/spec/fixtures/github/contents_bazel_with_maven_install.json

@@ -0,0 +1,28 @@
+[
+  {
+    "name": "MODULE.bazel",
+    "path": "MODULE.bazel",
+    "sha": "abc123",
+    "size": 1234,
+    "url": "https://api.github.com/repos/example/repo/contents/MODULE.bazel?ref=sha",
+    "html_url": "https://github.com/example/repo/blob/sha/MODULE.bazel",
+    "git_url": "https://api.github.com/repos/example/repo/git/blobs/abc123",
+    "download_url": "https://raw.githubusercontent.com/example/repo/sha/MODULE.bazel",
+    "type": "file",
+    "content": "bW9kdWxlKG5hbWUgPSAiZXhhbXBsZSIsIHZlcnNpb24gPSAiMS4wLjAiKQ==\n",
+    "encoding": "base64"
+  },
+  {
+    "name": "maven_install.json",
+    "path": "maven_install.json",
+    "sha": "abc123",
+    "size": 1234,
+    "url": "https://api.github.com/repos/example/repo/contents/maven_install.json?ref=sha",
+    "html_url": "https://github.com/example/repo/blob/sha/maven_install.json",
+    "git_url": "https://api.github.com/repos/example/repo/git/blobs/abc123",
+    "download_url": "https://raw.githubusercontent.com/example/repo/sha/maven_install.json",
+    "type": "file",
+    "content": "bW9kdWxlKG5hbWUgPSAiZXhhbXBsZSIsIHZlcnNpb24gPSAiMS4wLjAiKQ==\n",
+    "encoding": "base64"
+  }
+]