dependabot-terraform 0.169.2 → 0.169.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6d449dbf3910e48b7c1cf2243ad6426c6552f57b14e0ea1a746fe82c4f4b0d5
-  data.tar.gz: 58867724b89ec677bd2205dd352769981d8f09ff4276c6250f669b3d2d2b027a
+  metadata.gz: 19312fc4f1fa16e8878ca9341dc9220aea89631a8e2bc3e333c5d60552f8169f
+  data.tar.gz: 1ca7744b561dc23dcb18a21b84fd4af2066d5ad81a5a9b00063a36f0d7dd8678
 SHA512:
-  metadata.gz: 3673cf2cbbb49f85ca78004c4eb156408cedb35c801cea4dc7e26e4b7423ef870245e7e14b1b012385b31529e2ae1e353f1268449507208b5b1cabbe0031d3cf
-  data.tar.gz: 9d28e371d88fd7747e459e25a29684beed0aeb895bd7fe3e492baece410abf4bed8c567295f98b528c58991641c1c954443b85c0674b128588e2e9f3b7e433bc
+  metadata.gz: e091cc8432b35b2a1df07e203a2b500466ff667b4902551a683eff652e6f8dfaad1e077d8737fd9454a7f203ef3590dd0824d5632880df5399bf37afd04076d9
+  data.tar.gz: f2be046391dea598cb3eaac590957fab48a2cb63887642321ac4ddf183ab89f99f50e124211fda6b81431f48aa249fed3b8ee436b5a63d17a0f3a58fe7b74c60

data/lib/dependabot/terraform/file_parser.rb

@@ -28,10 +28,26 @@ module Dependabot
       def parse
         dependency_set = DependencySet.new
 
+        parse_terraform_files(dependency_set)
+
+        parse_terragrunt_files(dependency_set)
+
+        dependency_set.dependencies.sort_by(&:name)
+      end
+
+      private
+
+      def parse_terraform_files(dependency_set)
         terraform_files.each do |file|
           modules = parsed_file(file).fetch("module", {})
           modules.each do |name, details|
-            dependency_set << build_terraform_dependency(file, name, details)
+            details = details.first
+
+            source = source_from(details)
+            # Cannot update local path modules, skip
+            next if source[:type] == "path"
+
+            dependency_set << build_terraform_dependency(file, name, source, details)
           end
 
           parsed_file(file).fetch("terraform", []).each do |terraform|
@@ -43,7 +59,9 @@ module Dependabot
             end
           end
         end
+      end
 
+      def parse_terragrunt_files(dependency_set)
         terragrunt_files.each do |file|
           modules = parsed_file(file).fetch("terraform", [])
           modules.each do |details|
@@ -52,19 +70,15 @@ module Dependabot
             dependency_set << build_terragrunt_dependency(file, details)
           end
         end
-
-        dependency_set.dependencies.sort_by(&:name)
       end
 
-      private
-
-      def build_terraform_dependency(file, name, details)
-        details = details.first
-
-        source = source_from(details)
+      def build_terraform_dependency(file, name, source, details)
+        # dep_name should be unique for a source, using the info derived from
+        # the source or the source name provides this uniqueness
         dep_name = case source[:type]
                    when "registry" then source[:module_identifier]
                    when "provider" then details["source"]
+                   when "git" then git_dependency_name(name, source)
                    else name
                    end
         version_req = details["version"]&.strip
@@ -199,6 +213,15 @@ module Dependabot
         end
       end
 
+      def git_dependency_name(name, source)
+        git_source = Source.from_url(source[:url])
+        if source[:ref]
+          name + "::" + git_source.provider + "::" + git_source.repo + "::" + source[:ref]
+        else
+          name + "::" + git_source.provider + "::" + git_source.repo
+        end
+      end
+
       def git_source_details_from(source_string)
         git_url = source_string.strip.gsub(/^git::/, "")
         git_url = "https://" + git_url unless git_url.start_with?("git@") || git_url.include?("://")
@@ -266,7 +289,7 @@ module Dependabot
         return :path if source_string.start_with?(".")
         return :github if source_string.include?("github.com")
         return :bitbucket if source_string.start_with?("bitbucket.org/")
-        return :git if source_string.start_with?("git::")
+        return :git if source_string.start_with?("git::") || source_string.start_with?("git@")
         return :mercurial if source_string.start_with?("hg::")
         return :s3 if source_string.start_with?("s3::")
 

data/lib/dependabot/terraform/file_updater.rb

@@ -199,10 +199,11 @@ module Dependabot
         return /terraform\s*\{(?:(?!^\}).)*/m if terragrunt_file?(filename)
 
         # For modules we can do better - filter for module blocks that use the
-        # name of the dependency
+        # name of the module
+        module_name = dependency.name.split("::").first
         /
-          module\s+["']#{Regexp.escape(dependency.name)}["']\s*\{
-          (?:(?!^\}).)*
+         module\s+["']#{Regexp.escape(module_name)}["']\s*\{
+         (?:(?!^\}).)*
         /mx
       end
 

data/lib/dependabot/terraform/requirements_updater.rb

@@ -161,7 +161,8 @@ module Dependabot
             version_to_be_permitted.segments[index]
           elsif index == index_to_update
             version_to_be_permitted.segments[index] + 1
-          else 0
+          else
+            0
           end
         end
 

data/lib/dependabot/terraform.rb

@@ -20,3 +20,14 @@ Dependabot::Dependency.
 
 require "dependabot/utils"
 Dependabot::Utils.register_always_clone("terraform")
+
+Dependabot::Dependency.
+  register_display_name_builder(
+    "terraform",
+    lambda { |name|
+      # Only modify the name if it a git source dependency
+      next unless name.include? "::"
+
+      name.split("::").first + "::" + name.split("::")[2].split("/").last
+    }
+  )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-terraform
 version: !ruby/object:Gem::Version
-  version: 0.169.2
+  version: 0.169.6
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-30 00:00:00.000000000 Z
+date: 2021-12-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.169.2
+        version: 0.169.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.169.2
+        version: 0.169.6
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.0
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Terraform support for dependabot