vagrant-lxd 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a2ea2589b750536f634123b1deed2718c13151b
-  data.tar.gz: 24d46b5fac9f49b1d3daed822653518c2cbff856
+  metadata.gz: ceae5ec31aecf1934e40466195849ad4f2152b7a
+  data.tar.gz: 6d8ba4edabdfa6bc4007c81eb6c41a12836c2b83
 SHA512:
-  metadata.gz: f83fcd225dfd64d6792677de3678530753ac902f5eda4bdf3091d13f30b1b51e58b45b358fe0884364c884806a431778aa872bcf293d5382dc8bf89d94652b3c
-  data.tar.gz: 912fb1cd29e3211aa42bceab0261f3831ca080625b8baba9fb428f8cc861accdfa9b69d9c065d16198b0029094c8d40e66df55bbc020563ac8b76b712aa7aba6
+  metadata.gz: 2bfef2ee6532fd17a6ef5a0816fb5452e128866ac66b5aeced12f4e8781d4ea1f3fae859b49fdae5552362089d645c569d7b3426a68f83f0a5536a6e4d2d583c
+  data.tar.gz: fc765c52de52976c39215bf5fd712c258a62ba07741735b95b7eb43497809337bcf14ba80b273abc4d02bf97b8a4c76f4389406987411bf145cd320a564ff280

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 1cc4a48371c5f0713a2d98ac446b80170b4b71f0
+  revision: f31a340499a13868e60b2e4649c13a167a0bf387
   specs:
-    vagrant (2.0.3.dev)
+    vagrant (2.0.4.dev)
       childprocess (~> 0.6.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.5)
@@ -23,29 +23,30 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.1.4)
+    vagrant-lxd (0.2.0)
       hyperkit (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.10)
-      i18n (~> 0.7)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     builder (3.2.3)
     childprocess (0.6.3)
       ffi (~> 1.0, >= 1.0.11)
+    concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.21)
+    ffi (1.9.23)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -54,8 +55,8 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    hyperkit (1.1.0)
-      activesupport (~> 4.2.6)
+    hyperkit (1.2.0)
+      activesupport (>= 4.2.6)
       sawyer
     i18n (0.8.0)
     listen (3.1.5)
@@ -81,8 +82,8 @@ GEM
     netrc (0.11.0)
     nori (2.6.0)
     public_suffix (3.0.2)
-    rake (12.0.0)
-    rb-fsevent (0.10.2)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rb-kqueue (0.2.5)
@@ -91,22 +92,22 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.7.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     ruby_dep (1.3.1)
     rubyntlm (0.6.2)
     rubyzip (1.2.1)

data/README.md

@@ -84,6 +84,8 @@ Vagrant.configure('2') do |config|
     lxd.privileged = nil
     lxd.ephemeral = false
     lxd.profiles = ['default']
+    lxd.environment = {}
+    lxd.config = {}
   end
 end
 ```

data/lib/vagrant-lxd.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 Catalyst.net Ltd
+# Copyright (c) 2017-2018 Catalyst.net Ltd
 #
 # This file is part of vagrant-lxd.
 #

data/lib/vagrant-lxd/action.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 Catalyst.net Ltd
+# Copyright (c) 2017-2018 Catalyst.net Ltd
 #
 # This file is part of vagrant-lxd.
 #

data/lib/vagrant-lxd/capability.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 Catalyst.net Ltd
+# Copyright (c) 2017-2018 Catalyst.net Ltd
 #
 # This file is part of vagrant-lxd.
 #

data/lib/vagrant-lxd/command.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 Catalyst.net Ltd
+# Copyright (c) 2017-2018 Catalyst.net Ltd
 #
 # This file is part of vagrant-lxd.
 #

data/lib/vagrant-lxd/config.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 Catalyst.net Ltd
+# Copyright (c) 2017-2018 Catalyst.net Ltd
 #
 # This file is part of vagrant-lxd.
 #
@@ -23,15 +23,19 @@ module VagrantLXD
   class Config < Vagrant.plugin('2', :config)
     attr_accessor :api_endpoint
     attr_accessor :name
+    attr_accessor :timeout
+    attr_accessor :config
+    attr_accessor :environment
+    attr_accessor :ephemeral
     attr_accessor :nesting
     attr_accessor :privileged
-    attr_accessor :ephemeral
     attr_accessor :profiles
-    attr_accessor :timeout
 
     def initialize
       @name = UNSET_VALUE
       @timeout = UNSET_VALUE
+      @config = UNSET_VALUE
+      @environment = UNSET_VALUE
       @nesting = UNSET_VALUE
       @privileged = UNSET_VALUE
       @ephemeral = UNSET_VALUE
@@ -58,6 +62,20 @@ module VagrantLXD
         errors << "Invalid `timeout' (value must be positive): #{timeout.inspect}"
       end
 
+      if not config.is_a? Hash
+        errors << "Invalid `config' (value must be a hash): #{config.inspect}"
+      elsif not config.keys.all? { |x| x.is_a? Symbol }
+        errors << "Invalid `config' (hash keys must be symbols): #{config.inspect}"
+      end
+
+      if not environment.is_a? Hash
+        errors << "Invalid `environment' (value must be a hash): #{environment.inspect}"
+      elsif not environment.keys.all? { |x| x.is_a? String or x.is_a? Symbol }
+        errors << "Invalid `environment' (hash keys must be strings or symbols): #{environment.inspect}"
+      elsif not environment.values.all? { |x| x.is_a? String }
+        errors << "Invalid `environment' (hash values must be strings): #{environment.inspect}"
+      end
+
       begin
         URI(api_endpoint).scheme == 'https' or raise URI::InvalidURIError
       rescue URI::InvalidURIError
@@ -88,6 +106,14 @@ module VagrantLXD
         @name = nil
       end
 
+      if config == UNSET_VALUE
+        @config = {}
+      end
+
+      if environment == UNSET_VALUE
+        @environment = {}
+      end
+
       if nesting == UNSET_VALUE
         @nesting = nil
       end

data/lib/vagrant-lxd/driver.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 Catalyst.net Ltd
+# Copyright (c) 2017-2018 Catalyst.net Ltd
 #
 # This file is part of vagrant-lxd.
 #
@@ -17,6 +17,7 @@
 # along with vagrant-lxd. If not, see <http://www.gnu.org/licenses/>.
 #
 
+require 'active_support/core_ext/object/deep_dup'
 require 'hyperkit'
 require 'securerandom'
 require 'tempfile'
@@ -88,17 +89,20 @@ module VagrantLXD
     NOT_CREATED = Vagrant::MachineState::NOT_CREATED_ID
 
     attr_reader :api_endpoint
-    attr_reader :nesting
-    attr_reader :privileged
-    attr_reader :ephemeral
     attr_reader :name
     attr_reader :timeout
+    attr_reader :environment
+    attr_reader :ephemeral
+    attr_reader :nesting
+    attr_reader :privileged
     attr_reader :profiles
 
     def initialize(machine)
       @machine = machine
       @timeout = machine.provider_config.timeout
       @api_endpoint = machine.provider_config.api_endpoint
+      @config = @machine.provider_config.config
+      @environment = machine.provider_config.environment
       @nesting = machine.provider_config.nesting
       @privileged = machine.provider_config.privileged
       @ephemeral = machine.provider_config.ephemeral
@@ -289,6 +293,11 @@ module VagrantLXD
 
   private
 
+    #
+    # The remaining methods are just conveniences, not part of the API
+    # used by the rest of the plugin.
+    #
+
     def machine_id
       @machine.id
     end
@@ -371,25 +380,35 @@ module VagrantLXD
     end
 
     def config
-      config = {}
+      # NOTE We reuse ActiveSupport for `#deep_dup` here, but if the Hyperkit
+      # dependency ever goes away, drop ActiveSupport and use some other
+      # method to get a deep copy of the config.
+      config = @config.deep_dup
 
       # Add security settings, if specified. If not, we omit them so
       # they can be configured by one of the container's profiles instead.
       config[:'security.nesting'] = nesting unless nesting.nil?
       config[:'security.privileged'] = privileged unless privileged.nil?
 
+      # Include user-specified environment variables.
+      config.merge! Hash[environment.map { |k, v| [:"environment.#{k}", v] }]
+
       # Set "raw.idmap" if the host's sub{u,g}id configuration allows it.
       # This allows sharing folders via LXD (see synced_folder.rb).
-      begin
-        %w(uid gid).each do |type|
-          value = Process.send(type)
-          if File.readlines("/etc/sub#{type}").grep(/^root:#{value}:[1-9]/).any?
-            config[:'raw.idmap'] ||= ''
-            config[:'raw.idmap'] << "#{type} #{value} #{VAGRANT_UID}\n"
+      # If the user has already specified a 'raw.idmap', leave it alone.
+      unless config.include?(:'raw.idmap')
+        begin
+          # Check for root mappings in /etc/sub{uid,gid}.
+          %w(uid gid).each do |type|
+            id = Process.send(type)
+            if File.readlines("/etc/sub#{type}").grep(/^root:#{id}:[1-9]/).any?
+              config[:'raw.idmap'] ||= ''
+              config[:'raw.idmap'] << "#{type} #{id} #{VAGRANT_UID}\n"
+            end
           end
+        rescue StandardError => e
+          @logger.warn "Cannot read subordinate permissions file: #{e.message}"
         end
-      rescue StandardError => e
-        @logger.warn "Cannot read subordinate permissions file: #{e.message}"
       end
 
       @logger.debug 'Resulting configuration: ' << config.inspect
@@ -397,6 +416,7 @@ module VagrantLXD
       config
     end
 
+    # TODO Image handling should be moved into its own class.
     def prepare_image_file
       tmpdir = Dir.mktmpdir
 

data/lib/vagrant-lxd/plugin.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 Catalyst.net Ltd
+# Copyright (c) 2017-2018 Catalyst.net Ltd
 #
 # This file is part of vagrant-lxd.
 #

data/lib/vagrant-lxd/provider.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 Catalyst.net Ltd
+# Copyright (c) 2017-2018 Catalyst.net Ltd
 #
 # This file is part of vagrant-lxd.
 #

data/lib/vagrant-lxd/synced_folder.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 Catalyst.net Ltd
+# Copyright (c) 2017-2018 Catalyst.net Ltd
 #
 # This file is part of vagrant-lxd.
 #

data/lib/vagrant-lxd/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 Catalyst.net Ltd
+# Copyright (c) 2017-2018 Catalyst.net Ltd
 #
 # This file is part of vagrant-lxd.
 #
@@ -20,7 +20,7 @@
 module VagrantLXD
   module Version
     NAME = 'vagrant-lxd'
-    VERSION = '0.1.4'
+    VERSION = '0.2.0'
     DESCRIPTION = 'Vagrant LXD provider'
   end
 end

data/vagrant-lxd.gemspec

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 Catalyst.net Ltd
+# Copyright (c) 2017-2018 Catalyst.net Ltd
 #
 # This file is part of vagrant-lxd.
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxd
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperkit