poise-hoist 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fb46295a34a27f0f93f96bb1d19347a1abf7702
-  data.tar.gz: 6b408c0816b48407f2573eb27e5d2f54ecb03dcf
+  metadata.gz: 518418c390cdbf5b75dcddb83c1d6c8f82f30973
+  data.tar.gz: 031e61388626f606f34feda87fade78a3677d5b5
 SHA512:
-  metadata.gz: f8278a692afba614124b282cddd22f17c5aaa7896dbf0321bde657fa6d03158c87094b7fc421483f89344c66349cee0569caf1d6e01bba288bcda639bb471e8c
-  data.tar.gz: 42cad4e087ec0d89d6d780d9196998a0076d7765a489c21245751e7da7b512c4fae9c8f05948f630ec3ef66f3231fa0a9876c243637438629b0979b191952279
+  metadata.gz: bf936d9d119dca4f120234eb54573474cfc05f4e655ed822d15846b44199ae1ecfb7e60abae65bb58a05cc1db10fa6064830b0df6264434c5d8f25bf11ceb14f
+  data.tar.gz: 0a7018c2f7e5b28c1f32bd412b158a5c4a1c89c425f11d2aad1f21f0099146f9927eb1c0a889fc34997a8585d005b0662b5e79cb11a1d616e377bc9b4e083942

data/.kitchen.yml

@@ -1,10 +1,21 @@
 ---
 #<% require 'poise_boiler' %>
-<%= PoiseBoiler.kitchen(platforms: 'ubuntu-14.04') %>
+<%= PoiseBoiler.kitchen(platforms: 'ubuntu-16.04') %>
 
 provisioner:
   name: poise_policyfile_zero
-  policyfile: test/integration/default_policy.rb
 
 verifier:
   name: inspec
+
+suites:
+- name: default
+  run_list:
+  - poise-hoist_test
+  provisioner:
+    policyfile: test/integration/default_policy.rb
+- name: data_bags
+  run_list:
+  - poise-hoist_test
+  provisioner:
+    policyfile: test/integration/data_bags_policy.rb

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Poise-Hoist Changelog
 
+## v1.2.1
+
+* Fix a logic error if you aren't using the data bag support.
+
 ## v1.2.0
 
 * Support for reading attributes from data bags when configured via `node['poise-hoist']['data_bag']`.

data/README.md

@@ -64,9 +64,11 @@ be disabled by setting `node['poise-hoist']['hoist_chef_environment'] = false`.
 
 ## Data Bag Attributes
 
-To pull in data from a data bag, set `node['poise-hoist']['data_bag']`, in your
-Policyfile or in a wrapper cookbook. It will look for an item in the specified
-data bag using the name of the node and then the name of policy group.
+To pull in data from a data bag, set `default['poise-hoist']['data_bag'] = 'the name of the data bag'`
+in your Policyfile. It will look for an item in the specified data bag using the
+name of the node and then the name of policy group. You can use this in
+combination with the normal group-level hoisting to have a different data bag
+name for some policy groups.
 
 This can be useful in combination with attributes from the Policyfile to provide
 immediate overrides outside of the "compile and push" cycle of the policy system.

data/lib/poise_hoist.rb

@@ -40,8 +40,9 @@ module PoiseHoist
     # Hoist away, mateys!
     Chef::Mixin::DeepMerge.hash_only_merge!(node.role_default, node.role_default[policy_group]) if node.role_default.include?(policy_group)
     Chef::Mixin::DeepMerge.hash_only_merge!(node.role_override, node.role_override[policy_group]) if node.role_override.include?(policy_group)
-    # Grab from a data bag if one is configured.
-    hoist_from_data_bag!(node, policy_group, node['poise-hoist']['data_bag']) if node['poise-hoist']['data_bag']
+    # Grab from a data bag if one is configured. Remember this might run very
+    # early on newer Chef versions, before attribute loading.
+    hoist_from_data_bag!(node, policy_group, node['poise-hoist']['data_bag']) if node['poise-hoist'] && node['poise-hoist']['data_bag']
     # Install the patch for chef_environment.
     patch_chef_environment!(node, policy_group)
   end

data/lib/poise_hoist/version.rb

@@ -17,5 +17,5 @@
 
 module PoiseHoist
   # Version for the poise-hoist gem.
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/test/integration/data_bags/data_bags_spec.rb

@@ -0,0 +1,23 @@
+#
+# Copyright 2016-2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+describe file('/hoist_test') do
+  its(:content) { is_expected.to eq '{"one":11,"two":222,"three":3,"four":44}' }
+end
+
+describe file('/hoist_environment') do
+  its(:content) { is_expected.to eq 'local' }
+end

data/test/integration/data_bags_policy.rb

@@ -0,0 +1,26 @@
+#
+# Copyright 2016-2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name 'default'
+run_list 'poise-profiler', 'poise-hoist_test'
+
+default['other']['hoist_test']['one'] = 100
+default['local']['hoist_test']['one'] = 11
+override['hoist_test']['two'] = 22
+override['other']['hoist_test']['two'] = 220
+override['local']['hoist_test']['two'] = 222
+
+default['poise-hoist']['data_bag'] = 'hoist'

data/test/integration/default/default_spec.rb

@@ -15,7 +15,7 @@
 #
 
 describe file('/hoist_test') do
-  its(:content) { is_expected.to eq '{"one":11,"two":222,"three":3,"four":44}' }
+  its(:content) { is_expected.to eq '{"one":11,"two":222,"three":3,"four":4}' }
 end
 
 describe file('/hoist_environment') do

data/test/integration/default_policy.rb

@@ -22,5 +22,3 @@ default['local']['hoist_test']['one'] = 11
 override['hoist_test']['two'] = 22
 override['other']['hoist_test']['two'] = 220
 override['local']['hoist_test']['two'] = 222
-
-default['poise-hoist']['data_bag'] = 'hoist'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poise-hoist
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Noah Kantrowitz
@@ -142,7 +142,9 @@ files:
 - test/gemfiles/chef-13.0.gemfile
 - test/gemfiles/chef-13.gemfile
 - test/gemfiles/master.gemfile
+- test/integration/data_bags/data_bags_spec.rb
 - test/integration/data_bags/hoist/local.json
+- test/integration/data_bags_policy.rb
 - test/integration/default/default_spec.rb
 - test/integration/default_policy.rb
 - test/spec/fixtures/encrypted-node.json
@@ -204,7 +206,9 @@ test_files:
 - test/gemfiles/chef-13.0.gemfile
 - test/gemfiles/chef-13.gemfile
 - test/gemfiles/master.gemfile
+- test/integration/data_bags/data_bags_spec.rb
 - test/integration/data_bags/hoist/local.json
+- test/integration/data_bags_policy.rb
 - test/integration/default/default_spec.rb
 - test/integration/default_policy.rb
 - test/spec/fixtures/encrypted-node.json