Merge pull request #976 from tylerjl/pipeline-json-types

Fix pipeline json types

Author: tylerjl

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## x.x.x (Month Day, Year)
 
 #### Fixes
+* Fix an issue with string coercion for certain fields in pipelines.
 
 #### Features
 

lib/puppet_x/elastic/deep_to_s.rb

@@ -10,7 +10,7 @@ def self.deep_to_s(obj)
         obj.map { |element| deep_to_s(element) }
       elsif obj.is_a? Hash
         obj.merge(obj) { |_key, val| deep_to_s(val) }
-      elsif (not obj.is_a? String) and obj.respond_to? :to_s
+      elsif (not obj.is_a? String) and (not [true, false].include?(obj)) and obj.respond_to? :to_s
         obj.to_s
       else
         obj

spec/acceptance/tests/acceptance_spec.rb

@@ -2,6 +2,7 @@
 require 'helpers/acceptance/tests/basic_shared_examples.rb'
 require 'helpers/acceptance/tests/template_shared_examples.rb'
 require 'helpers/acceptance/tests/removal_shared_examples.rb'
+require 'helpers/acceptance/tests/pipeline_shared_examples.rb'
 require 'helpers/acceptance/tests/plugin_shared_examples.rb'
 require 'helpers/acceptance/tests/plugin_upgrade_shared_examples.rb'
 require 'helpers/acceptance/tests/snapshot_repository_shared_examples.rb'
@@ -89,6 +90,8 @@
 
   include_examples('template operations', es_01, v[:template])
 
+  include_examples('pipeline operations', es_01, v[:pipeline]) if semver(v[:elasticsearch_full_version]) >= semver('5.0.0')
+
   include_examples('plugin acceptance tests', v[:elasticsearch_plugins]) unless v[:elasticsearch_plugins].empty?
 
   # Only pre-5.x versions supported versions differing from core ES

spec/fixtures/pipelines/example.json

@@ -0,0 +1,47 @@
+{
+  "description": "An example pipeline.",
+  "on_failure": [
+    {
+      "set": {
+        "field": "error",
+        "value": "{{ _ingest.on_failure_message }}"
+      }
+    }
+  ],
+  "processors": [
+    {
+      "grok": {
+        "field": "message",
+        "ignore_missing": true,
+        "patterns": [
+          "%{COMBINEDAPACHELOG}"
+        ]
+      }
+    },
+    {
+      "remove": {
+        "field": "message"
+      }
+    },
+    {
+      "date": {
+        "field": "read_timestamp",
+        "formats": [
+          "dd/MMM/YYYY:H:m:s Z"
+        ],
+        "target_field": "@timestamp"
+      }
+    },
+    {
+      "remove": {
+        "field": "read_timestamp"
+      }
+    },
+    {
+      "script": {
+        "lang": "painless",
+        "source": "ctx._index = 'foo';"
+      }
+    }
+  ]
+}

spec/helpers/acceptance/tests/pipeline_shared_examples.rb

@@ -0,0 +1,39 @@
+require 'json'
+require 'helpers/acceptance/tests/manifest_shared_examples'
+require 'helpers/acceptance/tests/bad_manifest_shared_examples'
+
+shared_examples 'pipeline operations' do |instances, pipeline|
+  describe 'pipeline resources' do
+    let(:pipeline_name) { 'foo' }
+    context 'present' do
+      let(:extra_manifest) do
+        <<-MANIFEST
+          elasticsearch::pipeline { '#{pipeline_name}':
+            ensure  => 'present',
+            content => #{pipeline}
+          }
+        MANIFEST
+      end
+
+      include_examples(
+        'manifest application',
+        instances
+      )
+
+      context 'absent' do
+        let(:extra_manifest) do
+          <<-MANIFEST
+            elasticsearch::template { '#{pipeline_name}':
+              ensure => absent,
+            }
+          MANIFEST
+        end
+
+        include_examples(
+          'manifest application',
+          instances
+        )
+      end
+    end
+  end
+end

spec/helpers/unit/type/elasticsearch_rest_shared_examples.rb

@@ -68,7 +68,7 @@
           :name => resource_name,
           meta_property => { 'key' => { 'value' => '0', 'other' => true } }
         )[meta_property]).to include(
-          'key' => { 'value' => 0, 'other' => 'true' }
+          'key' => { 'value' => 0, 'other' => true }
         )
       end
     end

spec/spec_helper_acceptance.rb

@@ -33,6 +33,7 @@ def f
                      JSON.load(File.new('spec/fixtures/templates/post_6.0.json'))
                    end
     v[:template] = Puppet_X::Elastic.deep_to_i(Puppet_X::Elastic.deep_to_s(v[:template]))
+    v[:pipeline] = JSON.load(File.new('spec/fixtures/pipelines/example.json'))
 
     v[:elasticsearch_plugins] = Dir[
       artifact("*#{v[:elasticsearch_full_version]}.zip", ['plugins'])

spec/unit/type/elasticsearch_template_spec.rb

@@ -109,6 +109,8 @@ def deep_stringify(obj)
           obj.map { |element| deep_stringify(element) }
         elsif obj.is_a? Hash
           obj.merge(obj) { |_key, val| deep_stringify(val) }
+        elsif [true, false].include? obj
+          obj
         else
           obj.to_s
         end