chef-vault-retry 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff30d34bbf8026116369661dfe0339c53bfb2b51
-  data.tar.gz: a527512f4de92b17142e06c7993beaa670ff4289
+  metadata.gz: ebd822ec9d88f7fab435cc60cf48faa85608d686
+  data.tar.gz: 3d2a8956a769a8dd04fc68864cda8152fd7ec5b3
 SHA512:
-  metadata.gz: 41b84e9897fe479a20032128b488955a32cae01f308715c8135b1c201bb03cb9b1d4feaf2c11f6dff4fde35fa8e0cccd5e66abeefaa7245d9a7224b6c61df285
-  data.tar.gz: f1c0f2d2ae341a2e17f902cbd30ae09b76991be40f485a33e95041e7607ec55b37ce23453a087a3ac64a09d8868737c96c7fedcb39d3b1c2192c2e51e0b50cb9
+  metadata.gz: cd11e0ba0ec77f377bbc7409a60c478889be750cf97319e292ca127503e29dfa3f8068d0553cafe28eae12e0dc1aa91089ccb2c2fb7a882469b4c6a2841d2f7a
+  data.tar.gz: a19ad6626932f001d4737ae995db29f0f6f763fad7b0d7110ce34e0550bbc46c7e6fbe53d71616290f9f8e37da137ce01a5deb601e76a73403275f2ba8dafbc1

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Style/FileName:
+  Enabled: false

data/README.md

@@ -37,3 +37,7 @@ The same ChefVault::Item.load method will be called, but if a secret decryption
 2. Recipe execution will pause for 30 seconds
 3. The process will repeat
   * It will repeat this 40 times by default (~20 minutes). The number of retries can be customized by passing a Fixnum as the `retries` argument of `ChefVaultRetry::Item.load`
+
+## Databag Fallback
+
+This cookbook emulates the default `chef-vault` cookbook behaviour and falls back to normal data bag item loading if the item is not actually a Chef Vault item. This can be disabled by passing `databag_fallback=false` to `ChefVaultRetry::Item.load`.

data/lib/chef-vault-retry.rb

@@ -20,20 +20,24 @@ require 'chef-vault'
 
 class ChefVaultRetry
   class Item
-
-    def self.load(v, i, retries=40)
-      retries.times do
-        begin
-          return ChefVault::Item.load(v, i)
-        rescue ChefVault::Exceptions::SecretDecryption
-          puts "SecretDecryption exception raised; "\
-               "please refresh vault item (#{v}/#{i})"
-          sleep 30
-          next
+    def self.load(v, i, retries = 40, databag_fallback = true)
+      if ChefVault::Item.vault?(v, i)
+        retries.times do
+          begin
+            return ChefVault::Item.load(v, i)
+          rescue ChefVault::Exceptions::SecretDecryption
+            puts 'SecretDecryption exception raised; '\
+                 "please refresh vault item (#{v}/#{i})"
+            sleep 30
+            next
+          end
         end
+        fail "Failed after #{retries} attempts to decrypt #{v}/#{i}"
+      elsif databag_fallback
+        Chef::DataBagItem.load(v, i)
+      else
+        fail "#{v}/#{i} vault item not found and databag_fallback not permitted"
       end
-      fail "Failed after #{retries} attempts to decrypt #{v}/#{i}"
     end
-
   end
 end

data/lib/chef-vault-retry/version.rb

@@ -15,6 +15,6 @@
 # limitations under the License.
 
 class ChefVaultRetry
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-vault-retry
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Biola University
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-vault
@@ -32,6 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - README.md
 - chef-vault-retry.gemspec
@@ -57,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Retry support for chef-vault