dependabot-docker 0.145.4 → 0.146.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58f016d02ab0cc66881f122e1d8a5ce8abb459343bd7efbfb4f0955f606ff582
-  data.tar.gz: 432c5c48e996494ec1091d3fcd780d8d5040eb59fe6d41a4aa2c8cf6a9a4f6ea
+  metadata.gz: 60910ee73d4a6742a2a2286a1b26b34c2dc2e1f8c36a76561fd8459eec62dcb3
+  data.tar.gz: ea44ba12dd979555f48491a2fadbe34c9376f6866ca844e85f32db43b39de76c
 SHA512:
-  metadata.gz: 9c0484c00baf40a7795e65f317de6152daeb998b4f058b98d23e2746ff699d0a57d5d6e172a01b9f7f7b3c182c35a890a6a2c3e5e831c4a8d392c4051cb5ee5f
-  data.tar.gz: 0e438a20ee08614e251a3ccf680002aa17c1857c815b235004859e3c0ad40b8d88164f339131fcb42f5aef999cd63affcbaa62a0164f1f44de474943a356cb9b
+  metadata.gz: 2e55164d3ac950f270f1b9af44dd59ac7b2952077637dfd8d5beea650ec85f8812b13a7e7c228aae98566862a61aea01cb91fac231d634c993cec1ac293ea854
+  data.tar.gz: c1fa06cc9d9c5f5fca2a14828da657e8b182d50ad6badc0ed930a476d748691ad230666fc779a20d8d4bddf383e75e5d7ce1ad897a9126fc99ace2f5fd7a0974

data/lib/dependabot/docker/file_parser.rb

@@ -7,7 +7,6 @@ require "dependabot/file_parsers"
 require "dependabot/file_parsers/base"
 require "dependabot/errors"
 require "dependabot/docker/utils/credentials_finder"
-require "dependabot/docker/update_checker"
 
 module Dependabot
   module Docker
@@ -36,7 +35,7 @@ module Dependabot
       AWS_ECR_URL = /dkr\.ecr\.(?<region>[^.]+).amazonaws\.com/.freeze
 
       def parse
-        dependencies = {}
+        dependency_set = DependencySet.new
 
         dockerfiles.each do |dockerfile|
           dockerfile.content.each_line do |line|
@@ -48,29 +47,21 @@ module Dependabot
             version = version_from(parsed_from_line)
             next unless version
 
-            name = parsed_from_line.fetch("image")
-            dep_uniq_key = dep_key(name, version)
-
-            requirement = {
-              requirement: nil,
-              groups: [],
-              file: dockerfile.name,
-              source: source_from(parsed_from_line)
-            }
-            if (existing = dependencies[dep_uniq_key])
-              existing.requirements.push(requirement) unless existing.requirements.any? { |r| r == requirement }
-            else
-              dependencies[dep_uniq_key] = Dependency.new(
-                name: name,
-                version: version,
-                package_manager: "docker",
-                requirements: [requirement]
-              )
-            end
+            dependency_set << Dependency.new(
+              name: parsed_from_line.fetch("image"),
+              version: version,
+              package_manager: "docker",
+              requirements: [
+                requirement: nil,
+                groups: [],
+                file: dockerfile.name,
+                source: source_from(parsed_from_line)
+              ]
+            )
           end
         end
 
-        dependencies.values
+        dependency_set.dependencies
       end
 
       private
@@ -163,14 +154,6 @@ module Dependabot
 
         raise "No Dockerfile!"
       end
-
-      def dep_key(name, version)
-        m = version.match(Dependabot::Docker::UpdateChecker::NAME_WITH_VERSION)
-        return name unless m
-
-        captures = m.named_captures
-        [name, captures.fetch("prefix"), captures.fetch("suffix")].compact.join(":")
-      end
     end
   end
 end

data/lib/dependabot/docker/update_checker.rb

@@ -359,10 +359,18 @@ module Dependabot
             version = version_class.new(numeric_version_from(tag))
             ignore_requirements.any? { |r| r.satisfied_by?(version) }
           end
-        raise AllVersionsIgnored if @raise_on_ignored && filtered.empty? && candidate_tags.any?
+        if @raise_on_ignored && filter_lower_versions(filtered).empty? && filter_lower_versions(candidate_tags).any?
+          raise AllVersionsIgnored
+        end
 
         filtered
       end
+
+      def filter_lower_versions(tags)
+        versions_array = tags.map { |tag| version_class.new(numeric_version_from(tag)) }
+        versions_array.
+          select { |version| version > version_class.new(numeric_version_from(dependency.version)) }
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-docker
 version: !ruby/object:Gem::Version
-  version: 0.145.4
+  version: 0.146.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.145.4
+        version: 0.146.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.145.4
+        version: 0.146.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement