Skip to content

Commit

Permalink
remove glob experiment since it is rolled out (#10239)
Browse files Browse the repository at this point in the history
  • Loading branch information
jakecoffman authored Jul 18, 2024
1 parent e90eb49 commit f2acf30
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
2 changes: 1 addition & 1 deletion updater/lib/dependabot/dependency_snapshot.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 2 additions & 13 deletions updater/lib/dependabot/file_fetcher_command.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand All @@ -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
Expand Down

0 comments on commit f2acf30

Please sign in to comment.