vagrant-terraform 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2522d1ea4a52b4c972f6abf6a66f11f361ec801a26fb5bcb089d286a6cd292df
-  data.tar.gz: 703b30e9a3cb591a6022ad372ed5a1e9932bb319c170a07eda801659a14d734b
+  metadata.gz: 3b0980af98e95f4a9587641a569daeb896410b4bb86990d46f1816967321ebfd
+  data.tar.gz: 48c0115b522bb13890487a8854f6d771a7b4dda7196287105cbc740bbf4571cf
 SHA512:
-  metadata.gz: e361ce86c637c40b6b72510686a6cf9a77238f36fb7f8848965aeacac3acd95356d4928ddc6678d5a5c93108b8aaab38eb9d3eb6e74591706d461a6a0eeb356a
-  data.tar.gz: 448483359a5f6d30a4e95a5463edcb297504dae0ed4f42b65ede44a2834a1c9d9821c59bd123e9f2ae5132ce875e44fcf55754a085031ba72edcfae00442e1cb
+  metadata.gz: 6099a9a5c0029347b8d4f9ced88266ebeb62a2e21d8b9d92803d79ffe1b02af46ac619d3308feb1dd9148dc5e84fc5b096c449403c2e44e27987d41d5dcdb1d0
+  data.tar.gz: f8d825bdc67246c31e4cb0fb99f8b10eeb1f91563800ca195300bb74e7947f05e943fae52fdf6ce7325cdbed7d6d060db50a4debcfb399526a030c86c0f296ec

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/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,24 @@ 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
           end
-        rescue Timeout::Error
-          @logger.info("SSH Connection Failed: Timeout for IP: #{ip}" )
-          false
+          return false
         end
 
         def call(env)
@@ -51,7 +55,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/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module TerraformProvider
-    VERSION = '0.1.3'
+    VERSION = '0.1.5'
   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.5
 platform: ruby
 authors:
 - Mika Båtsman
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-01-09 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
@@ -68,7 +69,7 @@ homepage: https://github.com/mika-b/vagrant-terraform
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -83,8 +84,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.5.22
+signing_key: 
 specification_version: 4
 summary: This vagrant plugin provides the ability to create, control, and destroy
   virtual machines under proxmox