chef-lxc 0.1.3 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82d501f875d1abf562a893e4f3b4534fc612e304
-  data.tar.gz: 8d8d6bb519022d075cd5fcc0cfcd2c0930539ae0
+  metadata.gz: 024d4681812669a4f30454c5ab95e29f02494212
+  data.tar.gz: cdc9eeb06b91a6c575962994e75d145a38dbb4f8
 SHA512:
-  metadata.gz: 94b0b095341452c57c043b25e8c638805dc95696b4b3f6a5e04e870d81354c361f1a2f6bd9c9f4b2251a449152d641caa2c8cb019872df936ec5647847fc7b26
-  data.tar.gz: 0bd86128c42f08920d6b8c01fd97a41a3b71fd18c89b17bffe8a6dcc479005820cbd1e7df10efc9c49fe58fad2ac4d2dbfb68b3463fb4882c1ac35097c3c9112
+  metadata.gz: d5858865ababef7d065a64a23d6c94c98e15e81e6ee29633e1b9a02672188cd1bbe6c7a1d3e2ff89d68a4afdbe8dafc93d57a189bbd0befeb92ffb03e5ce161e
+  data.tar.gz: c096e26912c6ae3425e4eb5449204144b53e6eae6733efcb6c8e058065a2c37d8ae4f72b4a4eecfb280bad3f6dcea4d7649740902dc6597aba73a651b6826da2

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'chef', github: 'chef/chef'

data/Rakefile

@@ -7,3 +7,4 @@ RSpec::Core::RakeTask.new(:spec) do |t|
     a.push('--format progress')
   end.join(' ')
 end
+task :default => :spec

data/chef-lxc.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.bindir        = "bin"
 
-  spec.add_dependency "chef", ">= 11"
+  spec.add_dependency "chef", ">= 12"
   spec.add_dependency "ruby-lxc"
   spec.add_dependency "lxc-extra"
   spec.homepage    = 'https://github.com/ranjib/chef-lxc'

data/lib/chef/lxc/knife_helper.rb

@@ -33,7 +33,7 @@ class Chef
       def upload_data_bag(name, path, opts = {})
         items = Dir["#{path}/*"]
         name_args = [name, items].flatten
-        plugin = knife(Chef::Knife::DataBagFromFile, *name_args)do |config|
+        plugin = knife(Chef::Knife::DataBagFromFile, *name_args) do |config|
           if opts[:encrypted]
             config[:secret_file] = opts[:secret_file]
             config[:encrypt] = true
@@ -42,6 +42,35 @@ class Chef
         end
       end
 
+      def load_secret(secret_file = nil)
+        config = chef_config
+        Chef::EncryptedDataBagItem.load_secret(
+          secret_file || config[:knife][:secret_file]
+        )
+      end
+
+      def update_data_bag_item(data_bag_name, item_name, update_hash, opts = {})
+        hash = Chef::DataBagItem.load(data_bag_name, item_name)
+        if opts[:encrypted]
+          secret = load_secret(opts[:secret_file])
+          hash = Chef::EncryptedDataBagItem.load(data_bag_name, item_name, secret).to_hash
+        end
+        updated_hash = hash.merge(update_hash)
+        upload_data_bag_item_from_hash(data_bag_name, updated_hash, opts)
+      end
+
+      # hash must contain an entry of the form 'id' => item_name
+      def upload_data_bag_item_from_hash(data_bag_name, hash, opts = {})
+        config = chef_config
+        if opts[:encrypted]
+          secret = load_secret(opts[:secret_file])
+          hash = Chef::EncryptedDataBagItem.encrypt_data_bag_item(hash, secret)
+        end
+        item = Chef::DataBagItem.from_hash(hash)
+        item.data_bag(data_bag_name)
+        item.save
+      end
+
       def create_environment(name, opts ={})
         e = Chef::Environment.new
         e.name(name)

data/lib/chef/lxc/version.rb

@@ -1,5 +1,5 @@
 class Chef
   module LXC
-    VERSION = '0.1.3'
+    VERSION = '0.3'
   end
 end

data/lib/chef/lxc_helper.rb

@@ -1,6 +1,7 @@
 require 'lxc'
 require 'lxc/extra'
 require 'mixlib/shellout'
+require 'chef/resource_resolver'
 
 class Chef
   module LXCHelper

data/spec/chef/lxc/fleet_dsl.rb

@@ -2,46 +2,47 @@ require 'chef/lxc'
 require 'chef_zero/server'
 require 'tempfile'
 
+require 'spec_helper'
+
 cookbook_path = File.expand_path('../../../data/cookbooks', __FILE__)
-server = ChefZero::Server.new(host: '10.0.3.1', port: 8889)
-server.start_background unless server.running?
-tempfile = Tempfile.new('chef-lxc')
-File.open(tempfile.path, 'w') do |f|
-  f.write(server.gen_key_pair.first)
-end
 
-Chef::LXC.create_fleet('memcache') do |fleet|
-  # Create base container with chef installed in it
-  fleet.create_container('base') do |ct|
-    ct.recipe do
-      execute 'apt-get update -y'
-      remote_file '/opt/chef_12.2.1-1_amd64.deb' do
-        source 'http://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/13.04/x86_64/chef_12.2.1-1_amd64.deb'
-      end
-      dpkg_package 'chef' do
-        source '/opt/chef_12.2.1-1_amd64.deb'
-      end
-      directory '/etc/chef'
-      file '/etc/chef/client.pem' do
-        content ChefZero::Server.new.gen_key_pair.first
-      end
-      file '/etc/chef/client.rb' do
-        content "chef_server_url 'http://10.0.3.1:8889'\n"
+describe(:fleet_dsl) do
+  let(:server) { ChefSpecHelper.new_server }
+  let(:fleet) { ChefSpecHelper.create_fleet(server) }
+
+  after(:each) do
+    server.stop if server.running?
+  end
+
+  it 'succeeds' do
+    # Upload cookbooks, data bags, create roles
+    fleet.upload_cookbooks(cookbook_path)
+    fleet.create_role('memcached', 'recipe[memcached]')
+
+    # Create base container with chef installed in it
+    fleet.create_container('base') do |ct|
+      ct.recipe do
+        execute 'apt-get update -y'
+        remote_file '/opt/chef_12.2.1-1_amd64.deb' do
+          source 'http://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/13.04/x86_64/chef_12.2.1-1_amd64.deb'
+        end
+        dpkg_package 'chef' do
+          source '/opt/chef_12.2.1-1_amd64.deb'
+        end
+        directory '/etc/chef'
+        file '/etc/chef/client.pem' do
+          content ChefZero::Server.new.gen_key_pair.first
+        end
+        file '/etc/chef/client.rb' do
+          content "chef_server_url 'http://10.0.3.1:8889'\n"
+        end
       end
+      ct.stop
+    end
+
+    fleet.create_container('memcached', from: 'base') do |ct|
+      ct.command!('chef-client -r role[memcached]')
+      ct.stop
     end
-  end
-  
-  # configure chef setting for the new chef server
-  fleet.chef_config do |config|
-    config[:client_key] = tempfile.path
-    config[:node_name] = 'test'
-    config[:chef_server_url] = 'http://10.0.3.1:8889'
-  end
-  
-  # Upload cookbooks, data bags, create roles 
-  fleet.upload_cookbooks(cookbook_path)
-  fleet.create_role('memcached', 'recipe[memcached]')
-  fleet.create_container('memcached', from: 'base') do |ct|
-    ct.command('chef-client -r role[memcached]')
   end
 end

data/spec/chef/lxc/knife_helper_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe Chef::LXC::KnifeHelper do
+  before(:each) do
+    fleet.chef_config({encrypted_data_bag_secret: 'secret'})
+
+    allow(File).to receive(:exist?).and_call_original
+    allow(File).to receive(:exist?).with('secret').and_return(true)
+    allow(IO).to receive(:read).and_call_original
+    allow(IO).to receive(:read).with('secret').and_return('secret_val')
+  end
+
+  after(:each) do
+    server.stop if server.running?
+  end
+
+  def create_data_bag(data_bag_name, hash, opts = {})
+    fleet.create_data_bag(data_bag_name)
+    fleet.upload_data_bag_item_from_hash(data_bag_name, hash, opts)
+  end
+
+  let(:server) { ChefSpecHelper.new_server }
+  let(:fleet) { ChefSpecHelper.create_fleet(server) }
+  let(:data_bag_name) { :data_bag_name }
+  let(:item_name) { :item_name }
+
+  context('#update_data_bag_item') do
+    it 'adds new keys to data bag item (encrypted)' do
+      opts = {encrypted: true}
+      create_data_bag(data_bag_name, {'id' => item_name}, opts)
+
+      fleet.update_data_bag_item(data_bag_name, item_name, {a: :b}, opts)
+
+      secrets = Chef::EncryptedDataBagItem.load(data_bag_name, item_name)
+      expect(secrets['a']).to eq('b')
+    end
+
+    it 'overwrites old keys in data bag item (encrypted)' do
+      opts = {encrypted: true}
+      existing_data = {'id' => item_name, a: :c}
+      create_data_bag(data_bag_name, existing_data, opts)
+
+      fleet.update_data_bag_item(data_bag_name, item_name, {a: :b}, opts)
+
+      secrets = Chef::EncryptedDataBagItem.load(data_bag_name, item_name)
+      expect(secrets['a']).to eq('b')
+    end
+
+    it 'adds new keys to data bag item (unencrypted)' do
+      opts = {}
+      create_data_bag(data_bag_name, {'id' => item_name}, opts)
+
+      fleet.update_data_bag_item(data_bag_name, item_name, {a: :b}, opts)
+
+      secrets = Chef::DataBagItem.load(data_bag_name, item_name)
+      expect(secrets['a']).to eq('b')
+    end
+
+    it 'overwrites old keys in data bag item (unencrypted)' do
+      opts = {}
+      existing_data = {'id' => item_name, a: :c}
+      create_data_bag(data_bag_name, existing_data, opts)
+
+      fleet.update_data_bag_item(data_bag_name, item_name, {a: :b}, opts)
+
+      secrets = Chef::DataBagItem.load(data_bag_name, item_name)
+      expect(secrets['a']).to eq('b')
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -19,6 +19,28 @@ module LXCSpecHelper
   end
 end
 
+module ChefSpecHelper
+  def self.new_server
+    ChefZero::Server.new(host: '10.0.3.1', port: 8889)
+  end
+
+  def self.create_fleet(server)
+    server.start_background unless server.running?
+    tempfile = Tempfile.new('chef-lxc')
+    File.open(tempfile.path, 'w') do |f|
+      f.write(server.gen_key_pair.first)
+    end
+
+    Chef::LXC.create_fleet('chef-helper') do |fleet|
+      fleet.chef_config do |config|
+        config[:client_key] = tempfile.path
+        config[:node_name] = 'test'
+        config[:chef_server_url] = server.url
+      end
+    end
+  end
+end
+
 RSpec.configure do |config|
   config.expect_with(:rspec) { |c| c.syntax = :expect }
   config.filter_run(focus: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-lxc
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: '0.3'
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: ruby-lxc
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +148,7 @@ files:
 - lib/chef/resource/lxc.rb
 - spec/chef/lxc/fleet_dsl.rb
 - spec/chef/lxc/fleet_spec.rb
+- spec/chef/lxc/knife_helper_spec.rb
 - spec/chef/recipe_spec.rb
 - spec/chef/simple_spec.rb
 - spec/chef/template_spec.rb
@@ -178,13 +179,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: LXC bindings for Chef
 test_files:
 - spec/chef/lxc/fleet_dsl.rb
 - spec/chef/lxc/fleet_spec.rb
+- spec/chef/lxc/knife_helper_spec.rb
 - spec/chef/recipe_spec.rb
 - spec/chef/simple_spec.rb
 - spec/chef/template_spec.rb