dependabot-docker 0.331.0 → 0.333.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75e66d47a2a75f1540ae4ebbbf6b1bd47b708f46b31323311bf487ea636455c6
-  data.tar.gz: dd602e81d12ccc970b0aad4eb00be28d842707eb27f90f8d7845ea1d03bb04f3
+  metadata.gz: 73293573e3cc4eba2f84e906039c13ae2a94c600ef853ed487f3901a3ff28055
+  data.tar.gz: 8e84ecb6d916bc125917fd0fbf9a48c930b992ee6b03fc5f151e1dc8552467dc
 SHA512:
-  metadata.gz: 81eed9f8b8cae0cf62d0674cb33884dc70941562142e69d81bd995e93f36224e417934ede21652fe65fc8a2e07d3ac26efd44d6d2e970b23142c71b512b3d5e4
-  data.tar.gz: ac0f24cdcca7fbc035556bd6a27c6f68ac9fad29f1a920806e0a3564013610431240d8df07b6424cb79b32ac37234aa6ef761c4de50eec7cc41c75ce35e20637
+  metadata.gz: e05e294373acb9c88b2c9308b2c171be742d1f54c03ad7c63bde25fb15c978fc56e95ad025c11ac2afd249973b57f27f95a058fcaa47ed527d6949ac8410afa1
+  data.tar.gz: a5724c50f5abec9f813f34d7af64a5846d61f6add52a3e93d7e66a6c96e4aaee4302d6e25924a25befd983c0fca2230806a548cf49929be078f1bb22a19d825c

data/lib/dependabot/docker/file_fetcher.rb

@@ -27,6 +27,16 @@ module Dependabot
           filenames.any? { |f| f.match?(YAML_REGEXP) }
       end
 
+      sig { override.returns(T::Array[DependencyFile]) }
+      def fetch_files
+        fetched_files = correctly_encoded_dockerfiles
+        fetched_files += super
+
+        return fetched_files if fetched_files.any?
+
+        raise_appropriate_error(incorrectly_encoded_dockerfiles)
+      end
+
       private
 
       sig { override.returns(String) }
@@ -39,16 +49,6 @@ module Dependabot
         "Docker"
       end
 
-      sig { override.returns(T::Array[DependencyFile]) }
-      def fetch_files
-        fetched_files = correctly_encoded_dockerfiles
-        fetched_files += super
-
-        return fetched_files if fetched_files.any?
-
-        raise_appropriate_error(incorrectly_encoded_dockerfiles)
-      end
-
       sig { returns(T::Array[DependencyFile]) }
       def dockerfiles
         @dockerfiles ||= T.let(fetch_candidate_dockerfiles, T.nilable(T::Array[DependencyFile]))

data/lib/dependabot/docker/tag.rb

@@ -8,6 +8,7 @@ module Dependabot
   module Docker
     class Tag
       extend T::Sig
+
       WORDS_WITH_BUILD = /(?:(?:-[a-z]+)+-[0-9]+)+/
       VERSION_REGEX = /v?(?<version>[0-9]+(?:[_.][0-9]+)*(?:\.[a-z0-9]+|#{WORDS_WITH_BUILD}|-(?:kb)?[0-9]+)*)/i
       VERSION_WITH_SFX = /^(?<operator>[~^<>=]*)#{VERSION_REGEX}(?<suffix>-[a-z][a-z0-9.\-]*)?$/i

data/lib/dependabot/docker/version.rb

@@ -15,6 +15,7 @@ module Dependabot
     #
     class Version < Dependabot::Version
       extend T::Sig
+
       # The regex has limits for the 0,255 and 1,255 repetitions to avoid infinite limits which makes codeql angry.
       # A docker image cannot be longer than 255 characters anyways.
       DOCKER_VERSION_REGEX = /^(?<prefix>[a-z._\-]{0,255})[_\-v]?(?<version>.{1,255})$/

data/lib/dependabot/shared/shared_file_fetcher.rb

@@ -24,12 +24,6 @@ module Dependabot
         filenames.any? { |f| f.match?(filename_regex) }
       end
 
-      sig { override.returns(T::Array[DependencyFile]) }
-      def fetch_files
-        fetched_files = []
-        fetched_files + correctly_encoded_yamlfiles
-      end
-
       sig { returns(T::Array[Dependabot::DependencyFile]) }
       def correctly_encoded_yamlfiles
         candidate_files = yamlfiles.select { |f| f.content&.valid_encoding? }
@@ -87,6 +81,12 @@ module Dependabot
         )
       end
 
+      sig { override.returns(T::Array[DependencyFile]) }
+      def fetch_files
+        fetched_files = []
+        fetched_files + correctly_encoded_yamlfiles
+      end
+
       private
 
       sig { params(resource: Object).returns(T.nilable(T::Boolean)) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-docker
 version: !ruby/object:Gem::Version
-  version: 0.331.0
+  version: 0.333.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.331.0
+        version: 0.333.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.331.0
+        version: 0.333.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -211,14 +211,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
+        version: '3.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
+        version: '3.25'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -261,7 +261,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.331.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.333.0
 rdoc_options: []
 require_paths:
 - lib