dependabot-helm 0.390.0 → 0.391.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93712e7ddf8300b7a3eeaff8363220607eb72453c78859275dbab366d78e7d26
-  data.tar.gz: c8677544088532a69e90f056281c28578f279e826ddc624f98b80709563212c3
+  metadata.gz: fefe204d6b6b38a5013fe2a15d730c151d6607a73342e7794a33ef42c183a19e
+  data.tar.gz: d4d043b94710e2dec098208e7d71d4cb0f5f02ece40a1a6e9ac2bf32d6432348
 SHA512:
-  metadata.gz: 0e00b5559393479a515383d05da656067f673db20503176fee04436726dd5dcd5a45c3f83241fd378a94e64e1f863c51f76f2472593b6de38de28585b009d9a1
-  data.tar.gz: 06206be3e63e348226371f69a1f1ede06c14402f3648867dd9749d4bedc749a6b75e63a230ad14d15e47c0d8eb3a61c933c658165620f6c61a6316c5eb191cb5
+  metadata.gz: d516d5cc2af498019df76b8639d26ed443afae821867d9c6d0f5a1be9f849a9054fa1f7d5b3e7f7a2a187232173baa869a1bdcbb4b97259d03f6a00064dfea2f
+  data.tar.gz: b913d6f21bc0ee3007bd276f7682683a7c59f9733f75786979d8877681ca33eb33f6e4ee8c511cc58917b15855ada43030d2b1aa6d8e504b9b8cfe678164569e

data/lib/dependabot/helm/file_parser.rb

@@ -65,9 +65,8 @@ module Dependabot
       sig { params(dependency: Dependabot::Dependency, type: Symbol).void }
       def add_dependency_type_to_dependency(dependency, type)
         dependency.requirements.map! do |req|
-          req[:metadata] = {} unless req[:metadata]
-          req[:metadata][:type] = type
-          req
+          metadata = req.metadata || {}
+          Dependabot::DependencyRequirement.create(req.merge(metadata: metadata.merge(type: type)))
         end
       end
 

data/lib/dependabot/helm/file_updater/chart_updater.rb

@@ -122,16 +122,16 @@ module Dependabot
         sig { params(file: Dependabot::DependencyFile, old_version: String).returns(T.nilable(String)) }
         def updated_requirement_string(file, old_version)
           reqs = dependency.requirements.select do |r|
-            r[:file] == file.name && r.dig(:metadata, :type) == :helm_chart
+            r.file == file.name && r.metadata_symbol("type") == :helm_chart
           end
-          req = reqs.find { |r| r.dig(:source, :tag) == old_version } || reqs.first
-          req && req[:requirement]
+          req = reqs.find { |r| r.source_string("tag") == old_version } || reqs.first
+          req&.requirement_string
         end
 
         sig { params(file: Dependabot::DependencyFile).returns(T::Boolean) }
         def update_chart_dependency?(file)
-          reqs = dependency.requirements.select { |r| r[:file] == file.name }
-          reqs.any? { |r| r[:metadata]&.dig(:type) == :helm_chart }
+          reqs = dependency.requirements.select { |r| r.file == file.name }
+          reqs.any? { |r| r.metadata_symbol("type") == :helm_chart }
         end
       end
     end

data/lib/dependabot/helm/file_updater/image_updater.rb

@@ -116,9 +116,11 @@ module Dependabot
         end
         def update_version_tags(value_node, content, dependency_version)
           dependency.requirements.each do |req|
-            next unless req[:metadata][:type] == :docker_image
+            next unless req.metadata_symbol("type") == :docker_image
+
+            tag_value = req.source_string("tag")
+            next unless tag_value
 
-            tag_value = req[:source][:tag]
             version_scalar = value_node.children.find do |node|
               node.is_a?(Psych::Nodes::Scalar) && node.value == tag_value
             end

data/lib/dependabot/helm/requirement.rb

@@ -22,8 +22,8 @@ module Dependabot
     class Requirement < Dependabot::Requirement
       extend T::Sig
 
-      AND_SEPARATOR = T.let(/(?<=[a-zA-Z0-9*])\s+(?:&+\s+)?(?!\s*[|-])/, Regexp)
-      OR_SEPARATOR = T.let(/(?<=[a-zA-Z0-9*])\s*\|+/, Regexp)
+      AND_SEPARATOR = /(?<=[a-zA-Z0-9*])\s+(?:&+\s+)?(?!\s*[|-])/
+      OR_SEPARATOR = /(?<=[a-zA-Z0-9*])\s*\|+/
 
       # Allow an optional 'v' prefix and an optional '+<build metadata/digest>'
       # suffix. Helm::Version supports the latter (e.g. "1.0.119807+<digest>"
@@ -33,7 +33,7 @@ module Dependabot
       version_pattern = "v?#{Gem::Version::VERSION_PATTERN}(?:\\+[0-9A-Za-z\\-.]+)?"
 
       PATTERN_RAW = T.let("\\s*(#{quoted})?\\s*(#{version_pattern})\\s*".freeze, String)
-      PATTERN = T.let(/\A#{PATTERN_RAW}\z/, Regexp)
+      PATTERN = /\A#{PATTERN_RAW}\z/
 
       # Always returns a Helm::Version (never the plain Gem::Version-backed
       # DefaultRequirement), so satisfaction comparisons stay Helm::Version vs

data/lib/dependabot/helm/update_checker/requirements_updater.rb

@@ -71,9 +71,11 @@ module Dependabot
 
           requirements.map do |req|
             next req unless latest_resolvable_version
-            next req unless req[:requirement]
+
+            requirement = req.requirement_string
+            next req unless requirement
             # Leave dist-tags / non-numeric leading tokens untouched.
-            next req if req[:requirement].match?(/^([A-Za-uw-z]|v[^\d])/)
+            next req if requirement.match?(/^([A-Za-uw-z]|v[^\d])/)
 
             case update_strategy
             when RequirementsUpdateStrategy::WidenRanges then widen_requirement(req)
@@ -105,7 +107,7 @@ module Dependabot
 
         sig { params(req: Dependabot::DependencyRequirement).returns(Dependabot::DependencyRequirement) }
         def update_version_requirement(req)
-          current_requirement = req[:requirement]
+          current_requirement = T.must(req.requirement_string)
           return req if current_requirement.strip == ""
 
           if current_requirement.match?(/(<|-\s)/i)
@@ -114,7 +116,7 @@ module Dependabot
             return req if ruby_requirements(current_requirement).any? { |r| r.satisfied_by?(latest_resolvable_version) }
 
             updated_req = update_range_requirement(current_requirement)
-            return T.cast(req.merge(requirement: updated_req), Dependabot::DependencyRequirement)
+            return Dependabot::DependencyRequirement.create(req.merge(requirement: updated_req))
           end
 
           # Strict lower-bound (`>`) and not-equal (`!=`) constraints are already
@@ -128,13 +130,15 @@ module Dependabot
           end
 
           reqs = current_requirement.strip.split(SEPARATOR).map(&:strip)
-          T.cast(req.merge(requirement: update_version_string(reqs.first)), Dependabot::DependencyRequirement)
+          Dependabot::DependencyRequirement.create(
+            req.merge(requirement: update_version_string(T.must(reqs.first)))
+          )
         end
 
         # Blank, or already permitted by the resolved version, under any strategy.
         sig { params(req: Dependabot::DependencyRequirement).returns(T::Boolean) }
         def already_satisfied?(req)
-          current_requirement = req[:requirement]
+          current_requirement = T.must(req.requirement_string)
           return true if current_requirement.strip == ""
 
           ruby_requirements(current_requirement).any? { |r| r.satisfied_by?(latest_resolvable_version) }
@@ -151,7 +155,7 @@ module Dependabot
         def widen_requirement(req)
           return req if already_satisfied?(req)
 
-          current_requirement = req[:requirement]
+          current_requirement = T.must(req.requirement_string)
           reqs = current_requirement.strip.split(SEPARATOR).map(&:strip)
 
           updated_requirement =
@@ -166,7 +170,7 @@ module Dependabot
               "#{current_requirement} || ^#{latest_resolvable_version}"
             end
 
-          T.cast(req.merge(requirement: updated_requirement), Dependabot::DependencyRequirement)
+          Dependabot::DependencyRequirement.create(req.merge(requirement: updated_requirement))
         end
 
         sig { params(requirement_string: String).returns(T::Array[Helm::Requirement]) }

data/lib/dependabot/helm/update_checker.rb

@@ -47,14 +47,16 @@ module Dependabot
       def updated_requirements
         return dependency.requirements unless latest_version
 
-        updated_reqs = dependency.requirements.map do |req|
-          case req.dig(:metadata, :type)
+        dependency.requirements.map do |req|
+          case req.metadata_symbol("type")
           when nil then req
           when :helm_chart then updated_chart_requirement(req)
-          else req.merge(requirement: latest_version.to_s) # image deps: exact overwrite
+          else
+            Dependabot::DependencyRequirement.create(
+              req.merge(requirement: latest_version.to_s)
+            ) # image deps: exact overwrite
           end
         end
-        wrap_requirements(updated_reqs)
       end
 
       private
@@ -68,7 +70,7 @@ module Dependabot
       sig { params(req: Dependabot::DependencyRequirement).returns(Dependabot::DependencyRequirement) }
       def updated_chart_requirement(req)
         current_constraint = chart_constraint_for(req)
-        synthetic = T.cast(req.merge(requirement: current_constraint), Dependabot::DependencyRequirement)
+        synthetic = Dependabot::DependencyRequirement.create(req.merge(requirement: current_constraint))
 
         T.must(
           RequirementsUpdater.new(
@@ -85,7 +87,7 @@ module Dependabot
       # or ranges) into one dependency with a single combined version.
       sig { params(req: Dependabot::DependencyRequirement).returns(String) }
       def chart_constraint_for(req)
-        (req[:requirement] || req.dig(:source, :tag) || dependency.version).to_s
+        (req.requirement || req.source_string("tag") || dependency.version).to_s
       end
 
       sig { returns(Dependabot::RequirementsUpdateStrategy) }
@@ -111,7 +113,7 @@ module Dependabot
       sig { returns(Dependabot::Version) }
       def chart_anchor_version
         constraints = dependency.requirements
-                                .select { |r| r.dig(:metadata, :type) == :helm_chart }
+                                .select { |r| r.metadata_symbol("type") == :helm_chart }
                                 .map { |r| chart_constraint_for(r) }
         constraints = [dependency.version.to_s] if constraints.empty?
         T.must(constraints.map { |c| anchor_for_constraint(c) }.min)
@@ -283,12 +285,12 @@ module Dependabot
       # name across files/entries); an update is warranted if even one changes.
       sig { returns(T::Boolean) }
       def chart_requirement_changes?
-        chart_reqs = dependency.requirements.select { |r| r.dig(:metadata, :type) == :helm_chart }
+        chart_reqs = dependency.requirements.select { |r| r.metadata_symbol("type") == :helm_chart }
         chart_reqs = dependency.requirements if chart_reqs.empty?
         return true if chart_reqs.empty?
 
         chart_reqs.any? do |req|
-          updated_chart_requirement(req)[:requirement].to_s != chart_constraint_for(req)
+          updated_chart_requirement(req).requirement.to_s != chart_constraint_for(req)
         end
       end
 
@@ -307,7 +309,7 @@ module Dependabot
       sig { returns(Symbol) }
       def dependency_type
         req = dependency.requirements.first
-        type = T.must(req).dig(:metadata, :type)
+        type = T.must(req).metadata_symbol("type")
 
         type || :unknown
       end
@@ -350,8 +352,7 @@ module Dependabot
       sig { returns(T.nilable(Gem::Version)) }
       def fetch_latest_chart_version
         chart_name = dependency.name
-        source = dependency.requirements.first&.dig(:source)
-        repo_url = source&.dig(:registry)
+        repo_url = dependency.requirements.first&.source_string("registry")
         repo_name = extract_repo_name(repo_url)
         releases = fetch_releases_with_helm_cli(chart_name, repo_name, repo_url)
         return releases if releases
@@ -518,19 +519,20 @@ module Dependabot
 
       sig { returns(Dependabot::Dependency) }
       def build_docker_dependency
-        source = T.must(dependency.requirements.first)[:source]
+        requirement = T.must(dependency.requirements.first)
+        path = requirement.source_string("path")
         name = dependency.name
         version = dependency.version
 
-        if source[:path]
-          parts = source[:path].split(".")
+        if path
+          parts = path.split(".")
           if parts.length > 1 && (parts.last == "tag" || parts.last == "image")
             # The actual image name might be in image.repository
-            name = parts[0...-1].join(".")
+            name = T.must(parts[0...-1]).join(".")
           end
         end
 
-        registry = source[:registry] || nil
+        registry = requirement.source_string("registry")
 
         Dependency.new(
           name: name,
@@ -538,7 +540,7 @@ module Dependabot
           requirements: [{
             requirement: nil,
             groups: [],
-            file: T.must(dependency.requirements.first)[:file],
+            file: requirement.file,
             source: {
               registry: registry,
               tag: version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-helm
 version: !ruby/object:Gem::Version
-  version: 0.390.0
+  version: 0.391.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.390.0
+        version: 0.391.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.390.0
+        version: 0.391.0
 - !ruby/object:Gem::Dependency
   name: dependabot-docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.390.0
+        version: 0.391.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.390.0
+        version: 0.391.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +275,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.390.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.391.0
 rdoc_options: []
 require_paths:
 - lib