dependabot-terraform 0.259.0 → 0.261.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09c6fe1efc0b051249aa1e8030210adf9801c8af510995399c0752049222c3f0'
-  data.tar.gz: e99cf8ed798d2f5e57c370db21ca0f5fc26cd030068b019b4e73b0bdaa337233
+  metadata.gz: b5bf4ee2034d691008382f6d6ce217a3d0b010ae6359310aaab7cd8b348dd3b1
+  data.tar.gz: 0f930b2c435202ab7d301b28fa7e0f0f17ea07b3348e1937aacf820ee88fe6d6
 SHA512:
-  metadata.gz: d31d570844524852c367c2264a4b09d83bfee57dec1724a29a2c2a58840487fb9b9bc6492684dd7d787f06d84861efad916cab0207f68a56c95ee3665e7a9ae0
-  data.tar.gz: d51bbebb16805a02e1997d6858b8f5aa482395eb3a89665c4e2f92ce36074597f9d36492762d901010848c85a3a7e753ee177069e1857a60851f48d9957e302e
+  metadata.gz: 948fd636cdbf07154bf5692e99aaa67865f88a9707aacd727fa1593cc5f37c1f05bffab1f161a62d5ee3ed11122333dd7a839785de4dac93921aecb4c0342cd6
+  data.tar.gz: 68a81f0c15a466e3ba2357daab254ebc2f6be558c0571c6db4a2037b17b4b7d5f8d5c58879635b9cc2949404db12a0e230a7eac6f62dc072d61b7ff1895e899b

data/lib/dependabot/terraform/file_updater.rb

@@ -1,6 +1,8 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
+require "sorbet-runtime"
+
 require "dependabot/file_updaters"
 require "dependabot/file_updaters/base"
 require "dependabot/errors"
@@ -10,6 +12,8 @@ require "dependabot/shared_helpers"
 module Dependabot
   module Terraform
     class FileUpdater < Dependabot::FileUpdaters::Base
+      extend T::Sig
+
       include FileSelector
 
       PRIVATE_MODULE_ERROR = /Could not download module.*code from\n.*\"(?<repo>\S+)\":/
@@ -36,8 +40,8 @@ module Dependabot
         end
         updated_lockfile_content = update_lockfile_declaration(updated_files)
 
-        if updated_lockfile_content && lockfile.content != updated_lockfile_content
-          updated_files << updated_file(file: lockfile, content: updated_lockfile_content)
+        if updated_lockfile_content && T.must(lockfile).content != updated_lockfile_content
+          updated_files << updated_file(file: T.must(lockfile), content: updated_lockfile_content)
         end
 
         updated_files.compact!
@@ -137,12 +141,18 @@ module Dependabot
                .sub(hashes_object_regex, "")
       end
 
+      sig do
+        params(
+          new_req: T::Hash[Symbol, T.untyped]
+        )
+          .returns([String, String, Regexp])
+      end
       def lockfile_details(new_req)
-        content = lockfile.content.dup
+        content = T.must(lockfile).content.dup
         provider_source = new_req[:source][:registry_hostname] + "/" + new_req[:source][:module_identifier]
         declaration_regex = lockfile_declaration_regex(provider_source)
 
-        [content, provider_source, declaration_regex]
+        [T.must(content), provider_source, declaration_regex]
       end
 
       def lookup_hash_architecture # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
@@ -164,7 +174,7 @@ module Dependabot
           linux_arm64
         )
 
-        base_dir = dependency_files.first.directory
+        base_dir = T.must(dependency_files.first).directory
         lockfile_hash_removed = remove_provider_h1_hashes(content, declaration_regex)
 
         # This runs in the same directory as the actual lockfile update so
@@ -198,7 +208,7 @@ module Dependabot
           end
         rescue SharedHelpers::HelperSubprocessFailed => e
           if @retrying_lock && e.message.match?(MODULE_NOT_INSTALLED_ERROR)
-            mod = e.message.match(MODULE_NOT_INSTALLED_ERROR).named_captures.fetch("mod")
+            mod = T.must(e.message.match(MODULE_NOT_INSTALLED_ERROR)).named_captures.fetch("mod")
             raise Dependabot::DependencyFileNotResolvable, "Attempt to install module #{mod} failed"
           end
           raise if @retrying_lock || !e.message.include?("terraform init")
@@ -226,7 +236,7 @@ module Dependabot
         content, provider_source, declaration_regex = lockfile_details(new_req)
         lockfile_dependency_removed = content.sub(declaration_regex, "")
 
-        base_dir = dependency_files.first.directory
+        base_dir = T.must(dependency_files.first).directory
         SharedHelpers.in_a_temporary_repo_directory(base_dir, repo_contents_path) do
           # Determine the provider using the original manifest files
           platforms = architecture_type.map { |arch| "-platform=#{arch}" }.join(" ")
@@ -242,17 +252,17 @@ module Dependabot
           )
 
           updated_lockfile = File.read(".terraform.lock.hcl")
-          updated_dependency = updated_lockfile.scan(declaration_regex).first
+          updated_dependency = T.cast(updated_lockfile.scan(declaration_regex).first, String)
 
           # Terraform will occasionally update h1 hashes without updating the version of the dependency
           # Here we make sure the dependency's version actually changes in the lockfile
-          unless updated_dependency.scan(declaration_regex).first.scan(/^\s*version\s*=.*/) ==
-                 content.scan(declaration_regex).first.scan(/^\s*version\s*=.*/)
+          unless T.cast(updated_dependency.scan(declaration_regex).first, String).scan(/^\s*version\s*=.*/) ==
+                 T.cast(content.scan(declaration_regex).first, String).scan(/^\s*version\s*=.*/)
             content.sub!(declaration_regex, updated_dependency)
           end
         rescue SharedHelpers::HelperSubprocessFailed => e
           if @retrying_lock && e.message.match?(MODULE_NOT_INSTALLED_ERROR)
-            mod = e.message.match(MODULE_NOT_INSTALLED_ERROR).named_captures.fetch("mod")
+            mod = T.must(e.message.match(MODULE_NOT_INSTALLED_ERROR)).named_captures.fetch("mod")
             raise Dependabot::DependencyFileNotResolvable, "Attempt to install module #{mod} failed"
           end
           raise if @retrying_lock || !e.message.include?("terraform init")
@@ -276,8 +286,8 @@ module Dependabot
           output = e.message
 
           if output.match?(PRIVATE_MODULE_ERROR)
-            repo = output.match(PRIVATE_MODULE_ERROR).named_captures.fetch("repo")
-            if repo.match?(GIT_HTTPS_PREFIX)
+            repo = T.must(output.match(PRIVATE_MODULE_ERROR)).named_captures.fetch("repo")
+            if repo&.match?(GIT_HTTPS_PREFIX)
               repo = repo.sub(GIT_HTTPS_PREFIX, "")
               repo = repo.sub(/\.git$/, "")
             end
@@ -363,6 +373,7 @@ module Dependabot
         source[:registry_hostname] || source["registry_hostname"] || "registry.terraform.io"
       end
 
+      sig { params(provider_source: String).returns(Regexp) }
       def lockfile_declaration_regex(provider_source)
         /
           (?:(?!^\}).)*

data/lib/dependabot/terraform/metadata_finder.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 require "excon"
@@ -7,12 +7,16 @@ require "dependabot/metadata_finders"
 require "dependabot/metadata_finders/base"
 require "dependabot/terraform/registry_client"
 require "dependabot/shared_helpers"
+require "sorbet-runtime"
 
 module Dependabot
   module Terraform
     class MetadataFinder < Dependabot::MetadataFinders::Base
+      extend T::Sig
+
       private
 
+      sig { override.returns(T.nilable(Dependabot::Source)) }
       def look_up_source
         case new_source_type
         when "git" then find_source_from_git_url
@@ -21,10 +25,12 @@ module Dependabot
         end
       end
 
+      sig { returns(T.nilable(String)) }
       def new_source_type
         dependency.source_type
       end
 
+      sig { returns(T.nilable(Dependabot::Source)) }
       def find_source_from_git_url
         info = dependency.requirements.filter_map { |r| r[:source] }.first
 
@@ -32,6 +38,7 @@ module Dependabot
         Source.from_url(url)
       end
 
+      sig { returns(T.nilable(Dependabot::Source)) }
       def find_source_from_registry_details
         info = dependency.requirements.filter_map { |r| r[:source] }.first
         hostname = info[:registry_hostname] || info["registry_hostname"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-terraform
 version: !ruby/object:Gem::Version
-  version: 0.259.0
+  version: 0.261.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-30 00:00:00.000000000 Z
+date: 2024-06-13 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.259.0
+        version: 0.261.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.259.0
+        version: 0.261.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -260,7 +260,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.259.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.261.0
 post_install_message: 
 rdoc_options: []
 require_paths: