vagrant-lxd 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c4e09ae9c1b8bd49ad70106106a70bd6c1b6a82eb50a002e606603ba278d120
-  data.tar.gz: 3be761524f420eb75a04ab3a3c1043ca109a89ae4108e345bc22b5d7bd8cfbc6
+  metadata.gz: 81d3c5f71aaa0fb4f5fd3128722bf0d045619f7b56f2f6056f87ab396548d18f
+  data.tar.gz: 966e0817b7bb8fd94b7a865e2799b468a92b4522de5218a088e7502f75d218be
 SHA512:
-  metadata.gz: 79518954226df0b863a3108c6f8fbb360549ce53b7577ad9d07c24d94c67ae5005bc8053d04fe3344de3b8d21ad0447244d253e1190757f1b8d3a8304b226cbf
-  data.tar.gz: ddc249f6db94da9a27add204ad36549d4171d303a7c189c530df5d8163437d3807652924f77398f9c36e8814b94d64bf7f1c3951e8659d17a5a55ded84e15559
+  metadata.gz: f222d710cf807b6cbba3a5aae4dc0fb69df34c4a6d7112ef2df727f9218fd5296d8d3ed0a17fcecd8c68e3243bc982ea82a2fcdfedeb0932257bd7f08f940a9d
+  data.tar.gz: 9a0c720fd7130f77bf60663b5e1d7c2f8bc4da4bf74683214e3b4ec1e632334f704085053ae3e564d0cc967a6861d2b7597443fed20be33d8fad38cf13e49445

data/Gemfile.lock

@@ -27,20 +27,21 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.4.3)
+    vagrant-lxd (0.4.4)
       activesupport (~> 5.2.3)
+      faraday (~> 0.17)
       hyperkit (~> 1.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.3)
+    activesupport (5.2.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     bcrypt_pbkdf (1.0.1)
     builder (3.2.3)
     childprocess (0.6.3)
@@ -52,7 +53,7 @@ GEM
     ed25519 (1.2.4)
     erubis (2.7.0)
     fakefs (0.20.1)
-    faraday (0.15.4)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     gssapi (1.3.0)
@@ -80,7 +81,7 @@ GEM
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
-    minitest (5.11.3)
+    minitest (5.13.0)
     multi_json (1.13.1)
     multipart-post (2.1.1)
     net-scp (1.2.1)
@@ -90,7 +91,7 @@ GEM
     net-ssh (5.1.0)
     netrc (0.11.0)
     nori (2.6.0)
-    public_suffix (3.1.1)
+    public_suffix (4.0.3)
     rake (12.3.3)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
@@ -124,7 +125,7 @@ GEM
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext

data/README.md

@@ -13,7 +13,8 @@ The following features are currently supported:
  - VM management (create, suspend, destroy, etc.)
  - IPv4 networking
  - Synced folders
- - Snapshots
+ - Snapshots (via `vagrant snapshot`)
+ - Box Packaging (via `vagrant package`)
 
 The following features are not expected to work yet:
 

data/lib/vagrant-lxd/action.rb

@@ -124,6 +124,20 @@ module VagrantLXD
       end
     end
 
+    class Package
+      def initialize(app, env)
+        @app = app
+        @env = env
+      end
+
+      def call(env)
+        env['package.directory'] = env[:machine_package]
+        @app.call(env)
+      ensure
+        FileUtils.rm_rf(env[:machine_package])
+      end
+    end
+
     #
     # Action definitions.
     #
@@ -335,6 +349,24 @@ module VagrantLXD
         builder { |b| b.use SSHRun }
       end
 
+      def package
+        builder do |b|
+          b.use Call, state do |env, c|
+            case env[:machine_state]
+            when Vagrant::MachineState::NOT_CREATED_ID
+              next
+            when :frozen, :running
+              c.use halt
+            end
+
+            c.use Message, :info, 'Packaging machine...'
+            c.use LXD.action(:package)
+            c.use Package
+            c.use Vagrant::Action::General::Package
+          end
+        end
+      end
+
     private
 
       def builder

data/lib/vagrant-lxd/driver.rb

@@ -71,6 +71,10 @@ module VagrantLXD
       error_key 'lxd_image_creation_failure'
     end
 
+    class ImageExportFailure < Vagrant::Errors::VagrantError
+      error_key 'lxd_image_export_failure'
+    end
+
     class ContainerNotFound < Vagrant::Errors::VagrantError
       error_key 'lxd_container_not_found'
     end
@@ -343,6 +347,14 @@ module VagrantLXD
       end
     end
 
+    def package
+      if in_state? :stopped
+        create_package_directory
+      else
+        @logger.debug "Skipped packaging (#{machine_id} is not stopped)"
+      end
+    end
+
     def configure
       container = lxd.container(machine_id)
       container[:config] = container[:config].to_hash.merge(config)
@@ -602,6 +614,42 @@ module VagrantLXD
       FileUtils.rm_rf(tmpdir)
     end
 
+    # TODO s.a.
+    def create_package_directory
+      package_directory = Dir.mktmpdir
+
+      image = begin
+        lxd.create_image_from_container(machine_id, IMAGE_PROPERTIES)
+      rescue Hyperkit::BadRequest => e
+        if e.reason =~ /The image already exists: (\h{64})/
+          {
+            metadata: { fingerprint: $1 }
+          }
+        else
+          fail ImageExportFailure, machine_name: @machine.name, reason: e.reason
+        end
+      end
+
+      lxd.export_image(image[:metadata][:fingerprint], package_directory, filename: 'rootfs.tar.gz')
+
+      File.open(File.join(package_directory, 'metadata.json'), 'w') do |metadata|
+        metadata.puts JSON.pretty_generate({
+          'provider' => 'lxc',
+          'version'  => '1.0.0',
+          'built-on' => Time.now.strftime("%a %m %d %H:%M:%S %z %Y"),
+        })
+      end
+    rescue Exception => e
+      @machine.ui.error 'Failed to export container image'
+      @logger.error 'Error preparing container image: ' << e.message << "\n" << e.backtrace.join("\n")
+      fail ImageExportFailure, machine_name: @machine.name, reason: e.message
+    else
+      package_directory
+    ensure
+      # If the image was created just for this package, remove it.
+      lxd.delete_image(image[:metadata][:fingerprint]) rescue nil if image.is_a? Sawyer::Resource
+    end
+
     def error(klass)
       klass.new(
         provider: Version::NAME,

data/lib/vagrant-lxd/version.rb

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

data/templates/locales/en.yml

@@ -134,6 +134,13 @@ en:
         
             https://gitlab.com/catalyst-it/vagrant-lxd/issues
         
+      lxd_image_export_failure: |-
+        The provider was unable to export a container image for '%{machine_name}'.
+        
+        The underlying error message was: %{reason}
+        
+        The LXD logs may contain more information about the cause of this failure.
+        
       lxd_duplicate_attachment_failure: |-
         A machine can only be associated with one container at a time.
         

data/vagrant-lxd.gemspec

@@ -37,4 +37,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport', '~> 5.2.3'
   spec.add_runtime_dependency 'hyperkit', '~> 1.2.0'
+
+  # NOTE fixed to preserve ruby 1.x compatibility, versions after 1.0
+  # use the safe navigation operator and thus need ruby 2.3 or newer
+  spec.add_runtime_dependency 'faraday', '~> 0.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxd
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2020-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
 description: A Vagrant plugin that allows management of containers using LXD.
 email:
 - evanh@catalyst.net.nz
@@ -85,7 +99,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Vagrant LXD provider