vagrant-local 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1d8c9dce1b4dae4a69c98cc147082953ebfc7d9c487f8fca9db2db279cffadd
-  data.tar.gz: 50f67b0bb0ad9dc4d150672cae497e501163d5c2fd21044a2ec53fcbe21e3c8c
+  metadata.gz: 3e8832438f1e44676aca1406ba999ade22e226da20cfce80f421fe60371382e2
+  data.tar.gz: 378419aa3ca92637137742c25bcdf60080019146bcce245aa4a9757d990055cb
 SHA512:
-  metadata.gz: 18b3cc80cdb68f8f4aa070510e30ac44e6f1fc54975dd83eb9d38ac1254160d39d9257ac1e6b73bebfc9f1033f4474deb1b8fc510467f0ca5cd0a166a39c7dca
-  data.tar.gz: b30cd4213fe601d934e0c022cdeef40900b270ec805e71ec778978697775457358491b380535ae76b10276ac747ba394b0789470b2a86ecc7ecb70e1fbb2ee5e
+  metadata.gz: c8f3a53c97c9336e573e8f03905be56ec1d33f78fafb64a3255ff7e8ef9db3ebfd008684336650e87d71f732b889c67487df48efb856d03e8bb144ad8b3a7833
+  data.tar.gz: 6c5c020d2a53a1333923c28de16784aca14751deac47cab3beb1a6f1b21187f9a44ba74fbda1cf2d72966234f1b6a14af6c8e40e7f813203bda35ca6011e948a

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.0.2](https://github.com/STARTcloud/vagrant-local/compare/v0.0.1...v0.0.2) (2024-01-17)
+
+
+### Bug Fixes
+
+* box format auto-detect ([0d205f2](https://github.com/STARTcloud/vagrant-local/commit/0d205f2b2c0517669d1057cc1abc11f7f650cb9e))
+* call playbook instead of invidual plays ([8ebab01](https://github.com/STARTcloud/vagrant-local/commit/8ebab01374e7dc9b03a985ff862654a59add3afe))
+
 ## [0.0.1](https://github.com/STARTcloud/vagrant-local/compare/v1.0.1...v0.0.1) (2024-01-15)
 
 

data/lib/vagrant-local/action/import.rb

@@ -18,7 +18,33 @@ module VagrantPlugins
           @app = app
         end
 
+        def validate_uuid_format(uuid)
+          uuid_regex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/
+          true if uuid_regex.match?(uuid.to_s.downcase)
+        end
+
         def call(env)
+          @machine = env[:machine]
+          @executor = Executor::Exec.new
+          image = @machine.config.vm.box
+          datadir = @machine.data_dir
+          @driver = @machine.provider.driver
+          ui = env[:ui]
+          ui.info(I18n.t('vagrant_local.meeting'))
+          ui.info(I18n.t('vagrant_local.datadir'))
+          ui.info("  #{datadir}")
+          ui.info(I18n.t('vagrant_local.detecting_box'))
+
+          # Support zss maybe zst? Same thing? format only for now, use other images and convert later
+          box_format = env[:machine].box.metadata['format'] unless env[:machine].box.nil?
+
+          # Insert Future Code to try to convert existing box
+          ui.info(I18n.t('vagrant_local.detected_format')) if %w[ovf ova].include?(box_format)
+
+          ## No Local box template exists, Lets use Vagrant HandleBox to download the Box template
+          ui.info(I18n.t('vagrant_local.vagrant_cloud_box_detected'))
+          ui.info("  #{image}")
+          ui.clear_line
           @app.call(env)
         end
       end

data/lib/vagrant-local/action/shutdown.rb

@@ -31,10 +31,9 @@ module VagrantPlugins
           end
           env[:metrics]['instance_ssh_time'] = Util::Timer.time do
             300.times do
-              state_id = @driver.state(@machine)
-              ui.info(I18n.t('vagrant_local.graceful_shutdown_complete')) unless state_id == :running
-              sleep 1 if state_id == :running
-              break unless state_id == :running
+              ui.info(I18n.t('vagrant_local.graceful_shutdown_complete')) unless @driver.state == :running
+              sleep 1 if @driver.state == :running
+              break unless @driver.state == :running
               break if env[:interrupted]
             end
           end

data/lib/vagrant-local/action.rb

@@ -18,6 +18,9 @@ module VagrantPlugins
               env[:halt_on_error] = true
               b2.use action_start
             elsif !env[:result]
+              b2.use Import
+              b2.use HandleBox
+              b2.use BoxCheckOutdated
               b2.use Create
               b2.use Start
               b2.use WaitTillBoot

data/lib/vagrant-local/config.rb

@@ -6,34 +6,16 @@ module VagrantPlugins
   module ProviderLocal
     # This is used define the variables for the project
     class Config < Vagrant.plugin('2', :config)
-      # rubocop:disable Layout/LineLength
-      attr_accessor :brand, :autoboot, :setup_method, :safe_restart, :allowed_address, :post_provision_boot, :safe_shutdown, :boxshortname, :kernel, :debug, :debug_boot, :private_network, :winalcheck, :winlcheck, :lcheck, :alcheck, :snapshot_script, :diskif, :netif, :cdroms, :disk1path, :disk1size, :cpus, :cpu_configuration, :boot, :complex_cpu_conf, :memory, :vagrant_user, :vagrant_user_private_key_path, :setup_wait, :on_demand_vnics, :clean_shutdown_time, :dhcp4, :vagrant_user_pass, :firmware_type, :vm_type, :partition_id, :shared_disk_enabled, :shared_dir, :acpi, :os_type, :console, :consolehost, :consoleport, :console_onboot, :hostbridge, :sshport, :rdpport, :override, :additional_disks, :cloud_init_resolvers, :cloud_init_enabled, :cloud_init_dnsdomain, :cloud_init_password, :cloud_init_sshkey, :cloud_init_conf, :dns, :box, :vagrant_cloud_creator, :winbooted_string, :booted_string, :zunlockbootkey, :zunlockboot, :xhci_enabled, :login_wait
-
-      # rubocop:enable Layout/LineLength
+      attr_accessor :brand, :boxshortname, :kernel, :debug, :boot, :vagrant_user, :vagrant_user_private_key_path, :clean_shutdown_time, :vagrant_user_pass, :vm_type, :partition_id, :sshport,
+                    :rdpport, :box, :vagrant_cloud_creator
 
       def initialize
         super
-        @brand = 'bhyve'
-        @additional_disks = UNSET_VALUE
-        @autoboot = true
-        @post_provision_boot = false
+        @brand = 'aws'
         @kernel = nil
         @boxshortname = UNSET_VALUE
-        @cdroms = nil
-        @shared_dir = nil
-        @os_type = 'generic'
-        @debug_boot = nil
         @debug = nil
-        @consoleport = nil
-        @consolehost = '0.0.0.0'
-        @console_onboot = 'false'
-        @console = 'webvnc'
-        @memory = '2G'
-        @diskif = 'virtio-blk'
-        @netif = 'virtio-net-viona'
-        @cpus = 1
         @boot = UNSET_VALUE
-        @setup_wait = 90
         @box = UNSET_VALUE
         @clean_shutdown_time = 300
         @vmtype = 'production'
@@ -43,12 +25,6 @@ module VagrantPlugins
         @vagrant_user = 'vagrant'
         @vagrant_user_pass = 'vagrant'
         @vagrant_user_private_key_path = './id_rsa'
-        @xhci_enabled = 'off'
-        @override = false
-        @login_wait = 5
-        @private_network = nil
-        @vm_type = 'production'
-        @setup_method = nil
       end
     end
   end

data/lib/vagrant-local/driver.rb

@@ -37,8 +37,17 @@ module VagrantPlugins
                   end
       end
 
-      def state(machine)
-        vm_data = YAML.load_file("#{machine.name}.vmstate")
+      def state
+        data = [{
+          'name' => nil,
+          'ec2_id' => nil,
+          'state' => 'not_created',
+          'public_ip' => nil
+        }]
+        vmstate_file = "#{@machine.name}.vmstate"
+        File.write(vmstate_file, data.to_yaml) unless File.exist?(vmstate_file)
+
+        vm_data = YAML.load_file(vmstate_file)
         return :not_created unless vm_data.is_a?(Array) && !vm_data.empty? && vm_data.first.is_a?(Hash)
 
         vm_state = vm_data.first['state']
@@ -59,8 +68,8 @@ module VagrantPlugins
 
       ## Begin installation
       def install(_uii)
-        config = @machine.config.vm.provisioners[0].config.extra_vars.to_json
-        command = "#{@pfexec} ansible-playbook ./providers/ansible/install.yml -e '#{config}'"
+        config = @machine.config.vm.provisioners[1].config.extra_vars.to_json
+        command = "#{@pfexec} ansible-playbook ./providers/ansible/playbook.yml --tags 'install' -e '#{config}'"
         _stdin, stdout, _stderr, wait_thr = Open3.popen3(command)
         puts stdout.readline until stdout.eof?
         wait_thr.value
@@ -92,8 +101,8 @@ module VagrantPlugins
 
       ## Boot the Machine
       def boot(uii)
-        config = @machine.config.vm.provisioners[0].config.extra_vars.to_json
-        command = "#{@pfexec} ansible-playbook ./providers/ansible/boot.yml -e '#{config}'"
+        config = @machine.config.vm.provisioners[1].config.extra_vars.to_json
+        command = "#{@pfexec} ansible-playbook ./providers/ansible/playbook.yml --tags 'boot' -e '#{config}'"
         uii.info(I18n.t('vagrant_local.start'))
         _stdin, stdout, _stderr, wait_thr = Open3.popen3(command)
         puts stdout.readline until stdout.eof?
@@ -167,11 +176,11 @@ module VagrantPlugins
       # Halts the instance, first via shutdown command, then a halt.
       def halt(uii)
         provider_config = @machine.provider_config
-        config = @machine.config.vm.provisioners[0].config.extra_vars.to_json
+        config = @machine.config.vm.provisioners[1].config.extra_vars.to_json
         uii.info(I18n.t('vagrant_local.graceful_shutdown'))
         begin
           Timeout.timeout(provider_config.clean_shutdown_time) do
-            command = "#{@pfexec} ansible-playbook ./providers/ansible/halt.yml -e '#{config}'"
+            command = "#{@pfexec} ansible-playbook ./providers/ansible/playbook.yml --tags 'halt' -e '#{config}' "
             _stdin, stdout, _stderr, wait_thr = Open3.popen3(command)
             puts stdout.readline until stdout.eof?
             wait_thr.value
@@ -180,7 +189,7 @@ module VagrantPlugins
           uii.info(I18n.t('vagrant_local.graceful_shutdown_failed') + provider_config.clean_shutdown_time.to_s)
           begin
             Timeout.timeout(provider_config.clean_shutdown_time) do
-              command = "#{@pfexec} ansible-playbook ./providers/ansible/halt.yml -e '#{config}'"
+              command = "#{@pfexec} ansible-playbook ./providers/ansible/playbook.yml --tags 'halt' -e '#{config}' "
               _stdin, stdout, _stderr, wait_thr = Open3.popen3(command)
               puts stdout.readline until stdout.eof?
               wait_thr.value
@@ -193,10 +202,11 @@ module VagrantPlugins
 
       # Destroys the instance
       def destroy(id)
-        config = @machine.config.vm.provisioners[0].config.extra_vars.to_json
-        if state(@machine) == :stopped
+        # byebug
+        config = @machine.config.vm.provisioners[1].config.extra_vars.to_json
+        if state == :stopped
           id.info(I18n.t('vagrant_local.destroy'))
-          command = "#{@pfexec} ansible-playbook ./providers/ansible/destroy.yml -e '#{config}'"
+          command = "#{@pfexec} ansible-playbook ./providers/ansible/playbook.yml --tags 'destroy' -e '#{config}' "
           _stdin, stdout, _stderr, wait_thr = Open3.popen3(command)
           puts stdout.readline until stdout.eof?
           wait_thr.value

data/lib/vagrant-local/plugin.rb

@@ -2,6 +2,7 @@
 
 begin
   require 'vagrant'
+  require 'yaml'
 rescue LoadError
   raise 'The Vagrant Local plugin must be run within Vagrant.'
 end
@@ -19,11 +20,51 @@ module VagrantPlugins
         require_relative 'config'
         Config
       end
+
       provider(:local, parallel: false) do
         require_relative 'provider'
         Provider
       end
 
+      config(:aws, :provider) do
+        require_relative 'config'
+        Config
+      end
+
+      provider(:aws, parallel: false) do
+        require_relative 'provider'
+        Provider
+      end
+
+      config(:azure, :provider) do
+        require_relative 'config'
+        Config
+      end
+
+      provider(:azure, parallel: false) do
+        require_relative 'provider'
+        Provider
+      end
+
+      config(:gcp, :provider) do
+        require_relative 'config'
+        Config
+      end
+
+      provider(:gcp, parallel: false) do
+        require_relative 'provider'
+        Provider
+      end
+
+      config(:prominic, :provider) do
+        require_relative 'config'
+        Config
+      end
+
+      provider(:prominic, parallel: false) do
+        require_relative 'provider'
+        Provider
+      end
       # This initializes the internationalization strings.
       def self.setup_i18n
         I18n.load_path << File.expand_path('locales/en.yml', ProviderLocal.source_root)

data/lib/vagrant-local/provider.rb

@@ -66,7 +66,7 @@ module VagrantPlugins
       def state
         state_id = nil
         state_id = :not_created unless @machine.id
-        state_id = driver.state(@machine) if @machine.id && !state_id
+        state_id = driver.state if @machine.id && !state_id
         # This is a special pseudo-state so that we don't set the
         # NOT_CREATED_ID while we're setting up the machine. This avoids
         # clearing the data dir.

data/lib/vagrant-local/version.rb

@@ -2,7 +2,7 @@
 
 module VagrantPlugins
   module ProviderLocal
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
     NAME = 'vagrant-local'
   end
 end

data/locales/en.yml

@@ -4,7 +4,7 @@ en:
       not_created: |-
         Your instance of this box haven't been created
       is_running: |-
-        Your instance has already be booted
+        Your instance has already been booted
     errors:
       not_yet_implemented: |-
         Your configuration is not yet implemented
@@ -88,8 +88,8 @@ en:
       Starting the instance
     setting_dns_server: |-
       Setting nameserver ==> 
-    detected_ovf_format: |-
-      Detected OVF
+    detected_format: |-
+      Detected 
     importing_box_image: |-
       - Importing Box image ==> 
     importing_box_image_to_disk: |-

metadata

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