vagrant-hostsupdater 1.0.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a2a17cded96ebcabea7b7c83fe53a211fec0f67d
-  data.tar.gz: b78d9ce4c6ad59cf4b84e21b20cf757bd20babab
+SHA256:
+  metadata.gz: 28da9dcc8ae93032fce5f1005a560e515d04c52dd7fbd8b59a4fe02a5dc28d9f
+  data.tar.gz: 9b52816b56418ef87eeb9d4570832af2b21f4a54e1ff3fff8410f58cf79cb42a
 SHA512:
-  metadata.gz: e050e308db233943db5d919bdc29e955ac2107dac000e55d2c5cb126347dad34b48b20e7d6a020c606f38d77e06866e0790db0e203841b917bfb723a87a78db7
-  data.tar.gz: 0e9ab9617ce0683000bda509941020f2f8540c49a0664a9db48c78ad330ecff32a9f901dfe2ab2bc78a9c563663f7ab933bdabdb99ef03bdfb8eaf129bd2bad3
+  metadata.gz: 017dd22e81cec47f73a0af31ecfa58489fd8bc89c57b722d97ef4c381a5fd8d04365138268f5466bda9a486f7fad075071eb1b0ecc484dea7842a26e74dccbe3
+  data.tar.gz: 0f6b2d84f9c791d35e930ac6b75472a0fc38272b88bccfaa9c8b60df2476dcd1c3dd7d9a16b9bed0a9108b960dc077798216fb63c35e0dbaab233a4aa6df6554

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+.idea
 *.rbc
 .bundle
 .config

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Falk Kühnel
+Copyright 2018 Chris Smith
 
 MIT License
 

data/README.md

@@ -1,3 +1,19 @@
+# NOT MAINTAINED
+# USE AN ALTERNATIVE
+
+March 3, 2021
+
+Hi Everyone. @cgsmith here. I took maintenance over from @agiledivider (Falk Kühnel) in 2015. Myself and the company I worked for relied on Vagrant for our development machines and I relied on vagrant-hostsupdater for changing hosts files. When I found out he was no longer maintaining the project I reached out to him on Twitter and he was willing to let me maintain it and apply some much needed pull requests.
+
+Maintaining a large project is extremely rewarding. I enjoyed doing so but have stopped using Vagrant for development. There are other plugins to help you manage your hosts file or you can feel free to fork this one into your own. 
+
+Don't worry if you don't know Ruby... I didn't. I'm a PHP developer. I figured it out though and asked the right questions to get the problem solved. 
+
+So long... may we meet elsewhere on this vast planet.
+
+- Chris Smith
+
+
 # Vagrant::Hostsupdater
 
 [![Gem Version](https://badge.fury.io/rb/vagrant-hostsupdater.svg)](https://badge.fury.io/rb/vagrant-hostsupdater)
@@ -10,10 +26,10 @@
 
 This plugin adds an entry to your /etc/hosts file on the host system.
 
-On **up**, **resume** and **reload** commands, it tries to add the information, if its not already existant in your hosts file. If it needs to be added, you will be asked for an administrator password, since it uses sudo to edit the file.
+On **up**, **resume** and **reload** commands, it tries to add the information, if it does not already exist in your hosts file. If it needs to be added, you will be asked for an administrator password, since it uses sudo to edit the file.
 
 On **halt**, **destroy**, and **suspend**, those entries will be removed again.
-By setting the `config.hostsupdater.remove_on_suspend  = false`, **suspend** will not remove them. 
+By setting the `config.hostsupdater.remove_on_suspend  = false`, **suspend** and **halt** will not remove them. 
 
 
 ## Installation
@@ -38,6 +54,27 @@ You currently only need the `hostname` and a `:private_network` network with a f
 
 This IP address and the hostname will be used for the entry in the `/etc/hosts` file.
 
+### Multiple private network adapters
+
+If you have multiple network adapters i.e.:
+
+    config.vm.network :private_network, ip: "10.0.0.1"
+    config.vm.network :private_network, ip: "10.0.0.2"
+
+you can specify which hostnames are bound to which IP by passing a hash mapping the IP of the network to an array of hostnames to create, e.g.:
+
+    config.hostsupdater.aliases = {
+        '10.0.0.1' => ['foo.com', 'bar.com'],
+        '10.0.0.2' => ['baz.com', 'bat.com']
+    }
+
+This will produce `/etc/hosts` entries like so:
+
+    10.0.0.1 foo.com
+    10.0.0.1 bar.com
+    10.0.0.2 baz.com
+    10.0.0.2 bat.com
+
 ### Skipping hostupdater
 
 To skip adding some entries to the /etc/hosts file add `hostsupdater: "skip"` option to network configuration:
@@ -52,18 +89,81 @@ Example:
         netmask: "255.255.240.0",
         hostsupdater: "skip"
         
+### Keeping Host Entries After Suspend/Halt
+
+To keep your /etc/hosts file unchanged simply add the line below to your `VagrantFile`:
+
+    config.hostsupdater.remove_on_suspend = false
+    
+This disables vagrant-hostsupdater from running on **suspend** and **halt**.
+        
+
+## Suppressing prompts for elevating privileges
+
+These prompts exist to prevent anything that is being run by the user from inadvertently updating the hosts file. 
+If you understand the risks that go with supressing them, here's how to do it.
 
-## Passwordless sudo
+### Linux/OS X: Passwordless sudo
 
-Add the following snippet to the top of the sudoers file using `sudo visudo`. It will make vagrant
-stop asking password when updating hosts file:
+To allow vagrant to automatically update the hosts file without asking for a sudo password, add one of the following snippets to a new sudoers file include, i.e. `sudo visudo -f /etc/sudoers.d/vagrant_hostsupdater`.
+
+For Ubuntu and most Linux environments:
+
+    # Allow passwordless startup of Vagrant with vagrant-hostsupdater.
+    Cmnd_Alias VAGRANT_HOSTS_ADD = /bin/sh -c echo "*" >> /etc/hosts
+    Cmnd_Alias VAGRANT_HOSTS_REMOVE = /bin/sed -i -e /*/ d /etc/hosts
+    %sudo ALL=(root) NOPASSWD: VAGRANT_HOSTS_ADD, VAGRANT_HOSTS_REMOVE
+
+For MacOS:
 
     # Allow passwordless startup of Vagrant with vagrant-hostsupdater.
     Cmnd_Alias VAGRANT_HOSTS_ADD = /bin/sh -c echo "*" >> /etc/hosts
     Cmnd_Alias VAGRANT_HOSTS_REMOVE = /usr/bin/sed -i -e /*/ d /etc/hosts
     %admin ALL=(root) NOPASSWD: VAGRANT_HOSTS_ADD, VAGRANT_HOSTS_REMOVE
     
-        
+- If vagrant still asks for a password on commands that trigger the `VAGRANT_HOSTS_ADD` alias above (like **up**), you might need to wrap the echo statement in quotes, i.e. `Cmnd_Alias VAGRANT_HOSTS_ADD = /bin/sh -c 'echo "*" >> /etc/hosts'`. This seems to be a problem with older versions of Linux and MacOS.
+- If vagrant still asks for a password on commands that trigger the `VAGRANT_HOSTS_REMOVE` alias above (like
+**halt** or **suspend**), this might indicate that the location of **sed** in the `VAGRANT_HOSTS_REMOVE` alias is
+pointing to the wrong location. The solution is to find the location of **sed** (ex. `which sed`) and
+replace that location in the `VAGRANT_HOSTS_REMOVE` alias.
+    
+### Windows: UAC Prompt
+
+You can use `cacls` or `icacls` to grant your user account permanent write permission to the system's hosts file. 
+You have to open an elevated command prompt; hold `❖ Win` and press `X`, then choose "Command Prompt (Admin)"
+
+    cacls %SYSTEMROOT%\system32\drivers\etc\hosts /E /G %USERNAME%:W 
+
+## Using AWS as a Provider
+
+If you'd like AWS as a provider using [vagrant-aws](https://github.com/mitchellh/vagrant-aws) or other plugin,
+this plugin will detect the instance public IP by the tag infomations.  
+For example, [vagrant-aws](https://github.com/mitchellh/vagrant-aws) configures a tag infomations like the following.
+
+    config.vm.provider :aws do |aws, override|
+      aws.tags = {
+        "Name" => "vagrant",
+        ...
+      }
+      aws.elastic_ip = true
+      ...
+    end
+
+* [AWS CLI](https://aws.amazon.com/cli/) is required
+* The tag informations be unique for the instance
+* Enable Elastic IP for the instance
+
+## Using Google as a provider
+
+If you'd like a Google provider using [vagrant-google](https://github.com/mitchellh/vagrant-google), this plugin will detect the public IP from the name of the instance.
+[vagrant-google](https://github.com/mitchellh/vagrant-google) provides a default name, but you can specify your own as follows:
+
+    config.vm.provider :google do |google, override|
+      google.name = "somename"
+      ...
+    end
+
+* [Google Cloud SDK](https://cloud.google.com/sdk/) is required.
 
 ## Installing development version
 
@@ -88,6 +188,28 @@ vagrant plugin install vagrant-hostsupdater-*.gem
 
 ## Versions
 
+### 1.2.0
+* Bugfix: Fixing null string [#188](/../../issues/188)
+
+### 1.1.1
+* Bugfix: AWS Feature broke part of the code [#155](/../../issues/155)
+
+### 1.1.0
+* Feature: Added AWS support [#74](/../../pull/74)
+* Feature: Added libvirt provider [#122](/../../pull/122)
+* Feature: Add support for multiple private network adapters [#96](/../../pull/96)
+* Feature: Add support for VMs without private/public networking [#23](/../../issues/23)
+* Feature: Add Docker support [#149](/../../pull/149)
+* Bugfix: Windows users get UAC prompt [#40](/../../issues/40)
+* Bugfix: Documentation update and type fix
+* Misc: Added a note about suppressing UAC prompts
+
+### 1.0.2
+* Feature: Added `remove_on_suspend` for `vagrant_halt` [#71](/../../issues/71)
+* Feature: Skip entries if they already exist [#69](/../../issues/69)
+* Bugfix: Fixing extra lines in /etc/hosts file [#87](/../../pull/87)
+* Misc: Fix yellow text on UI [#39](/../../issues/39)
+
 ### 1.0.1
 * Bugfix: Fixing `up` issue on initialize [#28](/../../issues/28)
 
@@ -129,4 +251,4 @@ vagrant plugin install vagrant-hostsupdater-*.gem
 * fixed problem with removing hosts entries on destroy command (Thanks to Andy Bohne)
 
 ### 0.0.3
-* added aliases config option to define additional hostnames
+* added aliases config option to define additional hostnames

data/lib/vagrant-hostsupdater/Action/BaseAction.rb

@@ -0,0 +1,39 @@
+module VagrantPlugins
+  module HostsUpdater
+    module Action
+      class BaseAction
+        include HostsUpdater
+
+        # Vagrant 2.2.14 has changed the hooks execution policy so they
+        # started to be triggered more than once (a lot actually) which
+        # is non-performant and floody. With this static property, we
+        # control the executions and allowing just one.
+        #
+        # - https://github.com/hashicorp/vagrant/issues/12070#issuecomment-732271918
+        # - https://github.com/hashicorp/vagrant/compare/v2.2.13..v2.2.14#diff-4d1af7c67af870f20d303c3c43634084bab8acc101055b2e53ddc0d07f6f64dcL176-L180
+        # - https://github.com/agiledivider/vagrant-hostsupdater/issues/187
+        @@completed = {}
+
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @ui = env[:ui]
+        end
+
+        def call(env)
+          if not @@completed.key?(self.class.name)
+            run(env)
+            @@completed[self.class.name] = true
+          end
+
+          @app.call(env)
+        end
+
+        def run(env)
+          raise NotImplementedError.new("Must be implemented!")
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-hostsupdater/Action/CacheHosts.rb

@@ -1,17 +1,10 @@
 module VagrantPlugins
   module HostsUpdater
     module Action
-      class CacheHosts
-        include HostsUpdater
+      class CacheHosts < BaseAction
 
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-        end
-
-        def call(env)
+        def run(env)
           cacheHostEntries
-          @app.call(env)
         end
 
       end

data/lib/vagrant-hostsupdater/Action/RemoveHosts.rb

@@ -1,26 +1,20 @@
 module VagrantPlugins
   module HostsUpdater
     module Action
-      class RemoveHosts
-        include HostsUpdater
+      class RemoveHosts < BaseAction
 
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @ui = env[:ui]
-        end
-
-        def call(env)
+        def run(env)
           machine_action = env[:machine_action]
           if machine_action != :destroy || !@machine.id
             if machine_action != :suspend || false != @machine.config.hostsupdater.remove_on_suspend
-              @ui.info "Removing hosts"
-              removeHostEntries
-            else
-              @ui.info "Removing hosts on suspend disabled"
+              if machine_action != :halt || false != @machine.config.hostsupdater.remove_on_suspend
+                @ui.info "[vagrant-hostsupdater] Removing hosts"
+                removeHostEntries
+              else
+                @ui.info "[vagrant-hostsupdater] Removing hosts on suspend disabled"
+              end
             end
           end
-          @app.call(env)
         end
 
       end

data/lib/vagrant-hostsupdater/Action/UpdateHosts.rb

@@ -1,24 +1,14 @@
-require_relative "../HostsUpdater"
 module VagrantPlugins
   module HostsUpdater
     module Action
-      class UpdateHosts
-        include HostsUpdater
+      class UpdateHosts < BaseAction
 
-
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @ui = env[:ui]
-        end
-
-        def call(env)
-          @ui.info "Checking for host entries"
+        def run(env)
+          @ui.info "[vagrant-hostsupdater] Checking for host entries"
           addHostEntries()
-          @app.call(env)
         end
 
       end
     end
   end
-end
+end

data/lib/vagrant-hostsupdater/HostsUpdater.rb

@@ -1,43 +1,96 @@
+require 'open3'
+
 module VagrantPlugins
   module HostsUpdater
     module HostsUpdater
-      @@hosts_path = Vagrant::Util::Platform.windows? ? File.expand_path('system32/drivers/etc/hosts', ENV['windir']) : '/etc/hosts'
+      if ENV['VAGRANT_HOSTSUPDATER_PATH']
+        @@hosts_path = ENV['VAGRANT_HOSTSUPDATER_PATH']
+      else
+        @@hosts_path = Vagrant::Util::Platform.windows? ? File.expand_path('system32/drivers/etc/hosts', ENV['windir']) : '/etc/hosts'
+      end
+      @isWindowsHost = Vagrant::Util::Platform.windows?
+      @@ssh_known_hosts_path = '~/.ssh/known_hosts'
 
       def getIps
         ips = []
-        @machine.config.vm.networks.each do |network|
-          key, options = network[0], network[1]
-          ip = options[:ip] if (key == :private_network || key == :public_network) && options[:hostsupdater] != "skip"
-          ips.push(ip) if ip
-          if options[:hostsupdater] == 'skip'
-            @ui.info 'Skipping adding host entries (config.vm.network hostsupdater: "skip" is set)'
+
+        if ip = getAwsPublicIp
+          ips.push(ip)
+        elsif ip = getGooglePublicIp
+          ips.push(ip)
+        else
+            @machine.config.vm.networks.each do |network|
+              key, options = network[0], network[1]
+              ip = options[:ip] if (key == :private_network || key == :public_network) && options[:hostsupdater] != "skip"
+              ips.push(ip) if ip
+              if options[:hostsupdater] == 'skip'
+                @ui.info '[vagrant-hostsupdater] Skipping adding host entries (config.vm.network hostsupdater: "skip" is set)'
+            end
           end
         end
-        return ips
-      end
 
-      def getHostnames
-        hostnames = Array(@machine.config.vm.hostname)
-        if @machine.config.hostsupdater.aliases
-          hostnames.concat(@machine.config.hostsupdater.aliases)
+        if @machine.provider_name == :lxc
+          ip = @machine.provider.capability(:public_address)
+          ips.push(ip)
+        elsif @machine.provider_name == :docker
+          ip = @machine.provider.capability(:public_address)
+          ips.push(ip)
+        elsif @machine.provider_name == :libvirt
+          ssh_info = @machine.ssh_info
+          if ssh_info
+            ips.push(ssh_info[:host])
+          end
+        end
+        if not ips.any?
+          ips.push( '127.0.0.1' )
+        end
+        return ips.uniq
         end
+
+      # Get a hash of hostnames indexed by ip, e.g. { 'ip1': ['host1'], 'ip2': ['host2', 'host3'] }
+      def getHostnames(ips)
+        hostnames = Hash.new { |h, k| h[k] = [] }
+
+        case @machine.config.hostsupdater.aliases
+        when Array
+          # simple list of aliases to link to all ips
+          ips.each do |ip|
+            hostnames[ip] += @machine.config.hostsupdater.aliases
+          end
+        when Hash
+          # complex definition of aliases for various ips
+          @machine.config.hostsupdater.aliases.each do |ip, hosts|
+            hostnames[ip] += Array(hosts)
+          end
+        end
+
+        # handle default hostname(s) if not already specified in the aliases
+        Array(@machine.config.vm.hostname).each do |host|
+          if hostnames.none? { |k, v| v.include?(host) }
+            ips.each do |ip|
+              hostnames[ip].unshift host
+            end
+          end
+        end
+
         return hostnames
       end
 
-      def addHostEntries()
+      def addHostEntries
         ips = getIps
-        hostnames = getHostnames
         file = File.open(@@hosts_path, "rb")
         hostsContents = file.read
         uuid = @machine.id
         name = @machine.name
         entries = []
-        ips.each do |ip|
-          hostEntries = getHostEntries(ip, hostnames, name, uuid)
-          hostEntries.each do |hostEntry|
-            escapedEntry = Regexp.quote(hostEntry)
-            if !hostsContents.match(/#{escapedEntry}/)
-              @ui.info "adding to (#@@hosts_path) : #{hostEntry}"
+        getHostnames(ips).each do |ip, hostnames|
+          hostnames.each do |hostname|
+            entryPattern = hostEntryPattern(ip, hostname)
+
+            if hostsContents.match(/#{entryPattern}/)
+              @ui.info "[vagrant-hostsupdater]   found entry for: #{ip} #{hostname}"
+            else
+              hostEntry = createHostEntry(ip, hostname, name, uuid)
               entries.push(hostEntry)
             end
           end
@@ -51,7 +104,7 @@ module VagrantPlugins
 
       def removeHostEntries
         if !@machine.id and !@machine.config.hostsupdater.id
-          @ui.warn "No machine id, nothing removed from #@@hosts_path"
+          @ui.info "[vagrant-hostsupdater] No machine id, nothing removed from #@@hosts_path"
           return
         end
         file = File.open(@@hosts_path, "rb")
@@ -59,7 +112,8 @@ module VagrantPlugins
         uuid = @machine.id || @machine.config.hostsupdater.id
         hashedId = Digest::MD5.hexdigest(uuid)
         if hostsContents.match(/#{hashedId}/)
-            removeFromHosts
+          removeFromHosts
+          removeFromSshKnownHosts
         end
       end
 
@@ -67,21 +121,41 @@ module VagrantPlugins
         %Q(#{ip}  #{hostnames.join(' ')}  #{signature(name, uuid)})
       end
 
-      def getHostEntries(ip, hostnames, name, uuid = self.uuid)
-        entries = []
-        hostnames.each do |hostname|
-          entries.push(%Q(#{ip}  #{hostname}  #{signature(name, uuid)}))
-        end
-        return entries
+      def createHostEntry(ip, hostname, name, uuid = self.uuid)
+        %Q(#{ip}  #{hostname}  #{signature(name, uuid.to_s)})
+      end
+
+      # Create a regular expression that will match *any* entry describing the
+      # given IP/hostname pair. This is intentionally generic in order to
+      # recognize entries created by the end user.
+      def hostEntryPattern(ip, hostname)
+        Regexp.new('^\s*' + ip + '\s+' + hostname + '\s*(#.*)?$')
       end
 
       def addToHosts(entries)
         return if entries.length == 0
-        content = entries.join("\n").strip.concat("\n")
+        content = entries.join("\n").strip
+
+        @ui.info "[vagrant-hostsupdater] Writing the following entries to (#@@hosts_path)"
+        @ui.info "[vagrant-hostsupdater]   " + entries.join("\n[vagrant-hostsupdater]   ")
         if !File.writable_real?(@@hosts_path)
-          sudo(%Q(sh -c 'echo "#{content}" >> #@@hosts_path'))
+          @ui.info "[vagrant-hostsupdater] This operation requires administrative access. You may " +
+                       "skip it by manually adding equivalent entries to the hosts file."
+          if !sudo(%Q(sh -c 'echo "#{content}" >> #@@hosts_path'))
+            @ui.error "[vagrant-hostsupdater] Failed to add hosts, could not use sudo"
+            adviseOnSudo
+          end
+        elsif Vagrant::Util::Platform.windows?
+          require 'tmpdir'
+          uuid = @machine.id || @machine.config.hostsupdater.id
+          tmpPath = File.join(Dir.tmpdir, 'hosts-' + uuid.to_s + '.cmd')
+          File.open(tmpPath, "w") do |tmpFile|
+          entries.each { |line| tmpFile.puts(">>\"#{@@hosts_path}\" echo #{line}") }
+          end
+          sudo(tmpPath)
+          File.delete(tmpPath)
         else
-          content = "\n" + content
+          content = "\n" + content + "\n"
           hostsFile = File.open(@@hosts_path, "a")
           hostsFile.write(content)
           hostsFile.close()
@@ -91,20 +165,37 @@ module VagrantPlugins
       def removeFromHosts(options = {})
         uuid = @machine.id || @machine.config.hostsupdater.id
         hashedId = Digest::MD5.hexdigest(uuid)
-        if !File.writable_real?(@@hosts_path)
-          sudo(%Q(sed -i -e '/#{hashedId}/ d' #@@hosts_path))
+        if !File.writable_real?(@@hosts_path) || Vagrant::Util::Platform.windows?
+          if !sudo(%Q(sed -i -e '/#{hashedId}/ d' #@@hosts_path))
+            @ui.error "[vagrant-hostsupdater] Failed to remove hosts, could not use sudo"
+            adviseOnSudo
+          end
         else
           hosts = ""
           File.open(@@hosts_path).each do |line|
             hosts << line unless line.include?(hashedId)
           end
+          hosts.strip!
           hostsFile = File.open(@@hosts_path, "w")
           hostsFile.write(hosts)
           hostsFile.close()
         end
       end
 
-
+      def removeFromSshKnownHosts
+        if !@isWindowsHost
+          ips = getIps
+          hostnames = getHostnames(ips)
+          ips.each do |ip|
+            hostnames[ip].each do |hostname|
+              command = %Q(sed -i -e '/#{hostname}/ d' #@@ssh_known_hosts_path)
+              if system(command)
+                @ui.info "[vagrant-hostsupdater] Removed host: #{hostname} from ssh_known_hosts file: #@@ssh_known_hosts_path"
+              end
+            end
+          end
+        end
+      end
 
       def signature(name, uuid = self.uuid)
         hashedId = Digest::MD5.hexdigest(uuid)
@@ -114,11 +205,51 @@ module VagrantPlugins
       def sudo(command)
         return if !command
         if Vagrant::Util::Platform.windows?
-          `#{command}`
+          require 'win32ole'
+          args = command.split(" ")
+          command = args.shift
+          sh = WIN32OLE.new('Shell.Application')
+          sh.ShellExecute(command, args.join(" "), '', 'runas', 0)
         else
-          `sudo #{command}`
+          return system("sudo #{command}")
+        end
+      end
+
+      def adviseOnSudo
+        @ui.error "[vagrant-hostsupdater] Consider adding the following to your sudoers file:"
+        @ui.error "[vagrant-hostsupdater]   https://github.com/cogitatio/vagrant-hostsupdater#suppressing-prompts-for-elevating-privileges"
+      end
+
+      def getAwsPublicIp
+        return nil if ! Vagrant.has_plugin?("vagrant-aws")
+        aws_conf = @machine.config.vm.get_provider_config(:aws)
+        return nil if ! aws_conf.is_a?(VagrantPlugins::AWS::Config)
+        filters = ( aws_conf.tags || [] ).map {|k,v| sprintf('"Name=tag:%s,Values=%s"', k, v) }.join(' ')
+        return nil if filters == ''
+        cmd = 'aws ec2 describe-instances --filter '+filters
+        stdout, stderr, stat = Open3.capture3(cmd)
+        @ui.error sprintf("Failed to execute '%s' : %s", cmd, stderr) if stderr != ''
+        return nil if stat.exitstatus != 0
+        begin
+          return JSON.parse(stdout)["Reservations"].first()["Instances"].first()["PublicIpAddress"]
+        rescue => e
+          @ui.error sprintf("Failed to get IP from the result of '%s' : %s", cmd, e.message)
+          return nil
         end
       end
+
+      def getGooglePublicIp
+        return nil if ! defined?(VagrantPlugins::Google)
+        google_conf = @machine.config.vm.get_provider_config(:google)
+        return nil if ! google_conf.is_a?(VagrantPlugins::Google::Config)
+        cmd = 'gcloud compute instances list --filter="name=%s" --format="value(networkInterfaces[0].accessConfigs[0].natIP)"'
+        cmd = sprintf(cmd, google_conf.name)
+        stdout, stderr, stat = Open3.capture3(cmd)
+        @ui.error "Failed to execute '#{cmd}' : #{stderr}" if stderr != ''
+        ip = stdout.strip
+        return nil if stat.exitstatus != 0 || ip == nil || ip == ''
+        return ip
+      end
     end
   end
 end

data/lib/vagrant-hostsupdater/plugin.rb

@@ -1,6 +1,8 @@
-require "vagrant-hostsupdater/Action/UpdateHosts"
-require "vagrant-hostsupdater/Action/CacheHosts"
-require "vagrant-hostsupdater/Action/RemoveHosts"
+require_relative "HostsUpdater"
+require_relative "Action/BaseAction"
+require_relative "Action/UpdateHosts"
+require_relative "Action/CacheHosts"
+require_relative "Action/RemoveHosts"
 
 module VagrantPlugins
   module HostsUpdater
@@ -17,8 +19,7 @@ module VagrantPlugins
       end
 
       action_hook(:hostsupdater, :machine_action_up) do |hook|
-        hook.prepend(Action::RemoveHosts)
-        hook.after(Vagrant::Action::Builtin::SetHostname, Action::UpdateHosts)
+        hook.append(Action::UpdateHosts)
       end
 
       action_hook(:hostsupdater, :machine_action_provision) do |hook|
@@ -35,9 +36,6 @@ module VagrantPlugins
 
       action_hook(:hostsupdater, :machine_action_destroy) do |hook|
         hook.prepend(Action::CacheHosts)
-      end
-
-      action_hook(:hostsupdater, :machine_action_destroy) do |hook|
         hook.append(Action::RemoveHosts)
       end
 

data/lib/vagrant-hostsupdater/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module HostsUpdater
-    VERSION = '1.0.1'
+    VERSION = '1.2.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hostsupdater
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Falk Kühnel
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Enables Vagrant to update hosts file on the host machine
@@ -47,12 +47,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/vagrant-hostsupdater.rb
+- lib/vagrant-hostsupdater/Action/BaseAction.rb
 - lib/vagrant-hostsupdater/Action/CacheHosts.rb
 - lib/vagrant-hostsupdater/Action/RemoveHosts.rb
 - lib/vagrant-hostsupdater/Action/UpdateHosts.rb
@@ -72,17 +73,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to update hosts file on the host machine