vagrant-zones 0.1.94 → 0.1.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 778869048e63a224ab469bebda92cd1c236c14defc620300a72033c50ccb7f6c
-  data.tar.gz: 4eff63c5b2b5b92624bccc019e3a1cc8dd3d937ba67ed40603658f187f7475ac
+  metadata.gz: 6bc4c0b91b20ad53d95b7d2544e3b6766db2bb65615b5eb0d0e5196d33b7b48d
+  data.tar.gz: 4c134f5570b0e4fca44105f28c91a2b26291862cd5e6358dcab21e40fffadd77
 SHA512:
-  metadata.gz: 3f7627181d958f935cfef5b30a8169c410481b463323694ec5c73dbf8ce3735bd1bc32798ee011a6e405c79d9d1658b3cf6f1336c9e7a5d6e3e737a601ef33a6
-  data.tar.gz: 7ada33a5baa5222d69bb773876dac9ca1256dba2d00ff0f92329f78b6675d210b870d229971e3a9de383604d4bcf465c904b0c1d53033e9ddadfb7f5b42ec0eb
+  metadata.gz: f85d4e203831861888d8359face75ff093ea82702de832b5ade9f10757bbd896bcf60f84b1f8632f766af82415a357a8a82700ef8fa18b17de1fd42f261b3426
+  data.tar.gz: d78d087ce49093fc843a0f1ed4a96d95d9af91451cd8846a76b8e6b02f412b0dabeeed87853ac18f2c6b5e40c7b1e81e57a8aaf5ba26711e4f8be3d3df521bfa

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## [0.1.97](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.96...v0.1.97) (2024-08-17)
+
+
+### Bug Fixes
+
+* add destroy confirmation ([f04e30a](https://github.com/STARTcloud/vagrant-zones/commit/f04e30a3d522dd34568fe99ce6199ae771570b4b))
+* it was there all along ([7355e11](https://github.com/STARTcloud/vagrant-zones/commit/7355e11f15d932c92cf6a678dc574414620992de))
+* linting - add destroy confirmation ([35786fc](https://github.com/STARTcloud/vagrant-zones/commit/35786fcd404096362211a2a07b44e901b46cc295))
+* linting - add destroy confirmation ([31d0140](https://github.com/STARTcloud/vagrant-zones/commit/31d0140da06c66100e78fdd9618394d32428130b))
+* linting - add destroy confirmation ([30e0324](https://github.com/STARTcloud/vagrant-zones/commit/30e0324a1b0865574d3adb95f3cffbe6656bdd05))
+
+## [0.1.96](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.95...v0.1.96) (2024-08-17)
+
+
+### Bug Fixes
+
+* linting ([86dc089](https://github.com/STARTcloud/vagrant-zones/commit/86dc089c8c2b3b1740fb4ef4eb315f2b2e2dd94a))
+* linting ([04d665d](https://github.com/STARTcloud/vagrant-zones/commit/04d665d09e68473093a31d86e33065d7f0b698ca))
+
+## [0.1.95](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.94...v0.1.95) (2024-08-17)
+
+
+### Bug Fixes
+
+* linting ([d39015c](https://github.com/STARTcloud/vagrant-zones/commit/d39015c0faba337c8b197e9b35e79f4d1549daba))
+* linting ([14f34e2](https://github.com/STARTcloud/vagrant-zones/commit/14f34e2c4c10e716924de77d2000618ed249b0d0))
+* linting ([e908e4d](https://github.com/STARTcloud/vagrant-zones/commit/e908e4dce96a872890201cb67fadbd1fa7a69a02))
+* linting ([d62952d](https://github.com/STARTcloud/vagrant-zones/commit/d62952de42a07b637a95d6433d0a5d9279b74deb))
+* linting ([1403f3e](https://github.com/STARTcloud/vagrant-zones/commit/1403f3e24ca50c6878de684ec8770c1542c2798f))
+* linting ([43d7ecd](https://github.com/STARTcloud/vagrant-zones/commit/43d7ecd08425149f1c262a4af83cf447b2ebd5be))
+* updating vlans ([1749012](https://github.com/STARTcloud/vagrant-zones/commit/1749012ad76ec05c61ba49e66cf389f09531cfb2))
+
 ## [0.1.94](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.93...v0.1.94) (2024-01-09)
 
 

data/lib/vagrant-zones/action.rb

@@ -6,7 +6,7 @@ require 'log4r'
 module VagrantPlugins
   module ProviderZone
     # Run actions against the machine
-    module Action
+    module Action # rubocop:disable Metrics/ModuleLength
       include Vagrant::Action::Builtin
       @logger = Log4r::Logger.new('vagrant_zones::action')
 
@@ -116,8 +116,17 @@ module VagrantPlugins
       # This is the action that is primarily responsible for completely freeing the resources of the underlying virtual machine.
       def self.action_destroy
         Vagrant::Action::Builder.new.tap do |b|
-          b.use Call, IsCreated do |_env, b2|
-            b2.use Destroy
+          b.use Call, IsCreated do |env1, b2|
+            unless env1[:result]
+              b2.use NotCreated
+              b2.use Call, DestroyConfirm do |env2, b3|
+                b3.use Destroy if env2[:result]
+              end
+              next
+            end
+            b2.use Call, DestroyConfirm do |env2, b3|
+              b3.use Destroy if env2[:result]
+            end
           end
         end
       end

data/lib/vagrant-zones/command/console.rb

@@ -21,7 +21,7 @@ module VagrantPlugins
             require File.expand_path('webvnc_console', __dir__)
             WebVNCConsole
           end
-          super(argv, env)
+          super
         end
 
         def execute
@@ -48,9 +48,8 @@ module VagrantPlugins
             subopts.separator 'Available subcommands:'
             # Add the available subcommands as separators in order to print them
             # out as well.
-            keys = []
-            @subcommands.each { |(key, _value)| keys << key.to_s }
-            keys.sort.each do |key|
+            keys = @subcommands.map { |(key, _value)| key.to_s }.sort
+            keys.each do |key|
               subopts.separator "     #{key}"
             end
             subopts.separator 'For help on any individual subcommand run `vagrant zone console <subcommand> -h`'

data/lib/vagrant-zones/command/guest_power_controls.rb

@@ -17,7 +17,7 @@ module VagrantPlugins
             require File.expand_path('shutdown_guest', __dir__)
             ShutdownGuest
           end
-          super(argv, env)
+          super
         end
 
         def execute
@@ -42,9 +42,8 @@ module VagrantPlugins
             subopts.separator 'Available subcommands:'
             # Add the available subcommands as separators in order to print them
             # out as well.
-            keys = []
-            @subcommands.each { |(key, _value)| keys << key.to_s }
-            keys.sort.each do |key|
+            keys = @subcommands.map { |(key, _value)| key.to_s }.sort
+            keys.each do |key|
               subopts.separator "     #{key}"
             end
             subopts.separator ''

data/lib/vagrant-zones/command/zfssnapshot.rb

@@ -25,7 +25,7 @@ module VagrantPlugins
             require File.expand_path('configure_snapshots', __dir__)
             ConfigureSnapshots
           end
-          super(argv, env)
+          super
         end
 
         def execute
@@ -51,9 +51,8 @@ module VagrantPlugins
             subopts.separator 'Available subcommands:'
             # Add the available subcommands as separators in order to print them
             # out as well.
-            keys = []
-            @subcommands.each { |(key, _value)| keys << key.to_s }
-            keys.sort.each do |key|
+            keys = @subcommands.map { |(key, _value)| key.to_s }.sort
+            keys.each do |key|
               subopts.separator "     #{key}"
             end
             subopts.separator ''

data/lib/vagrant-zones/command/zone.rb

@@ -28,7 +28,7 @@ module VagrantPlugins
             require File.expand_path('console', __dir__)
             Console
           end
-          super(argv, env)
+          super
         end
 
         def execute
@@ -54,10 +54,8 @@ module VagrantPlugins
 
             # Add the available subcommands as separators in order to print them
             # out as well.
-            keys = []
-            @subcommands.each { |(key, _value)| keys << key.to_s }
-
-            keys.sort.each do |key|
+            keys = @subcommands.map { |(key, _value)| key.to_s }.sort
+            keys.each do |key|
               subopts.separator "     #{key}"
             end
 

data/lib/vagrant-zones/driver.rb

@@ -315,7 +315,7 @@ module VagrantPlugins
       ## Manage Network Interfaces
       def network(uii, state)
         config = @machine.provider_config
-        uii.info(I18n.t('vagrant_zones.creating_networking_interfaces')) if state == 'create'
+        uii.info(I18n.t('vagrant_zones.creating_networking_interfaces')) if state == 'create' && !config.on_demand_vnics
         @machine.config.vm.networks.each do |adaptertype, opts|
           case adaptertype.to_s
           when 'public_network'
@@ -625,16 +625,16 @@ module VagrantPlugins
         vnic_name = vname(uii, opts)
         uii.info(I18n.t('vagrant_zones.nat_vnic_setup'))
         uii.info("  #{vnic_name}")
-        strt = "#{@pfexec} zonecfg -z #{@machine.name} "
+        zonecfg_cmd = "#{@pfexec} zonecfg -z #{@machine.name} "
         cie = config.cloud_init_enabled
         case config.brand
         when 'lx'
           shrtstr1 = %(set allowed-address=#{allowed_address}; add property (name=gateway,value="#{defrouter}"); )
           shrtstr2 = %(add property (name=ips,value="#{allowed_address}"); add property (name=primary,value="true"); end;)
-          execute(false, %(#{strt}set global-nic=auto; #{shrtstr1} #{shrtstr2}"))
+          execute(false, %(#{zonecfg_cmd}set global-nic=auto; #{shrtstr1} #{shrtstr2}"))
         when 'bhyve'
-          execute(false, %(#{strt}"add net; set physical=#{vnic_name}; end;")) unless cie
-          execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set allowed-address=#{allowed_address}; end;")) if cie
+          execute(false, %(#{zonecfg_cmd}"add net; set physical=#{vnic_name}; end;")) unless cie
+          execute(false, %(#{zonecfg_cmd}"add net; set physical=#{vnic_name}; set allowed-address=#{allowed_address}; end;")) if cie
         end
       end
 
@@ -724,16 +724,12 @@ module VagrantPlugins
       def zoneniccreate(uii, opts)
         mac = macaddress(uii, opts)
         vnic_name = vname(uii, opts)
-        if opts[:vlan].nil?
-          uii.info(I18n.t('vagrant_zones.creating_vnic'))
-          uii.info("  #{vnic_name}")
-          execute(false, "#{@pfexec} dladm create-vnic -l #{opts[:bridge]} -m #{mac} #{vnic_name}")
-        else
-          vlan = opts[:vlan]
-          uii.info(I18n.t('vagrant_zones.creating_vnic'))
-          uii.info("  #{vnic_name}")
-          execute(false, "#{@pfexec} dladm create-vnic -l #{opts[:bridge]} -m #{mac} -v #{vlan} #{vnic_name}")
-        end
+        uii.info(I18n.t('vagrant_zones.creating_vnic'))
+        uii.info("  #{vnic_name}")
+        command = "#{@pfexec} dladm create-vnic -l #{opts[:bridge]} -m #{mac}"
+        command += " -v #{opts[:vlan]}" unless opts[:vlan].nil? || (opts[:vlan]).zero?
+        command += " #{vnic_name}"
+        execute(false, command)
       end
 
       # This helps us create all the datasets for the zone
@@ -1029,10 +1025,8 @@ module VagrantPlugins
         execute(false, %(#{zcfg}"add attr; set name=password; set value=#{ccip}; set type=string; end;")) unless ccip.nil?
 
         cclir = config.dns
-        dservers = []
-        cclir['dns'].each do |ns|
-          dservers.append(ns['nameserver'])
-        end
+        dservers = cclir['dns'].map { |ns| ns['nameserver'] }
+
         uii.info(I18n.t('vagrant_zones.setting_cloud_resolvers')) unless dservers.nil?
         uii.info("  #{dservers}") unless dservers.nil?
         execute(false, %(#{zcfg}"add attr; set name=resolvers; set value=#{dservers}; set type=string; end;")) unless dservers.nil?
@@ -1051,28 +1045,24 @@ module VagrantPlugins
         config = @machine.provider_config
         uii.info(I18n.t('vagrant_zones.vnic_setup'))
         uii.info("  #{vnic_name}")
-        strt = "#{@pfexec} zonecfg -z #{@machine.name} "
+        zonecfg_cmd = "#{@pfexec} zonecfg -z #{@machine.name} "
         cie = config.cloud_init_enabled
         aa = config.allowed_address
         case config.brand
         when 'lx'
           shrtstr1 = %(set allowed-address=#{allowed_address}; add property (name=gateway,value="#{defrouter}"); )
           shrtstr2 = %(add property (name=ips,value="#{allowed_address}"); add property (name=primary,value="true"); end;)
-          execute(false, %(#{strt}set global-nic=auto; #{shrtstr1} #{shrtstr2}"))
+          execute(false, %(#{zonecfg_cmd}set global-nic=auto; #{shrtstr1} #{shrtstr2}"))
         when 'bhyve'
-          if config.on_demand_vnics && !opts[:vlan].nil?
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set vlan-id=#{opts[:vlan]}; set global-nic=#{opts[:bridge]}; end;")) unless cie
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set vlan-id=#{opts[:vlan]}; set global-nic=#{opts[:bridge]}; set allowed-address=#{allowed_address}; end;")) if cie && aa
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set vlan-id=#{opts[:vlan]}; set global-nic=#{opts[:bridge]}; end;")) if cie && !aa
-          elsif config.on_demand_vnics && opts[:vlan].nil?
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set global-nic=#{opts[:bridge]}; end;")) unless cie
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set global-nic=#{opts[:bridge]}; set allowed-address=#{allowed_address}; end;")) if cie && aa
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set global-nic=#{opts[:bridge]}; end;")) if cie && !aa
-          elsif !config.on_demand_vnics
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; end;")) unless cie
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set allowed-address=#{allowed_address}; end;")) if cie && aa
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; end;")) if cie && !aa
-          end
+          vlan_option = opts[:vlan].nil? || opts[:vlan].zero? ? '' : "set vlan-id=#{opts[:vlan]}; "
+          base_cmd = if config.on_demand_vnics
+                       %(#{zonecfg_cmd}"add net; set physical=#{vnic_name}; #{vlan_option}set global-nic=#{opts[:bridge]}; )
+                     else
+                       %(#{zonecfg_cmd}"add net; set physical=#{vnic_name}; )
+                     end
+          execute(false, %(#{base_cmd}end;)) unless cie
+          execute(false, %(#{base_cmd}set allowed-address=#{allowed_address}; end;)) if cie && aa
+          execute(false, %(#{base_cmd}end;)) if cie && !aa
         end
       end
 

data/lib/vagrant-zones/provider.rb

@@ -12,7 +12,7 @@ module VagrantPlugins
       def initialize(machine)
         @logger = Log4r::Logger.new('vagrant::provider::zone')
         @machine = machine
-        super(machine)
+        super
       end
 
       def driver

data/lib/vagrant-zones/version.rb

@@ -2,7 +2,7 @@
 
 module VagrantPlugins
   module ProviderZone
-    VERSION = '0.1.94'
+    VERSION = '0.1.97'
     NAME = 'vagrant-zones'
   end
 end

data/vagrant-zones.gemspec

@@ -29,9 +29,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.7.0'
   spec.required_rubygems_version = '>= 1.3.6'
-  spec.add_runtime_dependency 'i18n', '~> 1.0'
-  spec.add_runtime_dependency 'iniparse', '~> 1.0'
-  spec.add_runtime_dependency 'log4r', '~> 1.1'
-  spec.add_runtime_dependency 'netaddr', '~> 2.0', '>= 2.0.4'
-  spec.add_runtime_dependency 'ruby_expect', '~> 1.7', '>= 1.7.5'
+  spec.add_dependency  'i18n', '~> 1.0'
+  spec.add_dependency  'iniparse', '~> 1.0'
+  spec.add_dependency  'log4r', '~> 1.1'
+  spec.add_dependency  'netaddr', '~> 2.0', '>= 2.0.4'
+  spec.add_dependency  'ruby_expect', '~> 1.7', '>= 1.7.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zones
 version: !ruby/object:Gem::Version
-  version: 0.1.94
+  version: 0.1.97
 platform: ruby
 authors:
 - Mark Gilbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n