vagrant-lxd 0.5.4 → 0.6.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06befa3b329e3326a09931a8b2a9697fd7f30c25d95935382eaa14fc71f55667
-  data.tar.gz: ed9cea092231c528d359a629b69b4c3ff847098c1e26706886a9d686df6d02b6
+  metadata.gz: 9c196e74a9041fa5c9b44c3cd7778f72132bf91a29d346b3e0fbbfe274cff72d
+  data.tar.gz: 06ea3d638d67f537708380a0e25913651525520d8c5a293d95152b78caf0c97f
 SHA512:
-  metadata.gz: ed5232a956aed40892dfc03e072e42a9292ad08f24e2ea5b5a720697aad947714f7a5b6d1073e8aee5b17e21445394b1f193f6e9f23ad1ea381a3b9a7d066979
-  data.tar.gz: a282394ec033c9b5ca9ba5706b8d288dfb19fa6ff6d492aa06170062cf83d7eff3984d03003fec9ebdc0a00cd0ea91554e0050fce22da96d96fe0ca9acaafebb
+  metadata.gz: debc110656b0c942d485e80b0221c5a8938bc3743ff9fde2bbd7108dcd57e3dbe7203947b8590a2e2c36ffe40e69c9eecc3c4ab4dcffe7f244802f5ebec9cc32
+  data.tar.gz: 83334cdbb74697c2875f59c023681bdbb1c1c1f4820a74e856ce6045bbb36c96ea28789a1f8fc9776e5fe8627a665702bd193e38049a5257f7d469838498eeb4

data/Gemfile.lock

@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.5.4)
+    vagrant-lxd (0.6.0.pre)
       activesupport (~> 5.2.3)
       faraday (~> 0.17)
       hyperkit (~> 1.3.0)
@@ -35,7 +35,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.6)
+    activesupport (5.2.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -45,15 +45,15 @@ GEM
     bcrypt_pbkdf (1.1.0)
     builder (3.2.4)
     childprocess (4.0.0)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     ed25519 (1.2.4)
     erubi (1.10.0)
-    excon (0.79.0)
-    fakefs (1.3.2)
-    faraday (0.17.4)
+    excon (0.87.0)
+    fakefs (1.4.0)
+    faraday (0.17.5)
       multipart-post (>= 1.2, < 3)
-    ffi (1.15.0)
+    ffi (1.15.4)
     gssapi (1.3.1)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -65,7 +65,7 @@ GEM
       sawyer
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    listen (3.5.1)
+    listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
@@ -75,23 +75,24 @@ GEM
       multi_json (~> 1.14)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    minitest (5.14.4)
+    mime-types-data (3.2021.0901)
+    minitest (5.15.0)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (3.0.0)
       net-ssh (>= 5.0.0, < 7.0.0)
     net-ssh (6.1.0)
     nori (2.6.0)
-    public_suffix (4.0.6)
-    rake (13.0.3)
-    rb-fsevent (0.10.4)
+    public_suffix (4.0.7)
+    rake (13.0.6)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rb-kqueue (0.2.5)
+    rb-kqueue (0.2.7)
       ffi (>= 0.5.0)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -109,16 +110,17 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     rubyntlm (0.6.3)
-    rubyzip (2.3.0)
-    sawyer (0.8.2)
+    rubyzip (2.3.2)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3)
     thread_safe (0.3.6)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    vagrant_cloud (3.0.4)
+    vagrant_cloud (3.0.5)
       excon (~> 0.73)
       log4r (~> 1.1.10)
+      rexml (~> 3.2.5)
     wdm (0.1.1)
     winrm (2.3.6)
       builder (>= 2.1.2)

data/README.md

@@ -85,6 +85,7 @@ Vagrant.configure('2') do |config|
     lxd.privileged = nil
     lxd.ephemeral = false
     lxd.profiles = ['default']
+    lxd.project = 'default'
     lxd.environment = {}
     lxd.config = {}
   end
@@ -148,7 +149,7 @@ is passed through to LXD. The hash values should all be strings:
       recursive: 'false',
     }
 
-[disk]: https://lxd.readthedocs.io/en/latest/instances/#type-disk
+[disk]: https://linuxcontainers.org/lxd/docs/master/instances/#type-disk
 
 ### Shared LXD Containers
 
@@ -203,7 +204,7 @@ Note that enabling these options will invalidate any user and group ID
 mappings you may have configured for synced folders, since privileged
 containers use the same UID and GID space as the host machine.
 
-[containers]: https://lxd.readthedocs.io/en/latest/containers/
+[containers]: https://linuxcontainers.org/lxd/docs/master/instances/
 
 ### Adding Devices
 
@@ -234,7 +235,7 @@ to run graphical applications transparently from within the guest:
 Note that disk devices should be configured as [synced
 folders](#synced-folders) rather than ad-hoc devices.
 
-[device-config]: https://lxd.readthedocs.io/en/latest/instances/#devices-configuration
+[device-config]: https://linuxcontainers.org/lxd/docs/master/instances/#devices-configuration
 
 ### Container Configuration
 
@@ -252,7 +253,40 @@ 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
+[instance-config]: https://linuxcontainers.org/lxd/docs/master/instances/#key-value-configuration
+
+### LXD Projects
+
+Since version 3.8, LXD has supported [projects] as a way to segment an LXD
+server. Each project has its own set of containers, profiles, images, and so
+on.
+
+This plugin allows the project for a container to be set on a per-machine
+basis. If `project` is unset, the container will be created in the "default"
+project. Different machines in the same Vagrantfile can use different projects:
+
+    config.vm.define 'default' do |box|
+      box.vm.provider 'lxd' do |lxd|
+        lxd.project = 'default'
+      end
+    end
+
+    config.vm.define 'custom-project-machine' do |box|
+      box.vm.provider 'lxd' do |lxd|
+        lxd.project = 'example'
+      end
+    end
+
+Configuring LXD projects is out of scope for this README, but note that each
+project must include a network device and root disk for this plugin to work
+correctly. The following commands should get you started with a new project:
+
+    lxc project create example
+    lxc project switch example
+    lxc profile device add default eth0 nic name=eth0 parent=lxdbr0 nictype=bridged
+    lxc profile device add default root disk path=/ pool=default
+
+[projects]: https://linuxcontainers.org/lxd/docs/master/projects/
 
 ## Hacking
 

data/lib/vagrant-lxd/config.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017-2019 Catalyst.net Ltd
+# Copyright (c) 2017-2022 Catalyst.net Ltd
 #
 # This file is part of vagrant-lxd.
 #
@@ -32,6 +32,7 @@ module VagrantLXD
     attr_accessor :nesting
     attr_accessor :privileged
     attr_accessor :profiles
+    attr_accessor :project
     attr_accessor :vagrant_uid
     attr_accessor :vagrant_gid
     attr_accessor :client_certificate
@@ -47,6 +48,7 @@ module VagrantLXD
       @privileged = UNSET_VALUE
       @ephemeral = UNSET_VALUE
       @profiles = UNSET_VALUE
+      @project = UNSET_VALUE
       @api_endpoint = UNSET_VALUE
       @vagrant_uid = UNSET_VALUE
       @vagrant_gid = UNSET_VALUE
@@ -121,6 +123,10 @@ module VagrantLXD
         errors << "Invalid `profiles' (value must be an array of strings): #{profiles.inspect}"
       end
 
+      unless project.is_a? String
+        errors << "Invalid `project' (value must be a string): #{project.inspect}"
+      end
+
       unless vagrant_uid.is_a? Integer and vagrant_uid >= 0
         errors << "Invalid `vagrant_uid' (value must be a non-negative integer): #{vagrant_uid.inspect}"
       end
@@ -189,6 +195,10 @@ module VagrantLXD
         @profiles = ['default']
       end
 
+      if project == UNSET_VALUE
+        @project = 'default'
+      end
+
       if timeout == UNSET_VALUE
         @timeout = 10
       end

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

@@ -60,13 +60,13 @@ module VagrantLXD
         pkey = OpenSSL::PKey::RSA.new(PKEY_BITS)
         cert = OpenSSL::X509::Certificate.new
         cert.serial = 0
-        cert.version = 3
+        cert.version = 2
         cert.issuer = name
         cert.subject = name
         cert.public_key = pkey.public_key
         cert.not_before = Time.now
         cert.not_after = Time.now + (365 * 24 * 60 * 60 * CERT_EXPIRY_YEARS)
-        cert.sign(pkey, OpenSSL::Digest::SHA1.new)
+        cert.sign(pkey, OpenSSL::Digest::SHA256.new)
         @logger.debug "Saving new certificate to disk under #{path}..."
         FileUtils.mkdir_p(path, mode: 0o700)
         File.write(path / 'client.crt', cert.to_s, 0, perm: 0o600)

data/lib/vagrant-lxd/driver.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017-2019 Catalyst.net Ltd
+# Copyright (c) 2017-2022 Catalyst.net Ltd
 #
 # This file is part of vagrant-lxd.
 #
@@ -103,6 +103,23 @@ module VagrantLXD
       error_key 'snapshot_not_found'
     end
 
+    # Custom middleware that adds a `project` query parameter to all
+    # outgoing requests, in order to select the active LXD project.
+    class ProjectMiddleware < Faraday::Middleware
+      def call(env)
+        url = URI(env.url.to_s)
+        url.query = "#{url.query}&project=#{project}"
+        url.query.delete_prefix!('&')
+        @app.call(env.merge(url: url))
+      end
+
+      def ProjectMiddleware.create(project)
+        Class.new(self) do
+          define_method(:project) { project }
+        end
+      end
+    end
+
     class Hyperkit::BadRequest
       def reason
         return unless data.is_a? Hash
@@ -130,6 +147,7 @@ module VagrantLXD
     attr_reader :nesting
     attr_reader :privileged
     attr_reader :profiles
+    attr_reader :project
     attr_reader :client_certificate
     attr_reader :client_key
     attr_reader :vagrant_uid
@@ -146,6 +164,7 @@ module VagrantLXD
       @privileged = machine.provider_config.privileged
       @ephemeral = machine.provider_config.ephemeral
       @profiles = machine.provider_config.profiles
+      @project = machine.provider_config.project
       @name = machine.provider_config.name
       @client_certificate = machine.provider_config.client_certificate
       @client_key = machine.provider_config.client_key
@@ -406,11 +425,19 @@ module VagrantLXD
         api_endpoint: api_endpoint.to_s,
         client_cert: cert.certificate,
         client_key: cert.key,
+        middleware: middleware,
         verify_ssl: false,
         user_agent: USER_AGENT,
       )
     end
 
+    def middleware
+      project_middleware = ProjectMiddleware.create(project)
+      Hyperkit::Default.middleware.dup.tap do |builder|
+        builder.insert_after(Hyperkit::Middleware::FollowRedirects, project_middleware)
+      end
+    end
+
     def machine_id
       @machine.id
     end

data/lib/vagrant-lxd/provider.rb

@@ -31,7 +31,7 @@ module VagrantLXD
     end
 
     def state
-      state = @driver.state
+      state = @driver.tap { |d| d.validate! }.state
       short = state.to_s.gsub('_', ' ')
       long = I18n.t("vagrant.commands.status.#{state}")
       Vagrant::MachineState.new(state, short, long)

data/lib/vagrant-lxd/version.rb

@@ -20,7 +20,7 @@
 module VagrantLXD
   module Version
     NAME = 'vagrant-lxd'
-    VERSION = '0.5.4'
+    VERSION = '0.6.0.pre'
     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.5.4
+  version: 0.6.0.pre
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2022-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -95,9 +95,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: