CHANGELOG.md

@@ -2,9 +2,15 @@ Changelog
 =========
 
 ## Unreleased
-[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.8.2...HEAD)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.8.3...HEAD)
 
-## [v0.8.1](https://github.com/pcfens/puppet-filebeat/tree/v0.8.2)
+## [v0.8.3](https://github.com/pcfens/puppet-filebeat/tree/v0.8.3)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.8.2...v0.8.3)
+
+- Don't use a possibly undefined array's length to determine if it should be
+  iterated over [\52](https://github.com/pcfens/puppet-filebeat/pull/52)
+
+## [v0.8.2](https://github.com/pcfens/puppet-filebeat/tree/v0.8.2)
 [Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.8.1...v0.8.2)
 
 - Correctly set document type for v5 prospectors [\51](https://github.com/pcfens/puppet-filebeat/pull/51)

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "pcfens-filebeat",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "author": "pcfens",
   "license": "Apache-2.0",
   "summary": "A module to install and manage the filebeat log shipper",

templates/filebeat5.yml.erb

@@ -152,13 +152,13 @@ output.elasticsearch:
     <%- if @filebeat_config['output']['elasticsearch']['ssl']['verification_mode'] != nil -%>
     verification_mode: <%= @filebeat_config['output']['elasticsearch']['ssl']['verification_mode'] %>
     <%- end -%>
-    <%- if @filebeat_config['output']['elasticsearch']['ssl']['supported_protocols'].length > 0 -%>
+    <%- if @filebeat_config['output']['elasticsearch']['ssl']['supported_protocols'] != nil -%>
     supported_protocols:
     <%- @filebeat_config['output']['elasticsearch']['ssl']['supported_protocols'].each do |protocol| -%>
       - <%= protocol %>
       <%- end -%>
     <%- end -%>
-    <%- if @filebeat_config['output']['elasticsearch']['ssl']['certificate_authorities'].length > 0 -%>
+    <%- if @filebeat_config['output']['elasticsearch']['ssl']['certificate_authorities'] != nil -%>
     certificate_authorities:
     <%- @filebeat_config['output']['elasticsearch']['ssl']['certificate_authorities'].each do |ca| -%>
       - <%= ca %>
@@ -173,13 +173,13 @@ output.elasticsearch:
     <%- if @filebeat_config['output']['elasticsearch']['ssl']['key_passphrase'] != nil -%>
     key_passphrase: '<%= @filebeat_config['output']['elasticsearch']['ssl']['key_passphrase'] %>'
     <%- end -%>
-    <%- if @filebeat_config['output']['elasticsearch']['ssl']['cipher_suites'].length > 0 -%>
+    <%- if @filebeat_config['output']['elasticsearch']['ssl']['cipher_suites'] != nil -%>
     cipher_suites:
     <%- @filebeat_config['output']['elasticsearch']['ssl']['cipher_suites'].each do |cipher_suite| -%>
       - <%= cipher_suite %>
       <%- end -%>
     <%- end -%>
-    <%- if @filebeat_config['output']['elasticsearch']['ssl']['curve_types'].length > 0 -%>
+    <%- if @filebeat_config['output']['elasticsearch']['ssl']['curve_types'] != nil -%>
     curve_types:
     <%- @filebeat_config['output']['elasticsearch']['ssl']['curve_types'].each do |curve_type| -%>
       - <%= curve_type %>
@@ -228,13 +228,7 @@ output.logstash:
     <%- if @filebeat_config['output']['logstash']['ssl']['verification_mode'] != nil -%>
     verification_mode: <%= @filebeat_config['output']['logstash']['ssl']['verification_mode'] %>
     <%- end -%>
-    <%- if @filebeat_config['output']['logstash']['ssl']['supported_protocols'].length > 0 -%>
-    supported_protocols:
-    <%- @filebeat_config['output']['logstash']['ssl']['supported_protocols'].each do |protocol| -%>
-      - <%= protocol %>
-    <%- end -%>
-    <%- end -%>
-    <%- if @filebeat_config['output']['logstash']['ssl']['certificate_authorities'].length > 0 -%>
+    <%- if @filebeat_config['output']['logstash']['ssl']['certificate_authorities'] != nil -%>
     certificate_authorities:
     <%- @filebeat_config['output']['logstash']['ssl']['certificate_authorities'].each do |ca| -%>
       - <%= ca %>
@@ -249,13 +243,13 @@ output.logstash:
     <%- if @filebeat_config['output']['logstash']['ssl']['key_passphrase'] != nil -%>
     key_passphrase: '<%= @filebeat_config['output']['logstash']['ssl']['key_passphrase'] %>'
     <%- end -%>
-    <%- if @filebeat_config['output']['logstash']['ssl']['cipher_suites'].length > 0 -%>
+    <%- if @filebeat_config['output']['logstash']['ssl']['cipher_suites'] != nil -%>
     cipher_suites:
     <%- @filebeat_config['output']['logstash']['ssl']['cipher_suites'].each do |cipher_suite| -%>
       - <%= cipher_suite %>
     <%- end -%>
     <%- end -%>
-    <%- if @filebeat_config['output']['logstash']['ssl']['curve_types'].length > 0 -%>
+    <%- if @filebeat_config['output']['logstash']['ssl']['curve_types'] != nil -%>
     curve_types:
     <%- @filebeat_config['output']['logstash']['ssl']['curve_types'].each do |curve_type| -%>
       - <%= curve_type %>
@@ -284,7 +278,7 @@ output.kafka:
     <%- if @filebeat_config['output']['kafka']['partition']['hash']['reachable_only'] != nil -%>
     reachable_only: <%= @filebeat_config['output']['kafka']['partition']['hash']['reachable_only'] %>
     <%- end -%>
-    <%- if @filebeat_config['output']['kafka']['partition']['hash']['hash'].length > 0 -%>
+    <%- if @filebeat_config['output']['kafka']['partition']['hash']['hash'] != nil -%>
     hash:
     <%- @filebeat_config['output']['kafka']['partition']['hash']['hash'].each do |value| -%>
       - <%= value %>
@@ -356,13 +350,13 @@ output.kafka:
     <%- if @filebeat_config['output']['kafka']['ssl']['verification_mode'] != nil -%>
     verification_mode: <%= @filebeat_config['output']['kafka']['ssl']['verification_mode'] %>
     <%- end -%>
-    <%- if @filebeat_config['output']['kafka']['ssl']['supported_protocols'].length > 0 -%>
+    <%- if @filebeat_config['output']['kafka']['ssl']['supported_protocols'] != nil -%>
     supported_protocols:
     <%- @filebeat_config['output']['kafka']['ssl']['supported_protocols'].each do |protocol| -%>
       - <%= protocol %>
     <%- end -%>
     <%- end -%>
-    <%- if @filebeat_config['output']['kafka']['ssl']['certificate_authorities'].length > 0 -%>
+    <%- if @filebeat_config['output']['kafka']['ssl']['certificate_authorities'] != nil -%>
     certificate_authorities:
     <%- @filebeat_config['output']['kafka']['ssl']['certificate_authorities'].each do |ca| -%>
       - <%= ca %>
@@ -377,13 +371,13 @@ output.kafka:
     <%- if @filebeat_config['output']['kafka']['ssl']['key_passphrase'] != nil -%>
     key_passphrase: '<%= @filebeat_config['output']['kafka']['ssl']['key_passphrase'] %>'
     <%- end -%>
-    <%- if @filebeat_config['output']['kafka']['ssl']['cipher_suites'].length > 0 -%>
+    <%- if @filebeat_config['output']['kafka']['ssl']['cipher_suites'] != nil -%>
     cipher_suites:
     <%- @filebeat_config['output']['kafka']['ssl']['cipher_suites'].each do |cipher_suite| -%>
       - <%= cipher_suite %>
     <%- end -%>
     <%- end -%>
-    <%- if @filebeat_config['output']['kafka']['ssl']['curve_types'].length > 0 -%>
+    <%- if @filebeat_config['output']['kafka']['ssl']['curve_types'] != nil -%>
     curve_types:
     <%- @filebeat_config['output']['kafka']['ssl']['curve_types'].each do |curve_type| -%>
       - <%= curve_type %>
@@ -445,13 +439,13 @@ output.redis:
     <%- if @filebeat_config['output']['redis']['ssl']['verification_mode'] != nil -%>
     verification_mode: <%= @filebeat_config['output']['redis']['ssl']['verification_mode'] %>
     <%- end -%>
-    <%- if @filebeat_config['output']['redis']['ssl']['supported_protocols'].length > 0 -%>
+    <%- if @filebeat_config['output']['redis']['ssl']['supported_protocols'] != nil -%>
     supported_protocols:
     <%- @filebeat_config['output']['redis']['ssl']['supported_protocols'].each do |protocol| -%>
       - <%= protocol %>
     <%- end -%>
     <%- end -%>
-    <%- if @filebeat_config['output']['redis']['ssl']['certificate_authorities'].length > 0 -%>
+    <%- if @filebeat_config['output']['redis']['ssl']['certificate_authorities'] != nil -%>
     certificate_authorities:
     <%- @filebeat_config['output']['redis']['ssl']['certificate_authorities'].each do |ca| -%>
       - <%= ca %>
@@ -466,13 +460,13 @@ output.redis:
     <%- if @filebeat_config['output']['redis']['ssl']['key_passphrase'] != nil -%>
     key_passphrase: '<%= @filebeat_config['output']['redis']['ssl']['key_passphrase'] %>'
     <%- end -%>
-    <%- if @filebeat_config['output']['redis']['ssl']['cipher_suites'].length > 0 -%>
+    <%- if @filebeat_config['output']['redis']['ssl']['cipher_suites'] != nil -%>
     cipher_suites:
     <%- @filebeat_config['output']['redis']['ssl']['cipher_suites'].each do |cipher_suite| -%>
       - <%= cipher_suite %>
     <%- end -%>
     <%- end -%>
-    <%- if @filebeat_config['output']['redis']['ssl']['curve_types'].length > 0 -%>
+    <%- if @filebeat_config['output']['redis']['ssl']['curve_types'] != nil -%>
     curve_types:
     <%- @filebeat_config['output']['redis']['ssl']['curve_types'].each do |curve_type| -%>
       - <%= curve_type %>