vagrant-lxd 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5c54e824e6ddcb541c28c0630b0d93bf019b3e4adc3d78c8353b80d677f29b4
-  data.tar.gz: 95548bc78e3df80c016ed817210cc05c12b664a7fbb043a600a1c3a7420e22e1
+  metadata.gz: 9f0f075e1a4c96070a15ebb90aff04e8d7d4f256f7b5d8c8494390b2826ac729
+  data.tar.gz: 22ad9d6af3b0a06a88c331907b3ba62491c593627773491bcc82c95d7cad9138
 SHA512:
-  metadata.gz: 8ff4335dfb7edb5bf3995b9f1c71ade7044a0277b4346978958775c99402ac0b0db74ba8cd586d1464408ae09c544a68b773761b29789dfb084402ac36534c1c
-  data.tar.gz: 7d7ce503fb62c834911d3647b88e1b4c6cb0434532432fb1d1c055aa62ffee4ff493eb0c2561046ac243ac0949cdde57b0cb2b73c9c8bf1f85a887f0ad53808c
+  metadata.gz: 94ce807ed3c17ae49232dc19800a9f555251914fa3651b8d2b6f19941c52524a79f2042f3dbcbd4a73f0fbcfdadcdfd3e14449828582eac1cac38eb15175c759
+  data.tar.gz: 424cf1cbc62ea73dc806cafb32d8a2b758eb58d49a918823cf5f98f1819a82b97fe74de6c7b741a278710d923f5098132fa66f3eba456a14b08704d7c9586e08

data/Gemfile.lock

@@ -33,7 +33,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.7.0)
+    vagrant-lxd (0.7.1)
       activesupport (~> 5.2.3)
       faraday (~> 0.17)
       hyperkit (~> 1.3.0)

data/lib/vagrant-lxd/capability.rb

@@ -57,5 +57,10 @@ module VagrantLXD
         end
       end
     end
+
+    # TODO Install the minimal set of packages to allow for Vagrant to
+    # connect to a Debian-based guest.
+    def Capability.debian_guest(machine)
+    end
   end
 end

data/lib/vagrant-lxd/command.rb

@@ -37,6 +37,7 @@ module VagrantLXD
         o.separator 'Commands:'
         o.separator '     attach    associate machine with a running container'
         o.separator '     detach    disassociate machine from a running container'
+        o.separator '     exec      execute a command within a running container'
         o.separator '     shadow    print user and group ID mapping information'
         o.separator '     version   print current plugin version'
         o.separator ''
@@ -53,6 +54,8 @@ module VagrantLXD
         attach(args)
       when 'detach'
         detach(args)
+      when 'exec'
+        exec(args)
       when 'shadow'
         shadow(args)
       when 'version'
@@ -164,6 +167,45 @@ module VagrantLXD
       end
     end
 
+    def exec(args)
+      opts = OptionParser.new do |o|
+        o.banner = 'Usage: vagrant lxd exec [machine ...] -- <command> [args ...]'
+        o.separator ''
+        o.separator 'Executes a command on the target LXD container(s). Vagrant'
+        o.separator 'will wait until each command completes before printing its'
+        o.separator 'output and proceeding to the next machine.'
+      end
+
+      if args.include?('-h') or args.include?('--help')
+        @env.ui.info opts.help
+        exit 0
+      end
+
+      unless dashes = args.index('--')
+        fail Vagrant::Errors::CLIInvalidUsage, help: opts.help
+      end
+
+      machines = args.take(dashes)
+      command  = args.drop(dashes + 1)
+      status   = 0
+
+      with_target_machines(machines) do |machine|
+        if machine.id.nil? or machine.state.id != :running
+          machine.ui.warn 'Machine is not running, skipping...'
+        else
+          result = Driver.new(machine).exec(command)
+          stdout = result.output[:'1']
+          stderr = result.output[:'2']
+          status = status unless status.zero?
+          machine.ui.info "Running command `#{command.shelljoin}`..."
+          machine.ui.detail stdout.chomp unless stdout.empty?
+          machine.ui.error  stderr.chomp unless stderr.empty?
+        end
+      end
+
+      exit status
+    end
+
     def shadow(args)
       opts = OptionParser.new do |o|
         o.banner = 'Usage: vagrant lxd shadow --help'

data/lib/vagrant-lxd/config.rb

@@ -24,6 +24,7 @@ module VagrantLXD
   class Config < Vagrant.plugin('2', :config)
     attr_accessor :api_endpoint
     attr_accessor :name
+    attr_accessor :image
     attr_accessor :timeout
     attr_accessor :config
     attr_accessor :devices
@@ -40,6 +41,7 @@ module VagrantLXD
 
     def initialize
       @name = UNSET_VALUE
+      @image = UNSET_VALUE
       @timeout = UNSET_VALUE
       @config = UNSET_VALUE
       @devices = UNSET_VALUE
@@ -69,6 +71,10 @@ module VagrantLXD
         end
       end
 
+      unless image.nil? or image.is_a? String
+        errors << "Invalid `image' (value must be a string): #{image.inspect}"
+      end
+
       if not timeout.is_a? Integer
         errors << "Invalid `timeout' (value must be an integer): #{timeout.inspect}"
       elsif timeout < 1
@@ -167,6 +173,10 @@ module VagrantLXD
         @name = nil
       end
 
+      if image == UNSET_VALUE
+        @image = nil
+      end
+
       if config == UNSET_VALUE
         @config = {}
       end

data/lib/vagrant-lxd/driver.rb

@@ -164,6 +164,7 @@ module VagrantLXD
 
     def initialize(machine)
       @machine = machine
+      @image = machine.provider_config.image
       @timeout = machine.provider_config.timeout
       @api_endpoint = machine.provider_config.api_endpoint
       @config = machine.provider_config.config
@@ -286,34 +287,15 @@ module VagrantLXD
 
     def create
       if in_state? NOT_CREATED
-        image, container = nil, nil
+        fingerprint = image_from_box
         machine_id = generate_machine_id
-        file, fingerprint = Driver.synchronize { prepare_image_file }
-
-        Driver.synchronize do
-          begin
-            image = lxd.image(fingerprint)
-            @logger.debug 'Using image: ' << image.inspect
-          rescue Hyperkit::NotFound
-            image = lxd.create_image_from_file(file)
-            @logger.debug 'Created image: ' << image.inspect
-            begin
-              lxd.update_image(fingerprint, properties: IMAGE_PROPERTIES)
-              lxd.create_image_alias(fingerprint, machine_id, IMAGE_PROPERTIES)
-            rescue Hyperkit::Error
-              @logger.error 'Failed to set description for image: ' << e.reason
-            end
-          end
-        end
-
         container = lxd.create_container(machine_id, devices: devices, ephemeral: ephemeral, fingerprint: fingerprint, config: config, profiles: profiles)
         @logger.debug 'Created container: ' << container.inspect
-
         @machine.id = machine_id
       end
     rescue Hyperkit::Error => e
       lxd.delete_container(machine_id) rescue nil unless container.nil?
-      lxd.delete_image(image[:metadata][:fingerprint]) rescue nil unless image.nil?
+      lxd.delete_image(fingerprint) rescue nil unless fingerprint.nil?
       if e.reason =~ /Container '([^']+)' already exists/
         @machine.ui.error e.reason
         fail ContainerAlreadyExists, machine_name: @machine.name, container: $1
@@ -413,6 +395,14 @@ module VagrantLXD
       fail ContainerConfigurationFailure, machine_name: @machine.name, reason: e.reason
     end
 
+    def exec(command)
+      operation = lxd.execute_command(machine_id, command, sync: false, record_output: true)
+      wait_for_operation(operation).metadata.tap do |result|
+        result.output[:'1'] = lxd.get(result.output[:'1'])
+        result.output[:'2'] = lxd.get(result.output[:'2'])
+      end
+    end
+
     def info
       if in_state? :running, :frozen
         {
@@ -478,8 +468,9 @@ module VagrantLXD
     # is enabled or setting sync: true. TODO Upstream a better fix than
     # this, so that `wait_for_operation` really does.
     def wait_for_operation(operation)
+      @logger.debug 'Waiting for operation: ' << operation.inspect
       lxd.wait_for_operation(operation.id)
-    rescue Faraday::TimeoutError
+    rescue Net::ReadTimeout, Faraday::TimeoutError
       retry
     end
 
@@ -607,7 +598,28 @@ module VagrantLXD
       fail CertificateGenerationFailure, reason: e.message, api_endpoint: @api_endpoint.to_s, default_path: default_path, vagrant_path: vagrant_path
     end
 
-    # TODO Image handling should be moved into its own class.
+    def image_from_box
+      file, fingerprint = Driver.synchronize { prepare_image_file }
+
+      Driver.synchronize do
+        begin
+          image = lxd.image(fingerprint)
+          @logger.debug 'Using image: ' << image.inspect
+        rescue Hyperkit::NotFound
+          image = lxd.create_image_from_file(file)
+          @logger.debug 'Created image: ' << image.inspect
+          begin
+            lxd.update_image(fingerprint, properties: IMAGE_PROPERTIES)
+            lxd.create_image_alias(fingerprint, machine_id, IMAGE_PROPERTIES)
+          rescue Hyperkit::Error => e
+            @logger.error 'Failed to set description for image: ' << e.reason
+          end
+        end
+      end
+
+      fingerprint
+    end
+
     def prepare_image_file
       tmpdir = Dir.mktmpdir
 
@@ -664,7 +676,8 @@ module VagrantLXD
       package_directory = Dir.mktmpdir
 
       image = begin
-        lxd.create_image_from_container(machine_id, IMAGE_PROPERTIES)
+        operation = lxd.create_image_from_container(machine_id, properties: IMAGE_PROPERTIES, sync: false)
+        wait_for_operation(operation)
       rescue Hyperkit::BadRequest => e
         if e.reason =~ /The image already exists: (\h{64})/
           {

data/lib/vagrant-lxd/plugin.rb

@@ -49,6 +49,11 @@ module VagrantLXD
       Capability
     end
 
+    guest_capability(:debian, 'debian_guest') do
+      require_relative 'capability'
+      Capability
+    end
+
     host_capability(:linux, 'synced_folders') do
       require_relative 'capability'
       Capability

data/lib/vagrant-lxd/version.rb

@@ -20,7 +20,7 @@
 module VagrantLXD
   module Version
     NAME = 'vagrant-lxd'
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
     DESCRIPTION = 'Vagrant LXD provider'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxd
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-01 00:00:00.000000000 Z
+date: 2023-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport