Merge branch 'master' into rest-resources-int-datatypes

Author: tylerjl

CHANGELOG.md

@@ -5,6 +5,7 @@
 #### Fixes
 * REST-based resources are now coerced to string values to uniformly compare user defined values and Elasticsearch API responses.
 * Resolve deprecation warnings related to use of the deprecated is_array() function.
+* Resolve deprecation warnings related to use of the deprecated is_string() function.
 
 ## 6.3.0 (June 18, 2018)
 

manifests/license.pp

@@ -59,7 +59,7 @@
   Optional[Enum['shield', 'x-pack']] $security_plugin         = $elasticsearch::security_plugin,
   Boolean                            $validate_tls            = $elasticsearch::validate_tls,
 ) {
-  if $content != undef and is_string($content) {
+  if $content =~ String {
     $_content = parsejson($content)
   } else {
     $_content = $content

manifests/template.pp

@@ -66,7 +66,7 @@
   Optional[String]                $source                  = undef,
   Boolean                         $validate_tls            = $elasticsearch::validate_tls,
 ) {
-  if $content != undef and is_string($content) {
+  if $content =~ String {
     $_content = parsejson($content)
   } else {
     $_content = $content