hiera-vault 0.1.6 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5fb5cca3d9d24e6760776515dcb5acbfac438ae2
4
- data.tar.gz: 8a121daa6c51a3fc5c210a7640a95f9ceedcb38c
3
+ metadata.gz: 2e98b1ef726ad9a2412e138a71937ed4ae2bf49e
4
+ data.tar.gz: 206a6df160648bd03c1e1f3fb57582be24f16e1d
5
5
  SHA512:
6
- metadata.gz: 4400e13c0ac33f823313215f047d89500e87fe91b67cd1a483046c0b0884e1f7fa560ca7b4f8229091be3980f4d67aa981c60ded1afdf65421a0f35bf4597ba1
7
- data.tar.gz: 2718aa35637dd800b7338173f750c5b6ebf1c060e07a7cec70a4ded703c49b6beacf638f75426822483bbd153d69eed99c6c4e8736ad8d2ec59771dd3c71ae12
6
+ metadata.gz: 84622036bc28f5b5ba3054c5ae00c8ea5ccc31a943f6d329bc0240194e77097b1b6881b8085761262a9b981ecbd7f10f34ed0aa4fa884d2dc083ca819f6762b1
7
+ data.tar.gz: 503989936d17bcab44d4f96787a3b3a69ecfc53f062e96c90743b510033629d7beb9d47e957591bf5555e9c04e5a27167834f6b2745540e8cd1dd74f2d349a02
@@ -56,23 +56,27 @@ class Hiera
56
56
  # Only generic mounts supported so far
57
57
  @config[:mounts][:generic].each do |mount|
58
58
  path = Backend.parse_string(mount, scope, { 'key' => key })
59
- Hiera.debug("Looking in path #{path}")
60
- new_answer = lookup_generic("#{path}/#{key}", scope)
61
- #Hiera.debug("[hiera-vault] Answer: #{new_answer}:#{new_answer.class}")
62
- next if new_answer.nil?
63
- case resolution_type
64
- when :array
65
- raise Exception, "Hiera type mismatch: expected Array and got #{new_answer.class}" unless new_answer.kind_of? Array or new_answer.kind_of? String
66
- answer ||= []
67
- answer << new_answer
68
- when :hash
69
- raise Exception, "Hiera type mismatch: expected Hash and got #{new_answer.class}" unless new_answer.kind_of? Hash
70
- answer ||= {}
71
- answer = Backend.merge_answer(new_answer,answer)
72
- else
73
- answer = new_answer
74
- break
59
+ Backend.datasources(scope, order_override) do |source|
60
+ Hiera.debug("Looking in path #{path}/#{source}/")
61
+ new_answer = lookup_generic("#{path}/#{source}/#{key}", scope)
62
+ #Hiera.debug("[hiera-vault] Answer: #{new_answer}:#{new_answer.class}")
63
+ next if new_answer.nil?
64
+ case resolution_type
65
+ when :array
66
+ raise Exception, "Hiera type mismatch: expected Array and got #{new_answer.class}" unless new_answer.kind_of? Array or new_answer.kind_of? String
67
+ answer ||= []
68
+ answer << new_answer
69
+ when :hash
70
+ raise Exception, "Hiera type mismatch: expected Hash and got #{new_answer.class}" unless new_answer.kind_of? Hash
71
+ answer ||= {}
72
+ answer = Backend.merge_answer(new_answer,answer)
73
+ else
74
+ answer = new_answer
75
+ found = true
76
+ break
77
+ end
75
78
  end
79
+ break if found
76
80
  end
77
81
 
78
82
  return answer
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hiera-vault
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.6
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Sokolowski
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-01-08 00:00:00.000000000 Z
11
+ date: 2016-02-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: vault
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.2'
19
+ version: '0.3'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '0.2'
26
+ version: '0.3'
27
27
  description: Hiera backend for looking up secrets stored in Vault
28
28
  email: jonathan.sokolowski@gmail.com
29
29
  executables: []