vagrant-terraform 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2522d1ea4a52b4c972f6abf6a66f11f361ec801a26fb5bcb089d286a6cd292df
-  data.tar.gz: 703b30e9a3cb591a6022ad372ed5a1e9932bb319c170a07eda801659a14d734b
+  metadata.gz: b91e84fbdc3a525218339936061f9350f02db124777bb7b07d1ac17229e02c6c
+  data.tar.gz: ae303b93001724e9696a22de69eca6f4d1822dc1063763a8d40aeaa1f9c73878
 SHA512:
-  metadata.gz: e361ce86c637c40b6b72510686a6cf9a77238f36fb7f8848965aeacac3acd95356d4928ddc6678d5a5c93108b8aaab38eb9d3eb6e74591706d461a6a0eeb356a
-  data.tar.gz: 448483359a5f6d30a4e95a5463edcb297504dae0ed4f42b65ede44a2834a1c9d9821c59bd123e9f2ae5132ce875e44fcf55754a085031ba72edcfae00442e1cb
+  metadata.gz: c26f1555ad6de110ddac0b844eb50d34ce1dde3f93b8918ccf33ab4cd0848f4d54ff373ca973cbb2ae29bddb5e2f0481f00085beaacb9c3b690fb7989b05ad62
+  data.tar.gz: 6e381a75c334749f0d8f1368a4f781a17b2f125d528544a30a0406fbca0104546bf2bfe2784ca75d2eacd07380f823fd29d6dc00984819addd7bba2901583ee3

data/.github/workflows/build-gem.yml

@@ -0,0 +1,32 @@
+name: Ruby Gem
+on: 
+  push:
+    tags:
+      - release/*
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby 3.3.6
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.3.6
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
+

data/README.md

@@ -7,7 +7,6 @@ Could be extended to support other Terraform providers in addition to Proxmox bu
 the moment I'm not planning to.
 
 Things I'm _not_ planning to do (due to lack of time and resources):
-* Put this in rubygems.org. If you want to use this, roll your own gem like instructed below.
 * Support other Terraform providers unless I have to move away from Proxmox to something else.
 * Add support for suspend / snapshots.
 * Support / test anything other than Ubuntu/Fedora
@@ -15,6 +14,12 @@ Things I'm _not_ planning to do (due to lack of time and resources):
 
 ## Installation
 
+From rubygems.org
+```
+vagrant plugin install vagrant-terraform
+```
+
+Build & install:
 ```
 $ gem build *.gemspec
 $ vagrant plugin install *.gem

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

@@ -80,6 +80,7 @@ resource "proxmox_vm_qemu" "#{vmname.gsub(/\./, '-')}" {
             }
         }
     }
+%SERIAL%
     nameserver = "#{config.nameserver}"
     searchdomain = "#{config.searchdomain}"
 %NETWORKS%
@@ -116,6 +117,18 @@ terraform {
     ipconfig%IDX% = "%IP%"
 END
 
+          serial_template = <<-END
+    serial {
+      id = 0
+      type = "socket"
+    }
+END
+          if config.serial_port
+            main_tf = main_tf.gsub(/%SERIAL%/, serial_template)
+          else
+            main_tf = main_tf.gsub(/%SERIAL%/, '')
+          end
+
           vagrantfile_networks = []
           env[:machine].id = vmname
           env[:machine].config.vm.networks.each_with_index do |network, idx|
@@ -150,8 +163,8 @@ END
           env[:ui].info(" -- Target node:   #{config.target_node}")
           env[:ui].info(" -- Storage domain: #{config.storage_domain}")
           env[:ui].info(" -- CPU Cores:     #{config.cpu_cores}")
-          env[:ui].info(" -- Memory:        #{Filesize.from("#{config.memory_size} B").to_f('MiB').to_i} MB")
-          env[:ui].info(" -- Disk:          #{Filesize.from("#{config.disk_size} B").to_f('GiB').to_i} GB") unless config.disk_size.nil?
+          env[:ui].info(" -- Memory:        #{Filesize.from("#{config.memory_size} B").to_f('MB').to_i} MB")
+          env[:ui].info(" -- Disk:          #{Filesize.from("#{config.disk_size} B").to_f('GB').to_i} GB") unless config.disk_size.nil?
 
           terraform_dir = env[:machine_tf_dir]
           terraform_main_file = "#{terraform_dir}/main.tf"
@@ -171,6 +184,18 @@ END
                 raise e
               end
 
+              # Terraform error message was 'clone failed: cfs-lock 'storage-qnap-nfs' error: got lock request timeout'
+              if e.message.gsub(ansi_escape_regex, '').include?("clone failed: cfs-lock")
+                env[:ui].info("Proxmox unable to get storage lock, retrying")
+                raise e
+              end
+
+              # Terraform error message was 'clone failed: 'storage-qnap-nfs'-locked command timed out - aborting'
+              if e.message.gsub(ansi_escape_regex, '').include?("command timed out")
+                env[:ui].info("Proxmox clone template, retrying")
+                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/wait_for_vm_up.rb

@@ -1,8 +1,9 @@
 require 'log4r'
-require 'vagrant-terraform/util/timer'
-require 'vagrant-terraform/util/terraform_execute'
 require 'socket'
 require 'timeout'
+require 'vagrant-terraform/util/timer'
+require 'vagrant-terraform/util/terraform_execute'
+Vagrant.require 'net/ssh'
 
 module VagrantPlugins
   module TerraformProvider
@@ -18,21 +19,30 @@ module VagrantPlugins
           @app = app
         end
 
-        def port_open?(ip, port, seconds=10)
-          # => checks if a port is open or not on a remote host
-          Timeout::timeout(seconds) do
+        def port_open?(ip)
+          # Check if ssh server responds, AuthenticationFailed is what we expect to get.
+          # If credentials vagrant:vagrant happen to work that's a success as well.
+          begin
             begin
-              TCPSocket.new(ip, port).close
-              @logger.info("SSH Check OK for IP: #{ip}")
-              true
-            rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, SocketError => e
-              @logger.info("SSH Connection Failed for IP #{ip}: #{e}")
-              false
+              ssh = Net::SSH.start(ip, "vagrant", password: "vagrant",
+                                   non_interactive: true, user_known_hosts_file: [],
+                                   verify_host_key: :never)
+            ensure
+              ssh&.close
             end
+            return true
+          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+            return false
+          rescue Net::SSH::AuthenticationFailed
+            return true
+          rescue Errno::ECONNRESET
+            @logger.debug("Got connection reset")
+            return false
+          rescue StandardError => e
+            @logger.debug("Got error #{e.message}")
+            return false
           end
-        rescue Timeout::Error
-          @logger.info("SSH Connection Failed: Timeout for IP: #{ip}" )
-          false
+          return false
         end
 
         def call(env)
@@ -42,7 +52,7 @@ module VagrantPlugins
           # Wait for VM to obtain an ip address.
           env[:metrics]["instance_ip_time"] = Util::Timer.time do
             env[:ui].info(I18n.t("vagrant_terraform.waiting_for_ip"))
-            for attempt in 1..300
+            for attempt in 1..100
               # If we're interrupted don't worry about waiting
               next if env[:interrupted]
 
@@ -51,7 +61,7 @@ module VagrantPlugins
               unless ip_addr.nil?
                 env[:ui].info("Got IP (attempt #{attempt}): #{ip_addr}")
                 # Check if SSH-Server is up
-                if port_open?(ip_addr, 22)
+                if port_open?(ip_addr)
                   env[:ip_address] = ip_addr
                   @logger.debug("Got output #{env[:ip_address]}")
                   break

data/lib/vagrant-terraform/action.rb

@@ -56,8 +56,8 @@ module VagrantPlugins
             end
 
             b2.use ProvisionerCleanup, :before if defined?(ProvisionerCleanup)
-            b2.use HaltVM unless env[:machine].state.id == :stopped
-            # b2.use WaitTillDown unless env[:machine].state.id == :stopped
+            # Maybe with sshfs clean halting could be beneficial
+            # b2.use HaltVM unless env[:machine].state.id == :stopped
             b2.use DestroyVM
           end
         end

data/lib/vagrant-terraform/config.rb

@@ -25,6 +25,7 @@ module VagrantPlugins
       attr_accessor :searchdomain
       attr_accessor :os_type
       attr_accessor :full_clone
+      attr_accessor :serial_port
 
       def initialize
         @api_url           = UNSET_VALUE
@@ -46,6 +47,7 @@ module VagrantPlugins
         @searchdomain      = UNSET_VALUE
         @os_type           = UNSET_VALUE
         @full_clone        = UNSET_VALUE
+        @serial_port       = UNSET_VALUE
       end
 
       def finalize!
@@ -68,6 +70,7 @@ module VagrantPlugins
         @searchdomain = '' if @searchdomain == UNSET_VALUE
         @os_type = 'l26' if @os_type == UNSET_VALUE
         @full_clone = true if @full_clone == UNSET_VALUE
+        @serial_port = false if @serial_port == UNSET_VALUE
 
         unless disk_size.nil?
           begin

data/lib/vagrant-terraform/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module TerraformProvider
-    VERSION = '0.1.3'
+    VERSION = '0.1.6'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-terraform
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Mika Båtsman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize
@@ -31,6 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build-gem.yml"
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
@@ -83,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: This vagrant plugin provides the ability to create, control, and destroy