vagrant-lxd 0.5.0 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1baeedff522cfbebedcb5502ca770a5acee212b651cd15ee5689de902151e218
-  data.tar.gz: a4310d180e7f8b686e474087f715fcf5896f37f51e233a934f9af156a332e633
+  metadata.gz: 06befa3b329e3326a09931a8b2a9697fd7f30c25d95935382eaa14fc71f55667
+  data.tar.gz: ed9cea092231c528d359a629b69b4c3ff847098c1e26706886a9d686df6d02b6
 SHA512:
-  metadata.gz: c26145438faab6e93dae3e9e838d899478cac316de5d97c9ee844acbebc192d2ff8b8b324ad9099b8a50cb75ac4770f88e60a26b2646020c53fe241a958b2f14
-  data.tar.gz: 70768153d8648bf0fc22406e9bb5107f399acac378a9ea5811955a483c11e4e0e9cb575afa8e58a9bb5e3d3844deb4cc6413a6e16001fefa8fe8ec5828be8844
+  metadata.gz: ed5232a956aed40892dfc03e072e42a9292ad08f24e2ea5b5a720697aad947714f7a5b6d1073e8aee5b17e21445394b1f193f6e9f23ad1ea381a3b9a7d066979
+  data.tar.gz: a282394ec033c9b5ca9ba5706b8d288dfb19fa6ff6d492aa06170062cf83d7eff3984d03003fec9ebdc0a00cd0ea91554e0050fce22da96d96fe0ca9acaafebb

data/.gitlab-ci.yml

@@ -1,10 +1,11 @@
-image: "ruby:2.4"
+image: ruby:2.5
 
 before_script:
   - apt-get -y update
   - apt-get -y upgrade
   - gem install bundler
-  - bundle install -j $(nproc) --path vendor/bundle
+  - bundle config set --local path vendor/bundle
+  - bundle install --jobs $(nproc)
 
 spec:
   script:

data/Gemfile

@@ -7,7 +7,7 @@ group :development do
   gem 'rspec'
   gem 'rspec-its'
   gem 'rspec-mocks'
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v2.2.15'
 end
 
 group :plugins do

data/Gemfile.lock

@@ -1,25 +1,24 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 2063111ab5cfcce0f6b2dbcecd9d24d47b512a96
+  revision: 9247e07fc8ffe2fdb91c6422bbb133a25983fe15
+  tag: v2.2.15
   specs:
-    vagrant (2.2.10.dev)
-      bcrypt_pbkdf (~> 1.0.0)
+    vagrant (2.2.15)
+      bcrypt_pbkdf (~> 1.1)
       childprocess (~> 4.0.0)
       ed25519 (~> 1.2.4)
-      erubis (~> 2.7.0)
+      erubi
       hashicorp-checkpoint (~> 0.1.5)
       i18n (~> 1.8)
-      listen (~> 3.1)
+      listen (~> 3.4)
       log4r (~> 1.1.9, < 1.1.11)
-      mime (~> 0.4.4)
+      mime-types (~> 3.3)
       net-scp (~> 1.2.0)
       net-sftp (~> 3.0)
-      net-ssh (~> 6.0)
+      net-ssh (>= 6.1.0, < 7)
       rb-kqueue (~> 0.2.0)
-      rest-client (>= 1.6.0, < 3.0)
-      ruby_dep (<= 1.3.1)
       rubyzip (~> 2.0)
-      vagrant_cloud (~> 2.0.3)
+      vagrant_cloud (~> 3.0.4)
       wdm (~> 0.1.0)
       winrm (>= 2.3.4, < 3.0)
       winrm-elevated (>= 1.2.1, < 2.0)
@@ -28,49 +27,45 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.5.0)
+    vagrant-lxd (0.5.4)
       activesupport (~> 5.2.3)
       faraday (~> 0.17)
-      hyperkit (~> 1.2.0)
+      hyperkit (~> 1.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.3)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    bcrypt_pbkdf (1.0.1)
+    bcrypt_pbkdf (1.1.0)
     builder (3.2.4)
     childprocess (4.0.0)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.2.4)
-    erubi (1.9.0)
-    erubis (2.7.0)
-    fakefs (1.2.2)
-    faraday (0.17.3)
+    erubi (1.10.0)
+    excon (0.79.0)
+    fakefs (1.3.2)
+    faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.13.1)
-    gssapi (1.3.0)
+    ffi (1.15.0)
+    gssapi (1.3.1)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashicorp-checkpoint (0.1.5)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
     httpclient (2.8.3)
-    hyperkit (1.2.0)
+    hyperkit (1.3.0)
       activesupport (>= 4.2.6)
       sawyer
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    listen (3.2.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
@@ -78,11 +73,10 @@ GEM
     logging (2.3.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
-    mime (0.4.4)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
-    minitest (5.14.1)
+    mime-types-data (3.2021.0225)
+    minitest (5.14.4)
     multi_json (1.15.0)
     multipart-post (2.1.1)
     net-scp (1.2.1)
@@ -90,51 +84,43 @@ GEM
     net-sftp (3.0.0)
       net-ssh (>= 5.0.0, < 7.0.0)
     net-ssh (6.1.0)
-    netrc (0.11.0)
     nori (2.6.0)
-    public_suffix (4.0.5)
-    rake (13.0.1)
+    public_suffix (4.0.6)
+    rake (13.0.3)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rb-kqueue (0.2.5)
       ffi (>= 0.5.0)
-    rest-client (2.0.2)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    ruby_dep (1.3.1)
-    rubyntlm (0.6.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubyntlm (0.6.3)
     rubyzip (2.3.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
-    vagrant_cloud (2.0.3)
-      rest-client (~> 2.0.2)
+    vagrant_cloud (3.0.4)
+      excon (~> 0.73)
+      log4r (~> 1.1.10)
     wdm (0.1.1)
-    winrm (2.3.4)
+    winrm (2.3.6)
       builder (>= 2.1.2)
       erubi (~> 1.8)
       gssapi (~> 1.2)
@@ -142,12 +128,12 @@ GEM
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.2.1)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
+    winrm-elevated (1.2.3)
       erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.3.4)
+    winrm-fs (1.3.5)
       erubi (~> 1.8)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 2.0)

data/README.md

@@ -236,6 +236,24 @@ folders](#synced-folders) rather than ad-hoc devices.
 
 [device-config]: https://lxd.readthedocs.io/en/latest/instances/#devices-configuration
 
+### Container Configuration
+
+You can pass custom key/value configuration using the `config` setting. This
+should be a map of [instance settings][instance-config], which will be wired
+directly through to the container:
+
+    config.vm.provider 'lxd' do |lxd|
+      lxd.config = {
+        'linux.kernel_modules': 'ip_tables,ip6_tables,netlink_diag,nf_nat,overlay',
+      }
+    end
+
+Not all instance settings make sense in the Vagrant context, and some will or
+won't work based on your LXD host's configuration, so making sure the config is
+valid is up to you.
+
+[instance-config]: https://lxd.readthedocs.io/en/latest/instances/#keyvalue-configuration
+
 ## Hacking
 
 To run Vagrant with the plugin automatically loaded, you can use the

data/doc/setting-up-lxd.md

@@ -9,7 +9,46 @@ Specifically, the following settings need to be applied:
  3. Your user must be in the "lxd" group.
  4. Your user must have a client certificate registered with LXD.
 
-## Xenial
+## Ubuntu Focal and Later
+
+On Ubuntu 20.04 and later, LXD is installed as a [Snap][]. To install
+and configure it as described above, you can use the following commands:
+
+```sh
+# install lxd
+sudo apt install -y lxd
+
+# enable https api access
+sudo lxd init --auto --network-address=127.0.0.1 --network-port=8443
+
+# add your user to the lxd group
+sudo usermod -a -G lxd $(whoami)
+
+# apply the new group membership
+newgrp lxd
+```
+
+Then, the first time you run Vagrant in a project that uses the LXD
+provider, it will generate a client certificate for the plugin to use
+and instruct you to add it to LXD with the following message:
+
+```
+You may need configure LXD to allow requests from this machine. The
+easiest way to do this is to add your LXC client certificate to LXD's
+list of trusted certificates. This can typically be done with the
+following command:
+
+    $ lxc config trust add ~/.vagrant.d/data/lxd/client.crt
+
+You can find more information about configuring LXD at:
+
+    https://linuxcontainers.org/lxd/getting-started-cli/#initial-configuration
+```
+
+Once you run that command as instructed, everything should be set up for
+the plugin to work correctly.
+
+## Ubuntu Xenial
 
 To install LXD and configure it as described above on Ubuntu 16.04, you
 can use the following commands:
@@ -25,7 +64,7 @@ sudo lxd init --auto --network-address=127.0.0.1 --network-port=8443
 sudo dpkg-reconfigure -p medium lxd
 
 # add your user to the lxd group
-sudo usermod -a lxd -G $(whoami)
+sudo usermod -a -G lxd $(whoami)
 ```
 
 Once LXD is configured, you should register a client certificate for
@@ -37,7 +76,7 @@ automatically generate the certificate for you):
 newgrp lxd
 
 # create and add a client certificate
-lxc config trust add /home/ubuntu/.config/lxc/client.crt
+lxc config trust add ~/.config/lxc/client.crt
 ```
 
 At this point everything should be set up for the plugin to work
@@ -53,5 +92,6 @@ If you're using the plugin on another platform, please feel free to
 propose an addition to this document or add instructions to the
 project's [wiki][] for others to follow.
 
+[Snap]: https://snapcraft.io/
 [getting-started-cli]: https://linuxcontainers.org/lxd/getting-started-cli/
 [wiki]: https://gitlab.com/catalyst-it/vagrant-lxd/wikis

data/lib/vagrant-lxd/action.rb

@@ -95,6 +95,24 @@ module VagrantLXD
       end
     end
 
+    #
+    # Remove all files from the provider's data directory.
+    #
+    class RemoveData
+      include FileUtils
+
+      def initialize(app, env)
+        @app = app
+      end
+
+      def call(env)
+        @app.call(env)
+      ensure
+        rm_rf(env[:machine].data_dir)
+        mkdir_p(env[:machine].data_dir)
+      end
+    end
+
     #
     # Issue a warning when the machine wants synced folders but the host
     # doesn't support it (according to the relevant shadow files).
@@ -125,6 +143,8 @@ module VagrantLXD
     end
 
     class Package
+      include FileUtils
+
       def initialize(app, env)
         @app = app
         @env = env
@@ -134,7 +154,7 @@ module VagrantLXD
         env['package.directory'] = env[:machine_package]
         @app.call(env)
       ensure
-        FileUtils.rm_rf(env[:machine_package])
+        rm_rf(env[:machine_package])
       end
     end
 
@@ -180,6 +200,7 @@ module VagrantLXD
                   d.use halt
                   d.use Message, :info, 'Destroying machine and associated data...'
                   d.use LXD.action(:destroy)
+                  d.use RemoveData
                 else
                   d.use Message, :info, 'Machine will not be destroyed.'
                 end

data/lib/vagrant-lxd/driver.rb

@@ -119,45 +119,6 @@ module VagrantLXD
       end
     end
 
-    module Hyperkit::Client::Containers
-      alias extract_container_options_without_devices extract_container_options
-
-      def extract_container_options(name, options)
-        opts = extract_container_options_without_devices(name, options)
-        options.slice(:devices).merge(opts)
-      end
-    end
-
-    # XXX This monkey patch has the fix from https://github.com/jeffshantz/hyperkit/pull/15
-    # TODO Remove this once there is a new release of the hyperkit gem.
-    module Hyperkit::Connection
-      def sawyer_options
-        opts = {
-          :links_parser => Sawyer::LinkParsers::Simple.new,
-        }
-        conn_opts = {}
-        conn_opts[:builder] = @middleware if @middleware
-        conn_opts[:proxy] = @proxy if @proxy
-
-        conn_opts[:ssl] = {
-          verify: verify_ssl
-        }
-
-        if client_cert && File.exist?(client_cert)
-          conn_opts[:ssl][:client_cert] = OpenSSL::X509::Certificate.new(File.read(client_cert))
-        end
-
-        # XXX https://github.com/jeffshantz/hyperkit/pull/15/files
-        if client_key && File.exist?(client_key)
-          conn_opts[:ssl][:client_key] = OpenSSL::PKey.read(File.read(client_key))
-        end
-
-        opts[:faraday] = Faraday.new(conn_opts)
-
-        opts
-      end
-    end
-
     NOT_CREATED = Vagrant::MachineState::NOT_CREATED_ID
 
     attr_reader :api_endpoint
@@ -200,7 +161,7 @@ module VagrantLXD
 
     def synced_folders_usable?
       # Check whether we've registered an idmap for the current user.
-      raw_idmap = container[:config][:'raw.idmap']
+      raw_idmap = config[:'raw.idmap']
       begin
         raw_idmap and
         id_in_map?(Process.uid, 'uid', raw_idmap) and
@@ -569,6 +530,8 @@ module VagrantLXD
       # If the user has already specified a 'raw.idmap', leave it alone.
       if config.include?(:'raw.idmap')
         # Manually specified, carry on.
+      elsif @machine.config.vm.synced_folders.reject { |_, f| f[:disabled] }.empty?
+        # No synced folders configured, carry on.
       elsif @machine.env.host.capability(:synced_folders)
         config[:'raw.idmap'] = ''
         config[:'raw.idmap'] << "uid #{Process.uid} #{vagrant_uid}\n"

data/lib/vagrant-lxd/provider.rb

@@ -23,6 +23,7 @@ module VagrantLXD
   class Provider < Vagrant.plugin('2', :provider)
     def initialize(machine)
       @machine = machine
+      @driver = Driver.new(machine)
     end
 
     def action(name)
@@ -30,16 +31,14 @@ module VagrantLXD
     end
 
     def state
-      env = @machine.action('state', lock: false)
-      state = env[:machine_state]
+      state = @driver.state
       short = state.to_s.gsub('_', ' ')
       long = I18n.t("vagrant.commands.status.#{state}")
       Vagrant::MachineState.new(state, short, long)
     end
 
     def ssh_info
-      env = @machine.action('info', lock: false)
-      env[:machine_info]
+      @driver.info
     end
 
     def to_s

data/lib/vagrant-lxd/synced_folder.rb

@@ -24,6 +24,7 @@ module VagrantLXD
 
     def usable?(machine, raise_error = false)
       return false unless machine.provider_name == :lxd
+      return false unless machine.env.host.capability(:synced_folders)
 
       @driver ||= Driver.new(machine)
 

data/lib/vagrant-lxd/version.rb

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

data/vagrant-lxd.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_runtime_dependency 'activesupport', '~> 5.2.3'
-  spec.add_runtime_dependency 'hyperkit', '~> 1.2.0'
+  spec.add_runtime_dependency 'hyperkit', '~> 1.3.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxd
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.4
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement