diff --git a/docker/lib/dependabot/docker/file_fetcher.rb b/docker/lib/dependabot/docker/file_fetcher.rb index e0bb1267344..abfb5161718 100644 --- a/docker/lib/dependabot/docker/file_fetcher.rb +++ b/docker/lib/dependabot/docker/file_fetcher.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +require "dependabot/docker/utils/helpers" require "dependabot/experiments" require "dependabot/file_fetchers" require "dependabot/file_fetchers/base" @@ -9,7 +10,6 @@ module Docker class FileFetcher < Dependabot::FileFetchers::Base YAML_REGEXP = /^[^\.]+\.ya?ml$/i DOCKER_REGEXP = /dockerfile/i - HELM_REGEXP = /values[\-a-zA-Z_0-9]*\.ya?ml$/i def self.required_files_in?(filenames) filenames.any? { |f| f.match?(DOCKER_REGEXP) } or @@ -86,7 +86,7 @@ def likely_kubernetes_resource?(resource) def correctly_encoded_yamlfiles candidate_files = yamlfiles.select { |f| f.content.valid_encoding? } candidate_files.select do |f| - if f.type == "file" && f.name.match?(HELM_REGEXP) + if f.type == "file" && Utils.likely_helm_chart?(f) true else # This doesn't handle multi-resource files, but it shouldn't matter, since the first resource diff --git a/docker/lib/dependabot/docker/file_updater.rb b/docker/lib/dependabot/docker/file_updater.rb index 05ab0a4d6aa..1ca62e2958b 100644 --- a/docker/lib/dependabot/docker/file_updater.rb +++ b/docker/lib/dependabot/docker/file_updater.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +require "dependabot/docker/utils/helpers" require "dependabot/file_updaters" require "dependabot/file_updaters/base" require "dependabot/errors" @@ -152,7 +153,7 @@ def private_registry_url(file) end def updated_yaml_content(file) - updated_content = file.name == "values.yaml" ? update_helm(file) : update_image(file) + updated_content = Utils.likely_helm_chart?(file) ? update_helm(file) : update_image(file) raise "Expected content to change!" if updated_content == file.content diff --git a/docker/lib/dependabot/docker/utils/helpers.rb b/docker/lib/dependabot/docker/utils/helpers.rb new file mode 100644 index 00000000000..f0546e8c373 --- /dev/null +++ b/docker/lib/dependabot/docker/utils/helpers.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module Dependabot + module Docker + module Utils + HELM_REGEXP = /values[\-a-zA-Z_0-9]*\.ya?ml$/i + + def self.likely_helm_chart?(file) + file.name.match?(HELM_REGEXP) + end + end + end +end