dependabot-terraform 0.355.0 → 0.357.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 497ab4c2e4b30eca7ed11e7b9c15090b2f29d69f0b67d5ef9286b35f891c5f10
-  data.tar.gz: 710c33ab898506ed3eb251c37e7fcdc6051dc591a159b8d80ae488242d8ff80f
+  metadata.gz: 7a2cbf57fa6c093093300b03f98684c1fc7b118fb12398619ffbf4dc3a01c7a7
+  data.tar.gz: d4ec66bdf562393a60374dfc64068d01fc811e1541df629efa148bdf1f800954
 SHA512:
-  metadata.gz: b6f8678f63d5ca935a26eb1d3cd4fc3d627af53960acf7c6516a269c1be709367a484db12d27b74906bfa81f106bf78c502cadd4a13a68934fa8348556eaef04
-  data.tar.gz: 14a51b3141578046624ee83be558dc3865e6ef98b90d31a2d268f4e469a8c513e59146fee9e94482c0f705cbe0fa1f39da135013011efd32b7b7224757b25262
+  metadata.gz: f4549e8bccd588fe4ea943bda4088de9750a933157f1ac26c073c05984f09135b2f8eca6552f59b105c9b615a337bfe063153a28b6283604583cc42880dfa0e6
+  data.tar.gz: de1c0555586234d67c7a6e3cc804a8cef167ac0c0cb5452ed938c29a68a8d10b82d6dd3e64c7b80f4d75ea43b4a88604e9863461fdbed0bbf37147c91b5285c1

data/lib/dependabot/terraform/file_fetcher.rb

@@ -94,8 +94,9 @@ module Dependabot
           end
         end
 
-        # NOTE: The `support_file` attribute is not used but we set this to
-        # match what we do in other ecosystems
+        # NOTE: Mark local module files as support files. The FileParser will
+        # still parse provider requirements from these files, but will skip
+        # module declarations (since we can't update local path modules)
         terraform_files.tap { |fs| fs.each { |f| f.support_file = true } }
       end
 

data/lib/dependabot/terraform/file_parser.rb

@@ -1,7 +1,6 @@
 # typed: strict
 # frozen_string_literal: true
 
-require "cgi"
 require "excon"
 require "nokogiri"
 require "open3"
@@ -61,27 +60,31 @@ module Dependabot
       sig { params(dependency_set: Dependabot::FileParsers::Base::DependencySet).void }
       def parse_terraform_files(dependency_set)
         terraform_files.each do |file|
-          next if file.support_file?
-
-          modules = parsed_file(file).fetch("module", {})
-          # If override.tf files are present, we need to merge the modules
-          if override_terraform_files.any?
-            override_terraform_files.each do |override_file|
-              override_modules = parsed_file(override_file).fetch("module", {})
-              modules = merge_modules(override_modules, modules)
+          # Process module declarations only for non-support files
+          # (we can't update local path modules in support files)
+          unless file.support_file?
+            modules = parsed_file(file).fetch("module", {})
+            # If override.tf files are present, we need to merge the modules
+            if override_terraform_files.any?
+              override_terraform_files.each do |override_file|
+                override_modules = parsed_file(override_file).fetch("module", {})
+                modules = merge_modules(override_modules, modules)
+              end
             end
-          end
 
-          modules.each do |name, details|
-            details = details.first
+            modules.each do |name, details|
+              details = details.first
 
-            source = source_from(details)
-            # Cannot update local path modules, skip
-            next if source && source[:type] == "path"
+              source = source_from(details)
+              # Cannot update local path modules, skip
+              next if source && source[:type] == "path"
 
-            dependency_set << build_terraform_dependency(file, name, T.must(source), details)
+              dependency_set << build_terraform_dependency(file, name, T.must(source), details)
+            end
           end
 
+          # Always process provider requirements, even in support files
+          # (nested local modules can have their own provider requirements)
           parsed_file(file).fetch("terraform", []).each do |terraform|
             required_providers = terraform.fetch("required_providers", {})
             required_providers.each do |provider|
@@ -305,7 +308,7 @@ module Dependabot
           type: "git",
           url: git_url,
           branch: nil,
-          ref: CGI.parse(querystr.to_s)["ref"].first&.split(%r{(?<!:)//})&.first
+          ref: URI.decode_www_form(querystr.to_s).to_h["ref"]&.split(%r{(?<!:)//})&.first
         }
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-terraform
 version: !ruby/object:Gem::Version
-  version: 0.355.0
+  version: 0.357.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.355.0
+        version: 0.357.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.355.0
+        version: 0.357.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +262,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.355.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.357.0
 rdoc_options: []
 require_paths:
 - lib
@@ -277,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.3.0
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Provides Dependabot support for Terraform
 test_files: []