dop_common 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06db02a6e3c138e0cefb89889a14bc57af725157
-  data.tar.gz: 19e104c7a7b4cece0fb0858bfb3399a5c83ef3db
+  metadata.gz: 07527d17d603f0e24a7ac08b22e97a4d6b8d68c7
+  data.tar.gz: e3db1d8a02b4a4b8c6ed3ca1f7a5d718d9a3ae3a
 SHA512:
-  metadata.gz: 6f960ca073dda2ee7ddf9094ee54a4ea2c75baddc0570293943ec73116965dff1b24396df2a5d6b400d75d79d0ebb0b14b89bb564d0a347c63d92758b623d6af
-  data.tar.gz: 64da82634072e695027fad76e8cda5ffe53bfb5afa613385e245eae337d86e79f93492acb49c358e13d7b91ff59983f865404483ad3cf5e2fe8e92ca6f4f4b24
+  metadata.gz: ec7e26b4587ededd9eb60174fb9e81d7e4c4f992a23a4cb0bf96230f6ed048b7008fe53dd73fc0b4cb8f783cdbb78e2eba4862bfab30a8645d94b2399694908d
+  data.tar.gz: a261d97e99b4a56976f1e12bb8eed7044e86798cd358f6fe2d271313eb17c4c5c0d801bc2dc715abf6f2905838350bba9292fc7d65863688b80a6b0d23e3c378

data/CHANGELOG.md

@@ -1,7 +1,11 @@
 # Change Log
 All notable changes to dop_common will be documented in this file.
 
-## [0.15.0]
+## [0.15.1]
+### Fixed
+- Fix the default plan store path for the hiera plugin and add some more tests
+
+## [0.15.0] - 2017-05-26
 ### Added
 - Some small API addition to the log stuff to get the current log file
 

data/Gemfile

@@ -8,4 +8,6 @@ if Gem::Version.new(RUBY_VERSION.dup) <= Gem::Version.new('1.9.3')
   gem 'json', '~> 1'
 end
 
+gem 'hiera'
+
 gemspec

data/lib/dop_common/version.rb

@@ -1,3 +1,3 @@
 module DopCommon
-  VERSION = '0.15.0'
+  VERSION = '0.15.1'
 end

data/lib/hiera/backend/dop_backend.rb

@@ -19,14 +19,17 @@ class Hiera
         if Config[:dop].kind_of?(Hash)
           @plan_store_dir ||= Config[:dop][:plan_store_dir]
         end
-        @plan_store_dir ||= '/var/lib/dop/plans'
+        # this is the fixed default path since the puppet master runs with the
+        # puppet user but wants to read from the default dop cache and not from
+        # the user specific one.
+        @plan_store_dir ||= '/var/lib/dop/cache/'
 
         @plan_store = DopCommon::PlanStore.new(@plan_store_dir)
         @plan_cache = DopCommon::PlanCache.new(@plan_store)
         Hiera.debug('DOP Plan Cache Loaded')
       end
 
-      def lookup(key, scope, order_override, resolution_type, context = nil)
+      def lookup(key, scope, order_override, resolution_type, context = {})
         node_name = scope['::clientcert']
         plan = @plan_cache.plan_by_node(node_name)
 
@@ -49,7 +52,11 @@ class Hiera
           Hiera.debug("Looking for data source #{source}")
           begin
             data = plan.configuration.lookup(source, key, scope)
-            new_answer = Hiera::Backend.parse_answer(data, scope, extra_data, context)
+            if Hiera::Backend.method(:parse_answer).arity == -4
+              new_answer = Hiera::Backend.parse_answer(data, scope, extra_data, context)
+            else
+              new_answer = Hiera::Backend.parse_answer(data, scope, extra_data)
+            end
             found = true
 
             case resolution_type.is_a?(Hash) ? :hash : resolution_type

data/spec/fixtures/hiera/hiera.yaml

@@ -0,0 +1,6 @@
+:backends:
+    - dop
+:hierarchy:
+    - nodes/%{::clientcert}
+    - roles/%{::role}
+    - defaults

data/spec/fixtures/simple_plan.yaml

@@ -9,6 +9,11 @@ nodes:
   'linux01.example.com':
     infrastructure: 'test'
 
+configuration:
+  nodes:
+    'linux01.example.com':
+      somevar: 'someval'
+
 steps:
   - name: 'write hello world'
     nodes: 'all'

data/spec/hiera/backend/dop_backend_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+require 'hiera'
+require 'hiera/backend/dop_backend'
+
+describe Hiera::Backend::Dop_backend do
+
+  before :each do
+    @tmpdir = Dir.mktmpdir
+    @plan_store = DopCommon::PlanStore.new(@tmpdir)
+    @plan_cache = DopCommon::PlanCache.new(@plan_store)
+    @plan_store.add(plan)
+    config = YAML.load_file(hiera_conf)
+    config.merge!({:dop => {:plan_store_dir => @tmpdir}})
+    @hiera = Hiera.new(:config => config)
+  end
+
+  after :each do
+    FileUtils.remove_entry_secure(@tmpdir)
+  end
+
+  let(:hiera_conf) { 'spec/fixtures/hiera/hiera.yaml' }
+  let(:plan) { 'spec/fixtures/simple_plan.yaml' }
+  let(:plan_name) { 'simple_plan' }
+  let(:plan_dir) { File.join(@tmpdir, plan_name) }
+  let(:versions_dir) { File.join(plan_dir, 'versions') }
+  let(:node_name) { 'linux01.example.com' }
+  let(:var) { 'somevar' }
+  let(:scope) { {'::clientcert' => node_name} }
+
+  describe '#lookup' do
+    subject { @hiera.lookup(var, nil, scope) }
+
+    context 'There is a plan in the store with the data' do
+      it { is_expected.to eq('someval') }
+    end
+
+    #context 'val is not set in the plan' do
+    #  let(:var) { 'someothervar' }
+    #  it { is_expected.to be(nil) }
+    #end
+
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dop_common
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Andreas Zuber
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashdiff
@@ -278,6 +278,7 @@ files:
 - spec/example_plans_spec.rb
 - spec/fixtures/example_ssh_key
 - spec/fixtures/example_ssh_key.pub
+- spec/fixtures/hiera/hiera.yaml
 - spec/fixtures/incl/root_part.yaml
 - spec/fixtures/incl/some_list.yaml
 - spec/fixtures/other_plan_same_nodes.yaml
@@ -286,6 +287,7 @@ files:
 - spec/fixtures/simple_plan.yaml
 - spec/fixtures/simple_plan_invalid.yaml
 - spec/fixtures/simple_plan_modified.yaml
+- spec/hiera/backend/dop_backend_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -342,6 +344,7 @@ test_files:
 - spec/example_plans_spec.rb
 - spec/fixtures/example_ssh_key
 - spec/fixtures/example_ssh_key.pub
+- spec/fixtures/hiera/hiera.yaml
 - spec/fixtures/incl/root_part.yaml
 - spec/fixtures/incl/some_list.yaml
 - spec/fixtures/other_plan_same_nodes.yaml
@@ -350,4 +353,5 @@ test_files:
 - spec/fixtures/simple_plan.yaml
 - spec/fixtures/simple_plan_invalid.yaml
 - spec/fixtures/simple_plan_modified.yaml
+- spec/hiera/backend/dop_backend_spec.rb
 - spec/spec_helper.rb