Add comment about ordering of architectures, remove unnecessary metho…

…d call
dependabot · Mar 25, 2022 · a8aeac1 · a8aeac1
1 parent db9bf82
commit a8aeac1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/terraform/lib/dependabot/terraform/file_updater.rb b/terraform/lib/dependabot/terraform/file_updater.rb
@@ -118,6 +118,8 @@ def lookup_hash_architecture
                  split("\n").map { |hash| hash.match(hashes_string_regex).to_s }.
                  select { |h| h&.match?(/^h1:/) }
 
+        # These are ordered in assumed popularity
+        # We try to exit early if we have detected all of the hashes
         architectures = %w(
           linux_amd64
           darwin_amd64
@@ -140,7 +142,7 @@ def lookup_hash_architecture
             updated_dependency = updated_lockfile.scan(declaration_regex).first
 
             updated_hashes = updated_dependency.match(hashes_object_regex).to_s.
-              split("\n").map { |hash| hash.match(hashes_string_regex).to_s }.
+                             split("\n").map { |hash| hash.match(hashes_string_regex).to_s }.
                              select { |a| a&.match?(/^h1:/) }
 
             architecture_hashes[arch.to_sym] = updated_hashes unless updated_hashes.nil?
@@ -193,16 +195,14 @@ def update_lockfile_declaration(updated_manifest_files) # rubocop:disable Metric
         declaration_regex = lockfile_declaration_regex(provider_source)
         lockfile_dependency_removed = content.sub(declaration_regex, "")
 
-        architecture = architecture_type
-
         base_dir = dependency_files.first.directory
         SharedHelpers.in_a_temporary_repo_directory(base_dir, repo_contents_path) do
           # Update the provider requirements in case the previous requirement doesn't allow the new version
           updated_manifest_files.each { |f| File.write(f.name, f.content) }
 
           File.write(".terraform.lock.hcl", lockfile_dependency_removed)
 
-          platforms = architecture.map { |arch| "-platform=#{arch}" }.join(" ")
+          platforms = architecture_type.map { |arch| "-platform=#{arch}" }.join(" ")
           SharedHelpers.run_shell_command("terraform providers lock #{platforms} #{provider_source} -no-color")
 
           updated_lockfile = File.read(".terraform.lock.hcl")

diff --git a/terraform/spec/dependabot/terraform/file_updater_spec.rb b/terraform/spec/dependabot/terraform/file_updater_spec.rb
@@ -963,6 +963,7 @@ module "consul" {
         )
       end
     end
+
     context "when using a lockfile that requires access to an unreachable module" do
       let(:project_name) { "lockfile_unreachable_module" }
       let(:dependencies) do