vagrant-vsphere 1.13.3 → 1.14.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b3633d48c4a883aebd8a67cacf4716c8a58535f6
-  data.tar.gz: 454d8aa650d41f7a746b5149a6c97cfdf2e07db3
+SHA256:
+  metadata.gz: a2c2f3104d84ad0220c48752678d997a9a856527790961de1bf874c174f2ca91
+  data.tar.gz: d341a5d0d4c15da2376e33946fbcaca800e561e384d21677ce059522fe2255ca
 SHA512:
-  metadata.gz: 6868a6f7ffcf83241298e5e21f3874d86eaf4794a488fee1a76fb52848e9d78c70c804a0c7bc9dba11a016d231262f485fd17984c2f27a660ac64819b05be8d2
-  data.tar.gz: 7cce82f0a3b19656f7905d51d363e86685ab23da67f1844e7a374a7973cb4eca43908942a145bd5b9d79dc49e69596d47b1422e039f7a6a6fd49d0447b879323
+  metadata.gz: dcbcfa728e970b142bae1c3353ba6c87be4a4988586df400dc7a80c742bb53970de31650c2e62a287dde3c1aa295c43817f7436d326d26283e7b51711cbaa46e
+  data.tar.gz: 6567b087ba97251076ec7f282b48c1214d8c5e8d67aa3f0107316c33461a5cfd62937ad434ea5c43054e325123feb90a9f739892e313851174e4fe116a9f79b1

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.13.3
+current_version = 1.14.0.pre1
 tag = true
 commit = true
 
@@ -8,3 +8,4 @@ commit = true
 [bumpversion:file:README.md]
 parse = version: (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
 serialize = version: {major}.{minor}.{patch}
+

data/.rubocop.yml

@@ -32,3 +32,18 @@ Metrics/ModuleLength:
 
 Metrics/PerceivedComplexity:
   Enabled: false
+
+# Disabled these cops upgrading rubocop to 1.25.0
+# TODO:Correct the issues found by these cops someday
+Lint/MissingSuper:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Naming:
+  Enabled: false
+
+# TODO: Add required ruby version to gemspec
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.3.5
+ruby-3.0.2

data/.travis.yml

@@ -1,11 +1,4 @@
 language: ruby
 cache: bundler
-rvm:
-  - 2.3.5
-
-before_install:
-  - rvm @global do gem uninstall bundler --all --executables
-  - gem uninstall bundler --all --executables
-  - gem install bundler --version '1.15.4'
 
 sudo: false

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [1.14.0 (2022-04-12)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.14.0.pre1)
+
+  - Update gem to ruby 3.0.2
+  - Support for vagrant >=2.2.17
+  - Update nokogiri dependency (1.13.4) to take care of dependabot alerts
+  - Update rbvmomi, rake, rubocop dependencies
+
+## [1.13.5 (2021-01-05)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.13.5)
+  - Pin nokogiri to 1.10.10. This fixes an issue where vagrant-vsphere failed to install due to 
+    nokogiri requiring Ruby >=2.5.  This is a workaround until the vagrant-nsidc plugin is updated
+    to work with newer versions of vagrant that are bundled with newer versions of Ruby
+
+## [1.13.4 (2020-03-31)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.13.4)
+
+  - Allow newer versions of i18n.
+    ([jmartin-r7:release-i18n](https://github.com/nsidc/vagrant-vsphere/pull/286))
+  - Updated .ruby-version to 2.6.5
+  - Fix broken tests.
+    ([wwestenbrink:master](https://github.com/nsidc/vagrant-vsphere/pull/283))
+
 ## [1.13.3 (2018-12-06)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.13.3)
 
   - Update i18n dependency to allow v1.1.1. This fixes an issue with

data/DEVELOPMENT.md

@@ -65,3 +65,25 @@ prefers to be run from the official installer rather than through the gem.
 Despite those warning messages, this is the
 [officially recommended](https://docs.vagrantup.com/v2/plugins/development-basics.html)
 method for Vagrant plugin development.
+
+### Releasing
+
+1) Ensure [travis-ci](https://travis-ci.org/github/nsidc/vagrant-vsphere/) build is passing
+2) Ensure `CHANGELOG.md` is up-to-date with the changes to release
+3) Update version in the code, according to [semver](https://semver.org/)
+    * [bumpversion](https://github.com/peritus/bumpversion) can be used; if not,
+      the version needs to be manually updated in `.bumpversion.cfg`,
+      `README.md`, and `lib/vSphere/version.rb` (e.g., as in
+      [`11eced2`](https://github.com/nsidc/vagrant-vsphere/commit/11eced2))
+4) `bundle exec rake build`
+    * builds the plugin to `pkg/vagrant-vsphere-$VERSION.gem`
+    * install to your system vagrant for further testing with `vagrant plugin
+      install ./pkg/vagrant-vsphere-$VERSION.gem`
+5) `bundle exec rake release`
+    * creates the version tag and pushes it to GitHub
+    * pushes the built gem to
+      [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere/)
+6) Update the [Releases page](https://github.com/nsidc/vagrant-vsphere/releases)
+    * the release name should match the version tag (e.g., `v1.2.3`)
+    * the release description can be the same as the `CHANGELOG.md` entry
+    * upload the `.gem` from RubyGems.org as an attached binary for the release

data/Gemfile

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org'
 
 group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem 'vagrant', github: 'mitchellh/vagrant'
+  gem 'vagrant', github: 'mitchellh/vagrant', ref: 'v2.2.19'
 end
 
 group :plugins do

data/README.md

@@ -19,9 +19,9 @@ This provider is built on top of the
 * libxml2, libxml2-dev, libxslt, libxslt-dev
 
 ## Current Version
-**version: 1.13.3**
+**version: 1.14.0.pre1**
 
-vagrant-vsphere (**version: 1.13.3**) is available from
+vagrant-vsphere (**version: 1.14.0.pre1**) is available from
 [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler/setup'
 require 'rspec/core/rake_task'
@@ -9,7 +11,7 @@ $stdout.sync = true
 $stderr.sync = true
 
 # Change to the directory of this file.
-Dir.chdir(File.expand_path('../', __FILE__))
+Dir.chdir(File.expand_path(__dir__))
 
 Bundler::GemHelper.install_tasks
 
@@ -17,4 +19,4 @@ RSpec::Core::RakeTask.new
 
 RuboCop::RakeTask.new
 
-task default: %w(rubocop spec)
+task default: %w[rubocop spec]

data/lib/vSphere/action/clone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'
@@ -19,14 +21,15 @@ module VagrantPlugins
           name = get_name machine, config, env[:root_path]
           dc = get_datacenter connection, machine
           template = dc.find_vm config.template_name
-          fail Errors::VSphereError, :'missing_template' if template.nil?
+          raise Errors::VSphereError, :'missing_template' if template.nil?
+
           vm_base_folder = get_vm_base_folder dc, template, config
-          fail Errors::VSphereError, :'invalid_base_path' if vm_base_folder.nil?
+          raise Errors::VSphereError, :'invalid_base_path' if vm_base_folder.nil?
 
           begin
             # Storage DRS does not support vSphere linked clones. http://www.vmware.com/files/pdf/techpaper/vsphere-storage-drs-interoperability.pdf
             ds = get_datastore dc, machine
-            fail Errors::VSphereError, :'invalid_configuration_linked_clone_with_sdrs' if config.linked_clone && ds.is_a?(RbVmomi::VIM::StoragePod)
+            raise Errors::VSphereError, :'invalid_configuration_linked_clone_with_sdrs' if config.linked_clone && ds.is_a?(RbVmomi::VIM::StoragePod)
 
             location = get_location ds, dc, machine, template
             spec = RbVmomi::VIM.VirtualMachineCloneSpec location: location, powerOn: true, template: false
@@ -74,9 +77,7 @@ module VagrantPlugins
 
               recommendation = result.recommendations[0]
               key = recommendation.key ||= ''
-              if key == ''
-                fail Errors::VSphereError, :missing_datastore_recommendation
-              end
+              raise Errors::VSphereError, :missing_datastore_recommendation if key == ''
 
               env[:ui].info I18n.t('vsphere.creating_cloned_vm_sdrs')
               env[:ui].info " -- Storage DRS recommendation: #{recommendation.target.name} #{recommendation.reasonText}"
@@ -125,13 +126,13 @@ module VagrantPlugins
           while wait
             events = query_customization_succeeded(vm, vem)
 
-            if events.size > 0
+            if events.size.positive?
               events.each do |e|
                 env[:ui].info e.fullFormattedMessage
               end
               wait = false
             elsif waited_seconds >= timeout
-              fail Errors::VSphereError, :'sysprep_timeout'
+              raise Errors::VSphereError, :'sysprep_timeout'
             else
               sleep(sleep_time)
               waited_seconds += sleep_time
@@ -154,7 +155,7 @@ module VagrantPlugins
           return customization_spec if private_networks.nil?
 
           # make sure we have enough NIC settings to override with the private network settings
-          fail Errors::VSphereError, :'too_many_private_networks' if private_networks.length > customization_spec.nicSettingMap.length
+          raise Errors::VSphereError, :'too_many_private_networks' if private_networks.length > customization_spec.nicSettingMap.length
 
           # assign the private network IP to the NIC
           private_networks.each_index do |idx|
@@ -212,7 +213,7 @@ module VagrantPlugins
           return config.name unless config.name.nil?
 
           prefix = "#{root_path.basename}_#{machine.name}"
-          prefix.gsub!(/[^-a-z0-9_\.]/i, '')
+          prefix.gsub!(/[^-a-z0-9_.]/i, '')
           # milliseconds + random number suffix to allow for simultaneous `vagrant up` of the same box in different dirs
           prefix + "_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100_000)}"
         end
@@ -229,7 +230,7 @@ module VagrantPlugins
           spec[:config][:deviceChange] ||= []
           @card ||= template.config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).first
 
-          fail Errors::VSphereError, :missing_network_card if @card.nil?
+          raise Errors::VSphereError, :missing_network_card if @card.nil?
 
           yield(@card)
 
@@ -241,7 +242,7 @@ module VagrantPlugins
         def add_custom_address_type(template, spec, addressType)
           spec[:config][:deviceChange] = []
           config = template.config
-          card = config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).first || fail(Errors::VSphereError, :missing_network_card)
+          card = config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).first || raise(Errors::VSphereError, :missing_network_card)
           card.addressType = addressType
           card_spec = { :deviceChange => [{ :operation => :edit, :device => card }] }
           template.ReconfigVM_Task(:spec => card_spec).wait_for_completion
@@ -257,13 +258,13 @@ module VagrantPlugins
           network = get_network_by_name(dc, vlan)
 
           modify_network_card(template, spec) do |card|
-            begin
-              switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(switchUuid: network.config.distributedVirtualSwitch.uuid, portgroupKey: network.key)
-              card.backing = RbVmomi::VIM::VirtualEthernetCardDistributedVirtualPortBackingInfo(port: switch_port)
-            rescue
-              # not connected to a distibuted switch?
-              card.backing = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(network: network, deviceName: network.name)
-            end
+
+            switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(switchUuid: network.config.distributedVirtualSwitch.uuid, portgroupKey: network.key)
+            card.backing = RbVmomi::VIM::VirtualEthernetCardDistributedVirtualPortBackingInfo(port: switch_port)
+          rescue StandardError
+            # not connected to a distibuted switch?
+            card.backing = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(network: network, deviceName: network.name)
+
           end
         end
 

data/lib/vSphere/action/close_vsphere.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 
 module VagrantPlugins

data/lib/vSphere/action/connect_vsphere.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 
 module VagrantPlugins

data/lib/vSphere/action/destroy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'
@@ -23,6 +25,7 @@ module VagrantPlugins
 
         def destroy_vm(env)
           return if env[:machine].state.id == :not_created
+
           vm = get_vm_by_uuid env[:vSphere_connection], env[:machine]
           return if vm.nil?
 

data/lib/vSphere/action/get_ssh_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'vSphere/util/vim_helpers'
 
@@ -21,12 +23,13 @@ module VagrantPlugins
         def filter_guest_nic(vm, machine)
           return vm.guest.ipAddress unless machine.provider_config.real_nic_ip
 
-          interfaces = vm.guest.net.select { |g| g.deviceConfigId > 0 }
+          interfaces = vm.guest.net.select { |g| g.deviceConfigId.positive? }
           ip_addresses = interfaces.map { |i| i.ipConfig.ipAddress.select { |a| a.state == 'preferred' } }.flatten
 
           return (vm.guest.ipAddress || nil) if ip_addresses.empty?
 
-          fail Errors::VSphereError.new, :'multiple_interface_with_real_nic_ip_set' if ip_addresses.size > 1
+          raise Errors::VSphereError.new, :'multiple_interface_with_real_nic_ip_set' if ip_addresses.size > 1
+
           ip_addresses.first.ipAddress
         end
 
@@ -35,8 +38,10 @@ module VagrantPlugins
 
           vm = get_vm_by_uuid connection, machine
           return nil if vm.nil?
+
           ip_address = filter_guest_nic(vm, machine)
           return nil if ip_address.nil? || ip_address.empty?
+
           {
             host: ip_address,
             port: 22

data/lib/vSphere/action/get_state.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'vSphere/util/vim_helpers'
 require 'vSphere/util/vm_helpers'
@@ -22,7 +24,7 @@ module VagrantPlugins
         private
 
         def get_state(connection, machine)
-          return :not_created  if machine.id.nil?
+          return :not_created if machine.id.nil?
 
           vm = get_vm_by_uuid connection, machine
 

data/lib/vSphere/action/is_created.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module VagrantPlugins
   module VSphere
     module Action

data/lib/vSphere/action/is_running.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module VagrantPlugins
   module VSphere
     module Action

data/lib/vSphere/action/is_suspended.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module VagrantPlugins
   module VSphere
     module Action

data/lib/vSphere/action/message_already_created.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n'
 
 module VagrantPlugins

data/lib/vSphere/action/message_not_created.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n'
 
 module VagrantPlugins

data/lib/vSphere/action/message_not_running.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n'
 
 module VagrantPlugins

data/lib/vSphere/action/message_not_suspended.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n'
 
 module VagrantPlugins

data/lib/vSphere/action/power_off.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'

data/lib/vSphere/action/power_on.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'

data/lib/vSphere/action/resume.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'

data/lib/vSphere/action/snapshot_delete.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vSphere/util/vim_helpers'
 require 'vSphere/util/vm_helpers'
 
@@ -16,8 +18,9 @@ module VagrantPlugins
           vm = get_vm_by_uuid(env[:vSphere_connection], env[:machine])
 
           env[:ui].info(I18n.t(
-            "vagrant.actions.vm.snapshot.deleting",
-            name: env[:snapshot_name]))
+                          "vagrant.actions.vm.snapshot.deleting",
+                          name: env[:snapshot_name]
+                        ))
 
           delete_snapshot(vm, env[:snapshot_name]) do |progress|
             env[:ui].clear_line
@@ -27,8 +30,9 @@ module VagrantPlugins
           env[:ui].clear_line
 
           env[:ui].info(I18n.t(
-            "vagrant.actions.vm.snapshot.deleted",
-            name: env[:snapshot_name]))
+                          "vagrant.actions.vm.snapshot.deleted",
+                          name: env[:snapshot_name]
+                        ))
 
           @app.call env
         end

data/lib/vSphere/action/snapshot_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vSphere/util/vim_helpers'
 require 'vSphere/util/vm_helpers'
 

data/lib/vSphere/action/snapshot_restore.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vSphere/util/vim_helpers'
 require 'vSphere/util/vm_helpers'
 
@@ -16,8 +18,9 @@ module VagrantPlugins
           vm = get_vm_by_uuid(env[:vSphere_connection], env[:machine])
 
           env[:ui].info(I18n.t(
-            "vagrant.actions.vm.snapshot.restoring",
-            name: env[:snapshot_name]))
+                          "vagrant.actions.vm.snapshot.restoring",
+                          name: env[:snapshot_name]
+                        ))
 
           restore_snapshot(vm, env[:snapshot_name]) do |progress|
             env[:ui].clear_line

data/lib/vSphere/action/snapshot_save.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vSphere/util/vim_helpers'
 require 'vSphere/util/vm_helpers'
 
@@ -16,8 +18,9 @@ module VagrantPlugins
           vm = get_vm_by_uuid(env[:vSphere_connection], env[:machine])
 
           env[:ui].info(I18n.t(
-            "vagrant.actions.vm.snapshot.saving",
-            name: env[:snapshot_name]))
+                          "vagrant.actions.vm.snapshot.saving",
+                          name: env[:snapshot_name]
+                        ))
 
           create_snapshot(vm, env[:snapshot_name]) do |progress|
             env[:ui].clear_line
@@ -27,8 +30,9 @@ module VagrantPlugins
           env[:ui].clear_line
 
           env[:ui].success(I18n.t(
-            "vagrant.actions.vm.snapshot.saved",
-            name: env[:snapshot_name]))
+                             "vagrant.actions.vm.snapshot.saved",
+                             name: env[:snapshot_name]
+                           ))
           @app.call env
         end
       end

data/lib/vSphere/action/suspend.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'

data/lib/vSphere/action/wait_for_ip_address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ipaddr'
 require 'timeout'
 

data/lib/vSphere/action.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vagrant'
 require 'vagrant/action/builder'
 
@@ -224,7 +226,7 @@ module VagrantPlugins
       end
 
       # TODO: Remove the if guard when Vagrant 1.8.0 is the minimum version.
-      # rubocop:disable IndentationWidth
+      # rubocop:disable Layout/IndentationWidth
       if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.8.0')
       def self.action_snapshot_delete
         Vagrant::Action::Builder.new.tap do |b|
@@ -292,11 +294,11 @@ module VagrantPlugins
           b.use CloseVSphere
         end
       end
-      end # Vagrant > 1.8.0 guard
-      # rubocop:enable IndentationWidth
+      end
+      # rubocop:enable Layout/IndentationWidth
 
       # autoload
-      action_root = Pathname.new(File.expand_path('../action', __FILE__))
+      action_root = Pathname.new(File.expand_path('action', __dir__))
       autoload :Clone, action_root.join('clone')
       autoload :CloseVSphere, action_root.join('close_vsphere')
       autoload :ConnectVSphere, action_root.join('connect_vsphere')
@@ -317,14 +319,14 @@ module VagrantPlugins
       autoload :WaitForIPAddress, action_root.join('wait_for_ip_address')
 
       # TODO: Remove the if guard when Vagrant 1.8.0 is the minimum version.
-      # rubocop:disable IndentationWidth
+      # rubocop:disable Layout/IndentationWidth
       if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.8.0')
       autoload :SnapshotDelete, action_root.join('snapshot_delete')
       autoload :SnapshotList, action_root.join('snapshot_list')
       autoload :SnapshotRestore, action_root.join('snapshot_restore')
       autoload :SnapshotSave, action_root.join('snapshot_save')
       end
-      # rubocop:enable IndentationWidth
+      # rubocop:enable Layout/IndentationWidth
     end
   end
 end

data/lib/vSphere/cap/public_address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module VagrantPlugins
   module VSphere
     module Cap
@@ -7,6 +9,7 @@ module VagrantPlugins
 
           ssh_info = machine.ssh_info
           return nil unless ssh_info
+
           ssh_info[:host]
         end
       end

data/lib/vSphere/cap/snapshot_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module VagrantPlugins
   module VSphere
     module Cap

data/lib/vSphere/config.rb

@@ -1,36 +1,11 @@
+# frozen_string_literal: true
+
 require 'vagrant'
 
 module VagrantPlugins
   module VSphere
     class Config < Vagrant.plugin('2', :config)
-      attr_accessor :ip_address_timeout # Time to wait for an IP address when booting, in seconds @return [Integer]
-      attr_accessor :host
-      attr_accessor :insecure
-      attr_accessor :user
-      attr_accessor :password
-      attr_accessor :data_center_name
-      attr_accessor :compute_resource_name
-      attr_accessor :resource_pool_name
-      attr_accessor :clone_from_vm
-      attr_accessor :template_name
-      attr_accessor :name
-      attr_accessor :vm_base_path
-      attr_accessor :customization_spec_name
-      attr_accessor :data_store_name
-      attr_accessor :linked_clone
-      attr_accessor :proxy_host
-      attr_accessor :proxy_port
-      attr_accessor :vlan
-      attr_accessor :addressType
-      attr_accessor :mac
-      attr_accessor :memory_mb
-      attr_accessor :cpu_count
-      attr_accessor :cpu_reservation
-      attr_accessor :mem_reservation
-      attr_accessor :extra_config
-      attr_accessor :real_nic_ip
-      attr_accessor :notes
-      attr_accessor :wait_for_sysprep
+      attr_accessor :ip_address_timeout, :host, :insecure, :user, :password, :data_center_name, :compute_resource_name, :resource_pool_name, :clone_from_vm, :template_name, :name, :vm_base_path, :customization_spec_name, :data_store_name, :linked_clone, :proxy_host, :proxy_port, :vlan, :addressType, :mac, :memory_mb, :cpu_count, :cpu_reservation, :mem_reservation, :extra_config, :real_nic_ip, :notes, :wait_for_sysprep # Time to wait for an IP address when booting, in seconds @return [Integer]
 
       attr_reader :custom_attributes
 
@@ -53,9 +28,7 @@ module VagrantPlugins
       def validate(machine)
         errors = _detected_errors
 
-        if password == :ask || password.nil?
-          self.password = machine.ui.ask('vSphere Password (will be hidden): ', echo: false)
-        end
+        self.password = machine.ui.ask('vSphere Password (will be hidden): ', echo: false) if password == :ask || password.nil?
 
         # TODO: add blank?
         errors << I18n.t('vsphere.config.host') if host.nil?

data/lib/vSphere/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vagrant'
 
 module VagrantPlugins