dependabot-terraform 0.254.0 → 0.255.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab7104d63d7e71b3988d766baa0b991b7d2559a0274758a38b0e29802d13fbd5
-  data.tar.gz: a987b62c58f292e802a7ca1f6f9ddca00fd155ccc7d6e5769f4a35d4db50d554
+  metadata.gz: b86ff97e37a0fd8c3156a5bed89492c56564d444a8fea552b93498a34089ffed
+  data.tar.gz: e841cdee87c46bfeabd69cb7ca3bd707122ce22ed021f04289cb22bc434065ac
 SHA512:
-  metadata.gz: e7878dbe257b3ffb736f60e837538a4cc7ddd50428468b1e049da015e3d8352965dcae679bbd94da83a33f715aac88b6fa193d10552d4abb54176838e4516a2b
-  data.tar.gz: cee4d89fdc275e11b89f836b62f6930454bb219481ef7ea796aaec9329eebdb5689fef237fd14b30de0ddc081d7bdc3c82cb1738e44b493cc7fae690e14409a2
+  metadata.gz: a2010ee735c7e9674f5fd3445ecefd81d640b93caa3638377582f66180ad24237437809778ee09f4b066cbae6145ec5d4a9d9f02649bb1c690298563fa474521
+  data.tar.gz: 78c86fe178f4662a637faa9e6fb37b9b6755211c74e6fcf4f5eb7a6f7ac7ee6314bd67afe31fcca194b96ee424dbffc8cc60ad857b5f2dc01c0aaa6522347a5d

data/lib/dependabot/terraform/file_fetcher.rb

@@ -1,7 +1,8 @@
-# typed: false
+# typed: strict
 # frozen_string_literal: true
 
 require "sorbet-runtime"
+
 require "dependabot/file_fetchers"
 require "dependabot/file_fetchers/base"
 require "dependabot/terraform/file_selector"
@@ -12,15 +13,17 @@ module Dependabot
       extend T::Sig
       extend T::Helpers
 
-      include FileSelector
+      include FileFilter
 
       # https://www.terraform.io/docs/language/modules/sources.html#local-paths
       LOCAL_PATH_SOURCE = %r{source\s*=\s*['"](?<path>..?\/[^'"]+)}
 
+      sig { override.params(filenames: T::Array[String]).returns(T::Boolean) }
       def self.required_files_in?(filenames)
         filenames.any? { |f| f.end_with?(".tf", ".hcl") }
       end
 
+      sig { override.returns(String) }
       def self.required_files_message
         "Repo must contain a Terraform configuration file."
       end
@@ -37,22 +40,35 @@ module Dependabot
 
       private
 
+      sig { returns(T::Array[Dependabot::DependencyFile]) }
       def terraform_files
-        @terraform_files ||=
+        @terraform_files ||= T.let(
           repo_contents(raise_errors: false)
           .select { |f| f.type == "file" && f.name.end_with?(".tf") }
-          .map { |f| fetch_file_from_host(f.name) }
+          .map { |f| fetch_file_from_host(f.name) },
+          T.nilable(T::Array[Dependabot::DependencyFile])
+        )
       end
 
+      sig { returns(T::Array[Dependabot::DependencyFile]) }
       def terragrunt_files
-        @terragrunt_files ||=
+        @terragrunt_files ||= T.let(
           repo_contents(raise_errors: false)
           .select { |f| f.type == "file" && terragrunt_file?(f.name) }
-          .map { |f| fetch_file_from_host(f.name) }
+          .map { |f| fetch_file_from_host(f.name) },
+          T.nilable(T::Array[Dependabot::DependencyFile])
+        )
       end
 
+      sig do
+        params(
+          files: T::Array[Dependabot::DependencyFile],
+          dir: String
+        )
+          .returns(T::Array[Dependabot::DependencyFile])
+      end
       def local_path_module_files(files, dir: ".")
-        terraform_files = []
+        terraform_files = T.let([], T::Array[Dependabot::DependencyFile])
 
         files.each do |file|
           terraform_file_local_module_details(file).each do |path|
@@ -71,19 +87,22 @@ module Dependabot
         terraform_files.tap { |fs| fs.each { |f| f.support_file = true } }
       end
 
+      sig { params(file: Dependabot::DependencyFile).returns(T::Array[String]) }
       def terraform_file_local_module_details(file)
         return [] unless file.name.end_with?(".tf")
-        return [] unless file.content.match?(LOCAL_PATH_SOURCE)
+        return [] unless file.content&.match?(LOCAL_PATH_SOURCE)
 
-        file.content.scan(LOCAL_PATH_SOURCE).flatten.map do |path|
+        T.must(file.content).scan(LOCAL_PATH_SOURCE).flatten.map do |path|
           Pathname.new(path).cleanpath.to_path
         end
       end
 
+      sig { returns(T.nilable(Dependabot::DependencyFile)) }
       def lockfile
-        return @lockfile if defined?(@lockfile)
-
-        @lockfile = fetch_file_if_present(".terraform.lock.hcl")
+        @lockfile ||= T.let(
+          fetch_file_if_present(".terraform.lock.hcl"),
+          T.nilable(Dependabot::DependencyFile)
+        )
       end
     end
   end

data/lib/dependabot/terraform/file_filter.rb

@@ -0,0 +1,24 @@
+# typed: strong
+# frozen_string_literal: true
+
+require "sorbet-runtime"
+
+module Dependabot
+  module Terraform
+    module FileFilter
+      extend T::Sig
+
+      private
+
+      sig { params(file_name: String).returns(T::Boolean) }
+      def terragrunt_file?(file_name)
+        !lockfile?(file_name) && file_name.end_with?(".hcl")
+      end
+
+      sig { params(filename: String).returns(T::Boolean) }
+      def lockfile?(filename)
+        filename == ".terraform.lock.hcl"
+      end
+    end
+  end
+end

data/lib/dependabot/terraform/file_selector.rb

@@ -1,26 +1,39 @@
-# typed: false
+# typed: strong
 # frozen_string_literal: true
 
-module FileSelector
-  private
+require "sorbet-runtime"
 
-  def terraform_files
-    dependency_files.select { |f| f.name.end_with?(".tf") }
-  end
+require "dependabot/terraform/file_filter"
 
-  def terragrunt_files
-    dependency_files.select { |f| terragrunt_file?(f.name) }
-  end
+module Dependabot
+  module Terraform
+    module FileSelector
+      extend T::Sig
+      extend T::Helpers
 
-  def terragrunt_file?(file_name)
-    !lockfile?(file_name) && file_name.end_with?(".hcl")
-  end
+      abstract!
 
-  def lockfile?(filename)
-    filename == ".terraform.lock.hcl"
-  end
+      sig { abstract.returns(T::Array[Dependabot::DependencyFile]) }
+      def dependency_files; end
+
+      private
+
+      include FileFilter
+
+      sig { returns(T::Array[Dependabot::DependencyFile]) }
+      def terraform_files
+        dependency_files.select { |f| f.name.end_with?(".tf") }
+      end
+
+      sig { returns(T::Array[Dependabot::DependencyFile]) }
+      def terragrunt_files
+        dependency_files.select { |f| terragrunt_file?(f.name) }
+      end
 
-  def lockfile
-    dependency_files.find { |f| lockfile?(f.name) }
+      sig { returns(T.nilable(Dependabot::DependencyFile)) }
+      def lockfile
+        dependency_files.find { |f| lockfile?(f.name) }
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-terraform
 version: !ruby/object:Gem::Version
-  version: 0.254.0
+  version: 0.255.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-24 00:00:00.000000000 Z
+date: 2024-05-03 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.254.0
+        version: 0.255.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.254.0
+        version: 0.255.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: turbo_tests
   requirement: !ruby/object:Gem::Requirement
@@ -231,6 +245,7 @@ files:
 - helpers/build
 - lib/dependabot/terraform.rb
 - lib/dependabot/terraform/file_fetcher.rb
+- lib/dependabot/terraform/file_filter.rb
 - lib/dependabot/terraform/file_parser.rb
 - lib/dependabot/terraform/file_selector.rb
 - lib/dependabot/terraform/file_updater.rb
@@ -245,7 +260,7 @@ licenses:
 - Nonstandard
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.254.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.255.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -261,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.1.0
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Provides Dependabot support for Terraform