dependabot-terraform 0.260.0 → 0.261.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43fecafce99d6aeb9224e649b26718f7ced8d4947aa9fb9b6ca2645ad38abf52
-  data.tar.gz: 776bc8eb679e454945242ae40fd57df3fb611d5da901c76086fc2b5bb312ce5a
+  metadata.gz: f43110753b0a724a429bc09a65a8a86f311147c5611dfd03fdc6a4c51f900a88
+  data.tar.gz: d1b548612657b50cefcdf4fefed24a1f1ede3cec7c1f98679d8879ee894d9953
 SHA512:
-  metadata.gz: 1289bb397dd90e3ecb75da84617e96944ace792d6cc79fff16c488a2e1f2d7e7b90cc37a8b87ed7e6053857097a93d849645eddbd1d6848f1841d7f977bdad55
-  data.tar.gz: ff031b7ab0bc2b590cdbaab97abeed9525a5a418a9ea36b021d4eb6b7e4825e19d65ebbb7e1a4a432053874af0fa721535af4f92d4a59ec2ed9af9f400f828b6
+  metadata.gz: 2e4958e34241b4bf263f090518cb3d510e7a9b4945842b9710e6d7b2bcab9947f9b475a017007c14b4d15b65f3d496086cd6f3e83b940cdc8735780963903b09
+  data.tar.gz: 0420b3d5b33b2ceec10a5c752a2b49c40660d409a6a1e20f019964f8155e7272eadbe431109b69bc1f3b8cd6b6e2ccddd11794a8f0cf1740dc9eed439e6638a8

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"]

data/lib/dependabot/terraform/requirement.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 require "sorbet-runtime"
@@ -11,13 +11,15 @@ require "dependabot/terraform/version"
 module Dependabot
   module Terraform
     class Requirement < Dependabot::Requirement
+      extend T::Sig
       # Override regex PATTERN from Gem::Requirement to add support for the
       # optional 'v' prefix to release tag names, which Terraform supports.
       # https://www.terraform.io/docs/registry/modules/publish.html#requirements
-      OPERATORS = OPS.keys.map { |key| Regexp.quote(key) }.join("|").freeze
-      PATTERN_RAW = "\\s*(#{OPERATORS})?\\s*v?(#{Gem::Version::VERSION_PATTERN})\\s*".freeze
+      OPERATORS = T.let(OPS.keys.map { |key| Regexp.quote(key) }.join("|").freeze, String)
+      PATTERN_RAW = T.let("\\s*(#{OPERATORS})?\\s*v?(#{Gem::Version::VERSION_PATTERN})\\s*".freeze, String)
       PATTERN = /\A#{PATTERN_RAW}\z/
 
+      sig { params(obj: T.any(String, Gem::Version)).returns(T::Array[T.any(String, Version)]) }
       def self.parse(obj)
         return ["=", Version.new(obj.to_s)] if obj.is_a?(Gem::Version)
 
@@ -28,7 +30,7 @@ module Dependabot
 
         return DefaultRequirement if matches[1] == ">=" && matches[2] == "0"
 
-        [matches[1] || "=", Terraform::Version.new(T.must(matches[2]))]
+        [matches[1] || "=", Terraform::Version.new(matches[2])]
       end
 
       # For consistency with other languages, we define a requirements array.
@@ -36,11 +38,12 @@ module Dependabot
       # always contains a single element.
       sig { override.params(requirement_string: T.nilable(String)).returns(T::Array[Requirement]) }
       def self.requirements_array(requirement_string)
-        [new(requirement_string)]
+        [new(requirement_string.to_s)]
       end
 
       # Patches Gem::Requirement to make it accept requirement strings like
       # "~> 4.2.5, >= 4.2.5.1" without first needing to split them.
+      sig { params(requirements: T.any(String, T::Array[String])).void }
       def initialize(*requirements)
         requirements = requirements.flatten.flat_map do |req_string|
           req_string.split(",").map(&:strip)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-terraform
 version: !ruby/object:Gem::Version
-  version: 0.260.0
+  version: 0.261.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-06-17 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.260.0
+        version: 0.261.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.260.0
+        version: 0.261.1
 - !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.260.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.261.1
 post_install_message: 
 rdoc_options: []
 require_paths: