dependabot-terraform 0.147.0 → 0.147.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21f0249523d3bd37b7c26bfcc7e76b0246cb83ef62c8e7aabd76d3cf207476c9
-  data.tar.gz: 791a20bc9878a4f7e5e1806824551bee1102dc9c9eb8b2dd58a0fbe1e880fd05
+  metadata.gz: 1513bb43b2a242c080012555ab17869d6c062e941912c36dcc5ea76476be03b9
+  data.tar.gz: 731c9a7cd5658b622f7a24e87ea9a48909094af9cba08deb9850cb55a7f19bd9
 SHA512:
-  metadata.gz: b464c8b17eebf7f615824a79b85d660446e13e38741bfe60d195bf78643c0a983536c267719f3f775e78be1308d93b8cf1ba0c58ee7bddefa49404b2f1652fe9
-  data.tar.gz: 40b1ca7f782c0ed4d5309f293a72572d5f34be8963bbb4f7097d891a3545c7362d2331b029992776a4446ee5933bec22211d0848d9aff9df40d2b29839a50bf0
+  metadata.gz: 3ea9a436607ccb4b54b21743d6952d41b4a86bd344724372facdb6368b1fd6b1d24b7327ae569738280b8bd4187ae78f9fad0b458ac8832665a0741ca380eb33
+  data.tar.gz: b438039b06970eaf03a187567432a785e4f7eb2e9f61b18dffbdec99aa39080e2c322467d40b830af9b83356355a1d4702f61bbe84c9bdac50187309e7709a4d

data/helpers/build

@@ -14,13 +14,6 @@ fi
 
 os="$(uname -s | tr '[:upper:]' '[:lower:]')"
 
-json2hcl_checksum="d124ed13f3538c465fcab19e6015d311d3cd56f7dc2db7609b6e72fec666482d"
-json2hcl_url="https://github.com/kvz/json2hcl/releases/download/v0.0.6/json2hcl_v0.0.6_${os}_amd64"
-json2hcl_path="$install_dir/bin/json2hcl"
-wget -O "$json2hcl_path"  "$json2hcl_url"
-echo "$json2hcl_checksum  $json2hcl_path" | sha256sum -c
-chmod +x "$install_dir/bin/json2hcl"
-
 hcl2json_checksum="24068f1e25a34d8f8ca763f34fce11527472891bfa834d1504f665855021d5d4"
 hcl2json_url="https://github.com/tmccombs/hcl2json/releases/download/v0.3.3/hcl2json_${os}_amd64"
 hcl2json_path="$install_dir/bin/hcl2json"

data/lib/dependabot/terraform/file_fetcher.rb

@@ -10,7 +10,7 @@ module Dependabot
       include FileSelector
 
       def self.required_files_in?(filenames)
-        filenames.any? { |f| f.end_with?(".tf", ".tfvars") }
+        filenames.any? { |f| f.end_with?(".tf", ".hcl") }
       end
 
       def self.required_files_message

data/lib/dependabot/terraform/file_parser.rb

@@ -32,10 +32,7 @@ module Dependabot
         end
 
         terragrunt_files.each do |file|
-          # legacy terragrunt (.tfvars) files have a top-level "terragrunt" key
-          # that has since been removed.
-          legacy_modules = (parsed_file(file).fetch("terragrunt", []).first || {}).fetch("terraform", [])
-          modules = parsed_file(file).fetch("terraform", []) + legacy_modules
+          modules = parsed_file(file).fetch("terraform", [])
           modules.each do |details|
             next unless details["source"]
 
@@ -215,56 +212,6 @@ module Dependabot
       end
       # rubocop:enable Metrics/PerceivedComplexity
 
-      def parsed_file_hcl2(file)
-        SharedHelpers.in_a_temporary_directory do
-          File.write("tmp.tf", file.content)
-
-          command = "#{terraform_hcl2_parser_path} < tmp.tf"
-          start = Time.now
-          stdout, stderr, process = Open3.capture3(command)
-          time_taken = Time.now - start
-
-          unless process.success?
-            raise SharedHelpers::HelperSubprocessFailed.new(
-              message: stderr,
-              error_context: {
-                command: command,
-                time_taken: time_taken,
-                process_exit_value: process.to_s
-              }
-            )
-          end
-
-          JSON.parse(stdout)
-        end
-      end
-
-      def parsed_file_hcl1(file)
-        SharedHelpers.in_a_temporary_directory do
-          File.write("tmp.tf", file.content)
-
-          command = "#{terraform_parser_path} -reverse < tmp.tf"
-          start = Time.now
-          stdout, stderr, process = Open3.capture3(command)
-          time_taken = Time.now - start
-
-          unless process.success?
-            raise SharedHelpers::HelperSubprocessFailed.new(
-              message: stderr,
-              error_context: {
-                command: command,
-                time_taken: time_taken,
-                process_exit_value: process.to_s
-              }
-            )
-          end
-
-          json = JSON.parse(stdout)
-          json["module"] = json.fetch("module", []).inject({}) { |memo, item| memo.merge(item) }
-          json
-        end
-      end
-
       # == Returns:
       # A Hash representing each module found in the specified file
       #
@@ -289,12 +236,27 @@ module Dependabot
       # }
       def parsed_file(file)
         @parsed_buildfile ||= {}
-        @parsed_buildfile[file.name] ||=
-          if options[:legacy_terraform]
-            parsed_file_hcl1(file)
-          else
-            parsed_file_hcl2(file)
+        @parsed_buildfile[file.name] ||= SharedHelpers.in_a_temporary_directory do
+          File.write("tmp.tf", file.content)
+
+          command = "#{terraform_hcl2_parser_path} < tmp.tf"
+          start = Time.now
+          stdout, stderr, process = Open3.capture3(command)
+          time_taken = Time.now - start
+
+          unless process.success?
+            raise SharedHelpers::HelperSubprocessFailed.new(
+              message: stderr,
+              error_context: {
+                command: command,
+                time_taken: time_taken,
+                process_exit_value: process.to_s
+              }
+            )
           end
+
+          JSON.parse(stdout)
+        end
       rescue SharedHelpers::HelperSubprocessFailed => e
         msg = e.message.strip
         raise Dependabot::DependencyFileNotParseable.new(file.path, msg)

data/lib/dependabot/terraform/file_selector.rb

@@ -12,7 +12,6 @@ module FileSelector
   end
 
   def terragrunt_file?(file_name)
-    file_name != ".terraform.lock.hcl" &&
-      (file_name.end_with?(".tfvars") || file_name.end_with?(".hcl"))
+    file_name != ".terraform.lock.hcl" && file_name.end_with?(".hcl")
   end
 end

data/lib/dependabot/terraform/file_updater.rb

@@ -11,7 +11,7 @@ module Dependabot
       include FileSelector
 
       def self.updated_files_regex
-        [/\.tf$/, /\.tfvars$/, /\.hcl$/]
+        [/\.tf$/, /\.hcl$/]
       end
 
       def updated_dependency_files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-terraform
 version: !ruby/object:Gem::Version
-  version: 0.147.0
+  version: 0.147.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2021-05-19 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.147.0
+        version: 0.147.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.147.0
+        version: 0.147.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement