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.
+* Fixed an erroneous inclusion of '<' in logging.yml
 * Resolve deprecation warnings related to use of the deprecated is_string() function.
 
 ## 6.3.0 (June 18, 2018)

Rakefile

@@ -6,14 +6,13 @@ require 'net/http'
 require 'uri'
 require 'fileutils'
 require 'rspec/core/rake_task'
-require 'open-uri'
 require 'puppet-strings'
 require 'puppet-strings/tasks'
 require 'yaml'
 require 'json'
 require_relative 'spec/spec_utilities'
 
-ENV['VAULT_APPROLE_ROLE_ID'] = '48adc137-3270-fc4a-ae65-1306919d4bb0'
+ENV['VAULT_APPROLE_ROLE_ID'] ||= '48adc137-3270-fc4a-ae65-1306919d4bb0'
 oss_package = ENV['OSS_PACKAGE'] and ENV['OSS_PACKAGE'] == 'true'
 
 # Workaround for certain rspec/beaker versions
@@ -157,18 +156,13 @@ namespace :artifact do
   end
 
   namespace :snapshot do
-    begin
-      retries ||= 0
-      catalog = JSON.parse(
-        open('https://artifacts-api.elastic.co/v1/branches/6.3').read
-      )['latest']
-    rescue
-      retry if (retries += 1) < 3
-    end
+    snapshot_version = JSON.parse(http_retry('https://artifacts-api.elastic.co/v1/versions'))['versions'].reject do |version|
+      version.include? 'alpha'
+    end.last
 
-    ENV['snapshot_version'] = catalog['version']
+    ENV['snapshot_version'] = snapshot_version
 
-    downloads = catalog['projects']['elasticsearch']['packages'].select do |pkg, _|
+    downloads = JSON.parse(http_retry("https://artifacts-api.elastic.co/v1/search/#{snapshot_version}/elasticsearch"))['packages'].select do |pkg, _|
       pkg =~ /(?:deb|rpm)/ and (oss_package ? pkg =~ /oss/ : pkg !~ /oss/)
     end.map do |package, urls|
       [package.split('.').last, urls]

data/common.yaml

@@ -11,7 +11,7 @@ elasticsearch::api_timeout: 10
 elasticsearch::autoupgrade: false
 elasticsearch::config: {}
 elasticsearch::configdir: /etc/elasticsearch
-elasticsearch::daily_rolling_date_pattern: <
+elasticsearch::daily_rolling_date_pattern: |
   "'.'yyyy-MM-dd"
 elasticsearch::datadir_instance_directories: true
 elasticsearch::default_logging_level: 'INFO'

spec/spec_utilities.rb

@@ -1,4 +1,5 @@
 require 'bcrypt'
+require 'open-uri'
 
 def to_agent_version(puppet_version)
   # REF: https://docs.puppet.com/puppet/latest/reference/about_agent.html
@@ -114,6 +115,13 @@ def vault_available?
   end.empty?
 end
 
+def http_retry(url)
+  retries ||= 0
+  open(url).read
+rescue
+  retry if (retries += 1) < 3
+end
+
 # Helper to store arbitrary testing setting values
 def v
   RSpec.configuration.v