vagrant-terraform 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dacbe62294c85a5ec69042adae409df5b1ec31dad1ed5f1700c172931ff5a98b
-  data.tar.gz: 6b3eb82e39e8eb7c791f2c3ca9c3aff71074a2446fa8dae5cba7389271695d2e
+  metadata.gz: 5e305adfd79a1c56e8812dd068a5b2502a34236603ba57e1285597459d3e6387
+  data.tar.gz: db6c7c8e2235700b96fe3b548265b40fcb1624259e22f2efa036aabd293e6208
 SHA512:
-  metadata.gz: 58b44ccfbb6005bbfd22fb548fcaef0f1357e7f984435d2c598eafe06bae935a62e2731c60e5e2e150771cd12f716cd272855b844c9532022724162b4a2409e5
-  data.tar.gz: 38278548028309af518e1f323eb420dc422915a1aa52ffeaa512a3dd3f7b03db54b9c2d5026e69fffe3526c3cdd2a04e387fc601eee646c77e9edb79be3288c1
+  metadata.gz: fa6c9c6524467a8adf146fb8e41110df58d877e9f02de05252cfa776a6d37e0189b32c0ee1c1e342e4841155344791ffe28af32ea45f24625eb9491d663a364a
+  data.tar.gz: 246a8498c3cfa9ff61cf48fe713ccc1f838fe774858021c7194d5699d96dec3890b6aaf727ac8ffe27b361a1efef0b15937fa059ab336d0c4205a34f5016580f

data/lib/vagrant-terraform/action/create_vm.rb

@@ -172,6 +172,8 @@ END
 
           File.write(terraform_main_file, main_tf)
 
+          # Avoid downloading the provider every time even when it's in the cache
+          ENV['TF_PLUGIN_CACHE_MAY_BREAK_DEPENDENCY_LOCK_FILE'] = "1"
           retryable(on: Errors::TerraformError, tries: 100, sleep: 1) do
             begin
               terraform_execute(env, 'terraform init')
@@ -191,7 +193,33 @@ END
 
           retryable(on: Errors::TerraformError, tries: 10, sleep: 1) do
             begin
-              terraform_execute(env, "terraform apply -auto-approve")
+              lockfile = '.vagrant/terraform/lock'
+              max_retries = 300
+              retry_delay = 2
+
+              File.open(lockfile, 'w') do |file|
+                retries = 0
+
+                # VM creation can't be done in parallel because multiple VMs might get the same ID
+                # Get a lock before creating VM with 'terraform apply'
+                until file.flock(File::LOCK_EX | File::LOCK_NB)
+                  if retries >= max_retries
+                    raise Errors::CreateVMError,
+                      :error_message => "Failed to acquire lock after #{max_retries} attempts. Exiting."
+                  end
+
+                  @logger.debug("Lock is currently held. Retrying in #{retry_delay} seconds...")
+                  retries += 1
+                  sleep(retry_delay)
+                end
+
+                begin
+                  terraform_execute(env, "terraform apply -auto-approve")
+                ensure
+                  file.flock(File::LOCK_UN)
+                end
+              end
+
             rescue Errors::TerraformError => e
               # ==> vm_one: terraform stderr: ╷
               # ==> vm_one: │ Error: can't lock file '/var/lock/qemu-server/lock-100.conf' - got timeout
@@ -233,12 +261,18 @@ END
                 raise e
               end
 
-              # Creation failed. Terraform error message was 'clone failed: unable to create image: qemu-img: /mnt/pve/qnap-nfs/images/105/vm-105-cloudinit.qcow2: Could not create '/mnt/pve/qnap-nfs/images/105/vm-105-cloudinit.qcow2': No such file or directory'
-              if e.message.gsub(ansi_escape_regex, '') =~ /.*unable to create image .* No such file or directory/
+              # Terraform error message was "clone failed: unable to create image: qemu-img: /mnt/pve/qnap-nfs/images/105/vm-105-cloudinit.qcow2: Could not create '/mnt/pve/qnap-nfs/images/105/vm-105-cloudinit.qcow2': No such file or directory"
+              if e.message.gsub(ansi_escape_regex, '') =~ /.*unable to create image: .* No such file or directory/
                 env[:ui].info("Clone failed, retrying. Error was: #{e.message}")
                 raise e
               end
 
+              # Terraform error message was 'Request cancelled'
+              if e.message.gsub(ansi_escape_regex, '').include?("Request cancelled")
+                env[:ui].info("Proxmox error: Request cancelled")
+                raise e
+              end
+
               if e.message.gsub(ansi_escape_regex, '') =~ /.*Error: [0-9 ]*unable to create VM [0-9]*: config file already exists/
                 env[:ui].info("Proxmox ID conflict, retrying")
                 raise e

data/lib/vagrant-terraform/action/setup_terraform.rb

@@ -22,6 +22,7 @@ module VagrantPlugins
             # dir_name = env[:root_path].basename.to_s.dup.gsub(/[^-a-z0-9_]/i, "")
             begin
               Dir.mkdir(File.dirname(terraform_dir)) unless File.exist?(File.dirname(terraform_dir))
+              FileUtils.touch("#{File.dirname(terraform_dir)}/lock")
             rescue => e
               retry if e.message =~ /File exists/
               env[:ui].error("terraform init failed: #{e.message}")

data/lib/vagrant-terraform/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module TerraformProvider
-    VERSION = '0.1.11'
+    VERSION = '0.1.12'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-terraform
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Mika Båtsman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-24 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize