vagrant-lxd 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b7a90200673f156589bed529f7a173e7950798d
-  data.tar.gz: 2e266432e3978370153b9788740ab7619fb61687
+  metadata.gz: 7a2ea2589b750536f634123b1deed2718c13151b
+  data.tar.gz: 24d46b5fac9f49b1d3daed822653518c2cbff856
 SHA512:
-  metadata.gz: c69f93fad75e816cc856e75783b040bd38188468d7a4f8f098eddfb0f592e22d5fbdb23dacc430f23b72f48c07aaabc409246fbbbe8096dbb0ea999285ad821c
-  data.tar.gz: e77b010f6287d9aa119f535e845859cbc85ee0a16269ccacd6abedd6f884bba82e1dc076f7d230ec0d2169d3796cee56a091b5ab69e46d8b5d67ea8edc2a21b8
+  metadata.gz: f83fcd225dfd64d6792677de3678530753ac902f5eda4bdf3091d13f30b1b51e58b45b358fe0884364c884806a431778aa872bcf293d5382dc8bf89d94652b3c
+  data.tar.gz: 912fb1cd29e3211aa42bceab0261f3831ca080625b8baba9fb428f8cc861accdfa9b69d9c065d16198b0029094c8d40e66df55bbc020563ac8b76b712aa7aba6

data/.gitignore

@@ -1,3 +1,4 @@
 /.bundle/
 /.vagrant/
 /Vagrantfile
+/vendor

data/.gitlab-ci.yml

@@ -0,0 +1,13 @@
+image: "ruby:2.3"
+
+before_script:
+  - apt-get -y update
+  - apt-get -y upgrade
+  - gem install bundler --no-ri --no-rdoc
+  - bundle install -j $(nproc) --path vendor/bundle
+
+spec:
+  script:
+    - bundle exec rake spec
+  tags:
+    - shared

data/Gemfile

@@ -3,6 +3,8 @@ source 'https://rubygems.org/'
 group :development do
   gem 'rake'
   gem 'rspec'
+  gem 'rspec-its'
+  gem 'rspec-mocks'
   gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant.git'
 end
 

data/Gemfile.lock

@@ -1,17 +1,17 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: a7b228eb698352638270dc076d0385fa324ca187
+  revision: 1cc4a48371c5f0713a2d98ac446b80170b4b71f0
   specs:
-    vagrant (1.9.8.dev)
+    vagrant (2.0.3.dev)
       childprocess (~> 0.6.0)
       erubis (~> 2.7.0)
-      hashicorp-checkpoint (~> 0.1.1)
+      hashicorp-checkpoint (~> 0.1.5)
       i18n (>= 0.6.0, <= 0.8.0)
       listen (~> 3.1.5)
       log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.2.0)
       net-sftp (~> 2.1)
-      net-ssh (~> 4.1.0)
+      net-ssh (~> 4.2.0)
       rb-kqueue (~> 0.2.0)
       rest-client (>= 1.6.0, < 3.0)
       ruby_dep (<= 1.3.1)
@@ -23,19 +23,19 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.1.3)
+    vagrant-lxd (0.1.4)
       hyperkit (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.9)
+    activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    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)
@@ -43,14 +43,14 @@ GEM
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    faraday (0.12.2)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.18)
+    ffi (1.9.21)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashicorp-checkpoint (0.1.4)
+    hashicorp-checkpoint (0.1.5)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
@@ -70,17 +70,17 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    minitest (5.10.3)
-    multi_json (1.12.1)
+    minitest (5.11.3)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (4.1.0)
+    net-ssh (4.2.0)
     netrc (0.11.0)
     nori (2.6.0)
-    public_suffix (2.0.5)
+    public_suffix (3.0.2)
     rake (12.0.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
@@ -100,6 +100,9 @@ GEM
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
@@ -111,11 +114,11 @@ GEM
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.5)
     wdm (0.1.1)
     winrm (2.2.3)
       builder (>= 2.1.2)
@@ -129,7 +132,7 @@ GEM
     winrm-elevated (1.1.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.0.1)
+    winrm-fs (1.2.0)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -141,6 +144,8 @@ PLATFORMS
 DEPENDENCIES
   rake
   rspec
+  rspec-its
+  rspec-mocks
   vagrant!
   vagrant-lxd!
 

data/README.md

@@ -80,9 +80,10 @@ Vagrant.configure('2') do |config|
     lxd.api_endpoint = 'https://127.0.0.1:8443'
     lxd.timeout = 10
     lxd.name = nil
-    lxd.nesting = false
-    lxd.privileged = false
+    lxd.nesting = nil
+    lxd.privileged = nil
     lxd.ephemeral = false
+    lxd.profiles = ['default']
   end
 end
 ```

data/Rakefile

@@ -5,7 +5,7 @@ require 'rspec/core/rake_task'
 Bundler::GemHelper.install_tasks
 
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = '-I. -rspec/common'
+  t.rspec_opts = '-I. -fd -rspec/common'
   t.verbose = false
 end
 

data/lib/vagrant-lxd/config.rb

@@ -26,6 +26,7 @@ module VagrantLXD
     attr_accessor :nesting
     attr_accessor :privileged
     attr_accessor :ephemeral
+    attr_accessor :profiles
     attr_accessor :timeout
 
     def initialize
@@ -34,13 +35,14 @@ module VagrantLXD
       @nesting = UNSET_VALUE
       @privileged = UNSET_VALUE
       @ephemeral = UNSET_VALUE
+      @profiles = UNSET_VALUE
       @api_endpoint = UNSET_VALUE
     end
 
     def validate(machine)
       errors = _detected_errors
 
-      unless [UNSET_VALUE, nil].include? name
+      unless name.nil?
         if not name.is_a? String
           errors << "Invalid `name' (value must be a string): #{name.inspect}"
         elsif name.size >= 64
@@ -50,34 +52,34 @@ module VagrantLXD
         end
       end
 
-      unless timeout == UNSET_VALUE
-        if not timeout.is_a? Integer
-          errors << "Invalid `timeout' (value must be an integer): #{timeout.inspect}"
-        elsif timeout < 1
-          errors << "Invalid `timeout' (value must be positive): #{timeout.inspect}"
-        end
+      if not timeout.is_a? Integer
+        errors << "Invalid `timeout' (value must be an integer): #{timeout.inspect}"
+      elsif timeout < 1
+        errors << "Invalid `timeout' (value must be positive): #{timeout.inspect}"
       end
 
-      unless api_endpoint == UNSET_VALUE
-        begin
-          URI(api_endpoint).scheme == 'https' or raise URI::InvalidURIError
-        rescue URI::InvalidURIError
-          errors << "Invalid `api_endpoint' (value must be a valid HTTPS address): #{api_endpoint.inspect}"
-        end
+      begin
+        URI(api_endpoint).scheme == 'https' or raise URI::InvalidURIError
+      rescue URI::InvalidURIError
+        errors << "Invalid `api_endpoint' (value must be a valid HTTPS address): #{api_endpoint.inspect}"
       end
 
-      unless [UNSET_VALUE, true, false].include? nesting
+      unless [true, false, nil].include? nesting
         errors << "Invalid `nesting' (value must be true or false): #{nesting.inspect}"
       end
 
-      unless [UNSET_VALUE, true, false].include? privileged
+      unless [true, false, nil].include? privileged
         errors << "Invalid `privileged' (value must be true or false): #{privileged.inspect}"
       end
 
-      unless [UNSET_VALUE, true, false].include? ephemeral
+      unless [true, false].include? ephemeral
         errors << "Invalid `ephemeral' (value must be true or false): #{ephemeral.inspect}"
       end
 
+      unless profiles.is_a? Array and profiles == profiles.grep(String)
+        errors << "Invalid `profiles' (value must be an array of strings): #{profiles.inspect}"
+      end
+
       { Version::NAME => errors }
     end
 
@@ -87,17 +89,21 @@ module VagrantLXD
       end
 
       if nesting == UNSET_VALUE
-        @nesting = false
+        @nesting = nil
       end
 
       if privileged == UNSET_VALUE
-        @privileged = false
+        @privileged = nil
       end
 
       if ephemeral == UNSET_VALUE
         @ephemeral = false
       end
 
+      if profiles == UNSET_VALUE
+        @profiles = ['default']
+      end
+
       if timeout == UNSET_VALUE
         @timeout = 10
       end

data/lib/vagrant-lxd/driver.rb

@@ -93,6 +93,7 @@ module VagrantLXD
     attr_reader :ephemeral
     attr_reader :name
     attr_reader :timeout
+    attr_reader :profiles
 
     def initialize(machine)
       @machine = machine
@@ -101,6 +102,7 @@ module VagrantLXD
       @nesting = machine.provider_config.nesting
       @privileged = machine.provider_config.privileged
       @ephemeral = machine.provider_config.ephemeral
+      @profiles = machine.provider_config.profiles
       @name = machine.provider_config.name
       @logger = Log4r::Logger.new('vagrant::lxd')
       @lxd = Hyperkit::Client.new(api_endpoint: api_endpoint.to_s, verify_ssl: false)
@@ -216,7 +218,7 @@ module VagrantLXD
           @logger.debug 'Created image alias: ' << image_alias.inspect
         end
 
-        container = @lxd.create_container(machine_id, ephemeral: ephemeral, fingerprint: fingerprint, config: config)
+        container = @lxd.create_container(machine_id, ephemeral: ephemeral, fingerprint: fingerprint, config: config, profiles: profiles)
         @logger.debug 'Created container: ' << container.inspect
 
         @machine.id = machine_id
@@ -369,10 +371,12 @@ module VagrantLXD
     end
 
     def config
-      config = {
-        :'security.nesting' => nesting,
-        :'security.privileged' => privileged,
-      }
+      config = {}
+
+      # 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?
 
       # Set "raw.idmap" if the host's sub{u,g}id configuration allows it.
       # This allows sharing folders via LXD (see synced_folder.rb).

data/lib/vagrant-lxd/version.rb

@@ -20,7 +20,7 @@
 module VagrantLXD
   module Version
     NAME = 'vagrant-lxd'
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
     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.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperkit
@@ -32,6 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.md