vagrant-lxd 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be2300b7aa0ba5ccc8ae1d3ed7af2bbc0da4a1ded7aefe64e9896d26a672d905
-  data.tar.gz: c7e73c349e90e91f180e76f1a550d35852b0aa720a406361ef9f94e692eaa68a
+  metadata.gz: 1baeedff522cfbebedcb5502ca770a5acee212b651cd15ee5689de902151e218
+  data.tar.gz: a4310d180e7f8b686e474087f715fcf5896f37f51e233a934f9af156a332e633
 SHA512:
-  metadata.gz: 9bff61ace1311df547b7b0aa6ccb3917ec950353ac7a164e78971cf2297881e007d559fb86798913d8ae1c91b0c4d9b7d5a2e565d5fd00689ff04f9a64b71dbb
-  data.tar.gz: cb70de69a9de248887c1b3b116fb807f324783ce1adde52f411dc83a1f7245a3da08b687c14385ee34183a144823eec469f7a0968baafdc6455af2e3ccfd154b
+  metadata.gz: c26145438faab6e93dae3e9e838d899478cac316de5d97c9ee844acbebc192d2ff8b8b324ad9099b8a50cb75ac4770f88e60a26b2646020c53fe241a958b2f14
+  data.tar.gz: 70768153d8648bf0fc22406e9bb5107f399acac378a9ea5811955a483c11e4e0e9cb575afa8e58a9bb5e3d3844deb4cc6413a6e16001fefa8fe8ec5828be8844

data/.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: "ruby:2.3"
+image: "ruby:2.4"
 
 before_script:
   - apt-get -y update

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'
 end
 
 group :plugins do

data/Gemfile.lock

@@ -1,20 +1,20 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 7df0e62aded9316485e83fd5548bebbacf702ec7
+  revision: 2063111ab5cfcce0f6b2dbcecd9d24d47b512a96
   specs:
     vagrant (2.2.10.dev)
       bcrypt_pbkdf (~> 1.0.0)
-      childprocess (~> 3.0.0)
+      childprocess (~> 4.0.0)
       ed25519 (~> 1.2.4)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.5)
       i18n (~> 1.8)
-      listen (~> 3.1.5)
+      listen (~> 3.1)
       log4r (~> 1.1.9, < 1.1.11)
       mime (~> 0.4.4)
       net-scp (~> 1.2.0)
-      net-sftp (~> 2.1)
-      net-ssh (~> 5.2.0)
+      net-sftp (~> 3.0)
+      net-ssh (~> 6.0)
       rb-kqueue (~> 0.2.0)
       rest-client (>= 1.6.0, < 3.0)
       ruby_dep (<= 1.3.1)
@@ -28,7 +28,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.4.5)
+    vagrant-lxd (0.5.0)
       activesupport (~> 5.2.3)
       faraday (~> 0.17)
       hyperkit (~> 1.2.0)
@@ -45,8 +45,8 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     bcrypt_pbkdf (1.0.1)
     builder (3.2.4)
-    childprocess (3.0.0)
-    concurrent-ruby (1.1.6)
+    childprocess (4.0.0)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.4.4)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -68,12 +68,11 @@ GEM
     hyperkit (1.2.0)
       activesupport (>= 4.2.6)
       sawyer
-    i18n (1.8.3)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
     log4r (1.1.10)
     logging (2.3.0)
@@ -84,13 +83,13 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.0512)
     minitest (5.14.1)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multipart-post (2.1.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (5.2.0)
+    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)

data/lib/vagrant-lxd/driver.rb

@@ -128,6 +128,36 @@ module VagrantLXD
       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
@@ -570,9 +600,7 @@ module VagrantLXD
 
     def locate_or_generate_client_certificate
       vagrant_path = @machine.env.data_dir / 'lxd'
-      default_path = Certificate.default_path / 'lxc'
-
-      search_paths = [vagrant_path, default_path]
+      search_paths = [vagrant_path] + Certificate.default_paths
 
       Certificate.locate(search_paths) or
       Certificate.generate(vagrant_path)

data/lib/vagrant-lxd/driver/certificate.rb

@@ -33,8 +33,11 @@ module VagrantLXD
 
       @logger = Log4r::Logger.new('vagrant::lxd::driver::certificate')
 
-      def Certificate.default_path
-        Pathname.new('~/.config').expand_path
+      def Certificate.default_paths
+        [
+          Pathname.new('~/.config/lxc').expand_path,
+          Pathname.new('~/snap/lxd/current/.config/lxc').expand_path,
+        ]
       end
 
       def Certificate.issuer_name

data/lib/vagrant-lxd/version.rb

@@ -20,7 +20,7 @@
 module VagrantLXD
   module Version
     NAME = 'vagrant-lxd'
-    VERSION = '0.4.5'
+    VERSION = '0.5.0'
     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.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport