From f2acf301a213b0d34b5a7cead33604f29c63b2bc Mon Sep 17 00:00:00 2001 From: Jake Coffman Date: Thu, 18 Jul 2024 08:42:45 -0500 Subject: [PATCH] remove glob experiment since it is rolled out (#10239) --- updater/lib/dependabot/dependency_snapshot.rb | 2 +- updater/lib/dependabot/file_fetcher_command.rb | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/updater/lib/dependabot/dependency_snapshot.rb b/updater/lib/dependabot/dependency_snapshot.rb index ebd950ed2b7..d347a2c20fd 100644 --- a/updater/lib/dependabot/dependency_snapshot.rb +++ b/updater/lib/dependabot/dependency_snapshot.rb @@ -28,7 +28,7 @@ def self.create_from_job_definition(job:, job_definition:) file end - if Dependabot::Experiments.enabled?(:globs) && job.source.directories + if job.source.directories # The job.source.directory may contain globs, so we use the directories from the fetched files job.source.directories = decoded_dependency_files.flat_map(&:directory).uniq end diff --git a/updater/lib/dependabot/file_fetcher_command.rb b/updater/lib/dependabot/file_fetcher_command.rb index 21bc2d3f87f..e18898ea494 100644 --- a/updater/lib/dependabot/file_fetcher_command.rb +++ b/updater/lib/dependabot/file_fetcher_command.rb @@ -100,19 +100,8 @@ def file_fetcher_for_directory(directory) end def dependency_files_for_multi_directories - if Dependabot::Experiments.enabled?(:globs) - return @dependency_files_for_multi_directories ||= dependency_files_for_globs - end - - @dependency_files_for_multi_directories ||= job.source.directories.flat_map do |dir| - ff = with_retries { file_fetcher_for_directory(dir) } - files = ff.files - post_ecosystem_versions(ff) if should_record_ecosystem_versions? - files - end - end + return @dependency_files_for_multi_directories if defined?(@dependency_files_for_multi_directories) - def dependency_files_for_globs has_glob = T.let(false, T::Boolean) directories = Dir.chdir(job.repo_contents_path) do job.source.directories.map do |dir| @@ -124,7 +113,7 @@ def dependency_files_for_globs end.flatten end.uniq - directories.flat_map do |dir| + @dependency_files_for_multi_directories = directories.flat_map do |dir| ff = with_retries { file_fetcher_for_directory(dir) } begin