Merge branch 'pr/1036'

tylerjl · tylerjl · commit f94aa0fad6b2 · 2019-08-20T15:59:34.000-06:00
Closes #1036
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * Support for Puppet 6
 
 #### Fixes
+* Fix "Could not autoload" errors in some custom types/providers.
 
 ## 6.3.4 (August 7, 2019)
 
diff --git a/lib/puppet/provider/elasticsearch_user/elasticsearch_users.rb b/lib/puppet/provider/elasticsearch_user/elasticsearch_users.rb
@@ -1,4 +1,4 @@
-require 'puppet/provider/elastic_user_command'
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'puppet/provider/elastic_user_command')
 
 Puppet::Type.type(:elasticsearch_user).provide(
   :elasticsearch_users,
diff --git a/lib/puppet/provider/elasticsearch_user/esusers.rb b/lib/puppet/provider/elasticsearch_user/esusers.rb
@@ -1,4 +1,4 @@
-require 'puppet/provider/elastic_user_command'
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'puppet/provider/elastic_user_command')
 
 Puppet::Type.type(:elasticsearch_user).provide(
   :esusers,
diff --git a/lib/puppet/provider/elasticsearch_user/users.rb b/lib/puppet/provider/elasticsearch_user/users.rb
@@ -1,4 +1,4 @@
-require 'puppet/provider/elastic_user_command'
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'puppet/provider/elastic_user_command')
 
 Puppet::Type.type(:elasticsearch_user).provide(
   :users,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require 'puppet/provider/elastic_user_command'`
	`1`	`+require File.join(File.dirname(__FILE__), '..', '..', '..', 'puppet/provider/elastic_user_command')`
`2`	`2`
`3`	`3`	`Puppet::Type.type(:elasticsearch_user).provide(`
`4`	`4`	`:elasticsearch_users,`